remove clear & clearAll in ArgumentProcessor

BetterGUI-MC · Oct 29, 2023 · 6a1aed6 · 6a1aed6
1 parent 8e83db2
commit 6a1aed6
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 58 deletions.
diff --git a/src/main/java/me/hsgamer/bettergui/api/argument/ArgumentProcessor.java b/src/main/java/me/hsgamer/bettergui/api/argument/ArgumentProcessor.java
@@ -42,20 +42,4 @@ public interface ArgumentProcessor extends MenuElement {
   default Pair<Optional<List<String>>, String[]> tabComplete(UUID uuid, String[] args) {
     return Pair.of(Optional.empty(), args);
   }
-
-  /**
-   * Called when the display of the menu is removed
-   *
-   * @param uuid the UUID of the player
-   */
-  default void onClear(UUID uuid) {
-    // EMPTY
-  }
-
-  /**
-   * Called when the menu is cleared
-   */
-  default void onClearAll() {
-    // EMPTY
-  }
 }
diff --git a/src/main/java/me/hsgamer/bettergui/argument/ArgumentHandler.java b/src/main/java/me/hsgamer/bettergui/argument/ArgumentHandler.java
@@ -90,20 +90,6 @@ public List<String> handleTabComplete(UUID uuid, String[] args) {
     return tabComplete(uuid, args).getKey().orElse(Collections.emptyList());
   }
 
-  @Override
-  public void onClear(UUID uuid) {
-    for (ArgumentProcessor processor : processorMap.values()) {
-      processor.onClear(uuid);
-    }
-  }
-
-  @Override
-  public void onClearAll() {
-    for (ArgumentProcessor processor : processorMap.values()) {
-      processor.onClearAll();
-    }
-  }
-
   @Override
   public Menu getMenu() {
     return menu;

diff --git a/src/main/java/me/hsgamer/bettergui/argument/type/StoreArgumentProcessor.java b/src/main/java/me/hsgamer/bettergui/argument/type/StoreArgumentProcessor.java
@@ -20,8 +20,6 @@ public class StoreArgumentProcessor implements ArgumentProcessor {
   private final ArgumentProcessorBuilder.Input input;
   private final Map<UUID, String> map = new HashMap<>();
   private final int length;
-  private final String defaultValue;
-  private final boolean clearOnClose;
   private final boolean takeRemaining;
   private final ActionApplier actionApplier;
   private final List<String> suggestions;
@@ -37,15 +35,6 @@ public StoreArgumentProcessor(ArgumentProcessorBuilder.Input input) {
       .map(BigDecimal::intValue)
       .orElse(1);
 
-    this.defaultValue = Optional.ofNullable(options.get("default"))
-      .map(Objects::toString)
-      .orElse("");
-
-    this.clearOnClose = Optional.ofNullable(options.get("clear-on-close"))
-      .map(String::valueOf)
-      .map(Boolean::parseBoolean)
-      .orElse(false);
-
     this.takeRemaining = Optional.ofNullable(options.get("take-remaining"))
       .map(String::valueOf)
       .map(Boolean::parseBoolean)
@@ -88,7 +77,7 @@ public Optional<String[]> process(UUID uuid, String[] args) {
 
   @Override
   public String getValue(String query, UUID uuid) {
-    return map.getOrDefault(uuid, defaultValue);
+    return map.getOrDefault(uuid, "");
   }
 
   @Override
@@ -114,18 +103,6 @@ public Pair<Optional<List<String>>, String[]> tabComplete(UUID uuid, String[] ar
     return Pair.of(Optional.of(list), new String[0]);
   }
 
-  @Override
-  public void onClear(UUID uuid) {
-    if (clearOnClose) {
-      map.remove(uuid);
-    }
-  }
-
-  @Override
-  public void onClearAll() {
-    map.clear();
-  }
-
   @Override
   public Menu getMenu() {
     return input.menu;

diff --git a/src/main/java/me/hsgamer/bettergui/menu/BaseInventoryMenu.java b/src/main/java/me/hsgamer/bettergui/menu/BaseInventoryMenu.java
@@ -64,7 +64,6 @@ protected BaseInventoryMenu(Config config) {
 
       @Override
       protected void onRemoveDisplay(@NotNull BukkitGUIDisplay display) {
-        argumentHandler.onClear(display.getUniqueId());
         Optional.ofNullable(updateTasks.remove(display.getUniqueId())).ifPresent(Task::cancel);
         super.onRemoveDisplay(display);
       }
@@ -276,7 +275,6 @@ public void close(Player player) {
   @Override
   public void closeAll() {
     guiHolder.stop();
-    argumentHandler.onClearAll();
   }
 
   protected abstract B createButtonMap();

diff --git a/src/main/java/me/hsgamer/bettergui/menu/PredicateMenu.java b/src/main/java/me/hsgamer/bettergui/menu/PredicateMenu.java
@@ -101,7 +101,6 @@ public boolean create(Player player, String[] args, boolean bypass) {
         break;
       }
     }
-    argumentHandler.onClear(uuid);
     return isSuccessful;
   }
 
@@ -122,7 +121,7 @@ public void close(Player player) {
 
   @Override
   public void closeAll() {
-    argumentHandler.onClearAll();
+    // EMPTY
   }
 
   private static final class MenuProcess {