From e5605c32f2ec5363c692596338fbbbeb6a2aefc9 Mon Sep 17 00:00:00 2001 From: louis1706 Date: Fri, 2 Sep 2022 15:50:41 +0200 Subject: [PATCH 1/3] BuildRequestedChange --- Main.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Main.cs b/Main.cs index 20042a0..9fe1bc6 100644 --- a/Main.cs +++ b/Main.cs @@ -28,15 +28,12 @@ public class FacilityManagement : Exiled.API.Features.Plugin public override void OnEnabled() { - if (!Config.IsEnabled) return; Singleton = this; base.OnEnabled(); RegistEvents(); RegistPatch(); - - Exiled.API.Features.Log.Info($"[OnEnabled] FacilityManagement({Version}) Enabled Complete."); } public override void OnReloaded() { @@ -57,8 +54,6 @@ public override void OnDisabled() UnRegistEvents(); UnRegistPatch(); - - Exiled.API.Features.Log.Info($"[OnDisable] SanyaRemastered({Version}) Disabled Complete."); } private void RegistEvents() { From 9afc1f2e1279ceac44eaff906dd26e045b7684de Mon Sep 17 00:00:00 2001 From: louis1706 Date: Fri, 2 Sep 2022 16:50:54 +0200 Subject: [PATCH 2/3] Fix by Ficus-x - TeslaCommand check being dumb - Renaming some of the method and event - no use of lambda new() --- Commands/DisableTesla.cs | 4 +- EventHandlers.cs | 14 ++--- FacilityManagement.csproj | 4 +- Main.cs | 57 +++++++++---------- Patches/CommandIntercomTextFix.cs | 2 +- .../{IntercomPatche.cs => IntercomPatch.cs} | 2 +- ...FormaterPatche.cs => NameFormaterPatch.cs} | 2 +- 7 files changed, 41 insertions(+), 44 deletions(-) rename Patches/{IntercomPatche.cs => IntercomPatch.cs} (96%) rename Patches/{NameFormaterPatche.cs => NameFormaterPatch.cs} (98%) diff --git a/Commands/DisableTesla.cs b/Commands/DisableTesla.cs index 023c504..18f1aa0 100644 --- a/Commands/DisableTesla.cs +++ b/Commands/DisableTesla.cs @@ -22,11 +22,11 @@ public class DisableTesla : ICommand, IUsageProvider public bool Execute(ArraySegment 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 index 16cd1b0..4a9f433 100644 --- 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().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,7 +141,7 @@ public void HandleFemurEnter(EnteringFemurBreakerEventArgs ev) } } - public void HandleContain106(ContainingEventArgs ev) + public void OnContaining(ContainingEventArgs ev) { if (plugin.Config.Scp106LureAmount < 1) return; @@ -149,7 +149,7 @@ public void HandleContain106(ContainingEventArgs ev) } - public void HandleWarheadDetonation() + public void OnDetonated() { if (!plugin.Config.WarheadCleanup) return; diff --git a/FacilityManagement.csproj b/FacilityManagement.csproj index 01c2037..5b69594 100644 --- a/FacilityManagement.csproj +++ b/FacilityManagement.csproj @@ -106,9 +106,9 @@ - + - + diff --git a/Main.cs b/Main.cs index 9fe1bc6..f7d01b4 100644 --- a/Main.cs +++ b/Main.cs @@ -1,12 +1,10 @@ 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 { @@ -15,8 +13,8 @@ public class FacilityManagement : Exiled.API.Features.Plugin 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 Version Version { get; } = new(1,0,0); + public override Version RequiredExiledVersion { get; } = new(5,2,2); public EventHandlers EventHandlers { get; private set; } @@ -31,15 +29,14 @@ public override void OnEnabled() Singleton = this; base.OnEnabled(); - RegistEvents(); + RegisterEvents(); - RegistPatch(); + RegisterPatch(); } public override void OnReloaded() { - if (!Config.IsEnabled) return; - RegistEvents(); - RegistPatch(); + RegisterEvents(); + RegisterPatch(); base.OnReloaded(); } @@ -51,45 +48,45 @@ public override void OnDisabled() Timing.KillCoroutines(cor); RoundCoroutines.Clear(); - UnRegistEvents(); + UnRegisterEvents(); - UnRegistPatch(); + 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 { @@ -98,11 +95,11 @@ 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 index 5e15bfa..829972e 100644 --- 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 arguments, ICommandSender sender, out string response) { diff --git a/Patches/IntercomPatche.cs b/Patches/IntercomPatch.cs similarity index 96% rename from Patches/IntercomPatche.cs rename to Patches/IntercomPatch.cs index f0b169b..82c5d02 100644 --- a/Patches/IntercomPatche.cs +++ b/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 b/Patches/NameFormaterPatch.cs similarity index 98% rename from Patches/NameFormaterPatche.cs rename to Patches/NameFormaterPatch.cs index 478beae..05116be 100644 --- a/Patches/NameFormaterPatche.cs +++ b/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) { From 545618ed8ef1177288d538c5d8dcfc7b7ea21d82 Mon Sep 17 00:00:00 2001 From: louis1706 <66829532+louis1706@users.noreply.github.com> Date: Fri, 2 Sep 2022 16:55:55 +0200 Subject: [PATCH 3/3] Manual Fix for GitHub being dumb --- Main.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Main.cs b/Main.cs index f7d01b4..7690c93 100644 --- a/Main.cs +++ b/Main.cs @@ -8,11 +8,11 @@ public class FacilityManagement : Exiled.API.Features.Plugin { - 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 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); @@ -104,4 +104,4 @@ private void UnRegisterPatch() Harmony.UnpatchAll(Harmony.Id); } } -} \ No newline at end of file +}