Update for new SL Release

louis1706 · louis1706 · commit b40da8d98217 · 2025-05-12T22:00:22.000+02:00
diff --git a/Config.cs b/Config.cs
@@ -8,7 +8,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using UnityEngine;
-using KeycardPermissions = Interactables.Interobjects.DoorUtils.KeycardPermissions;
 
 namespace FacilityManagement
 {
diff --git a/ConfigBuild.cs b/ConfigBuild.cs
@@ -5,6 +5,7 @@
 using Exiled.API.Extensions;
 using System;
 using Exiled.API.Features;
+using Exiled.API.Enums;
 
 namespace FacilityManagement
 {
diff --git a/EventHandlers.cs b/EventHandlers.cs
@@ -126,25 +126,25 @@ public void Custom914()
             {
                 string Debug = "[Custom914]\n";
                 {
-                    Debug += $"KnobChangeCooldown: {scp914._knobChangeCooldown} => {scp914Build.KnobChangeCooldown}\n";
-                    Debug += $"DoorOpenTime: {scp914._doorOpenTime} => {scp914Build.DoorOpenTime}\n";
-                    Debug += $"ItemUpgradeTime: {scp914._itemUpgradeTime} => {scp914Build.ItemUpgradeTime}\n";
-                    Debug += $"DoorCloseTime: {scp914._doorCloseTime} => {scp914Build.DoorCloseTime}\n";
-                    Debug += $"TotalSequenceTime: {scp914._totalSequenceTime} => {scp914Build.ActivationCooldown}\n";
+                    Debug += $"KnobChangeCooldown: {scp914.KnobChangeCooldown} => {scp914Build.KnobChangeCooldown}\n";
+                    Debug += $"DoorOpenTime: {scp914.DoorOpenTime} => {scp914Build.DoorOpenTime}\n";
+                    Debug += $"ItemUpgradeTime: {scp914.ItemUpgradeTime} => {scp914Build.ItemUpgradeTime}\n";
+                    Debug += $"DoorCloseTime: {scp914.DoorCloseTime} => {scp914Build.DoorCloseTime}\n";
+                    Debug += $"TotalSequenceTime: {scp914.TotalSequenceTime} => {scp914Build.ActivationCooldown}\n";
                 }
                 Log.Debug(Debug);
             }
 
             if (scp914Build.KnobChangeCooldown is not null)
-                scp914._knobChangeCooldown = scp914Build.KnobChangeCooldown.Value;
+                scp914.KnobChangeCooldown = scp914Build.KnobChangeCooldown.Value;
             if (scp914Build.DoorOpenTime is not null)
-                scp914._doorOpenTime = scp914Build.DoorOpenTime.Value;
+                scp914.DoorOpenTime = scp914Build.DoorOpenTime.Value;
             if (scp914Build.ItemUpgradeTime is not null)
-                scp914._itemUpgradeTime = scp914Build.ItemUpgradeTime.Value;
+                scp914.ItemUpgradeTime = scp914Build.ItemUpgradeTime.Value;
             if (scp914Build.DoorCloseTime is not null)
-                scp914._doorCloseTime = scp914Build.DoorCloseTime.Value;
+                scp914.DoorCloseTime = scp914Build.DoorCloseTime.Value;
             if (scp914Build.ActivationCooldown is not null)
-                scp914._totalSequenceTime = scp914Build.ActivationCooldown.Value;
+                scp914.TotalSequenceTime = scp914Build.ActivationCooldown.Value;
 
         }
         public void CustomWindow()
@@ -296,8 +296,8 @@ public void CustomDoorSet(Door door, DoorType type)
                     string Debug = $"[CustomDoor] : {type}\n";
                     Debug += $"Health: {(breakabledoor is null ? "Nan" : breakabledoor.Health)} => {doorBuild.Health.Value}\n";
                     Debug += $"IgnoredDamageTypes: {(breakabledoor is null ? "Nan" : breakabledoor.IgnoredDamage)} => {doorBuild.DamageTypeIgnored}\n";
-                    Debug += $"RequiredPermissions: {door.RequiredPermissions.RequiredPermissions} => {doorBuild.RequiredPermission}\n";
-                    Debug += $"RequireAllPermission: {door.RequiredPermissions.RequireAll} => {doorBuild.RequireAllPermission}\n";
+                    Debug += $"RequiredPermissions: {door.KeycardPermissions} => {doorBuild.RequiredPermission}\n";
+                    Debug += $"RequireAllPermission: {door.Base.RequiredPermissions.RequireAll} => {doorBuild.RequireAllPermission}\n";
                     Log.Debug(Debug);
                 }
 
@@ -306,9 +306,9 @@ public void CustomDoorSet(Door door, DoorType type)
                 if (doorBuild.DamageTypeIgnored is not null && breakabledoor is not null)
                     breakabledoor.IgnoredDamage = doorBuild.DamageTypeIgnored.Value;
                 if (doorBuild.RequiredPermission is not null)
-                    door.RequiredPermissions.RequiredPermissions = doorBuild.RequiredPermission.Value;
+                    door.KeycardPermissions = doorBuild.RequiredPermission.Value;
                 if (doorBuild.RequireAllPermission is not null)
-                    door.RequiredPermissions.RequireAll = doorBuild.RequireAllPermission.Value;
+                    door.Base.RequiredPermissions.RequireAll = doorBuild.RequireAllPermission.Value;
             }
         }
     }
diff --git a/FacilityManagement.csproj b/FacilityManagement.csproj
@@ -78,7 +78,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ExMod.Exiled">
-      <Version>9.1.0</Version>
+      <Version>9.6.0-beta8</Version>
     </PackageReference>
     <PackageReference Include="Lib.Harmony">
       <Version>2.2.2</Version>
diff --git a/Patches/IntercomText/IntercomPatch.cs b/Patches/IntercomText/IntercomPatch.cs
@@ -48,9 +48,9 @@ private static void Prefix(BaseIntercom __instance)
                     if (!string.IsNullOrEmpty(FacilityManagement.Singleton.CustomText))
                         value = IntercomDisplay.IcomText.Unknown;
 
-                    if (ServerConsole.singleton.NameFormatter.Commands is null || FacilityManagement.Singleton.Config.CustomText is null || !FacilityManagement.Singleton.Config.CustomText.TryGetValue(value, out string content) || string.IsNullOrEmpty(content))
+                    if (ServerConsole.Singleton.NameFormatter.Commands is null || FacilityManagement.Singleton.Config.CustomText is null || !FacilityManagement.Singleton.Config.CustomText.TryGetValue(value, out string content) || string.IsNullOrEmpty(content))
                         return;
-                    if (!ServerConsole.singleton.NameFormatter.TryProcessExpression(content, "FacilityManagement", out string result))
+                    if (!ServerConsole.Singleton.NameFormatter.TryProcessExpression(content, "FacilityManagement", out string result))
                     {
                         Log.Error(result);
                     }
diff --git a/Patches/IntercomText/NameFormaterPatch.cs b/Patches/IntercomText/NameFormaterPatch.cs
@@ -29,9 +29,9 @@ public static void AddCustomInterpolatedCommand()
         {
             try
             {
-                if (ServerConsole.singleton.NameFormatter.Commands.ContainsKey("intercom_speech_remaining_time"))
+                if (ServerConsole.Singleton.NameFormatter.Commands.ContainsKey("intercom_speech_remaining_time"))
                     return;
-                Utils.CommandInterpolation.InterpolatedCommandFormatter interpolatedCommandFormatter = ServerConsole.singleton.NameFormatter;
+                Utils.CommandInterpolation.InterpolatedCommandFormatter interpolatedCommandFormatter = ServerConsole.Singleton.NameFormatter;
 
                 // Int
                 interpolatedCommandFormatter.Commands.Add("intercom_speech_remaining_time", (List<string> args) => Mathf.CeilToInt(Intercom.SpeechRemainingTime).ToString());
@@ -43,7 +43,7 @@ public static void AddCustomInterpolatedCommand()
                 interpolatedCommandFormatter.Commands.Add("intercom_is_in_use", (List<string> args) => (Intercom.Speaker is not null).ToString());
                 
                 // CustomText replace
-                ServerConsole.singleton.NameFormatter = interpolatedCommandFormatter;
+                ServerConsole.Singleton.NameFormatter = interpolatedCommandFormatter;
 
             }
             catch (Exception ex)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using System.Collections.Generic;`
`9`	`9`	`using System.ComponentModel;`
`10`	`10`	`using UnityEngine;`
`11`		`-using KeycardPermissions = Interactables.Interobjects.DoorUtils.KeycardPermissions;`
`12`	`11`
`13`	`12`	`namespace FacilityManagement`
`14`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Exiled.API.Extensions;`
`6`	`6`	`using System;`
`7`	`7`	`using Exiled.API.Features;`
	`8`	`+using Exiled.API.Enums;`
`8`	`9`
`9`	`10`	`namespace FacilityManagement`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ private static void Prefix(BaseIntercom __instance)`
`48`	`48`	`if (!string.IsNullOrEmpty(FacilityManagement.Singleton.CustomText))`
`49`	`49`	`value = IntercomDisplay.IcomText.Unknown;`
`50`	`50`
`51`		`- if (ServerConsole.singleton.NameFormatter.Commands is null \|\| FacilityManagement.Singleton.Config.CustomText is null \|\| !FacilityManagement.Singleton.Config.CustomText.TryGetValue(value, out string content) \|\| string.IsNullOrEmpty(content))`
	`51`	`+ if (ServerConsole.Singleton.NameFormatter.Commands is null \|\| FacilityManagement.Singleton.Config.CustomText is null \|\| !FacilityManagement.Singleton.Config.CustomText.TryGetValue(value, out string content) \|\| string.IsNullOrEmpty(content))`
`52`	`52`	`return;`
`53`		`- if (!ServerConsole.singleton.NameFormatter.TryProcessExpression(content, "FacilityManagement", out string result))`
	`53`	`+ if (!ServerConsole.Singleton.NameFormatter.TryProcessExpression(content, "FacilityManagement", out string result))`
`54`	`54`	`{`
`55`	`55`	`Log.Error(result);`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ public static void AddCustomInterpolatedCommand()`
`29`	`29`	`{`
`30`	`30`	`try`
`31`	`31`	`{`
`32`		`- if (ServerConsole.singleton.NameFormatter.Commands.ContainsKey("intercom_speech_remaining_time"))`
	`32`	`+ if (ServerConsole.Singleton.NameFormatter.Commands.ContainsKey("intercom_speech_remaining_time"))`
`33`	`33`	`return;`
`34`		`- Utils.CommandInterpolation.InterpolatedCommandFormatter interpolatedCommandFormatter = ServerConsole.singleton.NameFormatter;`
	`34`	`+ Utils.CommandInterpolation.InterpolatedCommandFormatter interpolatedCommandFormatter = ServerConsole.Singleton.NameFormatter;`
`35`	`35`
`36`	`36`	`// Int`
`37`	`37`	`interpolatedCommandFormatter.Commands.Add("intercom_speech_remaining_time", (List<string> args) => Mathf.CeilToInt(Intercom.SpeechRemainingTime).ToString());`
`@@ -43,7 +43,7 @@ public static void AddCustomInterpolatedCommand()`
`43`	`43`	`interpolatedCommandFormatter.Commands.Add("intercom_is_in_use", (List<string> args) => (Intercom.Speaker is not null).ToString());`
`44`	`44`
`45`	`45`	`// CustomText replace`
`46`		`- ServerConsole.singleton.NameFormatter = interpolatedCommandFormatter;`
	`46`	`+ ServerConsole.Singleton.NameFormatter = interpolatedCommandFormatter;`
`47`	`47`
`48`	`48`	`}`
`49`	`49`	`catch (Exception ex)`