Merge branch 'main' into dev

louis1706 · Sep 6, 2022 · 2b39bed · 2b39bed
2 parents 1e97f68 + 545618e
commit 2b39bed
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 54 deletions.
diff --git a/Commands/DisableTesla.cs b/Commands/DisableTesla.cs
@@ -22,11 +22,11 @@ public class DisableTesla : ICommand, IUsageProvider
 
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            if(sender.CheckPermission(PlayerPermissions.FacilityManagement, out response))
+            if(!sender.CheckPermission(PlayerPermissions.FacilityManagement, out response))
             {
                 return false;
             }
-            if (float.TryParse(arguments.ElementAtOrDefault(0), out float time))
+            if (!float.TryParse(arguments.ElementAtOrDefault(0), out float time))
             {
                 response = $"Invalid duration time {arguments.ElementAtOrDefault(0)}";
                 return false;

diff --git a/EventHandlers.cs b/EventHandlers.cs
@@ -19,7 +19,7 @@ public class EventHandlers
         public FacilityManagement plugin;
         public int LuresCount;
 
-        public void HandleRoundStart()
+        public void OnRoundStarted()
         {
             LuresCount = 0;
             if (plugin.Config.CustomTesla is not null)
@@ -85,7 +85,7 @@ public void HandleRoundStart()
             if (plugin.Config.Scp106LureAmount < 1)
                 Object.FindObjectOfType<LureSubjectContainer>().SetState(false, true);
         }
-        public void HandleWeaponShoot(ShootingEventArgs ev)
+        public void OnShooting(ShootingEventArgs ev)
         {
             if (ev.Shooter.CurrentItem is null)
                 return;
@@ -94,11 +94,11 @@ public void HandleWeaponShoot(ShootingEventArgs ev)
                 firearm.Ammo++;
             }
         }
-        public void HandleEnergyMicroHid(UsingMicroHIDEnergyEventArgs ev)
+        public void OnUsingMicroHIDEnergy(UsingMicroHIDEnergyEventArgs ev)
         {
             ev.Drain *= plugin.Config.EnergyMicroHid;
         }
-        public void HandleEnergyRadio(UsingRadioBatteryEventArgs ev)
+        public void OnUsingRadioBattery(UsingRadioBatteryEventArgs ev)
         {
             ev.Drain *= plugin.Config.EnergyRadio;
         }
@@ -118,7 +118,7 @@ public void OnHurting(HurtingEventArgs ev)
                 ev.Target.ActiveArtificialHealthProcesses.First().SustainTime = ahpProccessBuild.Sustain;
         }
 
-        public void HandleFemurEnter(EnteringFemurBreakerEventArgs ev)
+        public void OnEnteringFemurBreaker(EnteringFemurBreakerEventArgs ev)
         {
             // That means the femur breaker is always open
             if (plugin.Config.Scp106LureAmount < 1)
@@ -141,15 +141,15 @@ public void HandleFemurEnter(EnteringFemurBreakerEventArgs ev)
             }
         }
 
-        public void HandleContain106(ContainingEventArgs ev)
+        public void OnContaining(ContainingEventArgs ev)
         {
             if (plugin.Config.Scp106LureAmount < 1)
                 return;
             ev.IsAllowed = LuresCount > plugin.Config.Scp106LureAmount;
         }
 
 
-        public void HandleWarheadDetonation()
+        public void OnDetonated()
         {
             if (!plugin.Config.WarheadCleanup)
                 return;

diff --git a/FacilityManagement.csproj b/FacilityManagement.csproj
@@ -106,9 +106,9 @@
     <Compile Include="EventHandlers.cs" />
     <Compile Include="Patches\CommandIntercomTextFix.cs" />
     <Compile Include="Patches\IntercomDisplayTextFix.cs" />
-    <Compile Include="Patches\IntercomPatche.cs" />
+    <Compile Include="Patches\IntercomPatch.cs" />
     <Compile Include="Main.cs" />
-    <Compile Include="Patches\NameFormaterPatche.cs" />
+    <Compile Include="Patches\NameFormaterPatch.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Main.cs b/Main.cs
@@ -1,22 +1,20 @@
 namespace FacilityManagement
 {
-	using Exiled.API.Enums;
     using Exiled.Events.Handlers;
     using HarmonyLib;
     using MEC;
     using System;
     using System.Collections.Generic;
-    using System.Diagnostics;
 
     public class FacilityManagement : Exiled.API.Features.Plugin<Config>
     {
-		public static FacilityManagement Singleton;
+	public static FacilityManagement Singleton;
 
-		public override string Name => "FacilityManagement";
-		public override string Prefix => "FacilityManagement";
-		public override string Author => "Yamato#8987";
-        public override Version Version => new(1,0,0);
-        public override Version RequiredExiledVersion => new(5,2,2);
+	public override string Name => "FacilityManagement";
+	public override string Prefix => "FacilityManagement";
+	public override string Author => "Yamato#8987";
+        public override Version Version { get; } = new(1,0,0);
+        public override Version RequiredExiledVersion  { get; } = new(5,2,2);
 
         public EventHandlers EventHandlers { get; private set; }
 
@@ -28,21 +26,17 @@ public class FacilityManagement : Exiled.API.Features.Plugin<Config>
 
         public override void OnEnabled()
         {
-            if (!Config.IsEnabled) return;
             Singleton = this;
             base.OnEnabled();
 
-            RegistEvents();
+            RegisterEvents();
 
-            RegistPatch();
-
-            Exiled.API.Features.Log.Info($"[OnEnabled] FacilityManagement({Version}) Enabled Complete.");
+            RegisterPatch();
         }
         public override void OnReloaded()
         {
-            if (!Config.IsEnabled) return;
-            RegistEvents();
-            RegistPatch();
+            RegisterEvents();
+            RegisterPatch();
 
             base.OnReloaded();
         }
@@ -54,47 +48,45 @@ public override void OnDisabled()
                 Timing.KillCoroutines(cor);
             RoundCoroutines.Clear();
 
-            UnRegistEvents();
-
-            UnRegistPatch();
+            UnRegisterEvents();
 
-            Exiled.API.Features.Log.Info($"[OnDisable] SanyaRemastered({Version}) Disabled Complete.");
+            UnRegisterPatch();
         }
-        private void RegistEvents()
+        private void RegisterEvents()
         {
             EventHandlers = new(this);
-            Server.RoundStarted += EventHandlers.HandleRoundStart;
+            Server.RoundStarted += EventHandlers.OnRoundStarted;
 
-            Player.Shooting += EventHandlers.HandleWeaponShoot;
-            Player.UsingMicroHIDEnergy += EventHandlers.HandleEnergyMicroHid;
-            Player.UsingRadioBattery += EventHandlers.HandleEnergyRadio;
+            Player.Shooting += EventHandlers.OnShooting;
+            Player.UsingMicroHIDEnergy += EventHandlers.OnUsingMicroHIDEnergy;
+            Player.UsingRadioBattery += EventHandlers.OnUsingRadioBattery;
             Player.Spawning += EventHandlers.OnSpawning;
             Player.Hurting += EventHandlers.OnHurting;
-            Player.EnteringFemurBreaker += EventHandlers.HandleFemurEnter;
+            Player.EnteringFemurBreaker += EventHandlers.OnEnteringFemurBreaker;
 
-            Scp106.Containing += EventHandlers.HandleContain106;
+            Scp106.Containing += EventHandlers.OnContaining;
 
-            Warhead.Detonated += EventHandlers.HandleWarheadDetonation;
+            Warhead.Detonated += EventHandlers.OnDetonated;
         }
-        private void UnRegistEvents()
+        private void UnRegisterEvents()
         {
-            Server.RoundStarted -= EventHandlers.HandleRoundStart;
+            Server.RoundStarted -= EventHandlers.OnRoundStarted;
 
-            Player.Shooting -= EventHandlers.HandleWeaponShoot;
-            Player.UsingMicroHIDEnergy -= EventHandlers.HandleEnergyMicroHid;
-            Player.UsingRadioBattery -= EventHandlers.HandleEnergyRadio;
+            Player.Shooting -= EventHandlers.OnShooting;
+            Player.UsingMicroHIDEnergy -= EventHandlers.OnUsingMicroHIDEnergy;
+            Player.UsingRadioBattery -= EventHandlers.OnUsingRadioBattery;
             Player.Spawning -= EventHandlers.OnSpawning;
             Player.Hurting -= EventHandlers.OnHurting;
-            Player.EnteringFemurBreaker -= EventHandlers.HandleFemurEnter;
+            Player.EnteringFemurBreaker -= EventHandlers.OnEnteringFemurBreaker;
 
-            Scp106.Containing -= EventHandlers.HandleContain106;
+            Scp106.Containing -= EventHandlers.OnContaining;
 
-            Warhead.Detonated -= EventHandlers.HandleWarheadDetonation;
+            Warhead.Detonated -= EventHandlers.OnDetonated;
 
             EventHandlers = null;
         }
 
-        private void RegistPatch()
+        private void RegisterPatch()
         {
             try
             {
@@ -103,13 +95,13 @@ private void RegistPatch()
             }
             catch (Exception ex)
             {
-                Exiled.API.Features.Log.Error($"[RegistPatch] Patching Failed : {ex}");
+                Exiled.API.Features.Log.Error($"[RegisterPatch] Patching Failed : {ex}");
             }
         }
 
-        private void UnRegistPatch()
+        private void UnRegisterPatch()
         {
             Harmony.UnpatchAll(Harmony.Id);
         }
     }
-}
+}
diff --git a/Patches/CommandIntercomTextFix.cs b/Patches/CommandIntercomTextFix.cs
@@ -6,7 +6,7 @@
 namespace FacilityManagement.Patches
 {
     [HarmonyPatch(typeof(IntercomTextCommand), nameof(IntercomTextCommand.Execute))]
-    public static class IntercomTextCommandPatches
+    public static class IntercomTextCommandFix
     {
         public static bool Prefix(ref bool __result, ArraySegment<string> arguments, ICommandSender sender, out string response)
         {

diff --git a/Patches/IntercomPatche.cs → Patches/IntercomPatch.cs b/Patches/IntercomPatche.cs → Patches/IntercomPatch.cs
@@ -5,7 +5,7 @@
 
 namespace FacilityManagement.Patches
 {
-    public class IntercomUpdateTextPatche
+    public class IntercomUpdateTextPatch
     {
         [HarmonyPatch(typeof(Intercom), nameof(Intercom.IntercomState), MethodType.Setter)]
         public static class CommandIntercomTextSetterFix

diff --git a/Patches/NameFormaterPatche.cs → Patches/NameFormaterPatch.cs b/Patches/NameFormaterPatche.cs → Patches/NameFormaterPatch.cs
@@ -7,7 +7,7 @@
 namespace FacilityManagement.Patches
 {
     [HarmonyPatch(typeof(Intercom), nameof(Intercom.Start))]
-    public class NameFormaterPatche
+    public class NameFormaterPatch
     {
         public static void Postfix(Intercom __instance)
         {