remove harmony dll from release

fluffy-mods · Jul 22, 2021 · 5563608 · 5563608
1 parent bac263f
commit 5563608
Show file tree

Hide file tree

Showing 25 changed files with 38 additions and 14,713 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,10 +2,9 @@
 <ModMetaData>
     <name>Blueprints</name>
     <author>Fluffy</author>
-    <packageId>fluffy-blueprints</packageId>
-    <description/>
+    <packageId>Fluffy.Blueprints</packageId>
     <url/>
     <supportedVersions>
-        <li>1.3.3052</li>
+        <li>1.3</li>
     </supportedVersions>
 </ModMetaData>
diff --git a/Assemblies/BetterKeybinding.dll b/Assemblies/BetterKeybinding.dll
diff --git a/Assemblies/Blueprints.dll b/Assemblies/Blueprints.dll
diff --git a/Source/Blueprints/Blueprints.csproj b/Source/Blueprints/Blueprints.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,33 +36,7 @@
     <LangVersion>8</LangVersion>
   </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>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UnityEngine.CoreModule">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.IMGUIModule">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine.TextRenderingModule">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Blueprint.cs" />
@@ -82,24 +57,22 @@
     <Compile Include="Resources.cs" />
     <Compile Include="Settings.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\TOOLS\BetterKeybinding\BetterKeybinding.csproj">
       <Project>{7A074D05-578C-48C4-9A0E-1C289CF862E1}</Project>
       <Name>BetterKeybinding</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Krafs.Rimworld.Ref">
+      <Version>1.3.3067</Version>
+    </PackageReference>
+    <PackageReference Include="Lib.Harmony" Version="2.1.0">
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>mod update</PostBuildEvent>
   </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/Source/Blueprints/DefOf.cs b/Source/Blueprints/DefOf.cs
@@ -1,5 +1,5 @@
-// DefOf.cs
-// Copyright Karel Kroeze, 2019-2019
+// Copyright Karel Kroeze, 2021-2021.
+// Blueprints/Blueprints/DefOf.cs
 
 using RimWorld;
 using Verse;

diff --git a/Source/Blueprints/Patch_InspectGizmoGrid_DrawInspectGizmoGridFor.cs b/Source/Blueprints/Patch_InspectGizmoGrid_DrawInspectGizmoGridFor.cs
@@ -1,4 +1,4 @@
-// Copyright Karel Kroeze, 2020-2021.
+// Copyright Karel Kroeze, 2021-2021.
 // Blueprints/Blueprints/Patch_InspectGizmoGrid_DrawInspectGizmoGridFor.cs
 
 using System.Collections.Generic;
@@ -14,9 +14,17 @@ namespace Blueprints
     [HarmonyPatch(typeof(InspectGizmoGrid), nameof(InspectGizmoGrid.DrawInspectGizmoGridFor))]
     public class Patch_InspectGizmoGrid_DrawInspectGizmoGridFor
     {
-        public static FieldInfo gizmoList = AccessTools.Field(typeof(InspectGizmoGrid), "gizmoList");
+        public static MethodInfo addInfo = AccessTools.Method(typeof(List<Gizmo>), nameof(List<Gizmo>.Add));
+
+        public static MethodInfo clearInfo = AccessTools.Method(typeof(List<object>), "Clear");
+        public static FieldInfo  gizmoList = AccessTools.Field(typeof(InspectGizmoGrid), "gizmoList");
+        public static FieldInfo  objList   = AccessTools.Field(typeof(InspectGizmoGrid), "objList");
+
+        public static MethodInfo blueprintGetter = AccessTools
+                                                  .Property(typeof(Patch_InspectGizmoGrid_DrawInspectGizmoGridFor),
+                                                            nameof(BlueprintCopy))
+                                                  .GetGetMethod();
 
-        public static FieldInfo objList = AccessTools.Field(typeof(InspectGizmoGrid), "objList");
 
         public static Command_CreateBlueprintCopyFromSelected BlueprintCopy =>
             new Command_CreateBlueprintCopyFromSelected();
@@ -25,12 +33,6 @@ public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructio
         {
             var instructions = _instructions.ToList();
 
-            var clearInfo = AccessTools.Method(typeof(List<object>), "Clear");
-            var blueprintGetter = AccessTools
-                                 .Property(typeof(Patch_InspectGizmoGrid_DrawInspectGizmoGridFor),
-                                           nameof(BlueprintCopy))
-                                 .GetGetMethod();
-            var addInfo = AccessTools.Method(typeof(List<Gizmo>), nameof(List<Gizmo>.Add));
 
             for (var i = 0; i < instructions.Count; i++)
             {
@@ -40,6 +42,7 @@ public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructio
                           && instructions[i].Calls(clearInfo)
                           && instructions[i + 1].LoadsField(gizmoList))
                 {
+                    Debug.Message("injecting blueprint gizmo");
                     yield return new CodeInstruction(OpCodes.Ldsfld, gizmoList);
                     yield return new CodeInstruction(OpCodes.Call, blueprintGetter);
                     yield return new CodeInstruction(OpCodes.Callvirt, addInfo);

diff --git a/Source/Blueprints/Properties/AssemblyInfo.cs b/Source/Blueprints/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("2.0.0")]
-[assembly: AssemblyFileVersion("3.7.16")]
+[assembly: AssemblyFileVersion("3.7.33")]
diff --git a/Source/Blueprints/packages.config b/Source/Blueprints/packages.config
diff --git a/Source/Blueprints/packages/Lib.Harmony.2.0.0.6/.signature.p7s b/Source/Blueprints/packages/Lib.Harmony.2.0.0.6/.signature.p7s
diff --git a/Source/Blueprints/packages/Lib.Harmony.2.0.0.6/HarmonyLogo.png b/Source/Blueprints/packages/Lib.Harmony.2.0.0.6/HarmonyLogo.png
diff --git a/Source/Blueprints/packages/Lib.Harmony.2.0.0.6/LICENSE b/Source/Blueprints/packages/Lib.Harmony.2.0.0.6/LICENSE
diff --git a/Source/Blueprints/packages/Lib.Harmony.2.0.0.6/Lib.Harmony.2.0.0.6.nupkg b/Source/Blueprints/packages/Lib.Harmony.2.0.0.6/Lib.Harmony.2.0.0.6.nupkg
diff --git a/Source/Blueprints/packages/Lib.Harmony.2.0.0.6/lib/net35/0Harmony.dll b/Source/Blueprints/packages/Lib.Harmony.2.0.0.6/lib/net35/0Harmony.dll