Try merge dev

.github/workflows/dev.yml

@@ -16,9 +16,9 @@ defaults:
     working-directory: ./EXILED
 
 env:
-  EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Dev.zip
+  EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Dev.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
-  EXILED_DLL_ARCHIVER_URL: https://github.com/ExSLMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
+  EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
 
 jobs:
 

.github/workflows/docs.yml

@@ -12,7 +12,7 @@ permissions:
   id-token: write
 
 env:
-  EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Master.zip
+  EXILED_REFERENCES_URL: https://Exmod-team.github.io/SL-References/Master.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
 
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.

.github/workflows/main.yml

@@ -13,7 +13,7 @@ defaults:
     working-directory: ./EXILED
 
 env:
-  EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Master.zip
+  EXILED_REFERENCES_URL: https://Exmod-team.github.io/SL-References/Master.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
 
 jobs:

.github/workflows/push_nuget.yml

@@ -10,7 +10,7 @@ defaults:
     working-directory: ./EXILED
 
 env:
-  EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/LabAPI.zip
+  EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Dev.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://exslmod-team.github.io/SL-References/LabAPI.zip
+  EXILED_REFERENCES_URL: https://Exmod-team.github.io/SL-References/Dev.zip
   EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
-  EXILED_DLL_ARCHIVER_URL: https://github.com/ExSLMod-Team/EXILED-DLL-Archiver/releases/download/v1.8.1/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

@@ -25,8 +25,8 @@
 
     <Copyright>Copyright © $(Authors) 2020 - $([System.DateTime]::Now.ToString("yyyy"))</Copyright>
     <RepositoryType>Git</RepositoryType>
-    <RepositoryUrl>https://github.com/ExSLMod-Team/EXILED</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/ExSLMod-Team/EXILED</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Exmod-Team/EXILED</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/Exmod-Team/EXILED</PackageProjectUrl>
     <PackageLicenseExpression>CC-BY-SA-3.0</PackageLicenseExpression>
 
     <DefineConstants Condition="$(PublicBeta) == 'true'">$(DefineConstants);PUBLIC_BETA</DefineConstants>

EXILED/Exiled.API/Features/Core/UserSettings/KeybindSetting.cs

@@ -18,6 +18,23 @@ namespace Exiled.API.Features.Core.UserSettings
     /// </summary>
     public class KeybindSetting : SettingBase, IWrapper<SSKeybindSetting>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="KeybindSetting"/> class.
+        /// </summary>
+        /// <param name="id"><inheritdoc cref="SettingBase.Id"/></param>
+        /// <param name="label"><inheritdoc cref="SettingBase.Label"/></param>
+        /// <param name="suggested"><inheritdoc cref="KeyCode"/></param>
+        /// <param name="preventInteractionOnGUI"><inheritdoc cref="PreventInteractionOnGUI"/></param>
+        /// <param name="hintDescription"><inheritdoc cref="SettingBase.HintDescription"/></param>
+        /// <param name="header"><inheritdoc cref="SettingBase.Header"/></param>
+        /// <param name="onChanged"><inheritdoc cref="SettingBase.OnChanged"/></param>
+        [Obsolete("This method will be removed next major version because of a new feature. Use the constructor with \"allowSpectator\" instead.")]
+        public KeybindSetting(int id, string label, KeyCode suggested, bool preventInteractionOnGUI, string hintDescription, HeaderSetting header, Action<Player, SettingBase> onChanged)
+            : base(new SSKeybindSetting(id, label, suggested, preventInteractionOnGUI, false, hintDescription), header, onChanged)
+        {
+            Base = (SSKeybindSetting)base.Base;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="KeybindSetting"/> class.
         /// </summary>

EXILED/Exiled.API/Features/Player.cs

@@ -1163,11 +1163,6 @@ public bool IsSpawnProtected
         /// </summary>
         protected HealthStat CustomHealthStat { get; set; }
 
-        /// <summary>
-        /// Gets or sets a <see cref="ScaleController"/>.
-        /// </summary>
-        protected FpcScaleController ScaleController { get; set; }
-
         /// <summary>
         /// Converts LabApi player to EXILED player.
         /// </summary>
@@ -2077,7 +2072,7 @@ public void SetScale(Vector3 scale, IEnumerable<Player> viewers)
 
             try
             {
-                ScaleController.Scale = scale;
+                ReferenceHub.transform.localScale = scale;
 
                 foreach (Player target in viewers)
                     Server.SendSpawnMessage?.Invoke(null, new object[] { NetworkIdentity, target.Connection });
@@ -2099,12 +2094,12 @@ public void SetFakeScale(Vector3 fakeScale, IEnumerable<Player> viewers)
 
             try
             {
-                ScaleController.Scale = fakeScale;
+                ReferenceHub.transform.localScale = fakeScale;
 
                 foreach (Player target in viewers)
                     Server.SendSpawnMessage.Invoke(null, new object[] { NetworkIdentity, target.Connection });
 
-                ScaleController.Scale = currentScale;
+                ReferenceHub.transform.localScale = currentScale;
             }
             catch (Exception ex)
             {

EXILED/Exiled.CreditTags/Features/DatabaseHandler.cs

@@ -17,7 +17,7 @@ namespace Exiled.CreditTags.Features
 
     public static class DatabaseHandler
     {
-        private const string Url = "https://raw.githubusercontent.com/ExSLMod-Team/CreditTags/main/data.yml";
+        private const string Url = "https://raw.githubusercontent.com/Exmod-Team/CreditTags/main/data.yml";
         private const string ETagCacheFileName = "etag_cache.txt";
         private const string DatabaseCacheFileName = "data.yml";
         private const int CacheTimeInMinutes = 5;

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

@@ -107,7 +107,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             });
 
             const int offset = 1;
-            int index = newInstructions.FindIndex(i => i.opcode == OpCodes.Stloc_1) + offset;
+            int index = newInstructions.FindIndex(i => i.opcode == OpCodes.Stloc_2) + offset;
 
             newInstructions.InsertRange(index, new CodeInstruction[]
             {
@@ -116,7 +116,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Callvirt, PropertyGetter(typeof(DroppingItemEventArgs), nameof(DroppingItemEventArgs.Player))),
 
                 // ItemPickupBase
-                new(OpCodes.Ldloc_1),
+                new(OpCodes.Ldloc_2),
 
                 // ev.IsThrown
                 new(OpCodes.Ldloc_S, ev.LocalIndex),

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

@@ -55,10 +55,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new[]
                 {
-                    // pluginRequestSent = true (which prevent the second event call)
-                    new(OpCodes.Ldc_I4_1),
-                    new(OpCodes.Stloc_2),
-
                     // Player.Get(ply)
                     new(OpCodes.Ldarg_1),
                     new(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })),

EXILED/Exiled.Events/Patches/Events/Server/RoundEnd.cs

@@ -66,8 +66,8 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new CodeInstruction[]
                 {
                     new(OpCodes.Call, PropertyGetter(typeof(Round), nameof(Round.IgnoredPlayers))),
-                    new(OpCodes.Ldloc_S, 19),
-                    new(OpCodes.Call, Method(typeof(HashSet<ReferenceHub>), nameof(HashSet<ReferenceHub>.Contains))),
+                    new(OpCodes.Ldloc_S, 20),
+                    new(OpCodes.Callvirt, Method(typeof(HashSet<ReferenceHub>), nameof(HashSet<ReferenceHub>.Contains))),
                     new(OpCodes.Brtrue_S, jmp),
                 });
 

EXILED/Exiled.Events/Patches/Events/Warhead/ChangingLeverStatus.cs

@@ -22,33 +22,32 @@ namespace Exiled.Events.Patches.Events.Warhead
     using Warhead = Handlers.Warhead;
 
     /// <summary>
-    /// Patches <see cref="PlayerInteract.UserCode_CmdUsePanel__AlphaPanelOperations" />.
+    /// Patches <see cref="AlphaWarheadNukesitePanel.ServerInteract" />.
     /// Adds the <see cref="Warhead.ChangingLeverStatus" /> event.
     /// </summary>
     [EventPatch(typeof(Warhead), nameof(Warhead.ChangingLeverStatus))]
 
-    // [HarmonyPatch(typeof(PlayerInteract), nameof(PlayerInteract.UserCode_CmdUsePanel__AlphaPanelOperations))]
+    [HarmonyPatch(typeof(AlphaWarheadNukesitePanel), nameof(AlphaWarheadNukesitePanel.ServerInteract))]
     internal static class ChangingLeverStatus
     {
-        /*private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             Label returnLabel = generator.DefineLabel();
 
-            int offset = 2;
-            int index = newInstructions.FindLastIndex(instruction => instruction.opcode == OpCodes.Brtrue_S) + offset;
+            int index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Call);
 
             newInstructions.InsertRange(
                 index,
                 new[]
                 {
                     // Player.Get(component)
-                    new CodeInstruction(OpCodes.Ldloc_0).MoveLabelsFrom(newInstructions[index]),
+                    new CodeInstruction(OpCodes.Ldarg_1).MoveLabelsFrom(newInstructions[index]),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
                     // nukeside.Networkenabled
-                    new(OpCodes.Ldloc_1),
+                    new(OpCodes.Ldarg_0),
                     new(OpCodes.Call, PropertyGetter(typeof(AlphaWarheadNukesitePanel), nameof(AlphaWarheadNukesitePanel.Networkenabled))),
 
                     // true
@@ -73,6 +72,6 @@ internal static class ChangingLeverStatus
                 yield return newInstructions[z];
 
             ListPool<CodeInstruction>.Pool.Return(newInstructions);
-        }*/
+        }
     }
 }

EXILED/Exiled.Installer/Program.cs

@@ -42,7 +42,7 @@ internal enum PathResolution
 
     internal static class Program
     {
-        private const long RepoID = 984817990;
+        private const long RepoID = 833723500;
         private const string ExiledAssetName = "exiled.tar.gz";
 
         // This is the lowest version the installer will check to install

EXILED/Exiled.Installer/README.md

@@ -43,7 +43,7 @@ Trying to find release..
 Release found!
 PRE: True | ID: 87710626 | TAG: 6.0.0-beta.18
 Asset found!
-ID: 90263995 | NAME: Exiled.tar.gz | SIZE: 1027928 | URL: https://api.github.com/repos/ExSLMod-Team/Exiled-EA/releases/assets/90263995 | DownloadURL: https://github.com/ExSLMod-Team/Exiled-EA/releases/download/6.0.0-beta.18/Exiled.tar.gz
+ID: 90263995 | NAME: Exiled.tar.gz | SIZE: 1027928 | URL: https://api.github.com/repos/Exmod-Team/Exiled-EA/releases/assets/90263995 | DownloadURL: https://github.com/Exmod-Team/Exiled-EA/releases/download/6.0.0-beta.18/Exiled.tar.gz
 Processing 'EXILED/Plugins/dependencies/0Harmony.dll'
 Extracting '0Harmony.dll' into 'YourAppDataPath/EXILED/Plugins/dependencies/0Harmony.dll'...
 Processing 'EXILED/Plugins/dependencies/Exiled.API.dll'
@@ -88,7 +88,7 @@ Trying to find release..
 Release found!
 PRE: False | ID: 87710626 | TAG: 6.0.0-beta.18
 Asset found!
-ID: 90263995 | NAME: Exiled.tar.gz | SIZE: 1027928 | URL: https://api.github.com/repos/ExSLMod-Team/Exiled-EA/releases/assets/90263995 | DownloadURL: https://github.com/ExSLMod-Team/Exiled-EA/releases/download/6.0.0-beta.18/Exiled.tar.gz
+ID: 90263995 | NAME: Exiled.tar.gz | SIZE: 1027928 | URL: https://api.github.com/repos/Exmod-Team/Exiled-EA/releases/assets/90263995 | DownloadURL: https://github.com/Exmod-Team/Exiled-EA/releases/download/6.0.0-beta.18/Exiled.tar.gz
 Processing 'EXILED/Plugins/dependencies/0Harmony.dll'
 Extracting '0Harmony.dll' into '/user/SCP/EXILED/Plugins/dependencies/0Harmony.dll'...
 Processing 'EXILED/Plugins/dependencies/Exiled.API.dll'

EXILED/Exiled.Loader/Updater.cs

@@ -136,7 +136,7 @@ private HttpClient CreateHttpClient()
                 Timeout = TimeSpan.FromSeconds(480),
             };
 
-            client.DefaultRequestHeaders.Add("User-Agent", $"Exiled.Loader (https://github.com/ExSLMod-Team/EXILED, {Assembly.GetExecutingAssembly().GetName().Version.ToString(3)})");
+            client.DefaultRequestHeaders.Add("User-Agent", $"Exiled.Loader (https://github.com/Exmod-Team/EXILED, {Assembly.GetExecutingAssembly().GetName().Version.ToString(3)})");
 
             return client;
         }

EXILED/Exiled/Exiled.nuspec

@@ -9,9 +9,9 @@
     <owners>ExMod-Team</owners>
     <copyright>Copyright © ExMod Team 2024 - $year$</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <repository type="Git" url="https://github.com/ExSLMod-Team/EXILED" />
-    <licenseUrl>https://github.com/ExSLMod-Team/EXILED/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/ExSLMod-Team/EXILED</projectUrl>
+    <repository type="Git" url="https://github.com/Exmod-Team/EXILED" />
+    <licenseUrl>https://github.com/Exmod-Team/EXILED/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/Exmod-Team/EXILED</projectUrl>
     <icon>images\Exiled_Icon.png</icon>
     <description>Plugin framework for SCP: Secret Laboratory.</description>
 

EXILED/docs/articles/contributing/index.md

@@ -6,15 +6,15 @@ title: Contributing to EXILED
 This is a simple tutorial guiding you to contribute to our framework.
 
 ### Forking EXILED
-First, create a fork of our [GitHub repository](https://github.com/ExSLMod-Team/EXILED).
+First, create a fork of our [GitHub repository](https://github.com/Exmod-Team/EXILED).
 
 Then, clone it to your computer like so: `git clone https://github.com/your-username/EXILED.git`
 
 Open a terminal in your forked EXILED folder and run ```git checkout dev```. This will switch you to the dev branch, which all pull requests should be submitted to.
 
 ### Setting `EXILED_REFERENCES`
 
-If you haven't already, install the `SCP: Secret Laboratory Dedicated Server` through Steam or extract [this zip file](https://ExSLMod-Team.github.io/SL-References/Dev.zip) to an easily accessible folder.
+If you haven't already, install the `SCP: Secret Laboratory Dedicated Server` through Steam or extract [this zip file](https://Exmod-Team.github.io/SL-References/Dev.zip) to an easily accessible folder.
 
 #### Windows users
 Open the Environment Variables menu by searching for `Environment Variables` in the Start Menu.

EXILED/docs/articles/installation/automatic/linux.md

@@ -4,7 +4,7 @@ title: Automatic Linux Installation
 
 # Automatic Linux Installation
 
-Download `Exiled.Installer-Linux` from [here](https://github.com/ExSLMod-Team/EXILED/releases).
+Download `Exiled.Installer-Linux` from [here](https://github.com/Exmod-Team/EXILED/releases).
 
 Move it into your **server directory** and run it using `./Exiled.Installer-Linux`
 - Make sure the server directory is the one where LocalAdmin executable is found.

EXILED/docs/articles/installation/automatic/windows.md

@@ -4,7 +4,7 @@ title: Automatic Windows Installation
 
 # Automatic Windows Installation
 
-Download `Exiled.Installer-Win.exe` from [here](https://github.com/ExSLMod-Team/EXILED/releases).
+Download `Exiled.Installer-Win.exe` from [here](https://github.com/Exmod-Team/EXILED/releases).
 
 Move it into your **server directory** and double click the .exe.
 - Make sure the server directory is the one where LocalAdmin.exe is found.

EXILED/docs/articles/installation/manual.md

@@ -8,7 +8,7 @@ You can download exiled manually following this steps:
 
 ### Pick a release
 
-You can select a release inside [our official GitHub repo](https://github.com/ExSLMod-Team/EXILED/releases/).
+You can select a release inside [our official GitHub repo](https://github.com/Exmod-Team/EXILED/releases/).
 
 ### Download the release
 

EXILED/docs/docfx.json

@@ -27,7 +27,7 @@
       "_enableSearch": true,
       "_lang": "en",
       "_gitContribute": {
-        "repo": "https://github.com/ExSLMod-Team/EXILED",
+        "repo": "https://github.com/Exmod-Team/EXILED",
         "branch": "dev"
       }
     },