Update how to load mods

Author: dani0105

ModLoader/Loader.cs

@@ -1,14 +1,13 @@
-using SFS;
-using HarmonyLib;
+using HarmonyLib;
 using UnityEngine;
 using SFS.IO;
 using System.Collections.Generic;
 using System;
-using System.Linq.Expressions;
-using SFS.Builds;
 using System.Reflection;
 using UnityEngine.SceneManagement;
 using UnityEngine.Events;
+using System.IO;
+using System.Text.RegularExpressions;
 
 namespace ModLoader
 {
@@ -18,58 +17,68 @@ namespace ModLoader
     public class Loader : MonoBehaviour
     {
 
+        // This save Loader instance
+        public static Loader main;
 
-        // This is de main logger, use this to show message in console
-        public static ModConsole logger;
+        // This save the gameObject that implement Loader class
+        public static GameObject root;
 
-        private static Harmony patcher;
+        private static FolderPath _modsFolder;
 
-        // Thiss save Loader instance
-        public static Loader modLoader;
+        private const string modLoderVersion = "v1.1.0";
 
-        // This save the gameObject that implement Loader class
-        public static GameObject root;
-        public static BaseAssigner baseAssigner;
+        public static FolderPath ModsFolder
+        {
+            get
+            {
+                return _modsFolder;
+            }
+        }
 
         // List of all mods loaded in the folder MODS
-        private SFSMod[] modList;
+        private SFSMod[] _modList;
+        /*public SFSMod[] ModList
+        {
+            get
+        }*/
 
-        public Loader()
+        private void Awake()
         {
-            Loader.logger = new ModConsole();
-            Loader.modLoader = this;
+            Loader.main = this;
+            this._modList = new SFSMod[] { };
+            this.suscribeOnChangeScene(this.OnSceneLoaded);
+            _modsFolder = FileLocations.BaseFolder.Extend("MODS").CreateFolder();
         }
 
-        public void Awake()
+        private void Start()
         {
-            this.modList = new SFSMod[] { };
-            Loader.logger.log("Loading Mods", "ModLoader");
-            
-            // If not existe is created and pass FolderPath
-            FolderPath modFolder = FileLocations.BaseFolder.Extend("MODS").CreateFolder();
-            
-            // get list of files into MODS folder
-            IEnumerable<FilePath> files = modFolder.GetFilesInFolder(false);
-            foreach (FilePath file in files)
+            IEnumerable<FolderPath> modsFolders =  _modsFolder.GetFoldersInFolder(false);
+            string basePath = Path.Combine(FileLocations.BaseFolder, "MODS");
+            Debug.Log("Reading Mods");
+            Debug.LogError(new Exception("Error custom"));
+
+            foreach (FolderPath folder in modsFolders)
             {
-                // get only dll files in mods folder
-                if (file.Extension == "dll")
+                string fileModPath = Path.Combine(basePath, folder.FolderName, folder.FolderName+".dll");
+                try
+                {
+                    SFSMod mod = this.loadMod(fileModPath);
+                    this._modList.AddItem(mod);
+                    Debug.Log(mod.Name+" Loaded");
+                }
+                catch(Exception e)
                 {
-                    Loader.logger.log("Reading " + file.FileName, "ModLoader");
-                    // try to load mod
-                    this.loadMod(modFolder.GetRelativePath(file.FileName) + "/" + file.FileName);
+                    Debug.LogError("Error Reading "+folder.FolderName+" folder");
+                    Debug.LogError(e);
                 }
+                
             }
+            
         }
 
-        public SFSMod[] getModList()
-        {
-            return this.modList;
-        }
-
-        void OnEnable()
+        private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
         {
-            SceneManager.sceneLoaded += OnSceneLoaded;
+            Debug.Log("Scene change to "+scene.name);
         }
 
         public bool suscribeOnChangeScene(UnityAction<Scene, LoadSceneMode> method)
@@ -78,59 +87,80 @@ public bool suscribeOnChangeScene(UnityAction<Scene, LoadSceneMode> method)
             return true;
         }
 
-        void OnSceneLoaded(Scene scene, LoadSceneMode mode)
-        {
-            logger.log("scene change to "+ scene.name, "ModLoader");
-        }
-
-        private void loadMod(string path)
+        private SFSMod loadMod(string path)
         {
             Assembly assembly = Assembly.LoadFrom(path);
             SFSMod mod = null;
-            logger.log("Searching SFSMod interface", "ModLoader");
-            // we search SFSMod interface in dll file dounede in MODS folder
+
             foreach (Type typeClass in assembly.GetTypes())
             {
-                Type inteface = typeClass.GetInterface(typeof(SFSMod).Name);
-                if(inteface == null)
+                if (typeClass.IsSubclassOf(typeof(SFSMod)))
                 {
-                    continue;
+                    mod = (Activator.CreateInstance(typeClass) as SFSMod);
+                    break;
                 }
-                mod = (Activator.CreateInstance(typeClass) as SFSMod);                 
+                
             }
-            
-            if (mod == null)
+
+            if(mod == null)
             {
-                logger.log("File " + path + " don't have SFSMod interface","ModLoader");
-                return;
+                throw new Exception("SFSmod class not found");
             }
 
-            Loader.logger.log("SFSMod interface found", "ModLoader");
-
-            try
+            if (verifyModLoaderVersion(mod.ModLoderVersion))
             {
-                logger.log("Loading " + mod.getModName(), mod.getModAuthor());
-
-                // execute entry point of mod
+                mod.loadAssets();
                 mod.load();
-                logger.log("Loaded " + mod.getModName(), mod.getModAuthor());
-                this.modList.AddItem(mod);
+
+                return mod;
             }
-            catch( Exception e)
+            throw new Exception(mod.Name+" need ModLoader " + mod.Version);
+        }
+
+        /// <summary>
+        /// get if the mod have a valid version format and valid version for this modloader version
+        /// </summary>
+        /// <param name="version"> mod version</param>
+        /// <returns>true if valid version</returns>
+        private bool verifyModLoaderVersion(string version)
+        {
+            Regex rx = new Regex(@"\bv([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9]|x).([0-9]|[1-9][0-9]|x)\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            // have the formal v1.x.x
+            if (rx.IsMatch(version))
             {
-                logger.log("Error loading " + mod.getModName(), mod.getModAuthor());
-                logger.logError(e);
+                string[] modVersion = version.Split('.');
+                string[] target = modLoderVersion.Split('.');
+                
+                if(modVersion.Length == target.Length)
+                {
+                    for (short index = 0; index < target.Length; index++)
+                    {
+                        if (modVersion[index] == "x")
+                        {
+                            continue;
+                        }
+                        if (modVersion[index] != target[index])
+                        {
+                            return false;
+                        }
+                    }
+                    // have the format and is valid version for this modloader version
+                    return true; 
+
+                }
+               
             }
-        }
+            return false;
+        } 
 
         /// <summary>
         /// This is the mod loader entry point, this is the method execute after be injected in the game
         /// </summary>
         /// <param name="args"></param>
         public static void Main(string[] args)
         {
-            Loader.patcher = new Harmony("SFS.mod.loader");
-            Loader.patcher.PatchAll();
+            Harmony patcher = new Harmony("SFS.mod.loader");
+            patcher.PatchAll();
         }
     }