Merge pull request #50 from Scherub/add-planning-extended-support

Added PlanningExtended support

Author: JonathanTroyer

Progress-Renderer.csproj

@@ -127,6 +127,7 @@
     <Compile Include="Source\Harmony_Patches\Harmony_OptionListingUtility.cs" />
     <Compile Include="Source\Harmony_Patches\Harmony_OverlayDrawer.cs" />
     <Compile Include="Source\Harmony_Patches\Harmony_OverlayDrawHandler.cs" />
+    <Compile Include="Source\Harmony_Patches\Harmony_PlanDesignation_DesignationDraw.cs" />
     <Compile Include="Source\Harmony_Patches\Harmony_RoofGrid.cs" />
     <Compile Include="Source\Harmony_Patches\Harmony_ScreenshotModeHandler.cs" />
     <Compile Include="Source\Harmony_Patches\Harmony_Targeter.cs" />

Source/Harmony_Patches/HarmonySetup.cs

@@ -4,14 +4,17 @@
 
 namespace ProgressRenderer
 {
-
     [StaticConstructorOnStartup]
     static class HarmonySetup
     {
         static HarmonySetup()
         {
             var harmony = new Harmony("rimworld.neptimus7.progressrenderer");
-            harmony.PatchAll(Assembly.GetExecutingAssembly());      
+
+            if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "scherub.planningextended"))
+                harmony.PatchCategory("PlanningExtended");
+
+            harmony.PatchAllUncategorized(Assembly.GetExecutingAssembly());
         }
     }
 }

Source/Harmony_Patches/Harmony_PlanDesignation_DesignationDraw.cs

@@ -0,0 +1,35 @@
+using System;
+using HarmonyLib;
+using Verse;
+
+namespace ProgressRenderer
+{
+    [HarmonyPatchCategory("PlanningExtended")]
+    [HarmonyPatch("PlanDesignation", nameof(Designation.DesignationDraw))]
+    public static class Harmony_PlanDesignation_DesignationDraw
+    {
+        public static bool Prefix(Designation __instance)
+        {
+            try
+            {
+                if (__instance.def == null) return true;
+
+                var target = __instance.target;
+
+                Map map = target.HasThing ? target.Thing.MapHeld : Find.CurrentMap;
+
+                var renderManager = map?.GetComponent<MapComponent_RenderManager>();
+
+                if (renderManager?.Rendering == false) return true;
+
+                return PrModSettings.RenderDesignations;
+            }
+            catch (Exception ex)
+            {
+                // 1.6 UPDATE: Enhanced error reporting
+                Log.Error($"[ProgressRenderer] DesignationDraw patch error in 1.6: {ex}\n{ex.StackTrace}");
+                return true;
+            }
+        }
+    }
+}