LabAPI Update 14.0.3

.github/workflows/labapi.yml

@@ -16,7 +16,7 @@ defaults:
 env:
   EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/LabAPI.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
-  EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
+  EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/download/v1.8.0/EXILED-DLL-Archiver.exe
 
 jobs:
 

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

@@ -77,13 +77,13 @@ public Chamber(LockerChamber chamber, Locker locker)
         /// </summary>
         public IEnumerable<Pickup> ToBeSpawned
         {
-            get => Base._toBeSpawned.Select(Pickup.Get);
+            get => Base.ToBeSpawned.Select(Pickup.Get);
             set
             {
-                Base._toBeSpawned.Clear();
+                Base.ToBeSpawned.Clear();
 
                 foreach (Pickup pickup in value)
-                    Base._toBeSpawned.Add(pickup.Base);
+                    Base.ToBeSpawned.Add(pickup.Base);
             }
         }
 
@@ -137,26 +137,26 @@ public bool UseMultipleSpawnpoints
         /// </remarks>
         public Transform Spawnpoint
         {
-            get => Base._spawnpoint;
-            set => Base._spawnpoint = value;
+            get => Base.Spawnpoint;
+            set => Base.Spawnpoint = value;
         }
 
         /// <summary>
         /// Gets or sets a value indicating whether items should be spawned as soon as they one chamber is opened.
         /// </summary>
         public bool InitiallySpawn
         {
-            get => Base._spawnOnFirstChamberOpening;
-            set => Base._spawnOnFirstChamberOpening = value;
+            get => Base.SpawnOnFirstChamberOpening;
+            set => Base.SpawnOnFirstChamberOpening = value;
         }
 
         /// <summary>
         /// Gets or sets the amount of time before a player can interact with the chamber again.
         /// </summary>
         public float Cooldown
         {
-            get => Base._targetCooldown;
-            set => Base._targetCooldown = value;
+            get => Base.TargetCooldown;
+            set => Base.TargetCooldown = value;
         }
 
         /// <summary>
@@ -219,7 +219,7 @@ public void AddItemToSpawn(ItemType itemType, int quantity = 1, bool spawnIfIsOp
                     continue;
                 }
 
-                Base._toBeSpawned.Add(pickup.Base);
+                Base.ToBeSpawned.Add(pickup.Base);
             }
         }
 

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

@@ -220,7 +220,7 @@ public void AddItem(Pickup item)
                 // If the chamber is configured to spawn items on the first opening, add the item to the list of items to be spawned.
                 // Otherwise, spawn the item immediately.
                 if (chamber.InitiallySpawn)
-                    chamber.Base._toBeSpawned.Add(item.Base);
+                    chamber.Base.ToBeSpawned.Add(item.Base);
                 else
                     ItemDistributor.SpawnPickup(item.Base);
             }

EXILED/Exiled.API/Features/Player.cs

@@ -3535,7 +3535,7 @@ public void Teleport(object obj, Vector3 offset)
                     Teleport(locker.transform.position + Vector3.up + offset);
                     break;
                 case LockerChamber chamber:
-                    Teleport(chamber._spawnpoint.position + Vector3.up + offset);
+                    Teleport(chamber.Spawnpoint.position + Vector3.up + offset);
                     break;
                 case ElevatorChamber elevator:
                     Teleport(elevator.transform.position + Vector3.up + offset);

EXILED/Exiled.Events/EventArgs/Player/EscapingPocketDimensionEventArgs.cs

@@ -21,18 +21,27 @@ public class EscapingPocketDimensionEventArgs : IPlayerEvent, IDeniableEvent
         /// <summary>
         /// Initializes a new instance of the <see cref="EscapingPocketDimensionEventArgs" /> class.
         /// </summary>
+        /// <param name="pocketDimensionTeleport">
+        /// <inheritdoc cref="Teleporter" />
+        /// </param>
         /// <param name="player">
         /// <inheritdoc cref="Player" />
         /// </param>
         /// <param name="position">
         /// <inheritdoc cref="TeleportPosition" />
         /// </param>
-        public EscapingPocketDimensionEventArgs(Player player, Vector3 position)
+        public EscapingPocketDimensionEventArgs(PocketDimensionTeleport pocketDimensionTeleport, Player player, Vector3 position)
         {
+            Teleporter = pocketDimensionTeleport;
             Player = player;
             TeleportPosition = position;
         }
 
+        /// <summary>
+        /// Gets the PocketDimensionTeleport the player walked into.
+        /// </summary>
+        public PocketDimensionTeleport Teleporter { get; }
+
         /// <summary>
         /// Gets the player who's escaping the pocket dimension.
         /// </summary>

EXILED/Exiled.Events/EventArgs/Player/FailingEscapePocketDimensionEventArgs.cs

@@ -21,22 +21,25 @@ public class FailingEscapePocketDimensionEventArgs : IPlayerEvent, IDeniableEven
         /// <summary>
         /// Initializes a new instance of the <see cref="FailingEscapePocketDimensionEventArgs" /> class.
         /// </summary>
+        /// <param name="pocketDimensionTeleport">
+        /// <inheritdoc cref="Teleporter" />
+        /// </param>
         /// <param name="player">
         /// <inheritdoc cref="Player" />
         /// </param>
         /// <param name="isAllowed">
         /// <inheritdoc cref="IsAllowed" />
         /// </param>
-        public FailingEscapePocketDimensionEventArgs(Player player, bool isAllowed = true)
+        public FailingEscapePocketDimensionEventArgs(PocketDimensionTeleport pocketDimensionTeleport, Player player, bool isAllowed = true)
         {
+            Teleporter = pocketDimensionTeleport;
             Player = player;
             IsAllowed = isAllowed;
         }
 
         /// <summary>
         /// Gets the PocketDimensionTeleport the player walked into.
         /// </summary>
-        [Obsolete("can't be used")]
         public PocketDimensionTeleport Teleporter { get; }
 
         /// <summary>

EXILED/Exiled.Events/Patches/Events/Player/EscapingPocketDimension.cs

@@ -26,7 +26,7 @@ namespace Exiled.Events.Patches.Events.Player
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches the <see cref="PocketDimensionTeleport.Exit(ReferenceHub)"/> method.
+    /// Patches the <see cref="PocketDimensionTeleport.Exit(PocketDimensionTeleport, ReferenceHub)"/> method.
     /// Adds the <see cref="Handlers.Player.EscapingPocketDimension"/> event.
     /// </summary>
     [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.EscapingPocketDimension))]
@@ -47,14 +47,17 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new[]
                 {
+                    // pocketDimensionTeleport
+                    new CodeInstruction(OpCodes.Ldarg_0),
+
                     // referenceHub
-                    new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
+                    new CodeInstruction(OpCodes.Ldarg_1).MoveLabelsFrom(newInstructions[index]),
 
                     // Scp106PocketExitFinder.GetBestExitPosition(fpcRole)
                     new(OpCodes.Ldloc_0),
                     new(OpCodes.Call, Method(typeof(Scp106PocketExitFinder), nameof(Scp106PocketExitFinder.GetBestExitPosition), new[] { typeof(IFpcRole) })),
 
-                    // EscapingPocketDimensionEventArgs ev = new(Player, Vector3)
+                    // EscapingPocketDimensionEventArgs ev = new(PocketDimensionTeleport, Player, Vector3)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(EscapingPocketDimensionEventArgs))[0]),
                     new(OpCodes.Dup),
                     new(OpCodes.Dup),

EXILED/Exiled.Events/Patches/Events/Player/FailingEscapePocketDimension.cs

@@ -22,7 +22,7 @@ namespace Exiled.Events.Patches.Events.Player
     using static HarmonyLib.AccessTools;
 
     /// <summary>
-    /// Patches <see cref="PocketDimensionTeleport.Kill(ReferenceHub)" />.
+    /// Patches <see cref="PocketDimensionTeleport.Kill(PocketDimensionTeleport, ReferenceHub)" />.
     /// Adds the <see cref="Handlers.Player.FailingEscapePocketDimension" /> event.
     /// </summary>
     [EventPatch(typeof(Handlers.Player), nameof(Handlers.Player.FailingEscapePocketDimension))]
@@ -39,13 +39,16 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 0,
                 new[]
                 {
-                    // referenceHub
+                    // pocketDimensionTeleport
                     new CodeInstruction(OpCodes.Ldarg_0),
 
+                    // referenceHub
+                    new CodeInstruction(OpCodes.Ldarg_1),
+
                     // true
                     new(OpCodes.Ldc_I4_1),
 
-                    // FailingEscapePocketDimensionEventArgs ev = new(ReferenceHub, bool)
+                    // FailingEscapePocketDimensionEventArgs ev = new(PocketDimensionTeleport, ReferenceHub, bool)
                     new(OpCodes.Newobj, GetDeclaredConstructors(typeof(FailingEscapePocketDimensionEventArgs))[0]),
                     new(OpCodes.Dup),
 

EXILED/Exiled.Events/Patches/Events/Player/InteractingGenerator.cs

@@ -50,7 +50,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             Label notAllowed = generator.DefineLabel();
             Label skip = generator.DefineLabel();
             Label skip2 = generator.DefineLabel();
-            Label @break = newInstructions.FindLast(instruction => instruction.IsLdarg(0)).labels[0];
+            Label @break = (Label)newInstructions.FindLast(instruction => instruction.opcode == OpCodes.Br_S).operand;
 
             int offset = 1;
             int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(Stopwatch), nameof(Stopwatch.Stop)))) + offset;

EXILED/Exiled.Events/Patches/Fixes/LockerFixes.cs

@@ -31,7 +31,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             int offset = -1;
-            int index = newInstructions.FindIndex(i => i.LoadsField(Field(typeof(LockerChamber), nameof(LockerChamber._spawnOnFirstChamberOpening)))) + offset;
+            int index = newInstructions.FindIndex(i => i.LoadsField(Field(typeof(LockerChamber), nameof(LockerChamber.SpawnOnFirstChamberOpening)))) + offset;
 
             newInstructions.InsertRange(index, new[]
             {
@@ -50,16 +50,16 @@ private static void Hepler(LockerChamber chamber)
         {
             chamber.Content.Clear();
 
-            if (!chamber._spawnOnFirstChamberOpening)
+            if (!chamber.SpawnOnFirstChamberOpening)
                 return;
 
-            foreach (ItemPickupBase ipb in chamber._toBeSpawned)
+            foreach (ItemPickupBase ipb in chamber.ToBeSpawned)
             {
                 if (ipb != null)
                     ItemDistributor.SpawnPickup(ipb);
             }
 
-            chamber._toBeSpawned.Clear();
+            chamber.ToBeSpawned.Clear();
         }
     }
 }

EXILED/Exiled.Loader/AutoUpdateFiles.cs

@@ -17,6 +17,6 @@ public static class AutoUpdateFiles
         /// <summary>
         /// Gets which SCP: SL version generated Exiled.
         /// </summary>
-        public static readonly Version RequiredSCPSLVersion = new(14, 0, 0, 2);
+        public static readonly Version RequiredSCPSLVersion = new(14, 0, 0, 3);
     }
 }

EXILED/Exiled/Exiled.nuspec

@@ -26,7 +26,7 @@
     <file src="..\References\Assembly-CSharp-Publicized.dll" target="lib\net48" />
     <file src="..\References\CommandSystem.Core.dll" target="lib\net48" />
     <file src="..\References\NorthwoodLib.dll" target="lib\net48" />
-    <file src="..\References\PluginAPI.dll" target="lib\net48" />
+    <file src="..\References\LabAPI.dll" target="lib\net48" />
     <file src="..\References\YamlDotNet.dll" target="lib\net48" />
     <file src="..\bin\Release\Exiled.API.dll" target="lib\net48" />
     <file src="..\bin\Release\Exiled.API.xml" target="lib\net48" />

EXILED/docs/articles/SCPSLRessources/NW_Documentation.md

@@ -17,7 +17,7 @@
 title: NW Documentation
 ---
 
-Last Update (14.0.0.2)
+Last Update (14.0.0.3)
 
 ### Index
 
@@ -290,6 +290,7 @@ Last Update (14.0.0.2)
 - [SpectatorSpawnReason](#spectatorspawnreason)
 - [State](#state)
 - [States](#states)
+- [StatMessageType](#statmessagetype)
 - [StatusType](#statustype)
 - [SteamLobbyPrivacy](#steamlobbyprivacy)
 - [StorageLocation](#storagelocation)
@@ -1747,6 +1748,7 @@ Last Update (14.0.0.2)
  [2] = CuffedClassD
  [3] = Scientist
  [4] = CuffedScientist
+ [5] = Custom
 ```
 
 </details>
@@ -4636,6 +4638,17 @@ Last Update (14.0.0.2)
 
 </details>
 
+### StatMessageType
+
+<details><summary><b>PlayerStatsSystem.SyncedStatMessages+StatMessageType</b></summary>
+
+```
+ [0] = CurrentValue
+ [1] = MaxValue
+```
+
+</details>
+
 ### StatusType
 
 <details><summary><b>InventorySystem.Items.Usables.StatusMessage+StatusType</b></summary>
@@ -5200,7 +5213,7 @@ Last Update (14.0.0.2)
 
 <details><summary> <b>Damage Handlers</b></summary>
 
-```md title="Latest Updated: 14.0.0.2"
+```md title="Latest Updated: 14.0.0.3"
 All available DamageHandlers
 
 + Symbol ':' literally means "inherits from"