Apply to suggestions v2 kek

darkbot-reloaded · Oct 16, 2024 · 43f3b33 · 43f3b33
1 parent 3c1f98a
commit 43f3b33
Showing 1 changed file with 48 additions and 42 deletions.
diff --git a/src/main/java/com/github/manolo8/darkbot/core/manager/PetManager.java b/src/main/java/com/github/manolo8/darkbot/core/manager/PetManager.java
@@ -41,6 +41,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -67,11 +68,11 @@ public class PetManager extends Gui implements PetAPI {
     private Ship target;
     private boolean enabled = false;
 
-    private final FlashList<Gear> gearList = FlashList.ofArray(() -> new Gear(false));
+    private final FlashList<Gear> gearList = FlashList.ofArray(Gear::new);
     private final List<PetGear> newGears = new ArrayList<>();
 
     private final FlashListLong locatorWrapper = FlashListLong.ofArray();
-    private final FlashList<Gear> locatorList = FlashList.ofArray(() -> new Gear(true)).noAuto();
+    private final FlashList<SubGear> locatorList = FlashList.ofArray(SubGear::new).noAuto();
 
     private final List<Integer> petBuffsIds = new ArrayList<>();
 
@@ -81,7 +82,7 @@ public class PetManager extends Gui implements PetAPI {
 
     private ModuleStatus selection = ModuleStatus.NOTHING;
     private Gear currentModule;   // The Module used, like Passive mode, kamikaze, or enemy locator
-    private Gear currentSubModule;// The submodule used, like an npc inside enemy locator.
+    private SubGear currentSubModule;// The submodule used, like an npc inside enemy locator.
     private long validUntil;
     private NpcInfo selectedNpc;
 
@@ -296,7 +297,7 @@ public void update() {
     }
 
     private void updateSelectedLocatorNpc() {
-        Gear subModule = getCurrentSubModule();
+        SubGear subModule = currentSubModule;
         FakeNpc petPing = main.mapManager.entities.fakeNpc;
 
         if (subModule == null) {
@@ -359,8 +360,8 @@ private void updateCurrentModule(long elementsListAddress) {
         currentSubmodules.clear();
         currentModule = findGear(gearList, currGearCheck);
         if (currentModule == null) {
-            Gear current = null;
-            for (Gear gear : locatorList) {
+            SubGear current = null;
+            for (SubGear gear : locatorList) {
                 if (gear.check == currGearCheck) {
                     current = gear;
                     currentSubmodules.add(gear.id);
@@ -443,6 +444,7 @@ public Integer getGearOverride() {
 
         return locatorList.stream()
                 .map(gear -> gear.npcInfo)
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
     }
 
@@ -680,20 +682,51 @@ public Optional<Location> getLocatorNpcLoc() {
         return Optional.empty();
     }
 
-    public class Gear extends Reporting implements Point, LocatorPick {
-        public int id, parentId;
-        public long check;
-        public String name, fuzzyName;
-
+    public class SubGear extends Gear implements LocatorPick {
         private NpcInfo npcInfo;
+        private String fuzzyName;
 
-        private final SpriteObject sprite = new SpriteObject();
-        private final boolean submodule;
+        @Override
+        public boolean updateAndReport() {
+            boolean updated = super.updateAndReport();
+            if (updated) {
+                this.fuzzyName = Strings.fuzzyMatcher(name);
+                this.npcInfo = main.config.LOOT.NPC_INFOS.values().stream()
+                        .filter(npcInfo -> npcInfo.getFuzzyName().equals(fuzzyName))
+                        .findAny().orElse(null);
+            }
+
+            return updated;
+        }
 
-        public Gear(boolean submodule) {
-            this.submodule = submodule;
+        @Override
+        public eu.darkbot.api.config.types.@Nullable NpcInfo getNpcInfo() {
+            return npcInfo;
         }
 
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public String getFuzzyName() {
+            return fuzzyName;
+        }
+
+        @Override
+        public int getId() {
+            return id;
+        }
+    }
+
+    public static class Gear extends Reporting implements Point {
+        public int id, parentId;
+        public long check;
+        public String name;
+
+        private final SpriteObject sprite = new SpriteObject();
+
         @Override
         public boolean updateAndReport() {
             sprite.update(address);
@@ -708,15 +741,8 @@ public boolean updateAndReport() {
             this.id = id;
             this.parentId = parentId;
             this.name = name;
-            this.fuzzyName = Strings.fuzzyMatcher(name);
             this.check = readLong(208, 152, 16);
 
-            if (submodule) {
-                this.npcInfo = main.config.LOOT.NPC_INFOS.values().stream()
-                        .filter(npcInfo -> npcInfo.getFuzzyName().equals(fuzzyName))
-                        .findAny().orElse(null);
-            }
-
             return true;
         }
 
@@ -738,26 +764,6 @@ public void setModule(long gearsSprite) {
             Main.API.callMethodChecked(true, "23(hide)(26)008211400",
                     152, Main.API.readLong(gearsSprite, 176));
         }
-
-        @Override
-        public eu.darkbot.api.config.types.@Nullable NpcInfo getNpcInfo() {
-            return npcInfo;
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public String getFuzzyName() {
-            return fuzzyName;
-        }
-
-        @Override
-        public int getId() {
-            return id;
-        }
     }
 
     @Override