Update origin/dev

.github/workflows/cd.yml

@@ -0,0 +1,70 @@
+name: "Build and deploy project"
+
+on:
+    push:
+        branches: [ "master" ]
+
+env:
+    BUILD_TYPE: Release
+
+jobs:
+    build:
+        runs-on: windows-latest
+        steps:
+        - uses: actions/checkout@v4
+
+        - name: Pull submodule
+          run: git submodule update --init
+
+        - name: Configure CMake
+          run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+        - name: Build project
+          run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+        - name: Upload Artifacts
+          uses: actions/upload-artifact@v4
+          with:
+            name: fli-modloader
+            path: |
+                ./build/Release/ModLoader.dll
+                ./build/DllProxy/Release/version.dll
+    release:
+        needs: build
+        runs-on: ubuntu-latest
+        steps:
+            - name: Set up date-based tag
+              run: |
+                DATE_TAG="v$(date +'%Y%m%d.%H%M')"
+                echo "TAG_NAME=$DATE_TAG" >> $GITHUB_ENV
+                echo "{tag}=$DATE_TAG"
+            - name: Download Artifacts
+              uses: actions/download-artifact@v4
+            - name: Create GitHub Release
+              id: create_release
+              uses: softprops/action-gh-release@v2
+              with:
+                tag_name: ${{ env.TAG_NAME }}
+                body: "Automated release of ${{ github.ref_name }}."
+                generate_release_notes: true
+                token: ${{ secrets.RELEASE_CD_TOKEN }}
+
+            - name: Upload ModLoader.dll
+              uses: actions/upload-release-asset@v1
+              env:
+                GITHUB_TOKEN: ${{ secrets.RELEASE_CD_TOKEN }}
+              with:
+                upload_url: ${{ steps.create_release.outputs.upload_url }}
+                asset_path: "./fli-modloader/Release/ModLoader.dll"
+                asset_name: ModLoader.dll
+                asset_content_type: application/octet-stream
+
+            - name: Upload version.dll
+              uses: actions/upload-release-asset@v1
+              env:
+                GITHUB_TOKEN: ${{ secrets.RELEASE_CD_TOKEN }}
+              with:
+                upload_url: ${{ steps.create_release.outputs.upload_url }}
+                asset_path: "./fli-modloader/DllProxy/Release/version.dll"
+                asset_name: version.dll
+                asset_content_type: application/octet-stream

.gitignore

@@ -1,9 +1,10 @@
-lib
-FantasyL.b1c5f0c2
-.vs
-.vscode
-.intellij
-x64
-*/.github
-build
-out
+*
+!include/
+!include/**/*
+!src/
+!src/**/*
+#!CMakeLists.txt
+!README.md
+!.github/
+!.github/**/*
+!version_proxy.def

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "include"]
+	path = include
+	url = https://github.com/ReDevCafe/FantasyLifeI-ModLoader-Headers.git

CMakeLists.txt

@@ -1,22 +1,34 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.6)
 PROJECT(FantasyLifeI-ModLoader LANGUAGES CXX C)
 
-add_library(${PROJECT_NAME} SHARED src/dllmain.cpp) 
+set(VERSION 1.00)
+option(MLDEBUG "Enable ModLoader debug code" ON)
+
+add_subdirectory(DllProxy)
+add_library(${PROJECT_NAME} SHARED src/ModLoader.cpp)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
     OUTPUT_NAME "ModLoader"
-    CXX_STANDARD 17
+    CXX_STANDARD 20
     CXX_STANDARD_REQUIRED YES
 )
 
+target_compile_definitions(${PROJECT_NAME} PRIVATE MLCOMPILED)
+target_compile_definitions(${PROJECT_NAME} PRIVATE MLVERSION=\"${VERSION}\")
+
+if(MLDEBUG)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE MLDEBUG)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG")
+
+    if(MSVC)
+        target_compile_options(FantasyLifeI-ModLoader PRIVATE /wd4369 /wd4309)
+    endif()
+endif()
+
 target_include_directories(${PROJECT_NAME} PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/MinHook/include
-)
-
-target_precompile_headers(${PROJECT_NAME} 
-    PUBLIC
-        include/pch.h
 )
 
 target_link_libraries(${PROJECT_NAME} PUBLIC
@@ -25,9 +37,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
 )
 
 file(GLOB_RECURSE PROJECT_SOURCE "src/*.cpp")
-file(GLOB_RECURSE MINHOOK_SOURCE "MinHook/src/*.c")
 
 target_sources(${PROJECT_NAME} PUBLIC
     ${PROJECT_SOURCE}
-    ${MINHOOK_SOURCE}
-)
+)

DllProxy/CMakeLists.txt

@@ -0,0 +1,30 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.6)
+PROJECT(DllProxy LANGUAGES CXX C)
+
+add_library(${PROJECT_NAME} SHARED src/dllmain.cpp) 
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    OUTPUT_NAME "version"
+    CXX_STANDARD 17
+    CXX_STANDARD_REQUIRED YES
+)
+
+target_include_directories(${PROJECT_NAME} PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
+if(MSVC)
+    target_compile_options(${PROJECT_NAME} PRIVATE /MT /EHsc /DWIN32_LEAN_AND_MEAN)
+    set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/version_proxy.def")
+endif()
+
+target_link_libraries(${PROJECT_NAME} PUBLIC
+    user32
+    kernel32
+)
+
+file(GLOB_RECURSE PROJECT_SOURCE "src/*.cpp")
+
+target_sources(${PROJECT_NAME} PUBLIC
+    ${PROJECT_SOURCE}
+)