[Mod Manager] - Remake the Mod Manager to be cross-platform and conform to modern standards.

OpenKh.Command.AnbMaker/OpenKh.Command.AnbMaker.csproj

@@ -12,7 +12,7 @@
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
         <PackageReference Include="System.Interactive" Version="6.0.1" />
         <PackageReference Include="SkiaSharp" Version="2.88.8" />
-        <PackageReference Include="NLog" Version="5.3.2" />
+        <PackageReference Include="NLog" Version="6.2.0" />
     </ItemGroup>
 
     <ItemGroup>

OpenKh.Command.Bdxio/Commands/DecodeCommand.cs

@@ -1,6 +1,6 @@
 using McMaster.Extensions.CommandLineUtils;
 using NLog;
-using OpenKh.Command.Bdxio.Utils;
+using OpenKh.Kh2.Bdx.Utils;
 using System.ComponentModel.DataAnnotations;
 
 namespace OpenKh.Command.Bdxio.Commands

OpenKh.Command.Bdxio/Commands/EncodeCommand.cs

@@ -1,7 +1,7 @@
 using McMaster.Extensions.CommandLineUtils;
 using NLog;
-using OpenKh.Command.Bdxio.Models;
-using OpenKh.Command.Bdxio.Utils;
+using OpenKh.Kh2.Bdx.Models;
+using OpenKh.Kh2.Bdx.Utils;
 using System.ComponentModel.DataAnnotations;
 
 namespace OpenKh.Command.Bdxio.Commands

OpenKh.Command.Bdxio/OpenKh.Command.Bdxio.csproj

@@ -9,12 +9,13 @@
 
     <ItemGroup>
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
-        <PackageReference Include="NLog" Version="5.3.2" />
         <PackageReference Include="YamlDotNet" Version="16.3.0" />
         <PackageReference Include="Xe.BinaryMapper" Version="1.5.2" />
         <PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
 
         <ProjectReference Include="../OpenKh.Common/OpenKh.Common.csproj" />
+
+        <ProjectReference Include="..\OpenKh.Kh2\OpenKh.Kh2.csproj" />
     </ItemGroup>
 
     <ItemGroup>

OpenKh.Command.IdxImg/EpicGamesAssets.cs

@@ -130,6 +130,8 @@ private class BuildCommand
 
                 protected int OnExecute(CommandLineApplication app)
                 {
+                    List<string> _gameMap = new List<string>() { "kh1", "kh2", "Recom", "bbs", "kh3d" };
+
                     var enabled = File.ReadAllLines(ModsFile);
 
                     if (Directory.Exists(OutputFolder))
@@ -141,9 +143,9 @@ protected int OnExecute(CommandLineApplication app)
                     foreach (var mod_name in enabled.AsEnumerable().Reverse())
                     {
                         var mod_folder = Path.Combine(ModsFolder, mod_name);
-                        var metadata = File.OpenRead(Path.Combine(mod_folder, "mod.yml")).Using(Metadata.Read);
+                        var metadata = Metadata.Read(Path.Combine(mod_folder, "mod.yml"));
                         Console.WriteLine($"Patching {mod_name}");
-                        patcher.Patch(DataFolder, OutputFolder, metadata, mod_folder, platform: 2, packageMap: map, LaunchGame: GameId);
+                        patcher.Patch(DataFolder, OutputFolder, metadata, mod_folder, targetPlatform: 1, packageMap: map, targetGame: _gameMap.IndexOf(GameId));
                     }
 
                     using (var packageMapWriter = new StreamWriter(Path.Combine(OutputFolder, "patch-package-map.txt")))

OpenKh.Command.MapGen/OpenKh.Command.MapGen.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
-    <PackageReference Include="NLog" Version="5.3.2" />
+    <PackageReference Include="NLog" Version="6.2.0" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="AssimpNet" Version="5.0.0-beta1" />
     <PackageReference Include="YamlDotNet" Version="16.3.0" />

OpenKh.Command.Bdxio/Antlr4/BdxScript.g4 → OpenKh.Kh2/Bdx/Antlr/BdxScript.g4

@@ -1,49 +1,49 @@
-grammar BdxScript;
-
-prog: NL* (statement NL*)* EOF;
-statement:
-	section
-	| equ
-	| label ':' NL
-	| label ':' order
-	| order;
-
-label: name = id;
-
-equ: name = id 'equ' numberdata;
-
-order: db | resb | dw | resw | instruction | include;
-
-dw: 'dw' worddata (',' worddata)* NL;
-db: 'db' bytedata (',' bytedata)* NL;
-resb: 'resb' (numberdata | id) NL;
-resw: 'resw' (numberdata | id) NL;
-
-instruction: id (arg (',' arg)*)? NL;
-
-arg: (numberdata | id);
-offset: 'offset' id;
-bytedata: numberdata | id | StringData;
-worddata: numberdata | id;
-numberdata:
-	decimalnumber = DEC
-	| '0x' hexnumber = (DEC | HEX)
-	| floatnumber = FLOATNUM;
-hexbody: DEC | HEX;
-id: DEC | HEX | ID;
-include: '%include' FileName NL;
-section: 'section' section_id NL;
-section_id: '.text' | '.bss';
-
-StringData: '\'' ~[']* '\'';
-DEC: [-+]? [0-9]+;
-HEX: [0-9a-fA-F]+;
-FLOATNUM:
-	[-+]? ([0-9]* '.' [0-9]+)
-	| ([0-9]+ [eE] [-+]? [0-9]+);
-ID: [a-zA-Z_][a-zA-Z0-9_]* ('.' [a-zA-Z0-9_]+)*;
-WS: [ \t] -> skip;
-NL: '\r'? '\n' | '\r';
-FileName: '"' ~["]* '"';
-
-LINE_COMMENT: ';' ~[\r\n]* -> skip;
+grammar BdxScript;
+
+prog: NL* (statement NL*)* EOF;
+statement:
+	section
+	| equ
+	| label ':' NL
+	| label ':' order
+	| order;
+
+label: name = id;
+
+equ: name = id 'equ' numberdata;
+
+order: db | resb | dw | resw | instruction | include;
+
+dw: 'dw' worddata (',' worddata)* NL;
+db: 'db' bytedata (',' bytedata)* NL;
+resb: 'resb' (numberdata | id) NL;
+resw: 'resw' (numberdata | id) NL;
+
+instruction: id (arg (',' arg)*)? NL;
+
+arg: (numberdata | id);
+offset: 'offset' id;
+bytedata: numberdata | id | StringData;
+worddata: numberdata | id;
+numberdata:
+	decimalnumber = DEC
+	| '0x' hexnumber = (DEC | HEX)
+	| floatnumber = FLOATNUM;
+hexbody: DEC | HEX;
+id: DEC | HEX | ID;
+include: '%include' FileName NL;
+section: 'section' section_id NL;
+section_id: '.text' | '.bss';
+
+StringData: '\'' ~[']* '\'';
+DEC: [-+]? [0-9]+;
+HEX: [0-9a-fA-F]+;
+FLOATNUM:
+	[-+]? ([0-9]* '.' [0-9]+)
+	| ([0-9]+ [eE] [-+]? [0-9]+);
+ID: [a-zA-Z_][a-zA-Z0-9_]* ('.' [a-zA-Z0-9_]+)*;
+WS: [ \t] -> skip;
+NL: '\r'? '\n' | '\r';
+FileName: '"' ~["]* '"';
+
+LINE_COMMENT: ';' ~[\r\n]* -> skip;