Merge pull request #25 from ReDevCafe/dev

Dev

Author: AmeliaCute

.gitignore

@@ -7,5 +7,4 @@
 !README.md
 !.github/
 !.github/**/*
-!version_proxy.def
-!.gitmodule
+!version_proxy.def

.gitmodules

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

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 project(FantasyLifeI-ModLoader LANGUAGES CXX C)
 
 set(VERSION 1.00)
@@ -14,7 +14,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 )
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE MLCOMPILED)
-target_compile_definitions(${PROJECT_NAME} PRIVATE MLVERSION=\"${VERSION}\")
+target_compile_definitions(${PROJECT_NAME} PRIVATE MLVERSION=${VERSION})
 
 if(MLDEBUG)
     target_compile_definitions(${PROJECT_NAME} PRIVATE MLDEBUG)
@@ -36,8 +36,11 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
     kernel32
 )
 
-file(GLOB_RECURSE PROJECT_SOURCE "src/*.cpp")
+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)
 
+file(GLOB_RECURSE PROJECT_SOURCE "src/*.cpp")
 target_sources(${PROJECT_NAME} PUBLIC
     ${PROJECT_SOURCE}
-)
+)

DllProxy/CMakeLists.txt

@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.6)
-PROJECT(DllProxy LANGUAGES CXX C)
+cmake_minimum_required(VERSION 3.16)
+project(DllProxy LANGUAGES CXX C)
 
 add_library(${PROJECT_NAME} SHARED src/dllmain.cpp) 
 

README.md

@@ -42,21 +42,14 @@ Fantasy Life I/
         └── Mods/
 ```
 
-2. For each mod. create a subfolder inside `Mods` and drop in **both**:
-- `Mod.json`
-- The compiled mod DLL (e.g. `MyMod.mod`)
-
-> [!WARNING] 
-> Both files are required for the mod to be recognized and initialized by the mod loader so if a mod doesn't include them, there's a good chance the developer messed up their export. <br />
+2. Place your `.fliarchive` mod files inside the `Mods` directory
 
 Example layout:
 ```mathematica
 Fantasy Life I/
 └── Game/
     └── Contents/
         └── Mods/
-            ├── MyMod/     
-            │   ├── Mod.json 
-            │   └── MyMod.mod
-            └── OtherMod/... 
+            ├── MyMod.fliarchive
+            └── OtherMod.fliarchive 
 ```