Loading everything based on ModContent folder

MenuVariantsMod/BezelLoad.cs

@@ -9,16 +9,19 @@ public class BezelLoad
         public static List<CustomBezel> BezelList = new();
         public static List<string> BezelNames = new();
 
-        private static readonly string CUSTOM_BEZELS_DIR = Path.Combine("Mods", "MenuVariantsMod", "Content", "CustomBezels");
+        private static readonly string CUSTOM_BEZELS_DIR ="Content/CustomBezels";
 
-        public static void Load(FortContent content) {
-            string[] directories = Directory.GetDirectories(CUSTOM_BEZELS_DIR);
+        public static void Load(FortContent content) 
+        {
             BezelNames.Add("DEFAULT");
             BezelList = new List<CustomBezel>();
-            foreach (string customBezelPath in directories)
+
+            foreach (RiseCore.Resource resource in content[CUSTOM_BEZELS_DIR].Childrens)
             {
-                Atlas atlas = AtlasExt.CreateAtlas(content, Path.Combine(customBezelPath, "atlas.xml"), Path.Combine(customBezelPath,"atlas.png"));
-                var BezelData = Calc.LoadXML(Path.Combine(customBezelPath, "BezelData.xml"));
+                Atlas atlas = AtlasExt.CreateAtlas(content, $"{resource.Path}/atlas.xml", $"{resource.Path}/atlas.png", ContentAccess.ModContent);
+
+                RiseCore.Resource bezelDataResource = content[$"{resource.Path}/BezelData.xml"];
+                var BezelData = Calc.LoadXML(bezelDataResource.Stream);
                 var TrueBezelData = BezelData["BezelData"];
                 if (atlas == null)
                 {

MenuVariantsMod/LogoLoad.cs

@@ -7,20 +7,23 @@ namespace MenuVariantsMod
     public class LogoLoad
     {
         public static List<CustomLogo> LogoList;
+        private static readonly string CUSTOM_LOGOS_DIR = "Content/CustomLogos";
 
-        private static readonly string CUSTOM_LOGOS_DIR =  Path.Combine("Mods", "MenuVariantsMod", "Content", "CustomLogos" );
-
-        public static void Load(FortContent content) {
+        public static void Load(FortContent content) 
+        {
             MenuVariantModModule.Vanilla = new List<bool>();
             MenuVariantModModule.Vanilla.Add(true);
             MenuVariantModModule.Vanilla.Add(true);
 
-            string[] directories = Directory.GetDirectories(CUSTOM_LOGOS_DIR);
             LogoList = new List<CustomLogo>();
-            foreach (string customLogoPath in directories)
+            foreach (RiseCore.Resource resource in content[CUSTOM_LOGOS_DIR].Childrens)
             {
-                Atlas atlas = AtlasExt.CreateAtlas(content, Path.Combine(customLogoPath,"atlas.xml" ), Path.Combine(customLogoPath,"atlas.png"));
-                var LogoData = Calc.LoadXML(Path.Combine(customLogoPath, "LogoData.xml") );
+                if (resource.Childrens == null)
+                    continue;
+
+                Atlas atlas = AtlasExt.CreateAtlas(content, $"{resource.Path}/atlas.xml" , $"{resource.Path}/atlas.png", ContentAccess.ModContent);
+                RiseCore.Resource logoDataResource = content[$"{resource.Path}/LogoData.xml"];
+                var LogoData = Calc.LoadXML(logoDataResource.Stream);
                 var TrueLogoData = LogoData["LogoData"];
 
                 if (atlas == null)

MenuVariantsMod/MenuVariantsModModule.cs

@@ -16,7 +16,7 @@ public class MenuVariantModModule : FortModule
     public static MenuVariantModModule Instance;
     public static List<bool> Vanilla;
 
-    public static List<string> MenuVariantNames = new List<string>();
+    public static List<string> MenuVariantNames = new();
     public MenuVariantModModule() 
     {
         Instance = this;
@@ -29,12 +29,11 @@ public override void Load()
         On.TowerFall.Logo.ctor += MyLogo.ctor;
         typeof(ModExports).ModInterop();
     }
-
     public override void LoadContent()
     {
-        string customLogos = Path.Combine("Mods", "MenuVariantsMod", "Content", "CustomLogos");
+        string customLogos = Path.Combine("Mods", Content.MetadataPath.Replace("mod:", ""), "Content", "CustomLogos");
         Directory.CreateDirectory(customLogos);
-        string customBezels = Path.Combine("Mods", "MenuVariantsMod", "Content", "CustomBezels");
+        string customBezels = Path.Combine("Mods", Content.MetadataPath.Replace("mod:", ""), "Content", "CustomBezels");
         Directory.CreateDirectory(customBezels);
 
         MenuVariantNames.Add("ASCENSION");

MenuVariantsMod/MenuVariantsModSettings.cs

@@ -1,6 +1,5 @@
 using Monocle;
 using FortRise;
-using TowerFall;
 
 namespace MenuVariantsMod;
 

MenuVariantsMod/MyBezel.cs

@@ -5,6 +5,9 @@ public class MyBezel
 {
     public static void MyLoad() 
     {
+        if (MenuVariantModModule.Settings.BezelVariant > 0 && !BezelLoad.BezelList.Any())
+            MenuVariantModModule.Settings.BezelVariant = 0;
+
         if (MenuVariantModModule.Settings.BezelVariant > 0)
         {
             var LoadedBezel = BezelLoad.BezelList[MenuVariantModModule.Settings.BezelVariant - 1];

MenuVariantsMod/MyLogo.cs

@@ -37,6 +37,10 @@ public static void ctor(On.TowerFall.Logo.orig_ctor orig, Logo self)
         self.RemoveAll();
         var towerTarget = LogoData.Get<Vector2>("towerTarget");
         var coreTarget = LogoData.Get<Vector2>("towerTarget");
+
+        if (MenuVariantModModule.Settings.MenuVariant >= MenuVariantModModule.Vanilla.Count)
+            MenuVariantModModule.Settings.MenuVariant = 0;
+
         if (MenuVariantsMod.MenuVariantModModule.Vanilla[MenuVariantModModule.Settings.MenuVariant])
         {
             if (MenuVariantModModule.Settings.MenuVariant == 0)
@@ -135,7 +139,7 @@ public static void ctor(On.TowerFall.Logo.orig_ctor orig, Logo self)
         }
         else
         {
-            var LoadedLogo = LogoLoad.LogoList[MenuVariantModModule.Settings.MenuVariant-2];
+            var LoadedLogo = LogoLoad.LogoList[MenuVariantModModule.Settings.MenuVariant - 2];
             var atlas = LoadedLogo.Atlas;
             if (LoadedLogo.VanillaTitle)
             {