Merge pull request #1 from CitiesSkylinesMods/v1.1

Compatibility improvements with Harmony mod
CitiesSkylinesMods · Jan 31, 2021 · 5393c81 · 5393c81
2 parents 0212296 + 7ecd37e
commit 5393c81
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 36 deletions.
diff --git a/TrolleybusTrailerMod/Patcher.cs b/TrolleybusTrailerMod/Patcher.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Reflection;
+using ColossalFramework.UI;
+using HarmonyLib;
+using UnityEngine;
+
+namespace TrolleybusTrailerMod {
+    public static class Patcher {       
+        private const string HarmonyId  = "krzychu124.trolleybus.trailer.ai";
+        private static bool patched;
+        public static void PatchAll() {
+            try {
+                Harmony harmony = new Harmony(HarmonyId);
+                harmony.PatchAll(Assembly.GetExecutingAssembly());
+                Debug.Log("[Trolleybus Trailer AI] Patches applied correctly");
+                patched = true;
+            } catch (Exception e) {
+                Debug.LogError("[Trolleybus Trailer AI] Exception while patching game:\n" + e);
+                UIView.library
+                    .ShowModal<ExceptionPanel>(
+                        "ExceptionPanel")
+                    .SetMessage(
+                        "Trolleybus Trailer AI ",
+                        "Something went wrong while patching. :(\nMod will not work correctly. Contact author for support.",
+                        true);
+            }
+        }
+
+        public static void UnPatchAll() {
+            if (!patched) return;
+            Harmony harmony = new Harmony(HarmonyId);
+            harmony.UnpatchAll(HarmonyId );
+            patched = false;
+            Debug.Log("[Trolleybus Trailer AI] UnPatched successfully");
+        }
+    }
+}
diff --git a/TrolleybusTrailerMod/Properties/AssemblyInfo.cs b/TrolleybusTrailerMod/Properties/AssemblyInfo.cs
@@ -31,4 +31,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.1.1.*")]
diff --git a/TrolleybusTrailerMod/TrolleybusTrailerMod.cs b/TrolleybusTrailerMod/TrolleybusTrailerMod.cs
@@ -1,44 +1,23 @@
-using System;
-using System.Reflection;
-using ColossalFramework.UI;
-using HarmonyLib;
+using CitiesHarmony.API;
 using ICities;
 using UnityEngine;
 
 namespace TrolleybusTrailerMod {
-    public class TrolleybusTrailerMod: IUserMod {
+    public class TrolleybusTrailerMod : IUserMod {
         public string Name { get; } = "Trolleybus Trailer AI";
         public string Description { get; } = "Support Trolleybus trailers with poles at any trailer";
 
-        public readonly string HARMONY_ID = "krzychu124.trolleybus.trailer.ai";
-        private Harmony _harmony;
-
         public void OnEnabled() {
-            if (CitiesHarmony.API.HarmonyHelper.IsHarmonyInstalled) {
-                CitiesHarmony.API.HarmonyHelper.DoOnHarmonyReady(() => {
-                    Debug.Log("[Trolleybus Trailer AI] Applying patches...");
-                    _harmony = new Harmony(HARMONY_ID);
-                    try {
-                        _harmony.PatchAll(Assembly.GetExecutingAssembly());
-                        Debug.Log("[Trolleybus Trailer AI] Patches applied correctly");
-                    } catch (Exception e) {
-                        Debug.LogError("[Trolleybus Trailer AI] Exception while patching game:\n" + e);
-                        UIView.library
-                            .ShowModal<ExceptionPanel>(
-                                "ExceptionPanel")
-                            .SetMessage(
-                                "Trolleybus Trailer AI ",
-                                "Something went wrong while patching. :(\nMod will not work correctly. Contact author for support.",
-                                true);
-                    }
+                HarmonyHelper.DoOnHarmonyReady(() => {
+                    Debug.Log("[Trolleybus Trailer AI] Try Patch...");
+                    Patcher.PatchAll();
                 });
-            }
         }
 
         public void OnDisabled() {
-            if (_harmony != null) {
-                Debug.Log("[Trolleybus Trailer AI] UnPatching...");
-                _harmony.UnpatchAll(HARMONY_ID);
+            if (HarmonyHelper.IsHarmonyInstalled) {
+                Debug.Log("[Trolleybus Trailer AI] Try UnPatch...");
+                Patcher.UnPatchAll();
             }
         }
     }

diff --git a/TrolleybusTrailerMod/TrolleybusTrailerMod.csproj b/TrolleybusTrailerMod/TrolleybusTrailerMod.csproj
@@ -32,15 +32,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony, Version=2.0.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Lib.Harmony.2.0.1\lib\net35\0Harmony.dll</HintPath>
+    <Reference Include="0Harmony, Version=2.0.4.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Lib.Harmony.2.0.4\lib\net35\0Harmony.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\dependencies\Assembly-CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="CitiesHarmony.API, Version=1.0.5.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\CitiesHarmony.API.1.0.5\lib\net35\CitiesHarmony.API.dll</HintPath>
+    <Reference Include="CitiesHarmony.API, Version=1.0.6.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\CitiesHarmony.API.1.0.6\lib\net35\CitiesHarmony.API.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ColossalManaged, Version=0.3.0.0, Culture=neutral, PublicKeyToken=null">
@@ -65,6 +65,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AI\TrolleybusTrailerAI.cs" />
+    <Compile Include="Patcher.cs" />
     <Compile Include="Patch\EditorImportTrolleyPolePatch.cs" />
     <Compile Include="Patch\EditorMaskDropdownPatch.cs" />
     <Compile Include="Patch\TrolleybusPatch.cs" />

diff --git a/TrolleybusTrailerMod/packages.config b/TrolleybusTrailerMod/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CitiesHarmony.API" version="1.0.5" targetFramework="net35" />
-  <package id="Lib.Harmony" version="2.0.1" targetFramework="net35" />
+  <package id="CitiesHarmony.API" version="1.0.6" targetFramework="net35" />
+  <package id="Lib.Harmony" version="2.0.4" targetFramework="net35" />
 </packages>