Update for Rimworld 1.1

jkluch · Feb 25, 2020 · 2e24a2b · 2e24a2b
1 parent c2b4f3a
commit 2e24a2b
Show file tree

Hide file tree

Showing 13 changed files with 2,479 additions and 103 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,16 +2,12 @@
 <ModMetaData>
   <name>Haul to Stack</name>
   <author>ItsComcastic</author>
-  <!--<targetVersion>1.0.0</targetVersion>-->
   <supportedVersions>
       <li>1.0</li>
       <li>1.1</li>
   </supportedVersions>
   <packageId>jkluch.HaulToStack</packageId>
   <description>
-&lt;size=18&gt;Version 1.0.0&lt;/size&gt;
-&lt;size=18&gt;This version also works with beta 19&lt;/size&gt;
-
 &lt;size=18&gt;Features&lt;/size&gt;
 Haulers will check for an existing stack to add it's item to.
 Haulers no longer reserve the haul-to tile meaning multiple pawns can haul to the same tile at once.

diff --git a/Assemblies/0Harmony.pdb b/Assemblies/0Harmony.pdb
diff --git a/Assemblies/HaulToStack.pdb b/Assemblies/HaulToStack.pdb
diff --git a/Source/HarmonyPatches.cs b/Source/HarmonyPatches.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Harmony;
+using HarmonyLib;
 using HugsLib;
 using HugsLib.Utils;
 using RimWorld;
@@ -19,19 +19,19 @@ public static class HarmonyPatches
 
         static HarmonyPatches()
         {
-            HarmonyInstance.DEBUG = true;
-            var harmony = HarmonyInstance.Create("com.jkluch.HaulToStack");
+            //Harmony.DEBUG = true;
+            var harmony = new Harmony("com.jkluch.HaulToStack");
 
             harmony.Patch(
                 original: AccessTools.Method(typeof(JobDriver_HaulToCell), "TryMakePreToilReservations", new Type[] { typeof(bool) }),
-                prefix: new HarmonyMethod(type: patchType, name: nameof(PreToilReservations_Prefix)),
-                postfix: new HarmonyMethod(type: patchType, name: nameof(PreToilReservations_Postfix))
+                prefix: new HarmonyMethod(methodType: patchType, methodName: nameof(PreToilReservations_Prefix)),
+                postfix: new HarmonyMethod(methodType: patchType, methodName: nameof(PreToilReservations_Postfix))
                 );
 
             harmony.Patch(
                 original: AccessTools.Method(typeof(StoreUtility), "TryFindBestBetterStoreCellForWorker"),
                 prefix: null,
-                postfix: new HarmonyMethod(type: patchType, name: nameof(TryFindBestBetterStoreCellForWorker_Postfix))
+                postfix: new HarmonyMethod(methodType: patchType, methodName: nameof(TryFindBestBetterStoreCellForWorker_Postfix))
                 );
 
             //Add a feature to CarryHauledThingToCell so if the haul-to tile is now reserved we look for a new location

diff --git a/Source/HaulToStack.cs b/Source/HaulToStack.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Harmony;
+using HarmonyLib;
 using HugsLib;
 using HugsLib.Utils;
 using RimWorld;

diff --git a/Source/HaulToStack.csproj b/Source/HaulToStack.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HaulToStack</RootNamespace>
     <AssemblyName>HaulToStack</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
@@ -34,6 +34,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="0Harmony, Version=2.0.0.6, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lib.Harmony.2.0.0.6\lib\net472\0Harmony.dll</HintPath>
+    </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\Rimworld Dependencies\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
@@ -42,6 +45,10 @@
       <HintPath>..\..\Rimworld Dependencies\Assembly-CSharp-firstpass.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="HugsLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UnlimitedHugs.Rimworld.HugsLib.6.2.0\lib\net472\HugsLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
@@ -55,20 +62,11 @@
     <Compile Include="HaulToStack.cs" />
     <Compile Include="HaulUtils.cs" />
     <Compile Include="JobDriver_HaulToStack.cs" />
-    <Compile Include="MultiVersionModFix.cs" />
     <Compile Include="PlannedHauls.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Harmony\Harmony\Harmony.csproj">
-      <Project>{69aee16a-b6e7-4642-8081-3928b32455df}</Project>
-      <Name>Harmony</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\RimworldHugsLib\HugsLib.csproj">
-      <Project>{a5d9bd45-533c-4ca0-9298-8950a3da724c}</Project>
-      <Name>HugsLib</Name>
-      <Private>False</Private>
-    </ProjectReference>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

diff --git a/Source/MultiVersionModFix.cs b/Source/MultiVersionModFix.cs
diff --git a/SteamDescription.txt b/SteamDescription.txt
@@ -0,0 +1,24 @@
+[h1]Compatible with Versions 1.0, 1.1[/h1]
+
+[h1]Features[/h1]
+Haulers will check for an existing stack to add it's item to.
+Haulers no longer reserve the haul-to tile meaning multiple pawns can haul to the same tile at once.
+
+
+[h1]Issues[/h1]
+You may still see your pawns haul to different stacks, this will happen under the following conditions:
+[list]
+[*]there are no existing stacks
+[*]the existing stacks are full[/list]
+
+Example:  If you get a pod drop with new loot and two pawns pickup some before any is placed, they might pick different spots in the stockpile to haul to.  I'm working on a system where they can share with eachother which tile they plan on placing new loot on which should fix that issue.
+
+[h1]Conflicts[/h1]
+It looks like there might be a conflict with a wall light mod if your stash runs against the wall light.  If you have wall lights against your stash take that tile out of your stockpile zone to prevent pawns from going into a loop of trying to haul over and over.  This issue isn't fixable by changing mod order unfortunately, I'll have to work with the mod creater on a solution.
+This overwrites the builtin JobDriver_HaulToCell.  If any other mods overwrite the JobDriver for hauling this mod will throw tile reservation errors.  This mod should be compatible with most other mods but let me know if you have any problems.
+
+
+Thanks to @Trips on the rimworld discord server for the Haul to Stack preview picture.
+
+Github
+https://github.com/jkluch/HaulToStack
diff --git a/v1.1/Assemblies/0Harmony.dll b/v1.1/Assemblies/0Harmony.dll
diff --git a/v1.1/Assemblies/0Harmony.pdb b/v1.1/Assemblies/0Harmony.pdb