Added support for Rimworld v1.4.3613.

BetterRimworlds · Jan 21, 2023 · 3c219f2 · 3c219f2
1 parent e4dc7fc
commit 3c219f2
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -43,11 +43,15 @@ The Zero-Point Energy Field is very real. Please see https://en.wikipedia.org/wi
 
 ## Change Log
 
-v1.0.0: 2021-06-17
-* Initial Release
+v1.2.0: 2023-01-21
+* Ported to Rimworld v1.4.
 
 v1.1.0: 2022-01-29
 * Released to Steam Workshop.
 * Ported to the Linux build system for Rimworld mods.
 * Fixed the long-standing sizing bug.
 * Ported to Rimworld v1.3.
+
+v1.0.0: 2021-06-17
+* Initial Release
+
diff --git a/Source/ZPM/ZPM.csproj b/Source/ZPM/ZPM.csproj
@@ -14,26 +14,24 @@
     <TargetFrameworkProfile />
     <LangVersion>8</LangVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug v1.2|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;RIMWORLD12</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <OutputPath>/rimworld/1.2/Mods/ZPM/1.2/Assemblies</OutputPath>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release v1.2|AnyCPU' ">
     <Optimize>true</Optimize>
     <DefineConstants>TRACE;RIMWORLD12</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <OutputPath>/rimworld/1.2/Mods/ZPM/1.2/Assemblies</OutputPath>
+    <MainPath>/tmp/rimworld/1.2/Mods/ZPM/1.2/Assemblies</MainPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release v1.3|AnyCPU' ">
     <OutputPath>/rimworld/1.3/Mods/ZPM/1.3/Assemblies</OutputPath>
+    <MainPath>/rimworld/1.2/Mods/ZPM/1.3/Assemblies</MainPath>
     <DefineConstants>RIMWORLD13</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release v1.4|AnyCPU' ">
+    <OutputPath>/rimworld/1.4/Mods/ZPM/1.4/Assemblies</OutputPath>
+    <MainPath>/rimworld/1.2/Mods/ZPM/1.4/Assemblies</MainPath>
+    <DefineConstants>RIMWORLD13,RIMWORLD14</DefineConstants>
+  </PropertyGroup>
   <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Release v1.2|AnyCPU' ">
     <Reference Include="Assembly-CSharp, Version=1.2.7528.19748, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\..\..\..\..\rimworld\1.2\RimWorldLinux_Data\Managed\Assembly-CSharp.dll</HintPath>
@@ -56,9 +54,10 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug v1.2|AnyCPU' ">
-    <Reference Include="Assembly-CSharp, Version=1.2.7528.19748, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\..\..\rimworld\1.2\RimWorldLinux_Data\Managed\Assembly-CSharp.dll</HintPath>
+
+  <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Release v1.3|AnyCPU' ">
+    <Reference Include="Assembly-CSharp, Version=1.3.7967.28253, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\..\..\..\..\rimworld\1.3\RimWorldLinux_Data\Managed\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -70,18 +69,18 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\..\..\rimworld\1.2\RimWorldLinux_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>..\..\..\..\..\rimworld\1.3\RimWorldLinux_Data\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\..\..\rimworld\1.2\RimWorldLinux_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\rimworld\1.3\RimWorldLinux_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Release v1.3|AnyCPU' ">
-    <Reference Include="Assembly-CSharp, Version=1.3.7967.28253, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\..\..\rimworld\1.3\RimWorldLinux_Data\Managed\Assembly-CSharp.dll</HintPath>
+   <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Release v1.4|AnyCPU' ">
+    <Reference Include="Assembly-CSharp, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\..\..\..\..\rimworld\1.4\RimWorldLinux_Data\Managed\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -93,11 +92,11 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\..\..\rimworld\1.3\RimWorldLinux_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>..\..\..\..\..\rimworld\1.4\RimWorldLinux_Data\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\..\..\rimworld\1.3\RimWorldLinux_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>..\..\..\..\..\rimworld\1.4\RimWorldLinux_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -109,4 +108,16 @@
   </ItemGroup>
 
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(OS)' == 'Unix' ">
+    <PropertyGroup>
+      <FilesSource>$(ProjectDir)..\..\ZPM</FilesSource>
+      <FilesDestination>$(OutputPath)..\..</FilesDestination>
+    </PropertyGroup>
+    <Exec Command="cp -rvf $(FilesSource)/* '$(FilesDestination)'" />
+    <Exec Command="cp -v '$(FilesSource)/../README.md' '$(FilesDestination)'" />
+    <Exec Command="mkdir -p '$(MainPath)'" />
+    <Exec Command="cp -vf $(OutputPath)* '$(MainPath)/'" />
+  </Target>
+
 </Project>
diff --git a/Source/ZPM/ZPM.sln b/Source/ZPM/ZPM.sln
@@ -8,16 +8,16 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Release v1.2|Any CPU = Release v1.2|Any CPU
-		Debug v1.2|Any CPU = Debug v1.2|Any CPU
 		Release v1.3|Any CPU = Release v1.3|Any CPU
+		Release v1.4|Any CPU = Release v1.4|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{675CE9D5-460C-496A-A6A9-8D3873EDCC87}.Release v1.2|Any CPU.ActiveCfg = Release v1.2|Any CPU
 		{675CE9D5-460C-496A-A6A9-8D3873EDCC87}.Release v1.2|Any CPU.Build.0 = Release v1.2|Any CPU
-		{675CE9D5-460C-496A-A6A9-8D3873EDCC87}.Debug v1.2|Any CPU.ActiveCfg = Debug v1.2|Any CPU
-		{675CE9D5-460C-496A-A6A9-8D3873EDCC87}.Debug v1.2|Any CPU.Build.0 = Debug v1.2|Any CPU
 		{675CE9D5-460C-496A-A6A9-8D3873EDCC87}.Release v1.3|Any CPU.ActiveCfg = Release v1.3|Any CPU
 		{675CE9D5-460C-496A-A6A9-8D3873EDCC87}.Release v1.3|Any CPU.Build.0 = Release v1.3|Any CPU
+		{675CE9D5-460C-496A-A6A9-8D3873EDCC87}.Release v1.4|Any CPU.ActiveCfg = Release v1.4|Any CPU
+		{675CE9D5-460C-496A-A6A9-8D3873EDCC87}.Release v1.4|Any CPU.Build.0 = Release v1.4|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/ZPM/About/About.xml b/ZPM/About/About.xml
@@ -5,6 +5,7 @@
     <supportedVersions>
         <li>1.2</li>
         <li>1.3</li>
+        <li>1.4</li>
     </supportedVersions>
     <author>HopeSeekr</author>
     <url>https://github.com/BetterRimworlds/ZPM/</url>