Merge pull request #39 from DekuDesu/development

fixed compatibility issues with other mods, addec comprehensive debug…

Author: artyredd

MiniMapLibrary/Settings.cs

@@ -9,6 +9,13 @@
 
 namespace MiniMapLibrary
 {
+    public enum LogLevel { 
+        none,
+        info,
+        debug,
+        all
+    }
+
     public static class Settings
     {
         public static Dimension2D MinimapSize { get; set; } = new Dimension2D(100, 100);
@@ -27,14 +34,18 @@ public static class Settings
 
         public const string DefaultResourcePath = "Textures/MiscIcons/texMysteryIcon";
 
+        public static LogLevel LogLevel => _logLevel.Value;
+
+        private static IConfigEntry<LogLevel> _logLevel;
+
         static Settings()
         {
             InitializeDefaultSettings();
         }
 
         private static void InitializeDefaultSettings()
         {
-            static void AddSize(InteractableKind type, 
+            static void Add(InteractableKind type, 
                 float width = -1, 
                 float height = -1, 
                 Color ActiveColor = default, 
@@ -65,52 +76,52 @@ static void AddSize(InteractableKind type,
                 InteractibleSettings.Add(type, setting);
             }
 
-            AddSize(InteractableKind.Chest, 10, 8, 
+            Add(InteractableKind.Chest, 10, 8, 
                 description: "Chests, including shops", 
                 path: "Textures/MiscIcons/texInventoryIconOutlined");
 
-            AddSize(InteractableKind.Shrine, 
+            Add(InteractableKind.Shrine, 
                 description: "All shrines (excluding Newt)", 
                 path: "Textures/MiscIcons/texShrineIconOutlined");
 
-            AddSize(InteractableKind.Teleporter, 15, 15, 
+            Add(InteractableKind.Teleporter, 15, 15, 
                 ActiveColor: Color.white, 
                 InactiveColor: Color.green, 
                 description: "Boss teleporters",
                 path: "Textures/MiscIcons/texTeleporterIconOutlined");
 
-            AddSize(InteractableKind.Player, 8, 8, 
+            Add(InteractableKind.Player, 8, 8, 
                 ActiveColor: PlayerIconColor, 
                 InactiveColor: PlayerIconColor, 
                 description: "",
                 path: "Textures/MiscIcons/texBarrelIcon");
 
-            AddSize(InteractableKind.Barrel, 5, 5, 
+            Add(InteractableKind.Barrel, 5, 5, 
                 description: "Barrels", 
                 path: "Textures/MiscIcons/texBarrelIcon");
 
-            AddSize(InteractableKind.Drone, 7, 7, 
+            Add(InteractableKind.Drone, 7, 7, 
                 description: "Drones", 
                 path: "Textures/MiscIcons/texDroneIconOutlined");
 
-            AddSize(InteractableKind.Special, 7, 7, 
+            Add(InteractableKind.Special, 7, 7, 
                 description: "Special interactibles such as the landing pod and fans",
                 path: DefaultResourcePath);
 
-            AddSize(InteractableKind.Enemy, 3, 3, 
+            Add(InteractableKind.Enemy, 3, 3, 
                 ActiveColor: Color.red, 
                 description: "Enemies",
                 path: "Textures/MiscIcons/texBarrelIcon");
 
-            AddSize(InteractableKind.Utility, 
+            Add(InteractableKind.Utility, 
                 description: "Scrappers", 
                 path: "Textures/MiscIcons/texLootIconOutlined");
 
-            AddSize(InteractableKind.Printer, 10, 8, 
+            Add(InteractableKind.Printer, 10, 8, 
                 description: "Printers",
                 path: "Textures/MiscIcons/texInventoryIconOutlined");
 
-            AddSize(InteractableKind.LunarPod, 7, 7, 
+            Add(InteractableKind.LunarPod, 7, 7, 
                 description: "Lunar pods (chests)",
                 path: "Textures/MiscIcons/texLootIconOutlined");
         }
@@ -126,7 +137,9 @@ public static InteractibleSetting GetSetting(InteractableKind type)
             {
                 Dimensions = DefaultUIElementSize,
                 ActiveColor = DefaultActiveColor,
-                InactiveColor = DefaultInactiveColor
+                InactiveColor = DefaultInactiveColor,
+                Description = "NO_DESCRIPTION",
+                IconPath = DefaultResourcePath
             };
         }
 
@@ -152,6 +165,11 @@ public static Dimension2D GetInteractableSize(InteractableKind type)
             return DefaultUIElementSize;
         }
 
+        public static void LoadApplicationSettings(IConfig config) 
+        {
+            _logLevel = config.Bind<LogLevel>($"Settings.General", "LogLevel", LogLevel.info, "The amount of information that the minimap mod should output to the console during runtime");
+        }
+
         public static void LoadConfigEntries(InteractableKind type, IConfig config)
         {
             InteractibleSetting setting = InteractibleSettings[type];
@@ -171,18 +189,5 @@ public static void LoadConfigEntries(InteractableKind type, IConfig config)
             setting.Dimensions.Width = width.Value;
             setting.IconPath = path.Value;
         }
-
-        public static void UpdateSetting(InteractableKind type, float width, float height, Color active, Color inactive)
-        {
-            if (InteractibleSettings.ContainsKey(type))
-            {
-                var setting = InteractibleSettings[type];
-
-                setting.ActiveColor = active;
-                setting.InactiveColor = inactive;
-                setting.Dimensions.Height = height;
-                setting.Dimensions.Width = width;
-            }
-        }
     }
 }

MiniMapLibrary/SpriteManager.cs

@@ -29,11 +29,9 @@ public void Dispose()
             if (path != null)
             {
                 return GetOrCache(path);
-
-                throw new Exception($"MissingTextureException: Interactible.{type} does not have a registered texture path to load.");
             }
 
-            throw new Exception($"MissingTextureException: Interactible.{type} does not have a registered texture path to load.");
+            throw new MissingComponentException($"MissingTextureException: Interactible.{type} does not have a registered texture path to load.");
         }
 
         private Sprite? GetOrCache(string Path)
@@ -49,6 +47,10 @@ public void Dispose()
             {
                 SpriteCache.Add(Path, loaded);
             }
+            else 
+            {
+                throw new MissingComponentException($"MissingTextureException: {Path} does not exist within the streaming assets");
+            }
 
             return loaded;
         }

MiniMapMod/Log.cs

@@ -1,4 +1,5 @@
 using BepInEx.Logging;
+using MiniMapLibrary;
 
 namespace MiniMapMod
 {
@@ -11,10 +12,10 @@ internal static void Init(ManualLogSource logSource)
             _logSource = logSource;
         }
 
-        internal static void LogDebug(object data) => _logSource.LogDebug(data);
+        internal static void LogDebug(object data){ if(Settings.LogLevel > MiniMapLibrary.LogLevel.info) _logSource.LogDebug(data); }
         internal static void LogError(object data) => _logSource.LogError(data);
         internal static void LogFatal(object data) => _logSource.LogFatal(data);
-        internal static void LogInfo(object data) => _logSource.LogInfo(data);
+        internal static void LogInfo(object data) { if (Settings.LogLevel > MiniMapLibrary.LogLevel.none) _logSource.LogDebug(data); }
         internal static void LogMessage(object data) => _logSource.LogMessage(data);
         internal static void LogWarning(object data) => _logSource.LogWarning(data);
     }