Cleanup

mr-phazer · Nov 24, 2024 · f5bbb30 · f5bbb30
1 parent c47aef4
commit f5bbb30
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 26 deletions.
diff --git a/Shared/SharedCore/PackFiles/PackFileContainerLoader.cs b/Shared/SharedCore/PackFiles/PackFileContainerLoader.cs
@@ -9,7 +9,7 @@ namespace Shared.Core.PackFiles
 {
     public interface IPackFileContainerLoader
     {
-        PackFileContainer Load(string packFileSystemPath);
+        PackFileContainer? Load(string packFileSystemPath);
         PackFileContainer? LoadAllCaFiles(GameTypeEnum gameEnum);
         PackFileContainer LoadSystemFolderAsPackFileContainer(string packFileSystemPath);
     }
@@ -58,7 +58,7 @@ void AddFolderContentToPackFile(PackFileContainer container, string folderPath,
                 AddFolderContentToPackFile(container, folder, rootPath);
         }
 
-        public PackFileContainer Load(string packFileSystemPath)
+        public PackFileContainer? Load(string packFileSystemPath)
         {
             try
             {

diff --git a/Shared/SharedCore/ToolCreation/EditorDatabase.cs b/Shared/SharedCore/ToolCreation/EditorDatabase.cs
@@ -6,33 +6,9 @@
 
 namespace Shared.Core.ToolCreation
 {
-    public class EditorInfo
-    {
-        public record ExtentionInfo(string Extention, int Priority);
 
-        public EditorInfo(EditorEnums editorEnum, Type view, Type viewModel)
-        {
-            EditorEnum = editorEnum;
-            View = view;
-            ViewModel = viewModel;
-        }
-        public List<ExtentionInfo> Extensions { get; set; } = new List<ExtentionInfo>();
-        public List<string> FolderRules { get; set; } = new List<string>();
-        public string ToolbarName { get; set; } = "";
-        public bool AddToolbarButton { get; set; } = false;
-        public bool IsToolbarButtonEnabled { get; set; } = false;
-        public EditorEnums EditorEnum { get; }
-        public Type View { get; }
-        public Type ViewModel { get; }
-    }
 
 
-    public static class EditorPriorites
-    {
-        public static int Low => 0;
-        public static int Default => 50;
-        public static int High => 100;
-    }
 
     public interface IEditorDatabase
     {

diff --git a/Shared/SharedCore/ToolCreation/EditorInfoBuilder.cs b/Shared/SharedCore/ToolCreation/EditorInfoBuilder.cs
@@ -1,5 +1,32 @@
 namespace Shared.Core.ToolCreation
 {
+    public class EditorInfo
+    {
+        public record ExtentionInfo(string Extention, int Priority);
+
+        public EditorInfo(EditorEnums editorEnum, Type view, Type viewModel)
+        {
+            EditorEnum = editorEnum;
+            View = view;
+            ViewModel = viewModel;
+        }
+        public List<ExtentionInfo> Extensions { get; set; } = new List<ExtentionInfo>();
+        public List<string> FolderRules { get; set; } = new List<string>();
+        public string ToolbarName { get; set; } = "";
+        public bool AddToolbarButton { get; set; } = false;
+        public bool IsToolbarButtonEnabled { get; set; } = false;
+        public EditorEnums EditorEnum { get; }
+        public Type View { get; }
+        public Type ViewModel { get; }
+    }
+
+    public static class EditorPriorites
+    {
+        public static int Low => 0;
+        public static int Default => 50;
+        public static int High => 100;
+    }
+
     public class EditorInfoBuilder
     {
         protected EditorInfo _instance;