clear currentIndexMap when stopping in ListButton and ListMask

Author: HSGamer

button/src/main/java/io/github/projectunified/craftux/button/ListButton.java

@@ -48,7 +48,7 @@ public boolean apply(@NotNull UUID uuid, @NotNull ActionItem actionItem) {
             return buttons.get(currentIndexMap.get(uuid)).apply(uuid, actionItem);
         }
 
-        for (int i = 0; i < getButtons().size(); i++) {
+        for (int i = 0; i < buttons.size(); i++) {
             Button button = buttons.get(i);
             if (button.apply(uuid, actionItem)) {
                 currentIndexMap.put(uuid, i);
@@ -58,4 +58,10 @@ public boolean apply(@NotNull UUID uuid, @NotNull ActionItem actionItem) {
 
         return false;
     }
+
+    @Override
+    public void stop() {
+        super.stop();
+        currentIndexMap.clear();
+    }
 }

mask/src/main/java/io/github/projectunified/craftux/mask/ListMask.java

@@ -8,20 +8,62 @@
 
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
 /**
  * The mask with a list of child masks
  */
 public class ListMask extends MultiMask<Mask> {
+    private final Map<UUID, Integer> currentIndexMap = new ConcurrentHashMap<>();
+    private boolean keepCurrentIndex = false;
+
+    /**
+     * Should the mask keep the current index for the unique id?
+     *
+     * @return true if it should
+     */
+    public boolean isKeepCurrentIndex() {
+        return keepCurrentIndex;
+    }
+
+    /**
+     * Should the mask keep the current index for the unique id?
+     *
+     * @param keepCurrentIndex true if it should
+     */
+    public void setKeepCurrentIndex(boolean keepCurrentIndex) {
+        this.keepCurrentIndex = keepCurrentIndex;
+    }
+
+    /**
+     * Remove the current index for the unique id
+     *
+     * @param uuid the unique id
+     */
+    public void removeCurrentIndex(UUID uuid) {
+        this.currentIndexMap.remove(uuid);
+    }
+
     @Override
     public @Nullable Map<Position, Consumer<ActionItem>> apply(@NotNull UUID uuid) {
-        for (Mask mask : elements) {
-            Map<Position, Consumer<ActionItem>> itemMap = mask.apply(uuid);
+        if (keepCurrentIndex && currentIndexMap.containsKey(uuid)) {
+            return elements.get(currentIndexMap.get(uuid)).apply(uuid);
+        }
+
+        for (int i = 0; i < elements.size(); i++) {
+            Map<Position, Consumer<ActionItem>> itemMap = elements.get(i).apply(uuid);
             if (itemMap != null) {
+                currentIndexMap.put(uuid, i);
                 return itemMap;
             }
         }
         return null;
     }
+
+    @Override
+    public void stop() {
+        super.stop();
+        currentIndexMap.clear();
+    }
 }