Merge branch 'main-refactor' into shared-impl

Author: shad0wshayd3

.github/workflows/main_ci.yml

@@ -4,49 +4,35 @@ on:
   push:
     branches: [ master ]
     paths:
-      - '.github/workflows/main_ci.yml'
-      - 'cmake/**'
-      - 'include/**'
-      - 'src/**'
-      - 'CMakeLists.txt'
-      - 'CMakePresets.json'
-      - 'vcpkg.json'
+      - ".github/workflows/main_ci.yml"
+      - "include/**"
+      - "src/**"
+      - "xmake.lua"
+      - "xmake-extra.lua"
   pull_request:
     branches: [ master ]
   workflow_dispatch:
 
-env:
-  BUILD_TYPE: Debug
-  VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg-cache
-
 jobs:
-  windows:
+  build-xmake:
     runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        mode:
+          - debug
+          - release
     steps:
-      - uses: actions/checkout@v4
-        with:
-          path: main
-
-      - name: Setup vcpkg
-        run: |
-          mkdir -p ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
-          cd $env:VCPKG_INSTALLATION_ROOT
-          ./bootstrap-vcpkg.bat
-          ./vcpkg --version > ${{ github.workspace }}/vcpkg-version.txt
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Cache vcpkg
-        uses: actions/cache@v4
-        id: vcpkg-cache
-        env:
-          cache-name: vcpkg-cache
+      - name: Setup XMake
+        uses: xmake-io/github-action-setup-xmake@v1
         with:
-          path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}/*
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('main/**/vcpkg.json', 'vcpkg-version.txt') }}
+          xmake-version: "latest"
 
-      - name: Configure CMake
-        working-directory: ${{ github.workspace }}/main
-        run: cmake --preset vs2022-windows-vcpkg
+      - name: Configure
+        run: xmake config -y --mode=${{ matrix.mode }}
 
       - name: Build
-        working-directory: ${{ github.workspace }}/main
-        run: cmake --build build --config ${{ env.BUILD_TYPE }}
+        run: xmake build -y -vD

.github/workflows/main_ci_xmake.yml

@@ -17,7 +17,7 @@ jobs:
       run: find -type f \( -name *.h -o -name *.cpp \) | xargs clang-format -style=file -i
 
     - name: Glob files
-      run: python ${{ github.workspace }}/res/scripts/cmake_generate.py
+      run: python ${{ github.workspace }}/res/scripts/generate_headers.py
 
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:

.github/workflows/maintenance.yml

@@ -3,21 +3,17 @@
 ## General Requirements
 
 ### Build Dependencies
-* [Visual Studio Community 2019 16.10.0 Preview 3.0](https://visualstudio.microsoft.com/vs/preview/)
+* [Visual Studio Community 2022 Preview](https://visualstudio.microsoft.com/vs/preview/)
 	* Desktop development with C++
+* [binary-io](https://github.com/Ryan-rsm-McKenzie/binary_io)
 * [mmio](https://github.com/Ryan-rsm-McKenzie/mmio)
 * [spdlog](https://github.com/gabime/spdlog)
 
 ### Development
-* [clang-format 12.0.0](https://github.com/llvm/llvm-project/releases)
-* [CMake](https://cmake.org/)
-* [vcpkg](https://github.com/microsoft/vcpkg)
+* [xmake](https://xmake.io/)
 
 ## F4SE Plugin Requirements
 
 ### End User Dependencies
 * [Address Library for F4SE Plugins](https://www.nexusmods.com/fallout4/mods/47327)
 * [F4SE](https://f4se.silverlock.org/)
-
-### Development
-* [Address Library for F4SE Plugins](https://www.nexusmods.com/fallout4/mods/47327)

CMakeLists.txt

@@ -15,7 +15,6 @@ namespace RE
 	enum class DIALOGUE_SUBTYPE;
 	enum class DIALOGUE_TYPE;
 	enum class WEAPON_CULL_TYPE;
-
 	class CachedValues;
 	class HighProcessData;
 	class MiddleHighProcessData;

CMakePresets.json

@@ -2,6 +2,8 @@
 
 namespace RE
 {
+	class BGSObjectInstance;
+
 	namespace ActorEquipManagerEvent
 	{
 		enum class Type : std::int32_t

README.md

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "RE/B/BGSAimModel.h"
+#include "RE/B/BSSpring_SpringState.h"
 #include "RE/N/NiPoint.h"
-#include "RE/S/SpringState.h"
 
 namespace RE
 {