handle generic event on Button

HSGamer · Mar 17, 2024 · 6ca3fde · 6ca3fde
1 parent 5887a46
commit 6ca3fde
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 23 deletions.
diff --git a/...gui-button/src/main/java/me/hsgamer/hscore/minecraft/gui/button/impl/PredicateButton.java b/...gui-button/src/main/java/me/hsgamer/hscore/minecraft/gui/button/impl/PredicateButton.java
@@ -3,6 +3,7 @@
 import me.hsgamer.hscore.minecraft.gui.button.Button;
 import me.hsgamer.hscore.minecraft.gui.button.DisplayButton;
 import me.hsgamer.hscore.minecraft.gui.event.ClickEvent;
+import me.hsgamer.hscore.minecraft.gui.event.ViewerEvent;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
@@ -136,20 +137,25 @@ public DisplayButton display(@NotNull UUID uuid) {
       return null;
     }
 
-    Optional.ofNullable(displayButton.getClickAction())
-      .map(displayButtonAction -> (Consumer<ClickEvent>) event -> {
-        if (preventSpamClick && clickCheckList.contains(uuid)) {
-          return;
-        }
-        clickCheckList.add(uuid);
-        clickFuturePredicate.apply(event).thenAccept(result -> {
-          clickCheckList.remove(uuid);
-          if (Boolean.TRUE.equals(result)) {
-            displayButtonAction.accept(event);
+    Optional.ofNullable(displayButton.getAction())
+      .map(displayButtonAction -> (Consumer<ViewerEvent>) event -> {
+        if (event instanceof ClickEvent) {
+          ClickEvent clickEvent = (ClickEvent) event;
+          if (preventSpamClick && clickCheckList.contains(uuid)) {
+            return;
           }
-        });
+          clickCheckList.add(uuid);
+          clickFuturePredicate.apply(clickEvent).thenAccept(result -> {
+            clickCheckList.remove(uuid);
+            if (Boolean.TRUE.equals(result)) {
+              displayButtonAction.accept(event);
+            }
+          });
+        } else {
+          displayButtonAction.accept(event);
+        }
       })
-      .ifPresent(displayButton::setClickAction);
+      .ifPresent(displayButton::setAction);
 
     return displayButton;
   }

diff --git a/...raft/minecraft-gui/src/main/java/me/hsgamer/hscore/minecraft/gui/InventoryGUIDisplay.java b/...raft/minecraft-gui/src/main/java/me/hsgamer/hscore/minecraft/gui/InventoryGUIDisplay.java
@@ -64,7 +64,7 @@ protected InventoryGUIDisplay(@NotNull UUID uuid, @NotNull H holder) {
   public void handleEvent(ViewerEvent event) {
     if (event instanceof ClickEvent) {
       ClickEvent clickEvent = (ClickEvent) event;
-      getViewedButton(clickEvent.getSlot()).map(DisplayButton::getClickAction).ifPresent(consumer -> consumer.accept(clickEvent));
+      getViewedButton(clickEvent.getSlot()).map(DisplayButton::getAction).ifPresent(consumer -> consumer.accept(clickEvent));
     }
   }
 

diff --git a/...aft/minecraft-gui/src/main/java/me/hsgamer/hscore/minecraft/gui/button/DisplayButton.java b/...aft/minecraft-gui/src/main/java/me/hsgamer/hscore/minecraft/gui/button/DisplayButton.java
@@ -1,6 +1,7 @@
 package me.hsgamer.hscore.minecraft.gui.button;
 
 import me.hsgamer.hscore.minecraft.gui.event.ClickEvent;
+import me.hsgamer.hscore.minecraft.gui.event.ViewerEvent;
 import me.hsgamer.hscore.minecraft.gui.object.Item;
 import org.jetbrains.annotations.Nullable;
 
@@ -16,7 +17,7 @@ public class DisplayButton {
   public static final DisplayButton EMPTY = new DisplayButton();
 
   private Item item;
-  private Consumer<ClickEvent> clickAction;
+  private Consumer<ViewerEvent> action;
 
   /**
    * Get the item to display
@@ -41,24 +42,40 @@ public DisplayButton setItem(@Nullable Item item) {
   }
 
   /**
-   * Get the click action
+   * Get the action to handle the event
    *
    * @return the action
    */
   @Nullable
-  public Consumer<ClickEvent> getClickAction() {
-    return clickAction;
+  public Consumer<ViewerEvent> getAction() {
+    return action;
   }
 
   /**
-   * Set the click action
+   * Set the action to handle the event
    *
-   * @param clickAction the action
+   * @param action the action
    *
    * @return the current instance
    */
-  public DisplayButton setClickAction(@Nullable Consumer<ClickEvent> clickAction) {
-    this.clickAction = clickAction;
+  public DisplayButton setAction(@Nullable Consumer<ViewerEvent> action) {
+    this.action = action;
+    return this;
+  }
+
+  /**
+   * Set the action to handle the click event
+   *
+   * @param action the action
+   *
+   * @return the current instance
+   */
+  public DisplayButton setClickAction(@Nullable Consumer<ClickEvent> action) {
+    this.action = action == null ? null : event -> {
+      if (event instanceof ClickEvent) {
+        action.accept((ClickEvent) event);
+      }
+    };
     return this;
   }
 
@@ -71,8 +88,8 @@ public void apply(DisplayButton displayButton) {
     if (displayButton.item != null) {
       this.item = displayButton.item;
     }
-    if (displayButton.clickAction != null) {
-      this.clickAction = displayButton.clickAction;
+    if (displayButton.action != null) {
+      this.action = displayButton.action;
     }
   }
 }