Merge pull request #54 from DekuDesu/development

fixed bug where enabled/disabled icons were ignored in config

Author: artyredd

MiniMapLibrary/Scanner/DefaultSorter.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
+using MiniMapLibrary;
 
 #nullable enable
 namespace MiniMapLibrary.Scanner
@@ -13,6 +14,7 @@ public class DefaultSorter<T> : ISorter<T>
         private readonly Func<T, bool>? selector;
         private readonly Func<T, GameObject> converter;
         private readonly Func<T, bool>? activeChecker;
+        private readonly bool enabled;
 
         public DefaultSorter(InteractableKind kind, 
             Func<T, GameObject> converter, 
@@ -23,9 +25,10 @@ public DefaultSorter(InteractableKind kind,
             this.selector = selector;
             this.converter = converter;
             this.activeChecker = activeChecker;
+            this.enabled = Settings.GetSetting(kind).Config.Enabled.Value;
         }
 
-        public bool IsKind(T value) => selector?.Invoke(value) ?? false;
+        public bool IsKind(T value) => enabled && (selector?.Invoke(value) ?? false);
 
         public GameObject GetGameObject(T value) => converter(value);
 

MiniMapLibrary/Scanner/SingleKindScanner.cs

@@ -17,6 +17,7 @@ public class SingleKindScanner<T> : ITrackedObjectScanner where T : MonoBehaviou
         private readonly Range3D range;
         private readonly ISpriteManager spriteManager;
         private readonly Func<float> playerHeightRetriver;
+        private readonly bool enabled;
 
         public SingleKindScanner(InteractableKind kind, bool dynamic, IScanner<T> scanner, Range3D range, ISpriteManager spriteManager, Func<float> playerHeightRetriever, Func <T, GameObject> converter, Func<T, bool>? activeChecker = null, Func<T, bool>? selector = null)
         {
@@ -34,10 +35,17 @@ public SingleKindScanner(InteractableKind kind, bool dynamic, IScanner<T> scanne
             this.range = range ?? throw new ArgumentNullException(nameof(range));
             this.spriteManager = spriteManager ?? throw new ArgumentNullException(nameof(spriteManager));
             this.playerHeightRetriver = playerHeightRetriever;
+            enabled = Settings.GetSetting(kind).Config.Enabled.Value;
         }
 
         public void ScanScene(IList<ITrackedObject> list)
         {
+            // if the kind is disabled, don't bother scanning
+            if (enabled is false)
+            {
+                return;
+            }
+
             IEnumerable<T> foundObjects = scanner.Scan();
 
             foreach (var item in foundObjects)

MiniMapMod/MiniMapPlugin.cs

@@ -12,7 +12,7 @@
 
 namespace MiniMapMod
 {
-    [BepInPlugin("MiniMap", "Mini Map Mod", "3.3.1")]
+    [BepInPlugin("MiniMap", "Mini Map Mod", "3.3.2")]
     public class MiniMapPlugin : BaseUnityPlugin
     {
         private ISpriteManager SpriteManager;

README.md

@@ -84,6 +84,9 @@ Huge thanks to these awesome people who assisted in creating awesome features fo
 [Arcafanetiz](https://github.com/Arcafanetiz)
 
 ### Change Log
+Hotfix 3.1.2
+- fixed error that ignored icon's enabled options in config
+
 Minor 3.1.1
 - equipment drones no longer show up as equipment
 - fixed stack trace logging to be more meaningful

manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "MiniMapMod",
-  "version_number": "3.3.1",
+  "version_number": "3.3.2",
   "website_url": "https://github.com/DekuDesu",
   "description": "Adds a MiniMap to your game v3.3",
   "dependencies": [