Merge branch 'master' of https://github.com/Soraiko/OpenKh

OpenKH · Mar 17, 2024 · 1e3446d · 1e3446d
2 parents 8cdf7db + 3d2acaa
commit 1e3446d
Show file tree

Hide file tree

Showing 62 changed files with 3,153 additions and 721 deletions.
diff --git a/OpenKh.Command.Bdxio/OpenKh.Command.Bdxio.csproj b/OpenKh.Command.Bdxio/OpenKh.Command.Bdxio.csproj
@@ -8,9 +8,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
+        <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
         <PackageReference Include="NLog" Version="5.2.8" />
-        <PackageReference Include="YamlDotNet" Version="15.1.0" />
+        <PackageReference Include="YamlDotNet" Version="15.1.2" />
         <PackageReference Include="Xe.BinaryMapper" Version="1.5.2" />
         <PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
 

diff --git a/OpenKh.Command.CoctChanger/OpenKh.Command.CoctChanger.csproj b/OpenKh.Command.CoctChanger/OpenKh.Command.CoctChanger.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/OpenKh.Command.DoctChanger/OpenKh.Command.DoctChanger.csproj b/OpenKh.Command.DoctChanger/OpenKh.Command.DoctChanger.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/OpenKh.Command.ImgTool/OpenKh.Command.ImgTool.csproj b/OpenKh.Command.ImgTool/OpenKh.Command.ImgTool.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
-    <PackageReference Include="YamlDotNet" Version="15.1.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.3" />
+    <PackageReference Include="YamlDotNet" Version="15.1.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/OpenKh.Command.Layout/OpenKh.Command.Layout.csproj b/OpenKh.Command.Layout/OpenKh.Command.Layout.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
-    <PackageReference Include="YamlDotNet" Version="15.1.1" />
+    <PackageReference Include="YamlDotNet" Version="15.1.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/OpenKh.Command.MapGen/OpenKh.Command.MapGen.csproj b/OpenKh.Command.MapGen/OpenKh.Command.MapGen.csproj
@@ -13,11 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageReference Include="NLog" Version="5.2.8" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="AssimpNet" Version="5.0.0-beta1" />
-    <PackageReference Include="YamlDotNet" Version="15.1.0" />
+    <PackageReference Include="YamlDotNet" Version="15.1.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/OpenKh.Command.MapGenUtils/OpenKh.Command.MapGenUtils.csproj b/OpenKh.Command.MapGenUtils/OpenKh.Command.MapGenUtils.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
-        <PackageReference Include="YamlDotNet" Version="15.1.1" />
+        <PackageReference Include="YamlDotNet" Version="15.1.2" />
         <PackageReference Include="NJsonSchema" Version="11.0.0" />
     </ItemGroup>
 

diff --git a/OpenKh.Command.TexFooter/OpenKh.Command.TexFooter.csproj b/OpenKh.Command.TexFooter/OpenKh.Command.TexFooter.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
-    <PackageReference Include="YamlDotNet" Version="15.1.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.3" />
+    <PackageReference Include="YamlDotNet" Version="15.1.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/OpenKh.Common/OpenKh.Common.csproj b/OpenKh.Common/OpenKh.Common.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="Xe.BinaryMapper" Version="1.5.2" />
-    <PackageReference Include="YamlDotNet" Version="15.1.0" />
+    <PackageReference Include="YamlDotNet" Version="15.1.2" />
   </ItemGroup>
 
 </Project>
diff --git a/OpenKh.Game/OpenKh.Game.csproj b/OpenKh.Game/OpenKh.Game.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="MonoGame.Content.Builder" Version="3.7.0.9" />
     <PackageReference Include="MonoGame.Framework.DesktopGL.Core" Version="3.7.0.7" />
-    <PackageReference Include="YamlDotNet" Version="15.1.1" />
+    <PackageReference Include="YamlDotNet" Version="15.1.2" />
 	<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
   </ItemGroup>
 

diff --git a/OpenKh.Kh1/OpenKh.Kh1.csproj b/OpenKh.Kh1/OpenKh.Kh1.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.3" />
     <PackageReference Include="Xe.BinaryMapper" Version="1.5.2" />
   </ItemGroup>
 

diff --git a/OpenKh.Patcher/BarEntryExtractor/Extractor.cs b/OpenKh.Patcher/BarEntryExtractor/Extractor.cs
@@ -0,0 +1,18 @@
+using OpenKh.Kh2;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenKh.Patcher.BarEntryExtractor
+{
+    public record Extractor(
+        IEnumerable<string> Tags,
+        IfApplyToBarEntryDelegate IfApply,
+        Func<string, bool> SourceFileTest,
+        string FileExtension,
+        Func<Bar.Entry, Task<byte[]>> ExtractAsync,
+        Func<SourceBuilderArg, IEnumerable<AssetFile>> SourceBuilder = null
+    );
+}
diff --git a/OpenKh.Patcher/BarEntryExtractor/IfApplyToBarEntryDelegate.cs b/OpenKh.Patcher/BarEntryExtractor/IfApplyToBarEntryDelegate.cs
@@ -0,0 +1,11 @@
+using OpenKh.Kh2;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenKh.Patcher.BarEntryExtractor
+{
+    public delegate bool IfApplyToBarEntryDelegate(string EntryName, Bar.EntryType EntryType, int EntryIndex);
+}