Updated to Harmony 1.0.9

pardeike · Mar 17, 2017 · 06846fe · 06846fe
1 parent 053f09b
commit 06846fe
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 33 deletions.
diff --git a/Assemblies/0Harmony.dll b/Assemblies/0Harmony.dll
diff --git a/Assemblies/CameraPlus.dll b/Assemblies/CameraPlus.dll
diff --git a/Harmony/0Harmony.dll b/Harmony/0Harmony.dll
diff --git a/Source/Main.cs b/Source/Main.cs
@@ -31,65 +31,49 @@ static GameFont GetAdaptedGameFont()
 			return GameFont.Tiny;
 		}
 
-		class AdaptedGameFontReplacer : CodeProcessor
+		// we replace the first "GameFont.Tiny" with our "GetAdaptedGameFont()"
+		//
+		[HarmonyTranspiler]
+		static IEnumerable<CodeInstruction> AdaptedGameFontReplacerPatch(IEnumerable<CodeInstruction> instructions)
 		{
 			bool firstInstruction = true;
-
-			// we replace the first "GameFont.Tiny" with our "GetAdaptedGameFont()"
-			//
-			public override List<CodeInstruction> Process(CodeInstruction instruction)
+			foreach (var instruction in instructions)
 			{
-				var result = new List<CodeInstruction>();
 				if (firstInstruction && instruction.opcode == OpCodes.Ldc_I4_0)
 				{
 					var method = AccessTools.Method(typeof(GenMapUI_DrawThingLabel_Patch), "GetAdaptedGameFont");
-					var call = new CodeInstruction(OpCodes.Call, method);
-					result.Add(call);
+					yield return new CodeInstruction(OpCodes.Call, method);
 				}
 				else
-					result.Add(instruction);
+					yield return instruction;
 
 				firstInstruction = false;
-				return result;
 			}
 		}
-
-		[HarmonyProcessorFactory]
-		static HarmonyProcessor AdaptedGameFontReplacerPatch(MethodBase original)
-		{
-			var processor = new HarmonyProcessor();
-			processor.Add(new AdaptedGameFontReplacer());
-			return processor;
-		}
 	}
 
 	[HarmonyPatch(typeof(CameraDriver))]
 	[HarmonyPatch("get_CurrentZoom")]
 	static class CameraDriver_get_CurrentZoom_Patch
 	{
-		class ZoomLerper : CodeProcessor
+		// Normal values: 12, 13.8, 42, 57
+		//
+		[HarmonyTranspiler]
+		static IEnumerable<CodeInstruction> LerpCurrentZoom(IEnumerable<CodeInstruction> instructions)
 		{
-			// Normal values: 12, 13.8, 42, 57
-			//
-			public override List<CodeInstruction> Process(CodeInstruction instruction)
+			foreach (var instruction in instructions)
 			{
 				if (instruction.opcode == OpCodes.Ldc_R4)
 				{
 					var f = (float)instruction.operand;
 					f = GenMath.LerpDouble(12, 57, 30, 60, f);
 					instruction.operand = f;
+					yield return instruction;
 				}
-				return new List<CodeInstruction>() { instruction };
+				else
+					yield return instruction;
 			}
 		}
-
-		[HarmonyProcessorFactory]
-		static HarmonyProcessor LerpCurrentZoom(MethodBase original)
-		{
-			var processor = new HarmonyProcessor();
-			processor.Add(new ZoomLerper());
-			return processor;
-		}
 	}
 
 	[HarmonyPatch(typeof(CameraDriver))]

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]