refactor!: update to 14.1

EXILED/Exiled.API/Features/CustomStats/CustomHumeShieldStat.cs

@@ -23,7 +23,14 @@ public class CustomHumeShieldStat : HumeShieldStat
         /// </summary>
         public float ShieldRegenerationMultiplier { get; set; } = 1;
 
-        private float ShieldRegeneration => TryGetHsModule(out HumeShieldModuleBase controller) ? controller.HsRegeneration * ShieldRegenerationMultiplier : 0;
+        private float ShieldRegeneration
+        {
+            get
+            {
+                IHumeShieldProvider.GetForHub(Hub, out _, out _, out float hsRegen, out _);
+                return hsRegen * ShieldRegenerationMultiplier;
+            }
+        }
 
         /// <inheritdoc/>
         public override void Update()

EXILED/Exiled.API/Features/Doors/BasicDoor.cs

@@ -34,11 +34,6 @@ public BasicDoor(Basegame door, List<Room> room)
         /// </summary>
         public new Basegame Base { get; }
 
-        /// <summary>
-        /// Gets the list with all SCP-106's colliders.
-        /// </summary>
-        public IEnumerable<Collider> Scp106Colliders => Base.Scp106Colliders;
-
         /// <summary>
         /// Gets or sets the total cooldown before door can be triggered again.
         /// </summary>

EXILED/Exiled.API/Features/Doors/CheckpointDoor.cs

@@ -42,37 +42,37 @@ internal CheckpointDoor(Interactables.Interobjects.CheckpointDoor door, List<Roo
         /// <summary>
         /// Gets or sets the current checkpoint stage.
         /// </summary>
-        public Interactables.Interobjects.CheckpointDoor.CheckpointSequenceStage CurrentStage
+        public Interactables.Interobjects.CheckpointDoor.SequenceState CurrentStage
         {
-            get => Base.CurrentSequence;
-            set => Base.CurrentSequence = value;
+            get => Base.CurSequence;
+            set => Base.CurSequence = value;
         }
 
         /// <summary>
         /// Gets or sets a time in seconds for main timer.
         /// </summary>
         public float MainTimer
         {
-            get => Base.MainTimer;
-            set => Base.MainTimer = value;
+            get => Base.SequenceCtrl.OpenLoopTime;
+            set => Base.SequenceCtrl.OpenLoopTime = value;
         }
 
         /// <summary>
         /// Gets or sets time before doors close.
         /// </summary>
         public float WaitTime
         {
-            get => Base.WaitTime;
-            set => Base.WaitTime = value;
+            get => Base.SequenceCtrl.RemainingTime;
+            set => Base.SequenceCtrl.RemainingTime = value;
         }
 
         /// <summary>
         /// Gets or sets time in seconds when warning will be shown.
         /// </summary>
         public float WarningTime
         {
-            get => Base.WarningTime;
-            set => Base.WarningTime = value;
+            get => Base.SequenceCtrl.WarningTime;
+            set => Base.SequenceCtrl.WarningTime = value;
         }
 
         /// <inheritdoc/>

EXILED/Exiled.API/Features/Doors/Door.cs

@@ -22,11 +22,10 @@ namespace Exiled.API.Features.Doors
     using UnityEngine;
 
     using BaseBreakableDoor = Interactables.Interobjects.BreakableDoor;
-    using BaseKeycardPermissions = Interactables.Interobjects.DoorUtils.KeycardPermissions;
     using Breakable = BreakableDoor;
     using Checkpoint = CheckpointDoor;
     using Elevator = ElevatorDoor;
-    using KeycardPermissions = Enums.KeycardPermissions;
+    using KeycardPermissions = Exiled.API.Enums.KeycardPermissions;
 
     /// <summary>
     /// A wrapper class for <see cref="DoorVariant"/>.
@@ -181,8 +180,8 @@ public bool IsOpen
         /// </remarks>
         public KeycardPermissions KeycardPermissions
         {
-            get => (KeycardPermissions)RequiredPermissions.RequiredPermissions;
-            set => RequiredPermissions.RequiredPermissions = (BaseKeycardPermissions)value;
+            get => (KeycardPermissions)RequiredPermissions;
+            set => RequiredPermissions = (DoorPermissionFlags)value;
         }
 
         /// <summary>
@@ -244,10 +243,10 @@ public DoorLockType DoorLockType
         /// <summary>
         /// Gets or sets the required permissions to open the door.
         /// </summary>
-        public DoorPermissions RequiredPermissions
+        public DoorPermissionFlags RequiredPermissions
         {
-            get => Base.RequiredPermissions;
-            set => Base.RequiredPermissions = value;
+            get => Base.RequiredPermissions.RequiredPermissions;
+            set => Base.RequiredPermissions.RequiredPermissions = value;
         }
 
         /// <summary>
@@ -472,6 +471,8 @@ public static void UnlockAll(Func<Door, bool> predicate)
         /// <param name="beep">The beep sound to play.</param>
         public void PlaySound(DoorBeepType beep)
         {
+            // TODO: Fix that
+            /*
             switch (Base)
             {
                 case Interactables.Interobjects.BasicDoor basic:
@@ -481,6 +482,7 @@ public void PlaySound(DoorBeepType beep)
                     chkPt.RpcPlayBeepSound((byte)Mathf.Min((int)beep, 3));
                     break;
             }
+            */
         }
 
         /// <summary>
@@ -553,7 +555,7 @@ public void Lock(DoorLockType lockType)
         /// Returns the Door in a human-readable format.
         /// </summary>
         /// <returns>A string containing Door-related data.</returns>
-        public override string ToString() => $"{Type} ({Zone}) [{Room}] *{DoorLockType}* ={RequiredPermissions?.RequiredPermissions}=";
+        public override string ToString() => $"{Type} ({Zone}) [{Room}] *{DoorLockType}* ={RequiredPermissions}=";
 
         /// <summary>
         /// Creates the door object associated with a specific <see cref="DoorVariant"/>.

EXILED/Exiled.API/Features/Generator.cs

@@ -13,7 +13,7 @@ namespace Exiled.API.Features
 
     using Enums;
     using Exiled.API.Interfaces;
-
+    using Interactables.Interobjects.DoorUtils;
     using MapGeneration.Distributors;
 
     using UnityEngine;
@@ -216,7 +216,7 @@ public Player LastActivator
         public KeycardPermissions KeycardPermissions
         {
             get => (KeycardPermissions)Base._requiredPermission;
-            set => Base._requiredPermission = (Interactables.Interobjects.DoorUtils.KeycardPermissions)value;
+            set => Base._requiredPermission = (Interactables.Interobjects.DoorUtils.DoorPermissionFlags)value;
         }
 
         /// <summary>
@@ -281,7 +281,7 @@ public static bool TryGet(Func<Generator, bool> predicate, out IEnumerable<Gener
         /// <summary>
         /// Denies the unlock.
         /// </summary>
-        public void DenyUnlock() => Base.RpcDenied();
+        public void DenyUnlock() => Base.RpcDenied(DoorPermissionFlags.None);
 
         /// <summary>
         /// Denies the unlock and resets the interaction cooldown.
@@ -299,12 +299,12 @@ public void DenyUnlockAndResetCooldown()
         /// <param name="isEnabled">A value indicating whether the flag is enabled.</param>
         public void SetPermissionFlag(KeycardPermissions flag, bool isEnabled)
         {
-            Interactables.Interobjects.DoorUtils.KeycardPermissions permission = (Interactables.Interobjects.DoorUtils.KeycardPermissions)flag;
+            Interactables.Interobjects.DoorUtils.DoorPermissionFlags permissions = (Interactables.Interobjects.DoorUtils.DoorPermissionFlags)flag;
 
             if (isEnabled)
-                Base._requiredPermission |= permission;
+                Base._requiredPermission |= permissions;
             else
-                Base._requiredPermission &= ~permission;
+                Base._requiredPermission &= ~permissions;
         }
 
         /// <summary>

EXILED/Exiled.API/Features/Items/Armor.cs

@@ -73,15 +73,6 @@ internal Armor(ItemType type)
             set => Base._weight = value;
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether excess ammo should be removed when the armor is dropped.
-        /// </summary>
-        public bool RemoveExcessOnDrop
-        {
-            get => !Base.DontRemoveExcessOnDrop;
-            set => Base.DontRemoveExcessOnDrop = !value;
-        }
-
         /// <summary>
         /// Gets or sets how strong the helmet on the armor is.
         /// </summary>

EXILED/Exiled.API/Features/Items/Keycard.cs

@@ -7,10 +7,12 @@
 
 namespace Exiled.API.Features.Items
 {
+    using System.Linq;
+    using CommandSystem.Commands.RemoteAdmin.Inventory;
     using Exiled.API.Enums;
     using Exiled.API.Features.Pickups;
     using Exiled.API.Interfaces;
-
+    using Interactables.Interobjects.DoorUtils;
     using InventorySystem.Items.Keycards;
 
     using KeycardPickup = Pickups.KeycardPickup;
@@ -45,37 +47,31 @@ internal Keycard(ItemType type)
         public new KeycardItem Base { get; }
 
         /// <summary>
-        /// Gets or sets the <see cref="KeycardPermissions"/> of the keycard.
+        /// Gets the <see cref="KeycardPermissions"/> of the keycard.
         /// </summary>
         public KeycardPermissions Permissions
         {
-            get => (KeycardPermissions)Base.Permissions;
-            set => Base.Permissions = (Interactables.Interobjects.DoorUtils.KeycardPermissions)value;
-        }
+            get
+            {
+                foreach (DetailBase detail in Base.Details)
+                {
+                    switch (detail)
+                    {
+                        case PredefinedPermsDetail predefinedPermsDetail:
+                            return (KeycardPermissions)predefinedPermsDetail.Levels.Permissions;
+                        case CustomPermsDetail customPermsDetail:
+                            return (KeycardPermissions)customPermsDetail.GetPermissions(null);
+                    }
+                }
 
-        /// <summary>
-        /// Clones current <see cref="Keycard"/> object.
-        /// </summary>
-        /// <returns> New <see cref="Keycard"/> object. </returns>
-        public override Item Clone() => new Keycard(Type)
-        {
-            Permissions = Permissions,
-        };
+                return KeycardPermissions.None;
+            }
+        }
 
         /// <summary>
         /// Returns the Keycard in a human readable format.
         /// </summary>
         /// <returns>A string containing Keycard-related data.</returns>
         public override string ToString() => $"{Type} ({Serial}) [{Weight}] *{Scale}* |{Permissions}|";
-
-        /// <inheritdoc/>
-        internal override void ReadPickupInfoBefore(Pickup pickup)
-        {
-            base.ReadPickupInfoBefore(pickup);
-            if (pickup is KeycardPickup keycardPickup)
-            {
-                Permissions = keycardPickup.Permissions;
-            }
-        }
     }
 }

EXILED/Exiled.API/Features/Items/Scp1344.cs

@@ -11,7 +11,7 @@ namespace Exiled.API.Features.Items
 
     using InventorySystem.Items.Usables;
     using InventorySystem.Items.Usables.Scp1344;
-    using PlayerRoles.FirstPersonControl.Thirdperson.Subcontrollers;
+    using PlayerRoles.FirstPersonControl.Thirdperson.Subcontrollers.Wearables;
 
     /// <summary>
     /// A wrapper class for <see cref="Scp1344Item"/>.

EXILED/Exiled.API/Features/Lockers/Chamber.cs

@@ -115,7 +115,7 @@ public IEnumerable<ItemType> AcceptableTypes
         public KeycardPermissions RequiredPermissions
         {
             get => (KeycardPermissions)Base.RequiredPermissions;
-            set => Base.RequiredPermissions = (Interactables.Interobjects.DoorUtils.KeycardPermissions)value;
+            set => Base.RequiredPermissions = (Interactables.Interobjects.DoorUtils.DoorPermissionFlags)value;
         }
 
         /// <summary>
@@ -235,7 +235,7 @@ public void AddItem(Pickup item)
 
             Base.Content.Add(item.Base);
             item.Spawn();
-            if (Base._wasEverOpened)
+            if (Base.WasEverOpened)
                 item.IsLocked = false;
         }
 

EXILED/Exiled.API/Features/Npc.cs

@@ -11,25 +11,19 @@ namespace Exiled.API.Features
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Reflection;
-
-    using CentralAuth;
     using CommandSystem;
     using CommandSystem.Commands.RemoteAdmin.Dummies;
     using Exiled.API.Enums;
-    using Exiled.API.Features.Components;
     using Exiled.API.Features.CustomStats;
     using Exiled.API.Features.Roles;
     using Footprinting;
-    using GameCore;
     using MEC;
     using Mirror;
+    using NetworkManagerUtils.Dummies;
     using PlayerRoles;
     using PlayerStatsSystem;
     using UnityEngine;
 
-    using Object = UnityEngine.Object;
-
     /// <summary>
     /// Wrapper class for handling NPC players.
     /// </summary>
@@ -263,7 +257,7 @@ public static Npc Spawn(string name, RoleTypeId role, Vector3 position)
             {
                 npc.Role.Set(role, SpawnReason.ForceClass);
                 npc.Position = position;
-                npc.ReferenceHub.playerStats._dictionarizedTypes[typeof(HealthStat)] = npc.ReferenceHub.playerStats.StatModules[Array.IndexOf(PlayerStats.DefinedModules, typeof(HealthStat))] = npc.CustomHealthStat = new CustomHealthStat { Hub = npc.ReferenceHub };
+                npc.ReferenceHub.playerStats._dictionarizedTypes[typeof(HealthStat)] = npc.ReferenceHub.playerStats.StatModules[Array.IndexOf(PlayerStats.DefinedModules, typeof(HealthStat))] = npc.CustomHealthStat = new HealthStat { Hub = npc.ReferenceHub };
                 npc.Health = npc.MaxHealth; // otherwise the npc will spawn with 0 health
                 npc.ReferenceHub.playerStats._dictionarizedTypes[typeof(HumeShieldStat)] = npc.ReferenceHub.playerStats.StatModules[Array.IndexOf(PlayerStats.DefinedModules, typeof(HumeShieldStat))] = npc.CustomHumeShieldStat = new CustomHumeShieldStat { Hub = npc.ReferenceHub };
             });
@@ -287,7 +281,7 @@ public static Npc Spawn(string name, RoleTypeId role = RoleTypeId.None, bool ign
             Timing.CallDelayed(SpawnSetRoleDelay, () =>
             {
                 npc.Role.Set(role, SpawnReason.ForceClass, position is null ? RoleSpawnFlags.All : RoleSpawnFlags.AssignInventory);
-                npc.ReferenceHub.playerStats._dictionarizedTypes[typeof(HealthStat)] = npc.ReferenceHub.playerStats.StatModules[Array.IndexOf(PlayerStats.DefinedModules, typeof(HealthStat))] = npc.CustomHealthStat = new CustomHealthStat { Hub = npc.ReferenceHub };
+                npc.ReferenceHub.playerStats._dictionarizedTypes[typeof(HealthStat)] = npc.ReferenceHub.playerStats.StatModules[Array.IndexOf(PlayerStats.DefinedModules, typeof(HealthStat))] = npc.CustomHealthStat = new HealthStat { Hub = npc.ReferenceHub };
                 npc.Health = npc.MaxHealth; // otherwise the npc will spawn with 0 health
                 npc.ReferenceHub.playerStats._dictionarizedTypes[typeof(HumeShieldStat)] = npc.ReferenceHub.playerStats.StatModules[Array.IndexOf(PlayerStats.DefinedModules, typeof(HumeShieldStat))] = npc.CustomHumeShieldStat = new CustomHumeShieldStat { Hub = npc.ReferenceHub };
 

EXILED/Exiled.API/Features/Pickups/KeycardPickup.cs

@@ -42,9 +42,9 @@ internal KeycardPickup(ItemType type)
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="KeycardPermissions"/> of the keycard.
+        /// Gets the <see cref="KeycardPermissions"/> of the keycard.
         /// </summary>
-        public KeycardPermissions Permissions { get; set; }
+        public KeycardPermissions Permissions { get; private set; }
 
         /// <summary>
         /// Gets the <see cref="BaseKeycard"/> that this class is encapsulating.
@@ -67,7 +67,18 @@ protected override void InitializeProperties(ItemBase itemBase)
             base.InitializeProperties(itemBase);
             if (itemBase is KeycardItem keycardItem)
             {
-                Permissions = (KeycardPermissions)keycardItem.Permissions;
+                foreach (DetailBase detail in keycardItem.Details)
+                {
+                    switch (detail)
+                    {
+                        case PredefinedPermsDetail predefinedPermsDetail:
+                            Permissions = (KeycardPermissions)predefinedPermsDetail.Levels.Permissions;
+                            return;
+                        case CustomPermsDetail customPermsDetail:
+                            Permissions = (KeycardPermissions)customPermsDetail.GetPermissions(null);
+                            return;
+                    }
+                }
             }
         }
     }

EXILED/Exiled.API/Features/Player.cs

@@ -2962,9 +2962,6 @@ public void ClearInventory(bool destroy = true)
         /// <seealso cref="DropItems()"/>
         public void ClearItems(bool destroy = true)
         {
-            if (CurrentArmor is Armor armor)
-                armor.RemoveExcessOnDrop = false;
-
             while (Items.Count > 0)
                 RemoveItem(Items.ElementAt(0), destroy);
         }

EXILED/Exiled.API/Features/Roles/FpcRole.cs

@@ -82,12 +82,8 @@ public Vector3 Gravity
         /// </summary>
         public bool IsFallDamageEnable
         {
-            get => FirstPersonController.FpcModule.Motor._enableFallDamage;
-            set
-            {
-                enableFallDamageField ??= AccessTools.Field(typeof(FpcMotor), nameof(FpcMotor._enableFallDamage));
-                enableFallDamageField.SetValue(FirstPersonController.FpcModule.Motor, value);
-            }
+            get => FirstPersonController.FpcModule.Motor._fallDamageSettings.Enabled;
+            set => FirstPersonController.FpcModule.Motor._fallDamageSettings.Enabled = value;
         }
 
         /// <summary>