Fix/clean api

.clangd

@@ -0,0 +1,16 @@
+CompileFlags:
+  Add: [-std=c++20]
+
+---
+
+If:
+  PathMatch: include/SDK.h
+Diagnostics:
+  UnusedIncludes: None
+
+---
+
+If:
+  PathMatch: .*
+Diagnostics:
+  Suppress: [-Wunused-include:include/SDK.h]

.github/workflows/build-check.yml

@@ -0,0 +1,43 @@
+name: "Build Check"
+
+on:
+    push:
+        branches-ignore:
+            - master
+    pull_request:
+        branches:
+            - master
+
+env:
+    BUILD_TYPE: Release
+
+jobs:
+    build-check:
+        runs-on: windows-latest
+        steps:
+        - uses: actions/checkout@v4
+
+        - name: Cache LLVM
+          id: cache-llvm
+          uses: actions/cache@v4
+          with:
+            path: C:\Program Files\LLVM
+            key: llvm-21.1.0-windows
+
+        - name: Install LLVM 21.1.0
+          if: steps.cache-llvm.outputs.cache-hit != 'true'
+          run: choco install llvm --version=21.1.0 -y
+          shell: powershell
+
+        - name: Add LLVM to PATH
+          run: echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          shell: powershell
+
+        - name: Pull submodule
+          run: git submodule update --init
+
+        - name: Configure CMake with Clang-CL
+          run: cmake -B ${{github.workspace}}/build -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMLDEBUG=OFF
+
+        - name: Build project
+          run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

.github/workflows/cd.yml

@@ -13,11 +13,27 @@ jobs:
         steps:
         - uses: actions/checkout@v4
 
+        - name: Cache LLVM
+          id: cache-llvm
+          uses: actions/cache@v4
+          with:
+            path: C:\Program Files\LLVM
+            key: llvm-21.1.0-windows
+
+        - name: Install LLVM 21.1.0
+          if: steps.cache-llvm.outputs.cache-hit != 'true'
+          run: choco install llvm --version=21.1.0 -y
+          shell: powershell
+
+        - name: Add LLVM to PATH
+          run: echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          shell: powershell
+
         - name: Pull submodule
           run: git submodule update --init
 
-        - name: Configure CMake
-          run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+        - name: Configure CMake with Clang-CL
+          run: cmake -B ${{github.workspace}}/build -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMLDEBUG=OFF
 
         - name: Build project
           run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
@@ -27,9 +43,10 @@ jobs:
           with:
             name: fli-modloader
             path: |
-                ./build/Release/ModLoader.dll
-                ./build/Release/ModLoader.lib
-                ./build/DllProxy/Release/version.dll
+                ./build/ModLoader.dll
+                ./build/ModLoader.lib
+                ./build/DllProxy/version.dll
+
     release:
         needs: build
         runs-on: ubuntu-latest
@@ -38,9 +55,11 @@ jobs:
               run: |
                 DATE_TAG="v$(date +'%Y%m%d.%H%M')"
                 echo "TAG_NAME=$DATE_TAG" >> $GITHUB_ENV
-                echo "{tag}=$DATE_TAG"
+                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
@@ -49,33 +68,7 @@ jobs:
                 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
-
-            - name: Upload ModLoader.lib
-              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.lib"
-                asset_name: ModLoader.lib
-                asset_content_type: application/octet-stream
+                files: |
+                    ./fli-modloader/ModLoader.dll
+                    ./fli-modloader/ModLoader.lib
+                    ./fli-modloader/DllProxy/version.dll

.gitignore

@@ -1,10 +1,22 @@
+#Exclude ALL FILES
 *
+#Except :
+
+# Dll Proxy
+!DllProxy
+!DllProxy/**/*
+
+# Source codes
 !include/
 !include/**/*
 !src/
 !src/**/*
-#!CMakeLists.txt
+
+# Configuration and documentation
+!CMakeLists.txt
+!.clangd
 !README.md
+
+# Git Action
 !.github/
-!.github/**/*
-!version_proxy.def
+!.github/**/*

CMakeLists.txt

@@ -5,42 +5,28 @@ set(VERSION 1.00)
 option(MLDEBUG "Enable ModLoader debug code" ON)
 
 add_subdirectory(DllProxy)
-add_library(${PROJECT_NAME} SHARED src/ModLoader.cpp)
+add_library(${PROJECT_NAME} SHARED)
 
-set_target_properties(${PROJECT_NAME} PROPERTIES
-    OUTPUT_NAME "ModLoader"
-    CXX_STANDARD 20
-    CXX_STANDARD_REQUIRED YES
-)
-
-target_compile_definitions(${PROJECT_NAME} PRIVATE MLCOMPILED)
-target_compile_definitions(${PROJECT_NAME} PRIVATE MLVERSION=${VERSION})
+set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "ModLoader" CXX_STANDARD 20 CXX_STANDARD_REQUIRED YES)
+target_compile_definitions(${PROJECT_NAME} PRIVATE MLCOMPILED 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
-)
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    target_compile_options(${PROJECT_NAME} PRIVATE 
+        "-Wno-inconsistent-dllimport"
+        "-Wno-dllimport-static-field-def"
+        /EHsc /GS /MD
+    )
+endif()
 
-target_link_libraries(${PROJECT_NAME} PUBLIC
-    user32
-    kernel32
-)
 
-target_sources(${PROJECT_NAME} PRIVATE src/Lib/miniz.c)
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/miniz)
-target_compile_definitions(${PROJECT_NAME} PRIVATE MZ_ZIP_READER_ONLY)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_link_libraries(${PROJECT_NAME} PRIVATE user32 kernel32)
 
 file(GLOB_RECURSE PROJECT_SOURCE "src/*.cpp")
-target_sources(${PROJECT_NAME} PUBLIC
-    ${PROJECT_SOURCE}
-)
+target_sources(${PROJECT_NAME} PUBLIC src/Lib/miniz.c ${PROJECT_SOURCE})

DllProxy/CMakeLists.txt

@@ -1,26 +1,24 @@
 cmake_minimum_required(VERSION 3.16)
 project(DllProxy LANGUAGES CXX C)
 
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
 add_library(${PROJECT_NAME} SHARED src/dllmain.cpp) 
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
     OUTPUT_NAME "version"
-    CXX_STANDARD 17
+    CXX_STANDARD 20
     CXX_STANDARD_REQUIRED YES
+    LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/version_proxy.def"
 )
 
 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_compile_definitions(${PROJECT_NAME} PRIVATE WIN32_LEAN_AND_MEAN)
 target_link_libraries(${PROJECT_NAME} PUBLIC
     user32
     kernel32
+    shlwapi
 )
 
 file(GLOB_RECURSE PROJECT_SOURCE "src/*.cpp")

DllProxy/src/dllmain.cpp

@@ -1,9 +1,5 @@
-#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <Shlwapi.h>
-#pragma comment(lib, "Shlwapi.lib")
-#pragma comment(linker, "/DLL")
-
 static HMODULE hOriginal = NULL;
 
 // If needed we can load multiple DLLs

README.md

@@ -1,6 +1,6 @@
 # Fantasy Life I Mod Loader
 > [!IMPORTANT]
-> HEY!!! This mod loader is currently under development.. Somes features work (about 20%-30%??) but some things might break if you try weird stuff, that said, if you take your time and experiment a little you can already pull off some pretty cool things
+> HEY!!! This mod loader is currently under development.. Somes features work (about 25%-35%??) but some things might break if you try weird stuff, that said, if you take your time and experiment a little you can already pull off some pretty cool things
 > If you're interested in supporting the project, contributions are welcome! Feel free to open a Pull Request!!
 
 ### How to install the Mod Loader
@@ -53,3 +53,19 @@ Fantasy Life I/
             ├── MyMod.fliarchive
             └── OtherMod.fliarchive 
 ```
+
+### Build the ModLoader
+
+>[!WARNING]
+> Use LLVM 21.1.3 OR HIGHER
+
+```bash
+    $ cmake -B build -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DMLDEBUG=OFF
+```
+> [!NOTE]  
+> For debugging you might need to set `MLDEBUG` to `ON`: `-DMLDEBUG=OFF`
+> This is only needed if you require PDB files, otherwise keep this option off.
+
+```bash
+    $ cmake --build build --config Release
+```