From b6edc93636e0f01b2051d737adfe97049bb5b146 Mon Sep 17 00:00:00 2001 From: RMROC451 Date: Sun, 23 Jun 2024 02:10:47 -0500 Subject: [PATCH] renaming main class to have plugin suffix to avoid namespace collision issues. --- .../Patches/CarInspector_PopulateCarPanel_Patch.cs | 3 ++- TweaksAndThings/Patches/EngineRosterRow_Refresh_Patch.cs | 2 +- TweaksAndThings/Patches/ExpandedConsole_Patch.cs | 2 +- TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs | 3 ++- .../{TweaksAndThings.cs => TweaksAndThingsPlugin.cs} | 8 ++++---- 5 files changed, 10 insertions(+), 8 deletions(-) rename TweaksAndThings/{TweaksAndThings.cs => TweaksAndThingsPlugin.cs} (96%) diff --git a/TweaksAndThings/Patches/CarInspector_PopulateCarPanel_Patch.cs b/TweaksAndThings/Patches/CarInspector_PopulateCarPanel_Patch.cs index 710d4cc..04ad7ed 100644 --- a/TweaksAndThings/Patches/CarInspector_PopulateCarPanel_Patch.cs +++ b/TweaksAndThings/Patches/CarInspector_PopulateCarPanel_Patch.cs @@ -4,6 +4,7 @@ using HarmonyLib; using KeyValue.Runtime; using Model.OpsNew; using Railloader; +using RMROC451.TweaksAndThings; using RMROC451.TweaksAndThings.Enums; using RMROC451.TweaksAndThings.Extensions; using Serilog; @@ -33,7 +34,7 @@ public class CarInspector_PopulateCarPanel_Patch private static bool Prefix(CarInspector __instance, UIPanelBuilder builder) { - TweaksAndThings tweaksAndThings = SingletonPluginBase.Shared; + TweaksAndThingsPlugin tweaksAndThings = SingletonPluginBase.Shared; if (!tweaksAndThings.IsEnabled) return true; var consist = __instance._car.EnumerateCoupled(LogicalEnd.A); diff --git a/TweaksAndThings/Patches/EngineRosterRow_Refresh_Patch.cs b/TweaksAndThings/Patches/EngineRosterRow_Refresh_Patch.cs index 6906bb7..d29cb5b 100644 --- a/TweaksAndThings/Patches/EngineRosterRow_Refresh_Patch.cs +++ b/TweaksAndThings/Patches/EngineRosterRow_Refresh_Patch.cs @@ -25,7 +25,7 @@ public class EngineRosterRow_Refresh_Patch { public static void Postfix(EngineRosterRow __instance) { - TweaksAndThings? tweaksAndThings = SingletonPluginBase.Shared; + TweaksAndThingsPlugin? tweaksAndThings = SingletonPluginBase.Shared; RosterFuelColumnSettings? rosterFuelColumnSettings = tweaksAndThings?.settings?.EngineRosterFuelColumnSettings; if (tweaksAndThings == null || diff --git a/TweaksAndThings/Patches/ExpandedConsole_Patch.cs b/TweaksAndThings/Patches/ExpandedConsole_Patch.cs index cc6740a..6c0f385 100644 --- a/TweaksAndThings/Patches/ExpandedConsole_Patch.cs +++ b/TweaksAndThings/Patches/ExpandedConsole_Patch.cs @@ -32,7 +32,7 @@ public class ExpandedConsole_Add_Patch { try { - TweaksAndThings tweaksAndThings = SingletonPluginBase.Shared; + TweaksAndThingsPlugin tweaksAndThings = SingletonPluginBase.Shared; StateManager shared = StateManager.Shared; GameStorage gameStorage = shared.Storage; WebhookSettings settings = tweaksAndThings?.settings?.WebhookSettingsList?.FirstOrDefault(ws => ws.RailroadMark == gameStorage.RailroadMark); diff --git a/TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs b/TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs index acd0eb4..495cd94 100644 --- a/TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs +++ b/TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs @@ -2,6 +2,7 @@ using Model; using Model.OpsNew; using Railloader; +using RMROC451.TweaksAndThings; using RMROC451.TweaksAndThings.Extensions; using UI; using UI.Tags; @@ -20,7 +21,7 @@ public class TagController_UpdateTag_Patch private static void Postfix(Car car, TagCallout tagCallout) { TagController tagController = UnityEngine.Object.FindObjectOfType(); - TweaksAndThings tweaksAndThings = SingletonPluginBase.Shared; + TweaksAndThingsPlugin tweaksAndThings = SingletonPluginBase.Shared; if (!tweaksAndThings.IsEnabled || !tweaksAndThings.settings.HandBrakeAndAirTagModifiers) { diff --git a/TweaksAndThings/TweaksAndThings.cs b/TweaksAndThings/TweaksAndThingsPlugin.cs similarity index 96% rename from TweaksAndThings/TweaksAndThings.cs rename to TweaksAndThings/TweaksAndThingsPlugin.cs index fe59771..e0e6970 100644 --- a/TweaksAndThings/TweaksAndThings.cs +++ b/TweaksAndThings/TweaksAndThingsPlugin.cs @@ -14,7 +14,7 @@ using RMROC451.TweaksAndThings.Enums; namespace RMROC451.TweaksAndThings; -public class TweaksAndThings : SingletonPluginBase, IUpdateHandler, IModTabHandler +public class TweaksAndThingsPlugin : SingletonPluginBase, IUpdateHandler, IModTabHandler { private HttpClient client; internal HttpClient Client @@ -28,16 +28,16 @@ public class TweaksAndThings : SingletonPluginBase, IUpdateHand } } internal Settings? settings { get; private set; } = null; - readonly ILogger logger = Log.ForContext(); + readonly ILogger logger = Log.ForContext(); IModdingContext moddingContext { get; set; } IModDefinition modDefinition { get; set; } - static TweaksAndThings() + static TweaksAndThingsPlugin() { Log.Information("Hello! Static Constructor was called!"); } - public TweaksAndThings(IModdingContext moddingContext, IModDefinition self) + public TweaksAndThingsPlugin(IModdingContext moddingContext, IModDefinition self) { this.modDefinition = self;