Update for RW 1.1

KapitanOczywisty · Feb 25, 2020 · cbee96d · cbee96d
1 parent b1d40ad
commit cbee96d
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 12 deletions.
diff --git a/About/About-Debug.xml b/About/About-Debug.xml
@@ -2,6 +2,10 @@
 <ModMetaData>
 	<name>Change map edge limit - Dev Build</name>
 	<author>Kapitan Oczywisty</author>
-	<targetVersion>1.0.2059</targetVersion>
+    <supportedVersions>
+        <li>1.0</li>
+        <li>1.1</li>
+    </supportedVersions>
+    <packageId>kapitanoczywisty.changemapedge.dev</packageId>
 	<description>Change map edge limit dev build</description>
 </ModMetaData>
diff --git a/About/About-Release.xml b/About/About-Release.xml
@@ -2,7 +2,11 @@
 <ModMetaData>
 	<name>Change map edge limit</name>
 	<author>Kapitan Oczywisty</author>
-	<targetVersion>1.0.2059</targetVersion>
+    <supportedVersions>
+        <li>1.0</li>
+        <li>1.1</li>
+    </supportedVersions>
+    <packageId>kapitanoczywisty.changemapedge</packageId>
 	<description>
     Simple mod that allows you to customize "too close to map edge" limits when placing buildings, blueprints or zones. Should works with any other mod (unless is doing the same thing).
 

diff --git a/About/About.xml b/About/About.xml
@@ -2,6 +2,10 @@
 <ModMetaData>
 	<name>Change map edge limit - Dev Build</name>
 	<author>Kapitan Oczywisty</author>
-	<targetVersion>1.0.2059</targetVersion>
+    <supportedVersions>
+        <li>1.0</li>
+        <li>1.1</li>
+    </supportedVersions>
+    <packageId>kapitanoczywisty.changemapedge.dev</packageId>
 	<description>Change map edge limit dev build</description>
 </ModMetaData>
diff --git a/LoadFolders.xml b/LoadFolders.xml
@@ -0,0 +1,6 @@
+<loadFolders>
+  <v1.1>
+    <li>/</li>
+    <li>v1.1</li>
+  </v1.1>
+</loadFolders>
diff --git a/Source/ChangeMapEdge.csproj b/Source/ChangeMapEdge.csproj
@@ -9,14 +9,14 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ChangeMapEdge</RootNamespace>
     <AssemblyName>ChangeMapEdge</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Assemblies\</OutputPath>
+    <OutputPath>..\v1.1\Assemblies\</OutputPath>
     <DefineConstants>
     </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\ChangeMapEdge - Release\Assemblies\</OutputPath>
+    <OutputPath>..\..\ChangeMapEdge - Release\v1.1\Assemblies\</OutputPath>
     <DefineConstants>
     </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -34,15 +34,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony">
-      <HintPath>..\..\HugsLib\Assemblies\0Harmony.dll</HintPath>
+      <HintPath>..\..\HugsLib\v1.1\Assemblies\0Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="UnityEngine.CoreModule">
+      <HintPath>..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HugsLib">
-      <HintPath>..\..\HugsLib\Assemblies\HugsLib.dll</HintPath>
+      <HintPath>..\..\HugsLib\v1.1\Assemblies\HugsLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -85,14 +89,14 @@
     <StartProgram>$(SolutionDir)..\..\RimWorldWin.exe</StartProgram>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>echo F|xcopy "$(ProjectDir)..\About\About-$(ConfigurationName).xml" "$(TargetDir)..\About\About.xml" /C /Y /K /Q /D
+    <!--PostBuildEvent>echo F|xcopy "$(ProjectDir)..\About\About-$(ConfigurationName).xml" "$(TargetDir)..\About\About.xml" /C /Y /K /Q /D
 IF /I "$(ConfigurationName)" == "Release"; echo F|xcopy "$(ProjectDir)..\About\Preview.png" "$(TargetDir)..\About\Preview.png" /S /C /Y /K /Q /D
 IF /I "$(ConfigurationName)" == "Release"; xcopy "$(ProjectDir)..\Assemblies" "$(TargetDir)..\Assemblies" /S /C /Y /K /I /Q /D
 IF /I "$(ConfigurationName)" == "Release"; xcopy "$(ProjectDir)..\Defs" "$(TargetDir)..\Defs" /S /C /Y /K  /I /Q /D
 IF /I "$(ConfigurationName)" == "Release"; xcopy "$(ProjectDir)..\Patches" "$(TargetDir)..\Patches" /S /C /Y /K  /I /Q /D
 IF /I "$(ConfigurationName)" == "Release"; xcopy "$(ProjectDir)..\Languages" "$(TargetDir)..\Languages" /S /C /Y /K  /I /Q /D
 IF /I "$(ConfigurationName)" == "Release"; xcopy "$(ProjectDir)..\Sounds" "$(TargetDir)..\Sounds" /S /C /Y /K  /I /Q /D
 IF /I "$(ConfigurationName)" == "Release"; xcopy "$(ProjectDir)..\Textures" "$(TargetDir)..\Textures" /S /C /Y /K /I /Q /D
-IF /I "$(ConfigurationName)" == "Release"; IF EXIST "$(ProjectDir)..\LICENSE"; copy "$(ProjectDir)..\LICENSE" "$(TargetDir)..\LICENSE" /Y</PostBuildEvent>
+IF /I "$(ConfigurationName)" == "Release"; IF EXIST "$(ProjectDir)..\LICENSE"; copy "$(ProjectDir)..\LICENSE" "$(TargetDir)..\LICENSE" /Y</PostBuildEvent-->
   </PropertyGroup>
 </Project>
diff --git a/Source/ChangeMapEdgeHarmony.cs b/Source/ChangeMapEdgeHarmony.cs
@@ -1,6 +1,6 @@
 using System;
 using Verse;
-using Harmony;
+using HarmonyLib;
 using System.Reflection;
 using RimWorld;
 using UnityEngine;
@@ -12,7 +12,7 @@ static class ChangeMapEdgeHarmony
     {
         static ChangeMapEdgeHarmony()
         {
-            HarmonyInstance harmony = HarmonyInstance.Create("rimworld.kapitanoczywisty.changemapedge");
+            Harmony harmony = new Harmony("rimworld.kapitanoczywisty.changemapedge");
 
             MethodInfo nobuild_targetmethod = AccessTools.Method(typeof(Verse.GenDraw), "DrawNoBuildEdgeLines");
             HarmonyMethod nobuild_prefixmethod = new HarmonyMethod(typeof(ChangeMapEdgeHarmony).GetMethod("DrawNoBuildEdgeLines_Prefix"));

diff --git a/v1.1/About/About.xml b/v1.1/About/About.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ModMetaData>
+	<name>Change map edge limit - Dev Build</name>
+	<author>Kapitan Oczywisty</author>
+	<targetVersion>1.0.2059</targetVersion>
+	<description>Change map edge limit dev build</description>
+</ModMetaData>
diff --git a/v1.1/Assemblies/ChangeMapEdge.dll b/v1.1/Assemblies/ChangeMapEdge.dll