Backend refactor to API-based model and NodeJS GUI implementation

.github/workflows/dotnet-core-desktop.yml

@@ -1,81 +1,97 @@
 # gynt: This is based on the .NET Core Desktop starter action
 
-
 name: UCP Build
 
 on:
   workflow_dispatch:
   push:
-    branches: [ master, GUI-Update, development ]
+    branches: [master, GUI-Update, development]
   pull_request:
-    branches: [ master, GUI-Update, development ]
+    branches: [master, GUI-Update, development]
     types: [assigned, opened, edited, ready_for_review, reopened, synchronize]
 
 jobs:
-
   build:
-
     strategy:
       matrix:
         configuration: [Debug, Release]
         nuget: [latest]
 
-    runs-on: windows-latest  # For a list of available runner types, refer to
-                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
+    runs-on:
+      windows-latest # For a list of available runner types, refer to
+      # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
 
     env:
       OutputPath: ..\Output${{ matrix.configuration }}
-      Solution_Name: UnofficialCrusaderPatch.sln                      # Replace with your solution name, i.e. MyWpfApp.sln.
+      Solution_Name: UnofficialCrusaderPatch.sln # Replace with your solution name, i.e. MyWpfApp.sln.
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Checkout submodules
-      run: git submodule update --init --recursive --depth 1
-
-    # Install the .NET Core workload
-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-
-    # Restore NuGet packages
-    - name: Setup NuGet.exe
-      uses: nuget/setup-nuget@v1
-      with:
-        nuget-version: ${{ matrix.nuget }}
-    - name: Restore NuGet packages
-      run: nuget restore $env:Solution_Name
-
-    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-    - name: Setup MSBuild.exe
-      uses: microsoft/[email protected]
-
-    # Execute all unit tests in the solution
-    # - name: Execute unit tests
-    #   run: dotnet test
-
-    # Restore the application to populate the obj folder with RuntimeIdentifiers
-    - name: Build the application
-      run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration /p:OutputPath=$env:OutputPath
-      env:
-        Configuration: ${{ matrix.configuration }}
-
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: UCP-latest-release
-        path: |
-          OutputRelease/*.dll
-          OutputRelease/*.exe
-          OutputRelease/resources
-
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: UCP-latest-debug
-        path: |
-          OutputDebug
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Checkout submodules
+        run: git submodule update --init --recursive --depth 1
+
+      # Install the .NET Core workload
+      - name: Install .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "5.0.x"
+
+      # Restore NuGet packages
+      - name: Setup NuGet.exe
+        uses: nuget/setup-nuget@v1
+        with:
+          nuget-version: ${{ matrix.nuget }}
+      - name: Restore NuGet packages
+        run: nuget restore $env:Solution_Name
+
+      # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
+      - name: Setup MSBuild.exe
+        uses: microsoft/[email protected]
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Install npm dependencies
+        run: cd unofficialcrusaderpatch-gui && npm install && cd ..
+
+      # Execute all unit tests in the solution
+      # - name: Execute unit tests
+      #   run: dotnet test
+
+      # Restore the application to populate the obj folder with RuntimeIdentifiers
+      - name: Build the application
+        run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration /p:OutputPath=$env:OutputPath
+        env:
+          Configuration: ${{ matrix.configuration }}
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: UCP-latest-release
+          path: |
+            OutputRelease/*.dll
+            OutputRelease/*.exe
+            OutputRelease/resources
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: UCP-latest-debug
+          path: |
+            OutputDebug
+
+      - name: Package nodejs app
+        run: npm run --prefix unofficialcrusaderpatch-gui/ package
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: UnofficialCrusaderPatchGUI
+          path: |
+            unofficialcrusaderpatch-gui/release/build/*.exe

.gitignore

@@ -1,6 +1,11 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+UnofficialCrusaderPatchPyGUI/*.dll
+UnofficialCrusaderPatchPyGUI/*.xml
+UnofficialCrusaderPatchPyGUI/*.config
+UnofficialCrusaderPatchPyGUI/resources
+
 # User-specific files
 *.suo
 *.user
@@ -258,4 +263,4 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc

AICUpdater/AICUpdater.csproj

@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>AICUpdater</RootNamespace>
     <AssemblyName>AICUpdater</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -51,49 +52,52 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\AICharacter.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\AICharacter.cs">
       <Link>AICharacters\AICharacter.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\AICharacterName.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\AICharacterName.cs">
       <Link>AICharacters\AICharacterName.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\AICharacterSerializationException.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\AICharacterSerializationException.cs">
       <Link>AICharacters\AICharacterSerializationException.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\AICollection.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\AICHelper.cs">
+      <Link>AICharacters\AICHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\AICollection.cs">
       <Link>AICharacters\AICollection.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\AICSerializationException.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\AICSerializationException.cs">
       <Link>AICharacters\AICSerializationException.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\AIPersonality.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\AIPersonality.cs">
       <Link>AICharacters\AIPersonality.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\AIPersonalityFieldsEnum.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\AIPersonalityFieldsEnum.cs">
       <Link>AICharacters\AIPersonalityFieldsEnum.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\AISerializer.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\AISerializer.cs">
       <Link>AICharacters\AISerializer.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\PersonalityEnums\Buildings.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\PersonalityEnums\Buildings.cs">
       <Link>AICharacters\PersonalityEnums\Buildings.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\PersonalityEnums\Resources.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\PersonalityEnums\Resources.cs">
       <Link>AICharacters\PersonalityEnums\Resources.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\PersonalityEnums\SiegeEngines.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\PersonalityEnums\SiegeEngines.cs">
       <Link>AICharacters\PersonalityEnums\SiegeEngines.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\PersonalityEnums\TargetingType.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\PersonalityEnums\TargetingType.cs">
       <Link>AICharacters\PersonalityEnums\TargetingType.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\PersonalityEnums\Units.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\PersonalityEnums\Units.cs">
       <Link>AICharacters\PersonalityEnums\Units.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\PersonalityEnums\WorkshopSettings.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\PersonalityEnums\WorkshopSettings.cs">
       <Link>AICharacters\PersonalityEnums\WorkshopSettings.cs</Link>
     </Compile>
-    <Compile Include="..\UnofficialCrusaderPatch\AIC\Utils\RWAttributes.cs">
+    <Compile Include="..\UnofficialCrusaderPatch\Util\Readers\Utils\RWAttributes.cs">
       <Link>AICharacters\RWAttributes.cs</Link>
     </Compile>
     <Compile Include="AICUpdaterHelper.cs" />

AICUpdater/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
-</configuration>
+</configuration>

CodeBlox/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
-</configuration>
+</configuration>

CodeBlox/CodeBlox.csproj

@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>CodeBlox</RootNamespace>
     <AssemblyName>CodeBlox</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

IDAParser/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
-</configuration>
+</configuration>

IDAParser/IDAParser.csproj

@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>IDAParser</RootNamespace>
     <AssemblyName>IDAParser</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

UnofficialCrusaderPatch.sln

@@ -11,40 +11,69 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IDAParser", "IDAParser\IDAP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AICUpdater", "AICUpdater\AICUpdater.csproj", "{44C20962-0F8D-4582-95A1-0ECBA7AABF0A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnofficialCrusaderPatchGUI", "UnofficialCrusaderPatchGUI\UnofficialCrusaderPatchGUI.csproj", "{FFBFC874-6EAF-4B9C-8507-BBD5A9399CB5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnofficialCrusaderPatchConsole", "UnofficialCrusaderPatchConsole\UnofficialCrusaderPatchConsole.csproj", "{743F77E0-AD5A-42FE-B928-535AAF40AC4D}"
 EndProject
+Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "UnofficialCrusaderPatchGUI", "unofficialcrusaderpatch-gui\UnofficialCrusaderPatchGUI.njsproj", "{98C96052-2188-48A6-BCEC-CDFE4D55354A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{53FFBF10-68B1-474F-BD93-903195B2A14C} = {53FFBF10-68B1-474F-BD93-903195B2A14C}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{53FFBF10-68B1-474F-BD93-903195B2A14C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53FFBF10-68B1-474F-BD93-903195B2A14C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{53FFBF10-68B1-474F-BD93-903195B2A14C}.Debug|x86.ActiveCfg = Debug|x86
 		{53FFBF10-68B1-474F-BD93-903195B2A14C}.Debug|x86.Build.0 = Debug|x86
+		{53FFBF10-68B1-474F-BD93-903195B2A14C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53FFBF10-68B1-474F-BD93-903195B2A14C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{53FFBF10-68B1-474F-BD93-903195B2A14C}.Release|x86.ActiveCfg = Release|Any CPU
 		{53FFBF10-68B1-474F-BD93-903195B2A14C}.Release|x86.Build.0 = Release|Any CPU
+		{7DEF41CF-C827-4E8F-8243-E600AF1651C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DEF41CF-C827-4E8F-8243-E600AF1651C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DEF41CF-C827-4E8F-8243-E600AF1651C0}.Debug|x86.ActiveCfg = Debug|x86
 		{7DEF41CF-C827-4E8F-8243-E600AF1651C0}.Debug|x86.Build.0 = Debug|x86
+		{7DEF41CF-C827-4E8F-8243-E600AF1651C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DEF41CF-C827-4E8F-8243-E600AF1651C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7DEF41CF-C827-4E8F-8243-E600AF1651C0}.Release|x86.ActiveCfg = Release|Any CPU
 		{7DEF41CF-C827-4E8F-8243-E600AF1651C0}.Release|x86.Build.0 = Release|Any CPU
+		{0A526306-B374-43C4-BC10-102CD6A242E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A526306-B374-43C4-BC10-102CD6A242E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0A526306-B374-43C4-BC10-102CD6A242E1}.Debug|x86.ActiveCfg = Debug|x86
 		{0A526306-B374-43C4-BC10-102CD6A242E1}.Debug|x86.Build.0 = Debug|x86
+		{0A526306-B374-43C4-BC10-102CD6A242E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A526306-B374-43C4-BC10-102CD6A242E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A526306-B374-43C4-BC10-102CD6A242E1}.Release|x86.ActiveCfg = Release|Any CPU
 		{0A526306-B374-43C4-BC10-102CD6A242E1}.Release|x86.Build.0 = Release|Any CPU
+		{44C20962-0F8D-4582-95A1-0ECBA7AABF0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44C20962-0F8D-4582-95A1-0ECBA7AABF0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{44C20962-0F8D-4582-95A1-0ECBA7AABF0A}.Debug|x86.ActiveCfg = Debug|x86
 		{44C20962-0F8D-4582-95A1-0ECBA7AABF0A}.Debug|x86.Build.0 = Debug|x86
+		{44C20962-0F8D-4582-95A1-0ECBA7AABF0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44C20962-0F8D-4582-95A1-0ECBA7AABF0A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{44C20962-0F8D-4582-95A1-0ECBA7AABF0A}.Release|x86.ActiveCfg = Release|Any CPU
 		{44C20962-0F8D-4582-95A1-0ECBA7AABF0A}.Release|x86.Build.0 = Release|Any CPU
-		{FFBFC874-6EAF-4B9C-8507-BBD5A9399CB5}.Debug|x86.ActiveCfg = Debug|x86
-		{FFBFC874-6EAF-4B9C-8507-BBD5A9399CB5}.Debug|x86.Build.0 = Debug|x86
-		{FFBFC874-6EAF-4B9C-8507-BBD5A9399CB5}.Release|x86.ActiveCfg = Release|Any CPU
-		{FFBFC874-6EAF-4B9C-8507-BBD5A9399CB5}.Release|x86.Build.0 = Release|Any CPU
+		{743F77E0-AD5A-42FE-B928-535AAF40AC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{743F77E0-AD5A-42FE-B928-535AAF40AC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{743F77E0-AD5A-42FE-B928-535AAF40AC4D}.Debug|x86.ActiveCfg = Debug|x86
 		{743F77E0-AD5A-42FE-B928-535AAF40AC4D}.Debug|x86.Build.0 = Debug|x86
+		{743F77E0-AD5A-42FE-B928-535AAF40AC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{743F77E0-AD5A-42FE-B928-535AAF40AC4D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{743F77E0-AD5A-42FE-B928-535AAF40AC4D}.Release|x86.ActiveCfg = Release|Any CPU
 		{743F77E0-AD5A-42FE-B928-535AAF40AC4D}.Release|x86.Build.0 = Release|Any CPU
+		{98C96052-2188-48A6-BCEC-CDFE4D55354A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98C96052-2188-48A6-BCEC-CDFE4D55354A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98C96052-2188-48A6-BCEC-CDFE4D55354A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{98C96052-2188-48A6-BCEC-CDFE4D55354A}.Debug|x86.Build.0 = Debug|Any CPU
+		{98C96052-2188-48A6-BCEC-CDFE4D55354A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98C96052-2188-48A6-BCEC-CDFE4D55354A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98C96052-2188-48A6-BCEC-CDFE4D55354A}.Release|x86.ActiveCfg = Release|Any CPU
+		{98C96052-2188-48A6-BCEC-CDFE4D55354A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE