v3.1.3 adds exception handling in menus

pardeike · Nov 18, 2020 · 92b2ab4 · 92b2ab4
1 parent 0e863d6
commit 92b2ab4
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 5 deletions.
diff --git a/1.1/Assemblies/AchtungMod.dll b/1.1/Assemblies/AchtungMod.dll
diff --git a/1.2/Assemblies/AchtungMod.dll b/1.2/Assemblies/AchtungMod.dll
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>net.pardeike.rimworld.mod.achtung</identifier>
-  <version>3.1.2.0</version>
+  <version>3.1.3.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>be673269-db56-463b-8c36-e074881e0d77</ID>
   <ModName>Achtung!</ModName>
-  <Version>3.1.2.0</Version>
+  <Version>3.1.3.0</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>pardeike</Owner>

diff --git a/Source/JobDriver_CleanRoom.cs b/Source/JobDriver_CleanRoom.cs
@@ -112,4 +112,4 @@ private Room RoomAt(IntVec3 cell)
 			return RegionAndRoomQuery.RoomAt(cell, pawn.Map);
 		}
 	}
-}
+}
diff --git a/Source/Main.cs b/Source/Main.cs
@@ -721,14 +721,32 @@ public static void Postfix(Pawn __instance, ref string __result)
 	[HarmonyPatch(typeof(FloatMenuMakerMap))]
 	[HarmonyPatch(nameof(FloatMenuMakerMap.ChoicesAtFor))]
 	[HarmonyPatch(new[] { typeof(Vector3), typeof(Pawn) })]
+	[StaticConstructorOnStartup]
 	static class FloatMenuMakerMap_ChoicesAtFor_Patch
 	{
+		static readonly Texture2D AttentionIcon = ContentFinder<Texture2D>.Get("AttentionIcon", true);
+
 		public static void Postfix(List<FloatMenuOption> __result, Vector3 clickPos, Pawn pawn)
 		{
 			if (pawn?.Map != null && pawn.Drafted == false)
 				if (WorldRendererUtility.WorldRenderedNow == false)
 					__result.AddRange(Controller.AchtungChoicesAtFor(clickPos, pawn));
 		}
+
+		public static Exception Finalizer(Exception __exception, List<FloatMenuOption> __result)
+		{
+			if (__exception != null)
+			{
+				var exceptionString = __exception.ToString();
+				__result.Add(new FloatMenuOption("Achtung caught and prevented some mod exception. Select this to copy the stacktrace to your clipboard", () =>
+				{
+					var te = new TextEditor { text = exceptionString };
+					te.SelectAll();
+					te.Copy();
+				}, AttentionIcon, Color.yellow, MenuOptionPriority.VeryLow));
+			}
+			return null;
+		}
 	}
 
 	// custom context menu

diff --git a/Source/Originals/AttentionIcon.afphoto b/Source/Originals/AttentionIcon.afphoto
diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -13,5 +13,5 @@
 
 [assembly: Guid("8bd5a28f-96c4-43b4-907f-600aa0162f84")]
 
-[assembly: AssemblyVersion("3.1.2.0")]
-[assembly: AssemblyFileVersion("3.1.2.0")]
+[assembly: AssemblyVersion("3.1.3.0")]
+[assembly: AssemblyFileVersion("3.1.3.0")]
diff --git a/Textures/AttentionIcon.png b/Textures/AttentionIcon.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,4 +112,4 @@ private Room RoomAt(IntVec3 cell) @@
     			return RegionAndRoomQuery.RoomAt(cell, pawn.Map);
     		}
     	}
-    }
+    }