Merge pull request #260 from krzychu124/119-migration-to-harmony

Migration to Harmony / RedirectionFramework

Author: krzychu124

.gitmodules

@@ -1,6 +1,9 @@
 [submodule "TLM/OptionsFramework"]
 	path = TLM/OptionsFramework
-	url = ../OptionsFramework.git
+	url = https://github.com/krzychu124/OptionsFramework.git
 [submodule "TLM/CSUtil.CameraControl"]
 	path = TLM/CSUtil.CameraControl
-	url = ../CSUtil.CameraControl.git
+	url = https://github.com/krzychu124/CSUtil.CameraControl.git
+[submodule "TLM/TLM/RedirectionFramework"]
+	path = TLM/TLM/RedirectionFramework
+	url = https://github.com/krzychu124/RedirectionFramework.git

README.md

@@ -3,24 +3,28 @@
 <p align="center"><a href="https://steamcommunity.com/sharedfiles/filedetails/?id=583429740">Steam Workshop</a> • <a href="https://discord.gg/faKUnST">Discord Guild</a> • <a href="https://github.com/krzychu124/Cities-Skylines-Traffic-Manager-President-Edition/wiki/Installation">Installation Guide</a> • <a href="http://www.viathinksoft.de/tmpe/wiki">User Guide</a> • <a href="https://github.com/krzychu124/Cities-Skylines-Traffic-Manager-President-Edition/issues">Issue Tracker</a> • <a href="https://github.com/krzychu124/Cities-Skylines-Traffic-Manager-President-Edition/wiki/Report-a-Bug">Report a Bug</a><br /></p>
 <p align="center"><a href="https://steamcommunity.com/sharedfiles/filedetails/?id=583429740"><img src="https://img.shields.io/endpoint.svg?url=https://shieldsio-steam-workshop.jross.me/583429740" /></a> <a href="https://store.steampowered.com/app/255710/Cities_Skylines/"><img src="https://img.shields.io/badge/Game%20Version-1.12.1--f1-brightgreen.svg"></a> <a href="https://discord.gg/faKUnST"><img src="https://img.shields.io/discord/545065285862948894.svg?logo=discord&logoColor=F5F5F5" /></a> <a href="https://ci.appveyor.com/project/krzychu124/cities-skylines-traffic-manager-president-edition/branch/master"><img src="https://ci.appveyor.com/api/projects/status/dehkvuxk8b3h66e7/branch/master?svg=true" /></a></p>
 
+> ## Notice
+> We are currently working on version 11, which uses Harmony library. If you had any existing pull requests, or repository forks, they will need rebasing to the heavily modified `master` branch. If you need any help, please contact us using the links above.
+
 ## Current release
 
 > Having problems with traffic despawning after updating roads or rails? Try [Broken Node Detector](https://steamcommunity.com/sharedfiles/filedetails/?id=1777173984) which helps detect a game bug. Collossal Order are aware of the issue.
 
-#### Version [10.21.1 hotfix](https://github.com/krzychu124/Cities-Skylines-Traffic-Manager-President-Edition/compare/10.21...10.21.1), 06/07/2019
+### TM:PE [10.21.1 hotfix](https://github.com/krzychu124/Cities-Skylines-Traffic-Manager-President-Edition/compare/10.21...10.21.1), 06/07/2019
 
 - Fixed: Speed panel tanks fps if train tracks on screen (thanks rlas & DaEgi01!) (#411, #413)
 - Meta: Main changelog refactored (#412) 
 
-#### Version [10.21](https://github.com/krzychu124/Cities-Skylines-Traffic-Manager-President-Edition/compare/10.20...10.21), 02/07/2019
+### TM:PE [10.21](https://github.com/krzychu124/Cities-Skylines-Traffic-Manager-President-Edition/compare/10.20...10.21), 02/07/2019
+
 - Added: Cims have individual driving styles to determine lane changes and driving speed (#263 #334)
 - Added: Miles Per Hour option for speed limits (thanks kvakvs) (#384)
 - Added: Selectable style (US, UK, EU) of speed sign in speed limits UI (thanks kvakvs) (#384)
 - Added: Differentiate LABS, STABLE and DEBUG branches in UI (#326, #333)
 - Added: Keybinds tab in mod options - choose your own shortcuts! (thanks kvakvs) (#382)
 - Added: Show keyboard shortcuts in button tooltips where applicable (thanks kvakvs) (#382)
 - Added: Basic support of offline mode for users playing on EA's Origin service (#333, #400)
-- Improved: Avoid setting loss due to duplicate TM:PE subscriptions (#333, #306, #149, #190, #211, #400)
+- Improved:: Avoid setting loss due to duplicate TM:PE subscriptions (#333, #306, #149, #190, #211, #400)
 - Fixed: Vehicle limit count; compatibility with More Vehicles mod (thanks Dymanoid) (#362)
 - Fixed: Mail trucks ignoring lane arrows (thanks Subaru & eudyptula for feedback) (#307, #338)
 - Fixed: Vehicles stop in road trying to find parking (thanks eudyptula for investigating) (#259, #359)
@@ -71,4 +75,4 @@ We will not provide support if:
 - You are using an older version of the mod.
 - You are using an older version of Cities: Skylines.
 
-TM:PE is only tested on and updated for the latest version of Cities: Skylines.
+TM:PE is only tested on and updated for the latest version of Cities: Skylines.

TLM/CSUtil.Commons/Log.cs

@@ -9,6 +9,7 @@ namespace CSUtil.Commons {
 
 	public static class Log {
 		private enum LogLevel {
+			Trace,
 			Debug,
 			Info,
 			Warning,
@@ -35,6 +36,11 @@ public static void _Debug(string s) {
 			LogToFile(s, LogLevel.Debug);
 		}
 
+		[Conditional("TRACE")]
+		public static void _Trace(string s) {
+			LogToFile(s, LogLevel.Trace);
+		}
+
 		public static void Info(string s) {
 			LogToFile(s, LogLevel.Info);
 		}

TLM/CSUtil.Redirection/CSUtil.Redirection.csproj

@@ -44,6 +44,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="0Harmony">
+      <HintPath>lib\0Harmony.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -52,10 +55,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="HarmonyUtil.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RedirectionHelper.cs" />
-    <Compile Include="Redirector.cs" />
-    <Compile Include="MethodInfoExt.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CSUtil.Commons\CSUtil.Commons.csproj">

TLM/CSUtil.Redirection/HarmonyUtil.cs

@@ -0,0 +1,22 @@
+using Harmony;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace CSUtil.Redirection {
+	public static class HarmonyUtil {
+		/// <summary>
+		/// Finds the method that is represented by the given harmony method.
+		/// </summary>
+		/// <param name="method">queried harmony method</param>
+		/// <returns>method information</returns>
+		public static MethodBase GetOriginalMethod(HarmonyMethod method) {
+			if (method.originalType == null) return null;
+			if (method.methodName == null)
+				return AccessTools.Constructor(method.originalType, method.parameter);
+			return AccessTools.Method(method.originalType, method.methodName, method.parameter);
+		}
+	}
+}