CitiesSkylinesMods · kianzarrin · May 24, 2020 · Apr 25, 2020 · Apr 25, 2020 · Apr 25, 2020
diff --git a/TLM/TLM/LoadingExtension.cs b/TLM/TLM/LoadingExtension.cs
diff --git a/TLM/TLM/Manager/Impl/OptionsManager.cs b/TLM/TLM/Manager/Impl/OptionsManager.cs
@@ -1,4 +1,4 @@
-namespace TrafficManager.Manager.Impl {
+namespace TrafficManager.Manager.Impl {
     using CSUtil.Commons;
     using System;
     using TrafficManager.API.Manager;

diff --git a/TLM/TLM/Manager/Impl/UtilityManager.cs b/TLM/TLM/Manager/Impl/UtilityManager.cs
@@ -1,4 +1,4 @@
-namespace TrafficManager.Manager.Impl {
+namespace TrafficManager.Manager.Impl {
     using ColossalFramework;
     using CSUtil.Commons;
     using System.Threading;

diff --git a/TLM/TLM/Patch/_CitizenManager/ReleaseCitizenInstancePatch.cs b/TLM/TLM/Patch/_CitizenManager/ReleaseCitizenInstancePatch.cs
@@ -1,5 +1,5 @@
 namespace TrafficManager.Patch._CitizenManager {
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
 
     [HarmonyPatch(typeof(CitizenManager), "ReleaseCitizenInstance")]

diff --git a/TLM/TLM/Patch/_CitizenManager/ReleaseCitizenPatch.cs b/TLM/TLM/Patch/_CitizenManager/ReleaseCitizenPatch.cs
@@ -1,5 +1,5 @@
 namespace TrafficManager.Patch._CitizenManager {
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
 
     [HarmonyPatch(typeof(CitizenManager), "ReleaseCitizen")]

diff --git a/TLM/TLM/Patch/_CommonBuildingAI/SimulationStepPatch.cs b/TLM/TLM/Patch/_CommonBuildingAI/SimulationStepPatch.cs
@@ -1,13 +1,28 @@
-namespace TrafficManager.Patch._CommonBuildingAI {
+namespace TrafficManager.Patch._CommonBuildingAI {
+    using HarmonyLib;
     using JetBrains.Annotations;
+    using System.Reflection;
+
+    [HarmonyPatch]
+    [UsedImplicitly]
+    public class SimulationStepPatch
+    {
+        [UsedImplicitly]
+        public static MethodBase TargetMethod()
+        {
+            return HarmonyLib.AccessTools.DeclaredMethod(
+                typeof(CommonBuildingAI),
+                "SimulationStep",
+                new[] { typeof(ushort), typeof(Building).MakeByRefType() }) ??
+                throw new System.Exception("_CommonBuildingAI.SimulationStepPatch failed to find TargetMethod");
+        }
 
-    // [Harmony] Manually patched because struct references are used
-    public class SimulationStepPatch {
         /// <summary>
         /// Decreases parking space and public transport demand before each simulation step if the Parking AI is active.
         /// </summary>
         [UsedImplicitly]
-        public static void Prefix(ushort buildingID, ref Building data) {
+        public static void Prefix(ushort buildingID, ref Building data)
+        {
             Constants.ManagerFactory.ExtBuildingManager.OnBeforeSimulationStep(buildingID, ref data);
         }
     }

diff --git a/TLM/TLM/Patch/_DefaultTool/OnToolGUIPatch.cs b/TLM/TLM/Patch/_DefaultTool/OnToolGUIPatch.cs
@@ -1,5 +1,5 @@
 namespace TrafficManager.Patch._DefaultTool {
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.UI;
     using UnityEngine;

diff --git a/TLM/TLM/Patch/_DefaultTool/RenderOverlayPatch.cs b/TLM/TLM/Patch/_DefaultTool/RenderOverlayPatch.cs
@@ -1,5 +1,5 @@
 namespace TrafficManager.Patch._DefaultTool {
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.UI;
 

diff --git a/TLM/TLM/Patch/_HumanAI/ArriveAtDestinationPatch.cs b/TLM/TLM/Patch/_HumanAI/ArriveAtDestinationPatch.cs
@@ -1,6 +1,6 @@
 namespace TrafficManager.Patch._HumanAI {
     using ColossalFramework;
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.State;
 

diff --git a/TLM/TLM/Patch/_InfoManager/SetModePatch.cs b/TLM/TLM/Patch/_InfoManager/SetModePatch.cs
@@ -1,7 +1,7 @@
 namespace TrafficManager.Patch._InfoManager
 {
     using ColossalFramework;
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.Util;
     using TrafficManager.UI;

diff --git a/TLM/TLM/Patch/_NetManager/FinalizeSegmentPatch.cs b/TLM/TLM/Patch/_NetManager/FinalizeSegmentPatch.cs
@@ -1,5 +1,5 @@
 namespace TrafficManager.Patch._NetManager {
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
 
     [HarmonyPatch(typeof(NetManager), "FinalizeSegment")]

diff --git a/TLM/TLM/Patch/_NetManager/UpdateSegmentPatch.cs b/TLM/TLM/Patch/_NetManager/UpdateSegmentPatch.cs
@@ -1,5 +1,5 @@
 namespace TrafficManager.Patch._NetManager {
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
 
     [HarmonyPatch(

diff --git a/TLM/TLM/Patch/_NetSegment/CalculateSegmentPatch.cs b/TLM/TLM/Patch/_NetSegment/CalculateSegmentPatch.cs
@@ -1,6 +1,5 @@
 namespace TrafficManager.Patch._NetSegment {
-    using Harmony;
-    using JetBrains;
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.Manager.Impl;
 

diff --git a/TLM/TLM/Patch/_RoadBaseAI/GetTrafficLightNodeStatePatch.cs b/TLM/TLM/Patch/_RoadBaseAI/GetTrafficLightNodeStatePatch.cs
@@ -1,6 +1,6 @@
 namespace TrafficManager.Patch._RoadBaseAI {
     using ColossalFramework;
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.State;
     using UnityEngine;

diff --git a/TLM/TLM/Patch/_RoadBaseAI/SegmentSimulationStepPatch.cs b/TLM/TLM/Patch/_RoadBaseAI/SegmentSimulationStepPatch.cs
@@ -1,13 +1,24 @@
-namespace TrafficManager.Patch._RoadBaseAI {
+namespace TrafficManager.Patch._RoadBaseAI {
     using API.Traffic.Enums;
     using ColossalFramework;
+    using HarmonyLib;
     using JetBrains.Annotations;
+    using System.Reflection;
     using TrafficManager.State;
-    using CSUtil.Commons.Benchmark;
 
-
-    // [Harmony] Manually patched because struct references are used
-    public class SegmentSimulationStepPatch {
+    [HarmonyPatch]
+    [UsedImplicitly]
+    public class SegmentSimulationStepPatch
+    {
+        [UsedImplicitly]
+        public static MethodBase TargetMethod()
+        {
+            return HarmonyLib.AccessTools.DeclaredMethod(
+                typeof(RoadBaseAI),
+                "SimulationStep",
+                new[] { typeof(ushort), typeof(NetSegment).MakeByRefType() }) ??
+                throw new System.Exception("SegmentSimulationStepPatch failed to find TargetMethod");
+        }
 
         private static ushort lastSimulatedSegmentId = 0;
         private static byte trafficMeasurementMod = 0;

diff --git a/TLM/TLM/Patch/_RoadBaseAI/SetTrafficLightStatePatch.cs b/TLM/TLM/Patch/_RoadBaseAI/SetTrafficLightStatePatch.cs
@@ -1,5 +1,5 @@
 namespace TrafficManager.Patch._RoadBaseAI {
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.State;
     using static RoadBaseAI;

diff --git a/TLM/TLM/Patch/_RoadBaseAI/TrafficLightSimulationStepPatch.cs b/TLM/TLM/Patch/_RoadBaseAI/TrafficLightSimulationStepPatch.cs
@@ -1,8 +1,9 @@
-namespace TrafficManager.Patch._RoadBaseAI {
+namespace TrafficManager.Patch._RoadBaseAI {
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.State;
 
-    // [Harmony] Manually patched because struct references are used
+    [HarmonyPatch(typeof(TrainTrackBaseAI), nameof(TrainTrackBaseAI.LevelCrossingSimulationStep))]
     public class TrafficLightSimulationStepPatch {
         /// <summary>
         /// Decides whether the stock simulation step for traffic lights should run.

diff --git a/TLM/TLM/Patch/_RoadBaseAI/UpdateLanesPatch.cs b/TLM/TLM/Patch/_RoadBaseAI/UpdateLanesPatch.cs
@@ -1,6 +1,6 @@
 namespace TrafficManager.Patch._RoadBaseAI {
     using ColossalFramework;
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.State;
 

diff --git a/TLM/TLM/Patch/_RoadBaseAI/UpdateNodePatch.cs b/TLM/TLM/Patch/_RoadBaseAI/UpdateNodePatch.cs
@@ -1,6 +1,6 @@
 namespace TrafficManager.Patch._RoadBaseAI {
     using ColossalFramework;
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.Manager.Impl;
     using TrafficManager.State;

diff --git a/TLM/TLM/Patch/_RoadWorldInfoPanel/OnAdjustRoadButtonPatch.cs b/TLM/TLM/Patch/_RoadWorldInfoPanel/OnAdjustRoadButtonPatch.cs
@@ -1,7 +1,7 @@
 namespace TrafficManager.Patch._RoadWorldInfoPanel
 {
     using ColossalFramework;
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
 
     [HarmonyPatch(typeof(RoadWorldInfoPanel), "OnAdjustRoadButton")]

diff --git a/TLM/TLM/Patch/_TrainTrackBaseAI/LevelCrossingSimulationStepPatch.cs b/TLM/TLM/Patch/_TrainTrackBaseAI/LevelCrossingSimulationStepPatch.cs
@@ -1,8 +1,9 @@
-namespace TrafficManager.Patch._TrainTrackBase {
+namespace TrafficManager.Patch._TrainTrackBase {
+    using HarmonyLib;
     using JetBrains.Annotations;
     using TrafficManager.State;
 
-    // [Harmony] Manually patched because struct references are used
+    [HarmonyPatch(typeof(RoadBaseAI), nameof(RoadBaseAI.TrafficLightSimulationStep))]
     public class LevelCrossingSimulationStepPatch {
         /// <summary>
         /// Decides whether the stock simulation step for traffic lights should run.

diff --git a/TLM/TLM/Patch/_Vehicle/SpawnPatch.cs b/TLM/TLM/Patch/_Vehicle/SpawnPatch.cs
@@ -1,15 +1,15 @@
-using ColossalFramework;
+using ColossalFramework;
 using ColossalFramework.Math;
 using CSUtil.Commons;
-using Harmony;
+using HarmonyLib;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
 
 namespace TrafficManager.Patch._Vehicle {
-    // TODO this does currently not work with Harmony v1.1
+    // TODO [issue #864] replace custom AI with harmony patch when possible.
 
     //[HarmonyPatch(typeof(Vehicle), "Spawn")]
     //public static class SpawnPatch {

diff --git a/TLM/TLM/Patch/_Vehicle/UnspawnPatch.cs b/TLM/TLM/Patch/_Vehicle/UnspawnPatch.cs
@@ -1,15 +1,15 @@
-using ColossalFramework;
+using ColossalFramework;
 using ColossalFramework.Math;
 using CSUtil.Commons;
-using Harmony;
+using HarmonyLib;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
 
 namespace TrafficManager.Patch._Vehicle {
-    // TODO this does currently not work with Harmony v1.1
+    // TODO [issue #864] replace custom AI with harmony patch when possible.
 
     //[HarmonyPatch(typeof(Vehicle), "Unspawn")]
     //public static class UnspawnPatch {

diff --git a/TLM/TLM/Patch/_VehicleManager/CreateVehiclePatch.cs b/TLM/TLM/Patch/_VehicleManager/CreateVehiclePatch.cs
@@ -1,5 +1,5 @@
 namespace TrafficManager.Patch._VehicleManager {
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
 
     [HarmonyPatch(typeof(VehicleManager), "CreateVehicle")]

diff --git a/TLM/TLM/Patch/_VehicleManager/ReleaseVehiclePatch.cs b/TLM/TLM/Patch/_VehicleManager/ReleaseVehiclePatch.cs
@@ -1,5 +1,5 @@
 namespace TrafficManager.Patch._VehicleManager {
-    using Harmony;
+    using HarmonyLib;
     using JetBrains.Annotations;
 
     [HarmonyPatch(typeof(VehicleManager), "ReleaseVehicle")]

diff --git a/TLM/TLM/Patcher.cs b/TLM/TLM/Patcher.cs
@@ -0,0 +1,92 @@
+namespace TrafficManager {
+    using ColossalFramework;
+    using ColossalFramework.UI;
+    using CSUtil.Commons;
+    using HarmonyLib;
+    using System;
+    using System.Collections.Generic;
+    using System.Reflection;
+    using TrafficManager.RedirectionFramework;
+    using TrafficManager.Util;
+
+    public class Patcher {
+        public static Patcher Instance { get; private set; }
+
+        public static Patcher Create() => Instance = new Patcher();
+
+        private const string HARMONY_ID = "de.viathinksoft.tmpe";
+
+        private bool initialized_ = false;
+
+        public void Install() {
+            if (initialized_) {
+                return;
+            }
+
+            Log.Info("Init detours");
+            bool fail = false;
+
+            try {
+#if DEBUG
+                Harmony.DEBUG = true;
+#endif
+                // Harmony attribute-driven patching
+                Log.Info($"Performing Harmony attribute-driven patching");
+                var harmony = new Harmony(HARMONY_ID);
+                Shortcuts.Assert(harmony != null, "HarmonyInst!=null");
+                harmony.PatchAll();
+                Log.Info($"Harmony attribute-driven patching successfull!");
+            }
+            catch (Exception e) {
+                Log.Error("Could not deploy Harmony patches");
+                Log.Info(e.Message);
+                Log.Info(e.StackTrace);
+                fail = true;
+            }
+
+            try {
+                Log.Info("Deploying attribute-driven detours");
+                AssemblyRedirector.Deploy();
+            }
+            catch (Exception e) {
+                Log.Error("Could not deploy attribute-driven detours");
+                Log.Info(e.ToString());
+                Log.Info(e.StackTrace);
+                fail = true;
+            }
+
+            if (fail) {
+                Log.Info("Detours failed");
+                Singleton<SimulationManager>.instance.m_ThreadingWrapper.QueueMainThread(
+                    () => {
+                        UIView.library
+                              .ShowModal<ExceptionPanel>("ExceptionPanel")
+                              .SetMessage(
+                                "TM:PE failed to load",
+                                "Traffic Manager: President Edition failed to load. You can " +
+                                "continue playing but it's NOT recommended. Traffic Manager will " +
+                                "not work as expected.",
+                                true);
+                    });
+            } else {
+                Log.Info("Detours successful");
+            }
+
+            initialized_ = true;
+        }
+
+        public void Uninstall() {
+            if (!initialized_) {
+                return;
+            }
+
+            var harmony = new Harmony(HARMONY_ID);
+            Shortcuts.Assert(harmony != null, "HarmonyInst!=null");
+            harmony.UnpatchAll(HARMONY_ID);
+
+            initialized_ = false;
+            Log.Info("Reverting detours finished.");
+        }
+
+    }
+}
diff --git a/TLM/TLM/RedirectionFramework b/TLM/TLM/RedirectionFramework
diff --git a/TLM/TLM/State/GlobalConfig.cs b/TLM/TLM/State/GlobalConfig.cs
@@ -1,4 +1,4 @@
-namespace TrafficManager.State {
+namespace TrafficManager.State {
     using CSUtil.Commons;
     using JetBrains.Annotations;
     using System.IO;