feat: Bump Lib.Harmony from 2.2.2 to 2.4.2 in /EXILED

.github/workflows/labapi.yml

@@ -0,0 +1,74 @@
+name: Exiled Dev CI
+
+on:
+  push:
+    branches:
+      - LabAPI
+  pull_request:
+    branches:
+      - LabAPI
+  workflow_dispatch:
+
+defaults:
+  run:
+    working-directory: ./EXILED
+
+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/download/v1.8.1/EXILED-DLL-Archiver.exe
+
+jobs:
+
+  build:
+
+    runs-on: windows-latest
+    # Prevent double running for push & pull_request events from the main repo
+    if: github.event_name != 'push' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+
+    steps:
+
+    - name: Setup .NET Core SDK
+      uses: actions/setup-dotnet@v4.0.1
+
+    - name: Setup Nuget
+      uses: nuget/setup-nuget@v2
+
+    - uses: actions/checkout@v4.1.7
+
+    - name: Get references
+      shell: pwsh
+      run: |
+        Invoke-WebRequest -Uri ${{ env.EXILED_REFERENCES_URL }} -OutFile ${{ github.workspace }}/EXILED/References.zip
+        Expand-Archive -Path References.zip -DestinationPath ${{ env.EXILED_REFERENCES_PATH }}
+
+    - name: Build
+      env:
+        EXILED_REFERENCES: ${{ env.EXILED_REFERENCES_PATH }}
+      shell: pwsh
+      run: |
+        ./build.ps1 -BuildNuGet
+        $File = (Get-ChildItem -Path . -Include 'ExMod.Exiled.*.nupkg' -Recurse).Name
+        Out-File -FilePath ${{ github.env }} -InputObject "PackageFile=$File" -Encoding utf-8 -Append
+
+    - name: Upload nuget package
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ env.PackageFile }}
+        path: EXILED/${{ env.PackageFile }}
+
+    - name: Get references
+      shell: pwsh
+      run: |
+        Invoke-WebRequest -Uri ${{ env.EXILED_DLL_ARCHIVER_URL }} -OutFile ${{ github.workspace }}/EXILED/EXILED-DLL-Archiver.exe
+
+    - name: Packaging results as tar.gz
+      shell: pwsh
+      run: ./packaging.ps1
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: Build Result
+        path: EXILED/bin/Release/Exiled.tar.gz
+

.github/workflows/push_nuget.yml

@@ -10,7 +10,7 @@ defaults:
     working-directory: ./EXILED
 
 env:
-  EXILED_REFERENCES_URL: https://ExMod-Team.github.io/SL-References/Dev.zip
+  EXILED_REFERENCES_URL: https://ExMod-Team.github.io/SL-References/LabAPI.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
 
 jobs:

.github/workflows/release.yml

@@ -11,9 +11,9 @@ defaults:
     working-directory: ./EXILED
 
 env:
-  EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Dev.zip
+  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.1/EXILED-DLL-Archiver.exe
 
 jobs:
   build:

EXILED/EXILED.props

@@ -15,11 +15,11 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">9.5.1</Version>
+    <Version Condition="$(Version) == ''">9.6.0-beta5</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 
-    <HarmonyVersion>2.2.2</HarmonyVersion>
+    <HarmonyVersion>2.3.6</HarmonyVersion>
     <StyleCopVersion>1.1.118</StyleCopVersion>
     <SemanticVersioningVersion>2.0.2</SemanticVersioningVersion>
 

EXILED/Exiled.API/Enums/AdminToyType.cs

@@ -32,5 +32,10 @@ public enum AdminToyType
         /// Speaker toy.
         /// </summary>
         Speaker,
+
+        /// <summary>
+        /// Capybara toy.
+        /// </summary>
+        Capybara,
     }
 }

EXILED/Exiled.API/Enums/PrefabType.cs

@@ -336,5 +336,14 @@ public enum PrefabType
 
         [Prefab(912031041, "ElevatorChamberNuke")]
         ElevatorChamberNuke,
+
+        [Prefab(3087007600, "CapybaraToy")]
+        CapybaraToy,
+
+        [Prefab(3539746802, "Sinkhole")]
+        Sinkhole,
+
+        [Prefab(1548138668, "AutoRagdoll")]
+        AutoRagdoll,
     }
 }

EXILED/Exiled.API/Exiled.API.csproj

@@ -27,10 +27,10 @@
         </Reference>
         <Reference Include="Assembly-CSharp-firstpass" HintPath="$(EXILED_REFERENCES)\Assembly-CSharp-firstpass.dll" Private="false" />
         <Reference Include="CommandSystem.Core" HintPath="$(EXILED_REFERENCES)\CommandSystem.Core.dll" Private="false" />
+        <Reference Include="LabApi" HintPath="$(EXILED_REFERENCES)\LabApi.dll" Private="false" />
         <Reference Include="Pooling" HintPath="$(EXILED_REFERENCES)\Pooling.dll" Private="false" />
         <Reference Include="Mirror" HintPath="$(EXILED_REFERENCES)\Mirror.dll" Private="false" />
         <Reference Include="NorthwoodLib" HintPath="$(EXILED_REFERENCES)\NorthwoodLib.dll" Private="false" />
-        <Reference Include="PluginAPI" HintPath="$(EXILED_REFERENCES)\PluginAPI.dll" Private="false" />
         <Reference Include="Unity.TextMeshPro" HintPath="$(EXILED_REFERENCES)\Unity.TextMeshPro.dll" Private="false" />
         <Reference Include="UnityEngine" HintPath="$(EXILED_REFERENCES)\UnityEngine.dll" Private="false" />
         <Reference Include="UnityEngine.CoreModule" HintPath="$(EXILED_REFERENCES)\UnityEngine.CoreModule.dll" Private="false" />

EXILED/Exiled.API/Extensions/UserGroupExtensions.cs

@@ -37,7 +37,7 @@ public static bool EqualsTo(this UserGroup @this, UserGroup other)
         /// </summary>
         /// <param name="this">The <see cref="UserGroup"/>.</param>
         /// <returns>The key of that group, or <see langword="null"/> if not found.</returns>
-        public static string GetKey(this UserGroup @this) => Server.PermissionsHandler._groups
+        public static string GetKey(this UserGroup @this) => Server.PermissionsHandler.Groups
             .FirstOrDefault(pair => pair.Value.EqualsTo(@this)).Key;
 
         /// <summary>
@@ -47,7 +47,7 @@ public static string GetKey(this UserGroup @this) => Server.PermissionsHandler._
         /// <returns>The value of that group, or <see langword="null"/> if not found.</returns>
         public static UserGroup GetValue(string groupName)
         {
-            ServerStatic.GetPermissionsHandler().GetAllGroups().TryGetValue(groupName, out UserGroup userGroup);
+            ServerStatic.PermissionsHandler.GetAllGroups().TryGetValue(groupName, out UserGroup userGroup);
             return userGroup;
         }
     }

EXILED/Exiled.API/Features/Camera.cs

@@ -216,8 +216,8 @@ internal Camera(Scp079Camera camera079)
         /// </summary>
         public Quaternion Rotation
         {
-            get => Base._cameraAnchor.rotation;
-            set => Base._cameraAnchor.rotation = value;
+            get => Base.CameraAnchor.rotation;
+            set => Base.CameraAnchor.rotation = value;
         }
 
         /// <summary>

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

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 // <copyright file="CustomHumeShieldStat.cs" company="ExMod Team">
 // Copyright (c) ExMod Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.
@@ -18,25 +18,17 @@ namespace Exiled.API.Features.CustomStats
     /// </summary>
     public class CustomHumeShieldStat : HumeShieldStat
     {
-        /// <inheritdoc />
-        public override float MaxValue => CustomMaxValue == -1 ? base.MaxValue : CustomMaxValue;
-
         /// <summary>
         /// Gets or sets the multiplier for gaining HumeShield.
         /// </summary>
         public float ShieldRegenerationMultiplier { get; set; } = 1;
 
-        /// <summary>
-        /// Gets or sets the maximum amount of HumeShield the player can have.
-        /// </summary>
-        public float CustomMaxValue { get; set; } = -1;
-
         private float ShieldRegeneration => TryGetHsModule(out HumeShieldModuleBase controller) ? controller.HsRegeneration * ShieldRegenerationMultiplier : 0;
 
         /// <inheritdoc/>
         public override void Update()
         {
-            if (MaxValue == -1 && ShieldRegenerationMultiplier is 1)
+            if (ShieldRegenerationMultiplier is 1)
             {
                 base.Update();
                 return;
@@ -45,15 +37,15 @@ public override void Update()
             if (!NetworkServer.active)
                 return;
 
-            if (_valueDirty)
+            if (ValueDirty)
             {
                 new SyncedStatMessages.StatMessage()
                 {
                     Stat = this,
                     SyncedValue = CurValue,
                 }.SendToHubsConditionally(CanReceive);
                 _lastSent = CurValue;
-                _valueDirty = false;
+                ValueDirty = false;
             }
 
             if (ShieldRegeneration == 0)

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

@@ -44,35 +44,35 @@ internal CheckpointDoor(Interactables.Interobjects.CheckpointDoor door, List<Roo
         /// </summary>
         public Interactables.Interobjects.CheckpointDoor.CheckpointSequenceStage CurrentStage
         {
-            get => Base._currentSequence;
-            set => Base._currentSequence = value;
+            get => Base.CurrentSequence;
+            set => Base.CurrentSequence = 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.MainTimer;
+            set => Base.MainTimer = value;
         }
 
         /// <summary>
         /// Gets or sets time before doors close.
         /// </summary>
         public float WaitTime
         {
-            get => Base._waitTime;
-            set => Base._waitTime = value;
+            get => Base.WaitTime;
+            set => Base.WaitTime = 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.WarningTime;
+            set => Base.WarningTime = value;
         }
 
         /// <inheritdoc/>

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

@@ -357,7 +357,7 @@ public static T Get<T>(string name)
         /// </summary>
         /// <param name="gameObject">The base-game <see cref="UnityEngine.GameObject"/>.</param>
         /// <returns>The <see cref="Door"/> with the given name or <see langword="null"/> if not found.</returns>
-        public static Door Get(GameObject gameObject) => gameObject is null ? null : Get(gameObject.GetComponentInChildren<DoorVariant>());
+        public static Door Get(GameObject gameObject) => gameObject is null ? null : Get(gameObject.GetComponentInParent<DoorVariant>());
 
         /// <summary>
         /// Returns the closest <see cref="Door"/> to the given <paramref name="position"/>.

EXILED/Exiled.API/Features/Hazards/TemporaryHazard.cs

@@ -56,8 +56,8 @@ public bool IsDestroyed
         /// </summary>
         public float Duration
         {
-            get => Base._elapsed;
-            set => Base._elapsed = value;
+            get => Base.Elapsed;
+            set => Base.Elapsed = value;
         }
 
         /// <summary>

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);
             }
         }
 
@@ -245,6 +245,6 @@ public Vector3 GetRandomSpawnPoint()
         /// </summary>
         /// <param name="chamber"><see cref="LockerChamber"/>.</param>
         /// <returns><see cref="Chamber"/>.</returns>
-        internal static Chamber Get(LockerChamber chamber) => Chambers.TryGetValue(chamber, out Chamber chmb) ? chmb : new(chamber, Locker.Get(x => x.Chambers.Any(x => x.Base == chamber)).FirstOrDefault());
+        internal static Chamber Get(LockerChamber chamber) => chamber == null ? null : Chambers.TryGetValue(chamber, out Chamber chmb) ? chmb : new(chamber, Locker.Get(x => x.Chambers.Any(x => x.Base == chamber)).FirstOrDefault());
     }
 }

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);
             }