From a4b913b7d734e302e5c9f9e0285756fdc33a66e3 Mon Sep 17 00:00:00 2001 From: Mirai Tachibana Date: Sat, 4 Nov 2023 14:16:44 +0200 Subject: [PATCH] The warnings just dont stop --- Marsey/FileHandler.cs | 2 +- Marsey/GameAssemblyManager.cs | 2 +- Marsey/MarseyPatcher.cs | 2 +- Marsey/MarseyVars.cs | 2 +- Marsey/PatchAssemblyManager.cs | 2 +- Marsey/Utility.cs | 2 +- SS14.Loader/Program.cs | 3 +-- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Marsey/FileHandler.cs b/Marsey/FileHandler.cs index 09e41a3..1876487 100644 --- a/Marsey/FileHandler.cs +++ b/Marsey/FileHandler.cs @@ -8,7 +8,7 @@ namespace Marsey; /// /// Handles file operations in the patch folder /// -public class FileHandler +public abstract class FileHandler { /// /// Move "Enabled" assemblies to the "Enabled" folder. diff --git a/Marsey/GameAssemblyManager.cs b/Marsey/GameAssemblyManager.cs index ede41c6..21e3e87 100644 --- a/Marsey/GameAssemblyManager.cs +++ b/Marsey/GameAssemblyManager.cs @@ -8,7 +8,7 @@ namespace Marsey; /// /// Manages game's assemblies, this includes patching. /// -public class GameAssemblyManager +public abstract class GameAssemblyManager { private static Harmony? _harmony; diff --git a/Marsey/MarseyPatcher.cs b/Marsey/MarseyPatcher.cs index 529f357..b889b36 100644 --- a/Marsey/MarseyPatcher.cs +++ b/Marsey/MarseyPatcher.cs @@ -18,7 +18,7 @@ public class MarseyPatcher /// /// Robust.Client assembly as *loaded* by the *loader* /// Excepts if Robust.Client assembly is null - public void Boot(Assembly? robClientAssembly) + public static void Boot(Assembly? robClientAssembly) { if (robClientAssembly == null) throw new Exception("Robust.Client was null."); diff --git a/Marsey/MarseyVars.cs b/Marsey/MarseyVars.cs index c0f1326..ae1eb69 100644 --- a/Marsey/MarseyVars.cs +++ b/Marsey/MarseyVars.cs @@ -1,6 +1,6 @@ namespace Marsey; -public class MarseyVars +public abstract class MarseyVars { // Namespace identifier for Harmony public const string Identifier = "com.validhunters.marseyloader"; diff --git a/Marsey/PatchAssemblyManager.cs b/Marsey/PatchAssemblyManager.cs index 1df05aa..743674d 100644 --- a/Marsey/PatchAssemblyManager.cs +++ b/Marsey/PatchAssemblyManager.cs @@ -7,7 +7,7 @@ namespace Marsey; /// /// Initializes, validates and manages patch assemblies. /// -public class PatchAssemblyManager +public abstract class PatchAssemblyManager { private static Assembly? _robustAss; private static Assembly? _clientAss; diff --git a/Marsey/Utility.cs b/Marsey/Utility.cs index 6df47c8..ba11c31 100644 --- a/Marsey/Utility.cs +++ b/Marsey/Utility.cs @@ -2,7 +2,7 @@ namespace Marsey; -public class Utility +public abstract class Utility { public enum LogType { diff --git a/SS14.Loader/Program.cs b/SS14.Loader/Program.cs index 40ddd56..7d8d40a 100644 --- a/SS14.Loader/Program.cs +++ b/SS14.Loader/Program.cs @@ -61,8 +61,7 @@ private bool Run() SQLitePCL.Batteries_V2.Init(); - MarseyPatcher marsey = new MarseyPatcher(); - Thread t = new Thread(() => marsey.Boot(clientAssembly)); + Thread t = new Thread(() => MarseyPatcher.Boot(clientAssembly)); t.Start(); var launcher = Environment.GetEnvironmentVariable("SS14_LAUNCHER_PATH");