Merge pull request #106 from nexus4880/mod-manager-changes

Mod manager changes
project-fika · Dec 13, 2024 · 6619084 · 6619084
2 parents 24f5fa8 + a0f04ae
commit 6619084
Show file tree

Hide file tree

Showing 6 changed files with 338 additions and 141 deletions.
diff --git a/Fuyu.Backend/Program.cs b/Fuyu.Backend/Program.cs
@@ -7,6 +7,7 @@
 using Fuyu.DependencyInjection;
 using Fuyu.Modding;
 using System.Threading.Tasks;
+using Fuyu.Common.Networking;
 
 namespace Fuyu.Backend
 {
@@ -22,15 +23,23 @@ static async Task Main()
             ItemFactoryService.Load();
 
             var coreServer = new CoreServer();
-            coreServer.RegisterServices();
+			container.RegisterSingleton<HttpServer, CoreServer>(coreServer);
+
+			coreServer.RegisterServices();
             coreServer.Start();
 
             var eftMainServer = new EftMainServer();
-            eftMainServer.RegisterServices();
+			container.RegisterSingleton<HttpServer, EftMainServer>(eftMainServer);
+
+			eftMainServer.RegisterServices();
             eftMainServer.Start();
 
-            await ModManager.Instance.Load(container);
-            Terminal.WaitForInput();
+            Terminal.WriteLine("Loading mods...");
+			ModManager.Instance.AddMods("./Fuyu/Mods");
+			await ModManager.Instance.Load(container);
+            Terminal.WriteLine("Finished loading mods");
+
+			Terminal.WaitForInput();
             await ModManager.Instance.UnloadAll();
         }
     }

diff --git a/Fuyu.Common/IO/Resx.cs b/Fuyu.Common/IO/Resx.cs
@@ -41,43 +41,46 @@ public static void SetSource(string id, Assembly assembly)
                 _assemblies.Add(id, assembly);
                 _fullpaths.Add(id, paths);
             }
-        }
+		}
 
-        public static Stream GetStream(string id, string path)
-        {
-            // validate assembly
-            var hasAssembly = _assemblies.TryGetValue(id, out var assembly);
+		public static Stream GetStream(string id, string path)
+		{
+			// validate assembly
+			var hasAssembly = _assemblies.TryGetValue(id, out var assembly);
 
-            if (!hasAssembly)
-            {
-                throw new ArgumentException($"Source {id} is not registered for assemblies");
-            }
+			if (!hasAssembly)
+			{
+				throw new ArgumentException($"Source {id} is not registered for assemblies");
+			}
 
-            // validate fullpaths
-            var hasFullpath = _fullpaths.TryGetValue(id, out var fullpaths);
+			// validate fullpaths
+			var hasFullpath = _fullpaths.TryGetValue(id, out var fullpaths);
 
-            if (!hasFullpath)
-            {
-                throw new ArgumentException($"Source {id} is not registered for paths");
-            }
+			if (!hasFullpath)
+			{
+				throw new ArgumentException($"Source {id} is not registered for paths");
+			}
 
-            // find target
-            var target = $"{assembly.GetName().Name}.embedded.{path}";
+			// find target
+
+            // NOTE: replacing ".Resources" is, ideally, a temporary solution
+            // -- nexus4880, 2024-12-11
+			var target = $"{assembly.GetName().Name.Replace(".Resources", string.Empty)}.embedded.{path}";
 
-            foreach (var fullpath in fullpaths)
-            {
-                if (fullpath == target)
-                {
-                    // target found
-                    return assembly.GetManifestResourceStream(target);
-                }
-            }
+			foreach (var fullpath in fullpaths)
+			{
+				if (fullpath == target)
+				{
+					// target found
+					return assembly.GetManifestResourceStream(target);
+				}
+			}
 
-            // target not found
-            throw new FileNotFoundException($"Cannot find resource {path}");
-        }
+			// target not found
+			throw new FileNotFoundException($"Cannot find resource {path}");
+		}
 
-        public static string GetText(string id, string path)
+		public static string GetText(string id, string path)
         {
             using (var rs = GetStream(id, path))
             {

diff --git a/Fuyu.Common/IO/VFS.cs b/Fuyu.Common/IO/VFS.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Concurrent;
 using System.IO;
 
@@ -32,35 +33,53 @@ public static string[] GetFiles(string path)
             return Directory.GetFiles(path);
         }
 
-        public static void CreateDirectory(string path)
+        public static string[] GetFiles(string path, string pattern)
         {
-            Directory.CreateDirectory(path);
+            if (!Directory.Exists(path))
+            {
+                throw new DirectoryNotFoundException($"Directory {path} doesn't exist.");
+            }
+
+            return Directory.GetFiles(path, pattern);
         }
 
-        public static string ReadTextFile(string filepath)
+        public static string[] GetFiles(string path, string pattern, SearchOption search)
         {
-            var path = Path.GetDirectoryName(filepath);
-
-            if (!DirectoryExists(path))
+            if (!Directory.Exists(path))
             {
                 throw new DirectoryNotFoundException($"Directory {path} doesn't exist.");
             }
 
-            if (!File.Exists(filepath))
-            {
-                throw new FileNotFoundException($"File {filepath} doesn't exist.");
-            }
+            return Directory.GetFiles(path, pattern, search);
+        }
 
-            using (var fs = new FileStream(filepath, FileMode.Open, FileAccess.Read, FileShare.None))
+        public static string[] GetDirectories(string path)
+        {
+            if (!Directory.Exists(path))
             {
-                using (var sr = new StreamReader(fs))
-                {
-                    var text = sr.ReadToEnd();
-                    return text;
-                }
+                throw new DirectoryNotFoundException($"Directory {path} doesn't exist.");
             }
+
+            return Directory.GetDirectories(path);
+        }
+
+        public static void CreateDirectory(string path)
+        {
+            Directory.CreateDirectory(path);
         }
 
+        public static string ReadTextFile(string filepath)
+        {
+            using (var fs = OpenRead(filepath))
+			{
+				using (var sr = new StreamReader(fs))
+				{
+					var text = sr.ReadToEnd();
+					return text;
+				}
+			}
+		}
+
         // NOTE: we must prevent threads from accessing the same file at the
         //       same time. This way we can prevent data corruption when
         //       writing to the same file.
@@ -104,5 +123,22 @@ public static void WriteTextFile(string filepath, string text, bool append = fal
             // release thread lock
             _writeLock.TryRemove(filepath, out _);
         }
-    }
+
+		public static Stream OpenRead(string filepath)
+		{
+			var path = Path.GetDirectoryName(filepath);
+
+			if (!DirectoryExists(path))
+			{
+				throw new DirectoryNotFoundException($"Directory {path} doesn't exist.");
+			}
+
+			if (!File.Exists(filepath))
+			{
+				throw new FileNotFoundException($"File {filepath} doesn't exist.");
+			}
+
+			return new FileStream(filepath, FileMode.Open, FileAccess.Read, FileShare.None);
+		}
+	}
 }
diff --git a/Fuyu.Modding/EModType.cs b/Fuyu.Modding/EModType.cs
@@ -0,0 +1,9 @@
+namespace Fuyu.Modding
+{
+	public enum EModType
+	{
+		Invalid,
+		DLL,
+		Source
+	}
+}
diff --git a/Fuyu.Modding/Fuyu.Modding.csproj b/Fuyu.Modding/Fuyu.Modding.csproj
@@ -2,6 +2,9 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Fuyu.Common\Fuyu.Common.csproj" />
     <ProjectReference Include="..\Fuyu.DependencyInjection\Fuyu.DependencyInjection.csproj" />