Fixed "find/collect/see/install/etc X number of something" achievements not completing.

Author: wispborne

CHANGELOGS.md

@@ -1,8 +1,13 @@
 Version 1.5.6
+
 **MagicCampaign**
-- Fixed a bug since 2022 where `MagicCampaign.loadVariant` did not load `permaMods`/`sMods` correctly (reported by arbiter787).
+- Fixed a bug from 2022 where `MagicCampaign.loadVariant` did not load `permaMods`/`sMods` correctly (reported by arbiter787).
+
+**MagicAchievements**
+- Fixed "find/collect/see/install/etc X number of something" achievements not completing.
 
 Version 1.5.5
+
 **MagicAchievements**
 - sorry
 - Fixed achievements file not getting created if missing.

jars/MagicLib.jar

@@ -19,7 +19,7 @@ public class MagicTargetListAchievement extends MagicAchievement {
     protected String KEY = "magictargetlist_targets";
 
     public Map<String, Data> getTargets() {
-        Object obj = getMemory().get(KEY);
+        Object obj = getAchievementMemory().get(KEY);
 
         if (obj == null) {
             return new HashMap<>();
@@ -30,7 +30,7 @@ public Map<String, Data> getTargets() {
                 JSONObject jsonTargets = (JSONObject) obj;
                 Map<String, Data> result = new HashMap<>(jsonTargets.length());
 
-                for (Iterator it = jsonTargets.keys(); it.hasNext(); ) {
+                for (var it = jsonTargets.keys(); it.hasNext(); ) {
                     String key = (String) it.next();
                     JSONObject jsonData = jsonTargets.getJSONObject(key);
                     result.put(key, new Data(jsonData.getString(Data.DISPLAY_NAME), jsonData.getBoolean(Data.IS_COMPLETE)));
@@ -85,7 +85,7 @@ public void setTargets(Map<String, String> targets) {
             savedTargets.remove(key);
         }
 
-        getMemory().put(KEY, savedTargets);
+        getAchievementMemory().put(KEY, savedTargets);
     }
 
     /**
@@ -100,7 +100,7 @@ public void addTarget(String targetKey, String displayName) {
         if (savedTargets.containsKey(targetKey)) return;
 
         savedTargets.put(targetKey, new Data(displayName));
-        getMemory().put(KEY, savedTargets);
+        getAchievementMemory().put(KEY, savedTargets);
     }
 
     /**
@@ -126,7 +126,7 @@ public void setTargetComplete(String targetKey, boolean isComplete) {
             savedTargets.put(targetKey, new Data(targetKey, isComplete));
         }
 
-        getMemory().put(KEY, savedTargets);
+        getAchievementMemory().put(KEY, savedTargets);
     }
 
     @Override
@@ -138,7 +138,7 @@ public void advanceAfterInterval(float amount) {
             return;
 
         // If all targets are complete, complete the achievement.
-        if (shouldComplete(targets)) return;
+        if (!shouldComplete(targets)) return;
 
         completeAchievement();
         saveChanges();
@@ -150,13 +150,14 @@ public void advanceInCombat(float amount, List<InputEventAPI> events, boolean is
         super.advanceInCombat(amount, events, isSimulation);
 
         if (isSimulation) return;
+        if (isComplete()) return;
 
         Map<String, Data> targets = getTargets();
 
         if (targets.isEmpty())
             return;
 
-        if (shouldComplete(targets)) return;
+        if (!shouldComplete(targets)) return;
 
         completeAchievement();
         saveChanges();
@@ -181,10 +182,10 @@ public boolean shouldComplete(Map<String, Data> targets) {
 
         for (Data data : targets.values()) {
             if (!data.isComplete) {
-                return true;
+                return false;
             }
         }
-        return false;
+        return true;
     }
 
     @Override
@@ -214,12 +215,7 @@ public void createTooltip(@NotNull TooltipMakerAPI tooltipMakerAPI, boolean isEx
 
         tooltipMakerAPI.setBulletedListMode("  -  ");
         List<Data> values = new ArrayList<>(getTargets().values());
-        Collections.sort(values, new Comparator<Data>() {
-            @Override
-            public int compare(Data o1, Data o2) {
-                return o1.displayName.compareTo(o2.displayName);
-            }
-        });
+        values.sort(Comparator.comparing(o -> o.displayName));
 
         for (Data data : values) {
             tooltipMakerAPI.addPara(data.displayName, data.isComplete ? Misc.getTextColor() : Misc.getNegativeHighlightColor(), 0f);