add option to not load burrials from particles + fix laod api key from other mods

2 files changed, 8 insertions, 7 deletions

diff --git a/features/events/index.js b/features/events/index.js
index 5af1b09..58c408b 100644
--- a/features/events/index.js
+++ b/features/events/index.js
@@ -37,6 +37,7 @@ class Events extends Feature {
         this.burrialWaypointsPath = new ToggleSetting("Pathfind waypoints", "Calculate a path thru all the waypoints", true, "burrial_waypoints_path", this).requires(this.burrialWaypointsEnabled)
         this.onlyShowPath = new ToggleSetting("Only show waypoint path", "For if u want to use other mod waypoints + soopy path", false, "burrial_waypoints_only_path", this).requires(this.burrialWaypointsPath)
         this.burrialWaypointsNearest = new ToggleSetting("Show nearest using pathfinding", "Use pathfinding to highlight the next burrial instead of disance", true, "burrial_nearest_path", this).requires(this.burrialWaypointsEnabled)
+        this.loadFromParticles = new ToggleSetting("Load burrials from particles", "Will load particles from burrows in the world", true, "burrial_from_partles", this).requires(this.burrialWaypointsEnabled)
 
         this.updateTimerEnabled = new ToggleSetting("Show API update timer", "Shows a countdown till the burrial waypoints will be next updated", true, "burrial_timer", this).requires(this.burrialWaypointsEnabled)
         this.updateTimer = new HudTextElement()
@@ -279,7 +280,7 @@ class Events extends Feature {
                 }
             }
         }
-        if(this.showingWaypoints){
+        if(this.showingWaypoints && this.loadFromParticles.getValue()){
             let foundEnchant = false
             let foundCrit = false
             let foundStep = false
diff --git a/features/globalSettings/index.js b/features/globalSettings/index.js
index 47ed125..14f51bd 100644
--- a/features/globalSettings/index.js
+++ b/features/globalSettings/index.js
@@ -33,7 +33,7 @@ class Hud extends Feature {
         this.apiKeySetting = new TextSetting("Api Key", "Your hypixel api key", "", "api_key", this, "Run /api new to load", true)
         this.verifyApiKey = new ButtonSetting("Verify api key", "Click this to make sure the api key is working", "verify_key", this, "Click!", this.verifyKey2, undefined)
         this.newApiKey = new ButtonSetting("Run /api new", "This is here so u dont need to exit and re-enter", "api_new_command", this, "Click!", this.apiNewCommand, undefined)
-        this.findApiKey = new ButtonSetting("Attempt to load api key from other mods", "This will scan other mods configs to attempt to find your key", "find_key", this, "Click!", this.findKey, undefined)
+        this.findApiKey = new ButtonSetting("Attempt to load api key from other mods", "This will scan other mods configs to attempt to find your key", "find_key", this, "Click!", ()=>{this.findKey()}, undefined)
 
 
         // this.notifyNewVersion = new ToggleSetting("Notify when there is a new update", "Will notify you when there is a new version of soopyv2 avalible for download", false, "notify_update", this)
@@ -185,7 +185,7 @@ class Hud extends Feature {
                 let testKey = JSON.parse(new JavaString(Files.readAllBytes(Paths.get("./config/notenoughupdates/configNew.json")))).apiKey.apiKey
                 if(testKey){
                     if(this.verifyKey(testKey)){
-                        this.module.apiKeySetting.setValue(testKey)
+                        this.apiKeySetting.setValue(testKey)
                         new Notification("§aSuccess!", ["Found api key in NotEnoughUpdates!"])
                         return;
                     }else{
@@ -199,7 +199,7 @@ class Hud extends Feature {
                 let testKey = JSON.parse(new JavaString(Files.readAllBytes(Paths.get("./config/SkyblockExtras.cfg")))).values.apiKey
                 if(testKey){
                     if(this.verifyKey(testKey)){
-                        this.module.apiKeySetting.setValue(testKey)
+                        this.apiKeySetting.setValue(testKey)
                         new Notification("§aSuccess!", ["Found api key in SkyblockExtras!"])
                         return;
                     }else{
@@ -218,7 +218,7 @@ class Hud extends Feature {
                 })
                 if(testKey){
                     if(this.verifyKey(testKey)){
-                        this.module.apiKeySetting.setValue(testKey)
+                        this.apiKeySetting.setValue(testKey)
                         new Notification("§aSuccess!", ["Found api key in Skytils!"])
                         return;
                     }else{
@@ -232,7 +232,7 @@ class Hud extends Feature {
                 let testKey = FileLib.read("soopyAddonsData", "apikey.txt")
                 if(testKey){
                     if(this.verifyKey(testKey)){
-                        this.module.apiKeySetting.setValue(testKey)
+                        this.apiKeySetting.setValue(testKey)
                         new Notification("§aSuccess!", ["Found api key in old soopyaddons version!"])
                         return;
                     }else{
@@ -246,7 +246,7 @@ class Hud extends Feature {
                 let testKey = JSON.parse(FileLib.read("HypixelApiKeyManager", "localdata.json")).key
                 if(testKey){
                     if(this.verifyKey(testKey)){
-                        this.module.apiKeySetting.setValue(testKey)
+                        this.apiKeySetting.setValue(testKey)
                         new Notification("§aSuccess!", ["Found api key in HypixelApiKeyManager!"])
                         return;
                     }else{