Merge pull request #18 from ReDevCafe/dev

Author: EltyDev

CMakeLists.txt

@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.6)
-PROJECT(FantasyLifeI-ModLoader LANGUAGES CXX C)
+cmake_minimum_required(VERSION 3.10)
+project(FantasyLifeI-ModLoader LANGUAGES CXX C)
 
 set(VERSION 1.00)
 option(MLDEBUG "Enable ModLoader debug code" ON)

README.md

@@ -6,15 +6,16 @@
 ### How to install the Mod Loader
 1. Locate your game's binaries folder
 ```mathematica
-Fantasy Life I/Game/Binaries/Win64
-                                │
-                            [ THIS ONE ]
+Fantasy Life I/
+└── Game/
+    └── Binaries/
+        └── Win64 ← [ THIS ONE]
 ```
 2. Place **both** of the following files into that folder:
 - `ModLoader.dll`
 - `version.dll`
 > [!IMPORTANT]
-> `ModLoader.dll` and `version.dll` can be built from source or downloaded from our [release](https://github.com/AmeliaCute/FantasyLifeI-ModLoader/releases)
+> `ModLoader.dll` and `version.dll` can be built from source or downloaded from our [release](https://github.com/ReDevCafe/FantasyLifeI-API/releases)
 
 Your directory should now look like:
 ```mathematica
@@ -24,7 +25,7 @@ Fantasy Life I/
         └── Win64/
             ├── NFL1-Win64-Shipping.exe
             ├── ModLoader.dll
-            └── version.dll
+            ├── version.dll
 ```
 3. When you launch Fantasy Life I, the mod loader will automatically start alongside the game
 
@@ -33,27 +34,29 @@ Fantasy Life I/
 > If you're interested in making your own mods for Fantasy Life I, there's a ready-to-use template available here:
 > [Fantasy Life I Mod Template](https://github.com/ReDevCafe/FantasyLifeI-ModTemplate)
 
-1. At the root of your game install directory, create a folder named `Mods` if it doesn't already exist:
+1. Inside the Game/Contents directory of your game installation, create a folder named `Mods` if it doesn't already exist:
 ```mathematica
 Fantasy Life I/
-├── Mods/
 └── Game/
-    └── Binaries/...
+    └── Contents/
+        └── 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 chaance the developer messed up their export. <br />
+> 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 />
 
 Example layout:
 ```mathematica
 Fantasy Life I/
-└── Mods/
-    ├── MyMod/     
-    │   ├── Mod.json 
-    │   └── MyMod.mod
-    └── OtherMod/... 
+└── Game/
+    └── Contents/
+        └── Mods/
+            ├── MyMod/     
+            │   ├── Mod.json 
+            │   └── MyMod.mod
+            └── OtherMod/... 
 ```

include

@@ -102,26 +102,26 @@ int ModEnvironnement::SetupEnvironnement(std::string modDirs)
     std::vector<ModObject*> tempModList;
     for (const auto& entry : std::filesystem::directory_iterator(modDirs))
     {
-        if (!std::filesystem::is_directory(entry))
-        {
-            ModLoader::logger->error("Invalid object inside the mods folder");
-            return 0;
+        std::filesystem::path entryPath = entry.path();
+        if (!std::filesystem::is_directory(entry)) 
+        {   
+            ModLoader::logger->verbose("Invalid entry: ", entryPath);
+            continue; // Just skip it
         }
 
-        std::filesystem::path entryPath = entry.path();
         std::filesystem::path modJsonPath = entryPath / "Mod.json";
         if (!std::filesystem::exists(modJsonPath))
         {
-            ModLoader::logger->error("Invalid mod packet inside of",  entryPath, " Missing: ", modJsonPath);
-            return 0;
+            ModLoader::logger->warn("Invalid mod packet inside of ",  entryPath, " Missing: ", modJsonPath);
+            continue;
         }
 
         ModObject* mod = new ModObject(parseModMeta(modJsonPath), entryPath);
         std::filesystem::path modLibPath = entryPath / (mod->getMeta().name + ".mod");
         if (!std::filesystem::exists(modLibPath))
         {
-            ModLoader::logger->error("Invalid mod packet inside of",  entryPath, " Missing: ", modLibPath);
-            return 0;
+            ModLoader::logger->warn("Invalid mod packet inside of ",  entryPath, " Missing: ", modLibPath);
+            continue;
         }
 
         tempModList.push_back(mod);

src/ModEnvironnement.cpp

@@ -17,7 +17,7 @@ DWORD WINAPI ModLoader::init(LPVOID lpParam) {
     gameData->initOthersData();
 
     gameCache = new GameCache();
-    modEnvironnement = new ModEnvironnement("../../../Mods");
+    modEnvironnement = new ModEnvironnement("../../Content/Mods");
     modEnvironnement->PreLoad();
 
     gameCache->PostLoadCache();