Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to Harmony 2.0 #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.vs/
bin/
obj/
2 changes: 1 addition & 1 deletion ChemicalBurns/ChemicalBurnMonitor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class CorrosiveChemical
public static StatusItem MakeStatusItem()
{
StatusItem statusItem = new StatusItem("ChemicalBurns", "DUPLICANTS", string.Empty, StatusItem.IconType.Exclamation, NotificationType.DuplicantThreatening, false, OverlayModes.None.ID, true, 63486);
statusItem.AddNotification(null, null, null, 0f);
statusItem.AddNotification(null, null, null);
return statusItem;
}

Expand Down
4 changes: 2 additions & 2 deletions ChemicalBurns/ChemicalBurns.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
using System.Linq;
using System.Text;
using UnityEngine;
using Harmony;
using HarmonyLib;

namespace ChemicalBurns
{
// Add mod strings
[HarmonyPatch(typeof(EntityConfigManager), "LoadGeneratedEntities")]
internal class ChemicalBurns_EntityConfigManager_LoadGeneratedEntities
internal class ChemicalBurns_EntityConfigManager_LoadGeneratedEntities : KMod.UserMod2
{
private static void Prefix()
{
Expand Down
27 changes: 21 additions & 6 deletions ChemicalBurns/ChemicalBurns.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ChemicalBurns</RootNamespace>
<AssemblyName>ChemicalBurns</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand All @@ -21,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -29,15 +30,19 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony">
<Reference Include="0Harmony, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\0Harmony.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp">
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\Assembly-CSharp-firstpass.dll</HintPath>
</Reference>
<Reference Include="System" />
Expand All @@ -46,10 +51,12 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine">
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\UnityEngine.CoreModule.dll</HintPath>
</Reference>
</ItemGroup>
Expand All @@ -58,5 +65,13 @@
<Compile Include="ChemicalBurnMonitor.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="mod.yaml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="mod_info.yaml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
4 changes: 2 additions & 2 deletions ChemicalBurns/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
Binary file removed ChemicalBurns/bin/Debug/0Harmony.dll
Binary file not shown.
Binary file not shown.
Binary file removed ChemicalBurns/bin/Debug/Assembly-CSharp.dll
Binary file not shown.
Binary file modified ChemicalBurns/bin/Debug/ChemicalBurns.dll
Binary file not shown.
Binary file modified ChemicalBurns/bin/Debug/ChemicalBurns.pdb
Binary file not shown.
Binary file removed ChemicalBurns/bin/Debug/UnityEngine.CoreModule.dll
Binary file not shown.
Binary file removed ChemicalBurns/bin/Debug/UnityEngine.dll
Binary file not shown.
Binary file modified ChemicalBurns/bin/Release/ChemicalBurns.dll
Binary file not shown.
Binary file removed ChemicalBurns/bin/Release/preview.png
Binary file not shown.
3 changes: 3 additions & 0 deletions ChemicalBurns/mod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
title: Chemical Burns
description: Duplicants will suffer damage when exposed to dangerous substances
staticID: ChemicalBurns2022
4 changes: 4 additions & 0 deletions ChemicalBurns/mod_info.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
supportedContent: ALL
minimumSupportedBuild: 44100
version: 2.0.0.0
APIVersion: 2
20 changes: 0 additions & 20 deletions ChemicalBurns/obj/Debug/ChemicalBurns.csproj.FileListAbsolute.txt

This file was deleted.

Binary file not shown.
Binary file removed ChemicalBurns/obj/Debug/ChemicalBurns.dll
Binary file not shown.
Binary file removed ChemicalBurns/obj/Debug/ChemicalBurns.pdb
Binary file not shown.

This file was deleted.

Binary file removed ChemicalBurns/obj/Debug/ChlorineIsDangerous.dll
Binary file not shown.
Binary file removed ChemicalBurns/obj/Debug/ChlorineIsDangerous.pdb
Binary file not shown.
1 change: 0 additions & 1 deletion ChemicalBurns/obj/Debug/CoreCompileInputs.cache

This file was deleted.

Binary file not shown.
4 changes: 2 additions & 2 deletions ExtendedBridges/ExtendedBridges.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using STRINGS;
using TUNING;
using UnityEngine;
using Harmony;
using HarmonyLib;

namespace ExtendedBridges
{
Expand Down Expand Up @@ -44,7 +44,7 @@ public static int GetBuildingIndex(HashedString category, string building_id)

// Add strings for the bridges and add them to the build menu
[HarmonyPatch(typeof(GeneratedBuildings), "LoadGeneratedBuildings")]
internal class ExtendedBridges_GeneratedBuildings_LoadGeneratedBuildings
internal class ExtendedBridges_GeneratedBuildings_LoadGeneratedBuildings : KMod.UserMod2
{
private static void Prefix()
{
Expand Down
12 changes: 11 additions & 1 deletion ExtendedBridges/ExtendedBridges.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ExtendedBridges</RootNamespace>
<AssemblyName>ExtendedBridges</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand All @@ -21,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -29,6 +30,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony, Version=1.2.0.1, Culture=neutral, processorArchitecture=MSIL">
Expand Down Expand Up @@ -69,5 +71,13 @@
<Compile Include="ExtendedLogicRibbonBridgeConfig.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="mod.yaml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="mod_info.yaml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
4 changes: 2 additions & 2 deletions ExtendedBridges/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
Binary file removed ExtendedBridges/bin/Debug/0Harmony.dll
Binary file not shown.
Binary file not shown.
Binary file removed ExtendedBridges/bin/Debug/Assembly-CSharp.dll
Binary file not shown.
Binary file not shown.
Binary file removed ExtendedBridges/bin/Debug/UnityEngine.dll
Binary file not shown.
3 changes: 3 additions & 0 deletions ExtendedBridges/mod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
title: Longer Bridges
description: This mod adds additional bridges to the game which are four tiles wide instead of three
staticID: LongerBridges2022
4 changes: 4 additions & 0 deletions ExtendedBridges/mod_info.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
supportedContent: ALL
minimumSupportedBuild: 44100
version: 2.0.0.0
APIVersion: 2
1 change: 0 additions & 1 deletion ExtendedBridges/obj/Debug/CoreCompileInputs.cache

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file removed ExtendedBridges/obj/Debug/ExtendedBridges.dll
Binary file not shown.
Binary file removed ExtendedBridges/obj/Debug/ExtendedBridges.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions FunctionalAirlocks/FunctionalAirlocks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
using System.Linq;
using System.Reflection;
using System.Reflection.Emit;
using Harmony;
using HarmonyLib;
using UnityEngine;

namespace FunctionalAirlocks
{
[HarmonyPatch(typeof(Door), "OnPrefabInit")]
internal class FunctionalAirlocks_Door_OnPrefabInit
internal class FunctionalAirlocks_Door_OnPrefabInit : KMod.UserMod2
{
private static void Postfix(ref Door __instance)
{
Expand Down
27 changes: 21 additions & 6 deletions FunctionalAirlocks/FunctionalAirlocks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FunctionalAirlocks</RootNamespace>
<AssemblyName>FunctionalAirlocks</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand All @@ -21,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -29,15 +30,19 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony">
<Reference Include="0Harmony, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\0Harmony.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp">
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\Assembly-CSharp-firstpass.dll</HintPath>
</Reference>
<Reference Include="System" />
Expand All @@ -46,16 +51,26 @@
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine">
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\UnityEngine.CoreModule.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="FunctionalAirlocks.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="mod.yaml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="mod_info.yaml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
4 changes: 2 additions & 2 deletions FunctionalAirlocks/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
Binary file modified FunctionalAirlocks/bin/Debug/FunctionalAirlocks.dll
Binary file not shown.
Binary file modified FunctionalAirlocks/bin/Debug/FunctionalAirlocks.pdb
Binary file not shown.
3 changes: 3 additions & 0 deletions FunctionalAirlocks/mod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
title: Functional Airlocks
description: This mod does something to airlocks I'm not sure of
staticID: FunctionalAirlocks2022
4 changes: 4 additions & 0 deletions FunctionalAirlocks/mod_info.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
supportedContent: ALL
minimumSupportedBuild: 44100
version: 2.0.0.0
APIVersion: 2
1 change: 0 additions & 1 deletion FunctionalAirlocks/obj/Debug/CoreCompileInputs.cache

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file removed FunctionalAirlocks/obj/Debug/FunctionalAirlocks.pdb
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file removed FunctionalAirlocks/obj/Debug/ManualAirlock.dll
Binary file not shown.
Binary file removed FunctionalAirlocks/obj/Debug/ManualAirlock.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions GrindUpMetals/GrindUpMetals.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Collections.Generic;
using Harmony;
using HarmonyLib;

namespace GrindUpMetals
{
[HarmonyPatch(typeof(RockCrusherConfig), "ConfigureBuildingTemplate")]
internal class RockCrusherConfig_ConfigureBuildingTemplate
internal class RockCrusherConfig_ConfigureBuildingTemplate : KMod.UserMod2
{
private static void Postfix(RockCrusherConfig __instance)
{
Expand Down
Loading