add changes to make compilable for hk 1.5.12620

.github/workflows/build.yaml

@@ -60,17 +60,23 @@ jobs:
             macos) echo "RID=osx-x64" >> $GITHUB_ENV ;;
           esac
 
-      - uses: actions/setup-dotnet@v4
+      - uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: 10.x
       - name: Setup MSBuild
         run: |
           sudo apt-get update -y
           sudo apt-get install -y mono-devel
       - name: Restore Dependencies
         run: |
           dotnet restore
-      - name: Build PrePatcher
+      - name: Build PrePatcher & PostPatcher
         run: |
           dotnet build PrePatcher -o PrePatcher/Output -p:Configuration=Release
+          dotnet build PostPatcher -o PostPatcher/Output -p:Configuration=Release
+      - name: Build TC assembly patches
+        run: |
+          dotnet build TeamCherry.Localization --runtime $RID -p:Configuration=Release
       - name: Build Assembly-CSharp
         run: |
           dotnet build Assembly-CSharp --runtime $RID -p:Configuration=Release

.gitignore

@@ -2,6 +2,7 @@
 ## files generated by popular Visual Studio add-ons.
 
 PrePatcher/Output
+PostPatcher/Output
 
 # User-specific files
 *.suo

Assembly-CSharp/Assembly-CSharp.csproj

@@ -3,6 +3,7 @@
         <RootNamespace>Modding</RootNamespace>
         <AssemblyName>Assembly-CSharp.mm</AssemblyName>
         <TargetFramework>net472</TargetFramework>
+        <!--<TargetFramework>netstandard2.1</TargetFramework>-->
         <AssemblyTitle>Hollow Knight - Mod API Enabled</AssemblyTitle>
         <Product>Modding API</Product>
         <Copyright>Copyright © 2017</Copyright>
@@ -16,22 +17,27 @@
         <Files Include="../Vanilla/*" />
 
         <BuildDir Include="$(TargetDir)" />
-
-        <Dependencies Include="$(TargetDir)Newtonsoft.Json.dll" />
+
         <Dependencies Include="$(TargetDir)MMHOOK_Assembly-CSharp.dll" />
         <Dependencies Include="$(TargetDir)MMHOOK_PlayMaker.dll" />
         <Dependencies Include="$(TargetDir)MonoMod.Utils.dll" />
         <Dependencies Include="$(TargetDir)Mono.Cecil.dll" />
         <Dependencies Include="$(TargetDir)MonoMod.RuntimeDetour.dll" />
+        <Dependencies Include="$(TargetDir)MMHOOK_TeamCherry.BuildBot.dll" />
+        <Dependencies Include="$(TargetDir)MMHOOK_TeamCherry.Cinematics.dll" />
+        <Dependencies Include="$(TargetDir)MMHOOK_TeamCherry.Localization.dll" />
+        <Dependencies Include="$(TargetDir)MMHOOK_TeamCherry.NestedFadeGroup.dll" />
+        <Dependencies Include="$(TargetDir)MMHOOK_TeamCherry.SharedUtils.dll" />
+        <Dependencies Include="$(TargetDir)MMHOOK_TeamCherry.TK2D.dll" />
     </ItemGroup>
 
     <PropertyGroup>
         <OutputDir>../OutputFinal</OutputDir>
         <!-- todo macOS -->
         <GamePath Condition="'$(OS)' == 'Windows_NT'">C:/Program Files (x86)/Steam/steamapps/common/Hollow Knight</GamePath>
         <GamePath Condition="'$(OS)' != 'Windows_NT'">$(HOME)/.local/share/Steam/steamapps/common/Hollow Knight</GamePath>
-        <CopyDir>$(GamePath)/hollow_knight_Data/Managed</CopyDir> 
-        
+        <CopyDir>$(GamePath)/hollow_knight_Data/Managed</CopyDir>
+
         <Mono Condition="$(OS) == WINDOWS_NT" />
         <Mono Condition="$(OS) != WINDOWS_NT">mono</Mono>
     </PropertyGroup>
@@ -44,12 +50,26 @@
         <Exec WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(MSBuildProjectDirectory)/../PrePatcher/Output/PrePatcher.exe&quot; Assembly-CSharp.dll Assembly-CSharp-patched.dll" />
         <Copy SkipUnchangedFiles="true" SourceFiles="$(TargetDir)Assembly-CSharp-patched.dll" DestinationFiles="$(TargetDir)Assembly-CSharp.dll" />
 
+        <Delete Condition="Exists('MONOMODDED_TeamCherry.Localization.dll')" Files="MONOMODDED_TeamCherry.Localization.dll" />
+        <Exec WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(TargetDir)MonoMod.exe&quot; TeamCherry.Localization.dll" />
+        <!-- because we patch in a value we'll reference in assembly-csharp -->
+        <Copy SkipUnchangedFiles="true" SourceFiles="$(TargetDir)MONOMODDED_TeamCherry.Localization.dll" DestinationFiles="$(TargetDir)TeamCherry.Localization.dll" />
+
         <Delete Condition="Exists('MONOMODDED_Assembly-CSharp.dll')" Files="MONOMODDED_Assembly-CSharp.dll" />
-        <Exec WorkingDirectory="@(BuildDir)" Command="$(Mono) MonoMod.exe Assembly-CSharp.dll" />
+        <Exec WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(TargetDir)MonoMod.exe&quot; Assembly-CSharp.dll" />
+
+        <Exec WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(MSBuildProjectDirectory)/../PostPatcher/Output/PostPatcher.exe&quot; MONOMODDED_Assembly-CSharp.dll Assembly-CSharp-postpatched.dll" />
+        <Copy SkipUnchangedFiles="true" SourceFiles="$(TargetDir)Assembly-CSharp-postpatched.dll" DestinationFiles="$(TargetDir)MONOMODDED_Assembly-CSharp.dll" />
 
         <!-- Generate Hooks !-->
-        <Exec Condition="!Exists('$(TargetDir)MMHOOK_Assembly-CSharp.dll')" WorkingDirectory="@(BuildDir)" Command="$(Mono) MonoMod.RuntimeDetour.HookGen.exe --private Assembly-CSharp.dll" />
-        <Exec Condition="!Exists('$(TargetDir)MMHOOK_Playmaker.dll')" WorkingDirectory="@(BuildDir)" Command="$(Mono) MonoMod.RuntimeDetour.HookGen.exe --private PlayMaker.dll" />
+        <Exec Condition="!Exists('$(TargetDir)MMHOOK_Assembly-CSharp.dll')" WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(TargetDir)MonoMod.RuntimeDetour.HookGen.exe&quot; --private Assembly-CSharp.dll" />
+        <Exec Condition="!Exists('$(TargetDir)MMHOOK_Playmaker.dll')" WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(TargetDir)MonoMod.RuntimeDetour.HookGen.exe&quot; --private PlayMaker.dll" />
+        <Exec Condition="!Exists('$(TargetDir)MMHOOK_TeamCherry.BuildBot.dll')" WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(TargetDir)MonoMod.RuntimeDetour.HookGen.exe&quot; --private TeamCherry.BuildBot.dll" />
+        <Exec Condition="!Exists('$(TargetDir)MMHOOK_TeamCherry.Cinematics.dll')" WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(TargetDir)MonoMod.RuntimeDetour.HookGen.exe&quot; --private TeamCherry.Cinematics.dll" />
+        <Exec Condition="!Exists('$(TargetDir)MMHOOK_TeamCherry.Localization.dll')" WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(TargetDir)MonoMod.RuntimeDetour.HookGen.exe&quot; --private TeamCherry.Localization.dll" />
+        <Exec Condition="!Exists('$(TargetDir)MMHOOK_TeamCherry.NestedFadeGroup.dll')" WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(TargetDir)MonoMod.RuntimeDetour.HookGen.exe&quot; --private TeamCherry.NestedFadeGroup.dll" />
+        <Exec Condition="!Exists('$(TargetDir)MMHOOK_TeamCherry.SharedUtils.dll')" WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(TargetDir)MonoMod.RuntimeDetour.HookGen.exe&quot; --private TeamCherry.SharedUtils.dll" />
+        <Exec Condition="!Exists('$(TargetDir)MMHOOK_TeamCherry.TK2D.dll')" WorkingDirectory="@(BuildDir)" Command="$(Mono) &quot;$(TargetDir)MonoMod.RuntimeDetour.HookGen.exe&quot; --private TeamCherry.TK2D.dll" />
     </Target>
 
     <Target Name="SetupExamples" AfterTargets="PostBuildEvent" Condition="'$(SetupExamples)' == 'true'">
@@ -60,28 +80,32 @@
         <!-- Copy the API and the documentation -->
         <Copy SourceFiles="$(TargetDir)MONOMODDED_Assembly-CSharp.dll" DestinationFiles="../Examples/HollowKnightManaged/Assembly-CSharp.dll" />
         <Copy SourceFiles="$(TargetDir)Assembly-CSharp.mm.xml" DestinationFiles="../Examples/HollowKnightManaged/Assembly-CSharp.xml" />
-
+        <Copy SourceFiles="$(TargetDir)MONOMODDED_TeamCherry.Localization.dll" DestinationFiles="../Examples/HollowKnightManaged/TeamCherry.Localization.dll" />
+        <Copy SourceFiles="$(TargetDir)TeamCherry.Localization.mm.xml" DestinationFiles="../Examples/HollowKnightManaged/TeamCherry.Localization.xml" />
+
         <!-- Copy the dependencies for the API and hooks for mods -->
         <Copy SourceFiles="@(Dependencies)" DestinationFolder="../Examples/HollowKnightManaged/" />
     </Target>
-    
+
     <Target Name="OutputFinal" AfterTargets="PostBuild">
         <!-- Cleanup -->
         <RemoveDir Directories="$(OutputDir)/" />
 
         <!-- Make the output directory -->
         <MakeDir Directories="$(OutputDir)/" />
 
-        <!-- Copy the API, the documentation, the overridden mscorlib, and the README. -->
+        <!-- Copy the API, the documentation, and the README. -->
         <Copy SourceFiles="../README.ModdingApi.md" DestinationFiles="$(OutputDir)/README.md" />
         <Copy SourceFiles="../override/mscorlib.dll" DestinationFiles="$(OutputDir)/mscorlib.dll" />
         <Copy SourceFiles="../override/mscorlib.xml" DestinationFiles="$(OutputDir)/mscorlib.xml" />
         <Copy SourceFiles="$(TargetDir)MONOMODDED_Assembly-CSharp.dll" DestinationFiles="$(OutputDir)/Assembly-CSharp.dll" />
         <Copy SourceFiles="$(TargetDir)Assembly-CSharp.mm.xml" DestinationFiles="$(OutputDir)/Assembly-CSharp.xml" />
-
+        <Copy SourceFiles="$(TargetDir)MONOMODDED_TeamCherry.Localization.dll" DestinationFiles="$(OutputDir)/TeamCherry.Localization.dll" />
+        <Copy SourceFiles="$(TargetDir)TeamCherry.Localization.mm.xml" DestinationFiles="$(OutputDir)/TeamCherry.Localization.xml" />
+
         <!-- Copy the dependencies for the API and hooks for mods -->
         <Copy SourceFiles="@(Dependencies)" DestinationFolder="$(OutputDir)" />
-        
+
         <PropertyGroup>
             <NativeLibPrefix Condition="'$(RuntimeIdentifier)' == 'win-x64'" />
             <NativeLibExtension Condition="'$(RuntimeIdentifier)' == 'win-x64'">.dll</NativeLibExtension>
@@ -95,19 +119,19 @@
         <!-- on .NET 5 and up, msbuild can automatically copy the relevant files from /runtimes/$RID/native/library.{dll,so,dylib}. Unfortunately, we're on net472 -->
         <Copy Condition="'$(RuntimeIdentifier)' != ''" SourceFiles="$(Pkgunityscenerepacker)/runtimes/$(RuntimeIdentifier)/native/$(NativeLibPrefix)unityscenerepacker$(NativeLibExtension)" DestinationFolder="$(OutputDir)" />
     </Target>
-    
+
     <Target Name="CopyOutputAfterFinal" AfterTargets="OutputFinal" Condition="'$(CopyDir)' != ''">
         <ItemGroup>
             <OutputFiles Include="$(OutputDir)\**\*" />
         </ItemGroup>
         <Copy SourceFiles="@(OutputFiles)" DestinationFolder="$(CopyDir)" />
     </Target>
-    
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
         <DebugType>full</DebugType>
         <DocumentationFile>bin\$(Configuration)\Assembly-CSharp.mm.xml</DocumentationFile>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <DebugType>pdbonly</DebugType>
         <DocumentationFile>bin\$(Configuration)\Assembly-CSharp.mm.xml</DocumentationFile>
     </PropertyGroup>
@@ -120,85 +144,46 @@
         <PackageReference Include="MonoMod.RuntimeDetour" Version="21.4.29.1">
             <IncludeAssets>all</IncludeAssets>
         </PackageReference>
-        
+
         <PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="21.4.29.1">
             <IncludeAssets>all</IncludeAssets>
         </PackageReference>
-        
+
         <PackageReference Include="unityscenerepacker" Version="2.4.0" GeneratePathProperty="true" />
     </ItemGroup>
-    
+
     <ItemGroup>
+        <ProjectReference Include="../TeamCherry.Localization/TeamCherry.Localization.csproj">
+            <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+        </ProjectReference>
         <ProjectReference Include="../PrePatcher/PrePatcher.csproj">
             <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
         </ProjectReference>
+        <ProjectReference Include="../PostPatcher/PostPatcher.csproj">
+            <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+        </ProjectReference>
     </ItemGroup>
-    
+
     <ItemGroup>
         <EmbeddedResource Include="logo.png"/>
         <!-- generated using https://github.com/jakobhellermann/unity-scene-repacker/blob/main/examples/export_monobehaviour_typetrees.rs -->
         <EmbeddedResource Include="monobehaviour-typetree-dump.lz4" />
     </ItemGroup>
 
     <ItemGroup>
-        <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-            <HintPath>../Vanilla/Assembly-CSharp.dll</HintPath>
-            <SpecificVersion>False</SpecificVersion>
-        </Reference>
-        <Reference Include="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <HintPath>..\override\mscorlib.dll</HintPath>
-        </Reference>
-        <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
-          <HintPath>../Vanilla/netstandard.dll</HintPath>
-        </Reference>
-        <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>../JsonNet/Newtonsoft.Json.dll</HintPath>
-        </Reference>
-        <Reference Include="PlayMaker, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-            <HintPath>../Vanilla/PlayMaker.dll</HintPath>
-            <SpecificVersion>False</SpecificVersion>
-        </Reference>
-        <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.AnimationModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.AssetBundleModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.AssetBundleModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.AudioModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.AudioModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.CoreModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.ImageConversionModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.ImageConversionModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.IMGUIModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.InputLegacyModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>../Vanilla/UnityEngine.InputLegacyModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.JSONSerializeModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.JSONSerializeModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.ParticleSystemModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.ParticleSystemModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.Physics2DModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.Physics2DModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.TextRenderingModule.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.UI.dll</HintPath>
-        </Reference>
-        <Reference Include="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>../Vanilla/UnityEngine.UIModule.dll</HintPath>
-        </Reference>
+        <Reference Include="../Vanilla/Assembly-CSharp.dll"/>
+        <Reference Include="../Vanilla/TeamCherry.*.dll"/>
+        <!--<Reference Include="../Vanilla/mscorlib.dll"/>-->
+        <Reference Include="../override/mscorlib.dll"/>
+        <Reference Include="../Vanilla/netstandard.dll"/>
+        <Reference Include="../Vanilla/Newtonsoft.Json.dll"/>
+        <Reference Include="../Vanilla/PlayMaker.dll"/>
+        <Reference Include="../Vanilla/UnityEngine.dll"/>
+        <Reference Include="../Vanilla/UnityEngine.*.dll"/>
+
+        <!--<Reference Include="../Vanilla/Unity.*.dll"/>-->
+        <!--<Reference Include="../Vanilla/Mono.*.dll"/>-->
+        <!--<Reference Include="../Vanilla/System.dll"/>-->
+        <!--<Reference Include="../Vanilla/System.*.dll"/>-->
     </ItemGroup>
 </Project>

Assembly-CSharp/Console.cs

@@ -76,7 +76,8 @@ public void Start()
                 string.Join(string.Empty, _messages.ToArray()),
                 _fontSize,
                 TextAnchor.LowerLeft,
-                new CanvasUtil.RectData(new Vector2(-5, -5), Vector2.zero, Vector2.zero, Vector2.one),
+                //new CanvasUtil.RectData(new Vector2(-5, -5), Vector2.zero, Vector2.zero, Vector2.one),
+                new CanvasUtil.RectData(Vector2.zero, Vector2.zero, Vector2.zero, Vector2.one),
                 _font
             );