Fix compatibility with ONI: Spaced Out version 496912

Source Code/Insulated Door/InsulatedDoor.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>InsulatedDoor</RootNamespace>
     <AssemblyName>InsulatedDoor</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,6 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>2</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'VanillaRelease|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -40,6 +42,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'SpacedOutRelease|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -50,6 +53,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <GameContentType Condition="'$(Configuration)' == 'VanillaRelease' Or '$(Configuration)' == 'VanillaDebug'">Vanilla</GameContentType>
@@ -83,6 +87,12 @@
       <HintPath>$(LibFolder)\UnityEngine.CoreModule.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'SpacedOutDebug|AnyCPU'">
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'VanillaDebug|AnyCPU'">
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="InsulatedManualPressureDoor\InsulatedManualPressureDoorConfig.cs" />
     <Compile Include="TinyInsulatedManualPressureDoor\TinyInsulatedManualPressureDoorConfig.cs" />

Source Code/Insulated Door/InsulatedDoors.cs

@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 using static STRINGS.UI;
 using Database;
 using System.Collections.Generic;
@@ -73,23 +73,8 @@ public class doorHelpers
     {
         public static void doorBuildMenu(string door, string menu, string pred)
         {
-            int index = TUNING.BUILDINGS.PLANORDER.FindIndex(x => x.category == menu);
-            if (index < 0)
-                return;
-            else
-            {
-                IList<string> data = TUNING.BUILDINGS.PLANORDER[index].data as IList<string>;
-                int num = -1;
-                foreach (string str in (IEnumerable<string>)data)
-                {
-                    if (str.Equals(pred))
-                        num = data.IndexOf(str);
-                }
-                if (num == -1)
-                    return;
-                else
-                    data.Insert(num + 1, door);
-            }
+            // Use officially supported call to add to the build menu, making pred unused.
+            ModUtil.AddBuildingToPlanScreen(menu, door);
         }
 
         public static void doorTechTree(string door, string group)

Source Code/Insulated Door/Localization/loc.cs

@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 using System;
 using System.IO;
 using System.Reflection;

Source Code/Insulated Door/Steam/mod_info.yaml

@@ -1,2 +1,4 @@
-supportedContent: EXPANSION1_ID
-lastWorkingBuild: 447598
+supportedContent: ALL
+minimumSupportedBuild: 496912
+version: 1.1.5
+APIVersion: 2

Source Code/Insulated Door/Utility/AnimFix_OnPrefabInit.cs

@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 //without game crash
 [HarmonyPatch(typeof(Door), "OnPrefabInit")]
 internal class AnimDoor_Door_OnPrefabInit

Source Code/Insulated Joint Plate/InsulatedPlate.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>InsulatedJointPlate</RootNamespace>
     <AssemblyName>InsulatedJointPlate</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,6 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'VanillaRelease|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -40,6 +42,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'SpacedOutRelease|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -50,6 +53,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <GameContentType Condition="'$(Configuration)' == 'VanillaRelease' Or '$(Configuration)' == 'VanillaDebug'">Vanilla</GameContentType>
@@ -59,6 +63,12 @@
     <LibFolder>..\..\..\..\LibONI\$(GameContentType)</LibFolder>
     <OutputPath>bin\$(Configuration)\</OutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'SpacedOutDebug|AnyCPU'">
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'VanillaDebug|AnyCPU'">
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony">
       <HintPath>$(LibFolder)\0Harmony.dll</HintPath>

Source Code/Insulated Joint Plate/InsulatedPlates.cs

@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 using static STRINGS.UI;
 using Database;
 using System.Collections.Generic;
@@ -64,23 +64,8 @@ public class bridgeHelpers
     {
         public static void bridgeBuildMenu(string door, string menu, string pred)
         {
-            int index = TUNING.BUILDINGS.PLANORDER.FindIndex(x => x.category == menu);
-            if (index < 0)
-                return;
-            else
-            {
-                IList<string> data = TUNING.BUILDINGS.PLANORDER[index].data as IList<string>;
-                int num = -1;
-                foreach (string str in (IEnumerable<string>)data)
-                {
-                    if (str.Equals(pred))
-                        num = data.IndexOf(str);
-                }
-                if (num == -1)
-                    return;
-                else
-                    data.Insert(num + 1, door);
-            }
+            // Use officially supported call to add to the build menu, making pred unused.
+            ModUtil.AddBuildingToPlanScreen(menu, door);
         }
 
         public static void bridgeTechTree(string door, string group)

Source Code/Insulated Joint Plate/Localization/loc.cs

@@ -1,4 +1,4 @@
-using Harmony;
+using HarmonyLib;
 using System;
 using System.IO;
 using System.Reflection;

Source Code/Insulated Joint Plate/Steam/archived_versions/vanilla/mod_info.yaml

@@ -1,2 +1,2 @@
 supportedContent: VANILLA_ID
-lastWorkingBuild: 447596
+minimumSupportedBuild: 441000

Source Code/Insulated Joint Plate/Steam/mod_info.yaml

@@ -1,2 +1,4 @@
-supportedContent: EXPANSION1_ID
-lastWorkingBuild: 447598
+supportedContent: ALL
+minimumSupportedBuild: 496912
+version: 1.1.5
+APIVersion: 2

Source Code/Insulated Joint Plate/Steam/translations/es.po

@@ -13,20 +13,20 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE.DESC
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE.DESC
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE."
 "DESC"
 msgid ""
 "Joint plates can run Heavi-Watt wires through walls without leaking gas or "
 "liquid."
 msgstr ""
 "Las placas de unión pueden pasar cables Heavi-Watt a través de las paredes "
-"sin fugas de gas o líquido."
+"sin fugas de gas o líquido"
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE.EFFECT
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE.EFFECT
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE."
 "EFFECT"
 msgid ""
 "Insulated version. Allows <link=\"HIGHWATTAGEWIRE\">Heavi-Watt Wire</link> "
@@ -37,9 +37,9 @@ msgstr ""
 "Versión aislada. Permite pasar la pared y el piso. Funciona como un panel "
 "regular."
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE.NAME
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE.NAME
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREBRIDGEHIGHWATTAGE."
 "NAME"
 msgid ""
 "<link=\"INSULATEDWIREBRIDGEHIGHWATTAGE\">Insulated Heavi-Watt Joint Plate</"
@@ -48,72 +48,72 @@ msgstr ""
 "<link=\"InsulatedWireBridgeHighWattage\">Placa de unión de Heavi-Watt "
 "aislada</link>"
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREREFINEDBRIDGEHIGHWATTAGE.DESC
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREREFINEDBRIDGEHIGHWATTAGE.DESC
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS."
 "INSULATEDWIREREFINEDBRIDGEHIGHWATTAGE.DESC"
 msgid ""
 "Insulated Version. Joint plates can run Heavi-Watt wires through walls "
 "without leaking gas or liquid."
 msgstr ""
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREREFINEDBRIDGEHIGHWATTAGE.EFFECT
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREREFINEDBRIDGEHIGHWATTAGE.EFFECT
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS."
 "INSULATEDWIREREFINEDBRIDGEHIGHWATTAGE.EFFECT"
 msgid ""
 "Insulated Version. Carries more than a regular Insulate Heavi-Watt Joint "
 "Plate without overloading."
 msgstr ""
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREREFINEDBRIDGEHIGHWATTAGE.NAME
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.INSULATEDWIREREFINEDBRIDGEHIGHWATTAGE.NAME
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS."
 "INSULATEDWIREREFINEDBRIDGEHIGHWATTAGE.NAME"
 msgid ""
 "<link=\"INSULATEDWIREREFINEDBRIDGEHIGHWATTAGE\">Insulated Heavi-Watt "
 "Conductive Joint Plate</link>"
 msgstr ""
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDREFINEDWIREBRIDGEHIGHWATTAGE.DESC
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDREFINEDWIREBRIDGEHIGHWATTAGE.DESC
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS."
 "LONGINSULATEDREFINEDWIREBRIDGEHIGHWATTAGE.DESC"
 msgid ""
 "Insulated Long Version. Joint plates can run Heavi-Watt wires through walls "
 "without leaking gas or liquid."
 msgstr ""
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDREFINEDWIREBRIDGEHIGHWATTAGE.EFFECT
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDREFINEDWIREBRIDGEHIGHWATTAGE.EFFECT
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS."
 "LONGINSULATEDREFINEDWIREBRIDGEHIGHWATTAGE.EFFECT"
 msgid ""
 "Insulated Long Version. Carries more than a regular Insulate Heavi-Watt "
 "Joint Plate without overloading."
 msgstr ""
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDREFINEDWIREBRIDGEHIGHWATTAGE.NAME
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDREFINEDWIREBRIDGEHIGHWATTAGE.NAME
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS."
 "LONGINSULATEDREFINEDWIREBRIDGEHIGHWATTAGE.NAME"
 msgid ""
 "<link=\"LONGINSULATEDREFINEDWIREBRIDGEHIGHWATTAGE\">Long Insulated "
 "Conductive Joint Plate</link>"
 msgstr ""
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDWIREBRIDGEHIGHWATTAGE.DESC
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDWIREBRIDGEHIGHWATTAGE.DESC
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS."
 "LONGINSULATEDWIREBRIDGEHIGHWATTAGE.DESC"
 msgid ""
 "Joint plates can run Heavi-Watt wires through walls without leaking gas or "
 "liquid."
 msgstr ""
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDWIREBRIDGEHIGHWATTAGE.EFFECT
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDWIREBRIDGEHIGHWATTAGE.EFFECT
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS."
 "LONGINSULATEDWIREBRIDGEHIGHWATTAGE.EFFECT"
 msgid ""
 "Insulated Long version. Allows <link=\"HIGHWATTAGEWIRE\">Heavi-Watt Wire</"
@@ -122,9 +122,9 @@ msgid ""
 "Functions as regular tile."
 msgstr ""
 
-#. InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDWIREBRIDGEHIGHWATTAGE.NAME
+#. InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS.LONGINSULATEDWIREBRIDGEHIGHWATTAGE.NAME
 msgctxt ""
-"InsulatedPlatesMod.STRINGS.BUILDINGS.PREFABS."
+"InsulatedDoorsMod.STRINGS.BUILDINGS.PREFABS."
 "LONGINSULATEDWIREBRIDGEHIGHWATTAGE.NAME"
 msgid ""
 "<link=\"LONGINSULATEDWIREBRIDGEHIGHWATTAGE\">Long Insulated Heavi-Watt Joint "