Event cleanup

j1sk1ss · Jul 16, 2024 · c4332b8 · c4332b8
1 parent b2c3a6f
commit c4332b8
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 165 deletions.
diff --git a/src/main/java/org/j1sk1ss/menuframework/events/ButtonClickEvent.java b/src/main/java/org/j1sk1ss/menuframework/events/ButtonClickEvent.java
diff --git a/src/main/java/org/j1sk1ss/menuframework/events/SliderClickEvent.java b/src/main/java/org/j1sk1ss/menuframework/events/SliderClickEvent.java
diff --git a/src/main/java/org/j1sk1ss/menuframework/listeners/InventoryClickHandler.java b/src/main/java/org/j1sk1ss/menuframework/listeners/InventoryClickHandler.java
@@ -35,7 +35,7 @@ public void onInventoryClick(InventoryClickEvent event) {
                 }
 
                 if (containsAllWords) {
-                    handlers.get(key).click(new ComponentClickEvent(handlers.get(key), player, event.getSlot(), event));
+                    handlers.get(key).click(event);
                     event.setCancelled(true);
                 }
             }

diff --git a/src/main/java/org/j1sk1ss/menuframework/objects/interactive/Component.java b/src/main/java/org/j1sk1ss/menuframework/objects/interactive/Component.java
@@ -51,8 +51,8 @@ public void click(int slot) {
      * Click interaction
      * @param click InventoryClickEvent
      */
-    public void click(ComponentClickEvent click) {
-        if (isClicked(click.getClickedSlot())) action(click);
+    public void click(InventoryClickEvent click) {
+        if (isClicked(click.getSlot())) action(click);
     }
 
     /**
@@ -67,7 +67,7 @@ public String getLoreLines() {
      * Action for button
      * @param event InventoryClickEvent
      */
-    public void action(ComponentClickEvent event) {
+    public void action(InventoryClickEvent event) {
         return;
     }
 

diff --git a/src/main/java/org/j1sk1ss/menuframework/objects/interactive/components/Bar.java b/src/main/java/org/j1sk1ss/menuframework/objects/interactive/components/Bar.java
@@ -80,7 +80,7 @@ public Bar(List<Integer> coordinates, Direction direction, List<String> options)
      * @param options Lore of items in bar
      * @param delegate Action
      */
-    public Bar(List<Integer> coordinates, Direction direction, List<String> options, Consumer<ComponentClickEvent> delegate) {
+    public Bar(List<Integer> coordinates, Direction direction, List<String> options, Consumer<InventoryClickEvent> delegate) {
         Coordinates = coordinates;
         Direction   = direction;
         Action      = delegate;
@@ -104,7 +104,7 @@ public Bar(List<Integer> coordinates, Direction direction, List<String> options,
      * @param options Lore of items in bar
      * @param delegate Action
      */
-    public Bar(List<Integer> coordinates, Direction direction, String name, String lore, List<String> options, Consumer<ComponentClickEvent> delegate) {
+    public Bar(List<Integer> coordinates, Direction direction, String name, String lore, List<String> options, Consumer<InventoryClickEvent> delegate) {
         Coordinates = coordinates;
         Direction   = direction;
         Action      = delegate;
@@ -132,7 +132,7 @@ public Bar(List<Integer> coordinates, Direction direction, String name, String l
      * @param dm Default option material
      */
     public Bar(List<Integer> coordinates, Direction direction, String name, String lore,
-               List<String> options, Consumer<ComponentClickEvent> delegate,
+               List<String> options, Consumer<InventoryClickEvent> delegate,
                int ldm, int ddm, Material lm, Material dm) {
         Coordinates      = coordinates;
         Direction        = direction;
@@ -149,7 +149,7 @@ public Bar(List<Integer> coordinates, Direction direction, String name, String l
     private final List<Integer> Coordinates;
     private final List<String> Options;
     private final Direction Direction;
-    private final Consumer<ComponentClickEvent> Action;
+    private final Consumer<InventoryClickEvent> Action;
     private final int LoadedDataModel;
     private final Material LoadedMaterial;
     private final int DefaultDataModel;
@@ -264,7 +264,7 @@ public Component deepCopy() {
     }
 
     @Override
-    public void action(ComponentClickEvent event) {
+    public void action(InventoryClickEvent event) {
         if (Action != null) Action.accept(event);
     }
 }
diff --git a/src/main/java/org/j1sk1ss/menuframework/objects/interactive/components/Button.java b/src/main/java/org/j1sk1ss/menuframework/objects/interactive/components/Button.java
@@ -3,20 +3,15 @@
 
 import lombok.experimental.ExtensionMethod;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.Inventory;
 import org.j1sk1ss.itemmanager.manager.Item;
 import org.j1sk1ss.itemmanager.manager.Manager;
-import org.j1sk1ss.menuframework.events.ButtonClickEvent;
-import org.j1sk1ss.menuframework.events.ComponentClickEvent;
 import org.j1sk1ss.menuframework.objects.interactive.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.function.Consumer;
 
 
@@ -50,15 +45,15 @@ public Button(int firstSlot, int secondSlot, String name, String lore) {
         Action = null;
     }
 
-    public Button(int firstSlot, int secondSlot, String name, String lore, Consumer<ComponentClickEvent> delegate) {
+    public Button(int firstSlot, int secondSlot, String name, String lore, Consumer<InventoryClickEvent> delegate) {
         FirstSlot  = firstSlot;
         SecondSlot = secondSlot;
         Name       = name;
         Lore       = lore;
         Action     = delegate;
     }
 
-    public Button(int firstSlot, int secondSlot, String name, String lore, Consumer<ComponentClickEvent> delegate, Material material) {
+    public Button(int firstSlot, int secondSlot, String name, String lore, Consumer<InventoryClickEvent> delegate, Material material) {
         FirstSlot    = firstSlot;
         SecondSlot   = secondSlot;
         Name         = name;
@@ -67,7 +62,7 @@ public Button(int firstSlot, int secondSlot, String name, String lore, Consumer<
         BodyMaterial = material;
     }
 
-    public Button(int firstSlot, int secondSlot, String name, String lore, Consumer<ComponentClickEvent> delegate, Material material, int model) {
+    public Button(int firstSlot, int secondSlot, String name, String lore, Consumer<InventoryClickEvent> delegate, Material material, int model) {
         FirstSlot           = firstSlot;
         SecondSlot          = secondSlot;
         Name                = name;
@@ -79,7 +74,7 @@ public Button(int firstSlot, int secondSlot, String name, String lore, Consumer<
 
     private final int FirstSlot;
     private final int SecondSlot;
-    private final Consumer<ComponentClickEvent> Action;
+    private final Consumer<InventoryClickEvent> Action;
 
     @Override
     public void place(Inventory inventory) {
@@ -125,10 +120,7 @@ public Component deepCopy() {
     }
 
     @Override
-    public void action(ComponentClickEvent event) {
-        var clickEvent = new ButtonClickEvent(event.getClickedSlot(), this, event.getPlayer(), event);
-        Bukkit.getPluginManager().callEvent(clickEvent);
-
+    public void action(InventoryClickEvent event) {
         if (Action != null) Action.accept(event);
     }
 }
diff --git a/src/main/java/org/j1sk1ss/menuframework/objects/interactive/components/Checkbox.java b/src/main/java/org/j1sk1ss/menuframework/objects/interactive/components/Checkbox.java
@@ -46,7 +46,7 @@ public Checkbox(int firstSlot, int secondSlot, String name, String lore) {
         DefaultMaterial  = Material.matchMaterial(MenuFramework.Config.getString("checkbox_data.default.material", "RED_STAINED_GLASS"));
     }
 
-    public Checkbox(int firstSlot, int secondSlot, String name, String lore, Consumer<ComponentClickEvent> delegate) {
+    public Checkbox(int firstSlot, int secondSlot, String name, String lore, Consumer<InventoryClickEvent> delegate) {
         FirstSlot  = firstSlot;
         SecondSlot = secondSlot;
         Name       = name;
@@ -60,7 +60,7 @@ public Checkbox(int firstSlot, int secondSlot, String name, String lore, Consume
     }
 
     public Checkbox(int firstSlot, int secondSlot, String name,
-                    String lore, Consumer<ComponentClickEvent> delegate,
+                    String lore, Consumer<InventoryClickEvent> delegate,
                     int cdm, int ddm, Material cm, Material dm) {
         FirstSlot  = firstSlot;
         SecondSlot = secondSlot;
@@ -75,7 +75,7 @@ public Checkbox(int firstSlot, int secondSlot, String name,
 
     private final int FirstSlot;
     private final int SecondSlot;
-    private final Consumer<ComponentClickEvent> Action;
+    private final Consumer<InventoryClickEvent> Action;
     private final int CheckedDataModel;
     private final Material CheckedMaterial;
     private final int DefaultDataModel;
@@ -108,11 +108,11 @@ public List<Integer> getCoordinates() {
     }
 
     @Override
-    public void action(ComponentClickEvent event) {
+    public void action(InventoryClickEvent event) {
         if (Action != null) Action.accept(event);
-        var inventory = event.getInventoryClickEvent().getInventory();
+        var inventory = event.getInventory();
 
-        if (Objects.requireNonNull(inventory.getItem(event.getClickedSlot())).getType().equals(DefaultMaterial)) {
+        if (Objects.requireNonNull(inventory.getItem(event.getSlot())).getType().equals(DefaultMaterial)) {
             for (var coordinate : getCoordinates()) 
                 inventory.setItem(coordinate, new Item(Name, Lore, CheckedMaterial, 1, CheckedDataModel));
         }

diff --git a/src/main/java/org/j1sk1ss/menuframework/objects/interactive/components/ClickArea.java b/src/main/java/org/j1sk1ss/menuframework/objects/interactive/components/ClickArea.java
@@ -32,36 +32,36 @@ public ClickArea(int firstCoordinate, int secondCoordinate) {
         Lore        = "ClickAreaLore";
     }
 
-    public ClickArea(int firstCoordinate, int secondCoordinate, Consumer<ComponentClickEvent> delegate) {
+    public ClickArea(int firstCoordinate, int secondCoordinate, Consumer<InventoryClickEvent> delegate) {
         Coordinates = positions2coordinates(firstCoordinate, secondCoordinate);
         Action      = delegate;
         Name        = "ClickArea";
         Lore        = "ClickAreaLore";
     }
 
-    public ClickArea(List<Integer> coordinates, Consumer<ComponentClickEvent> delegate) {
+    public ClickArea(List<Integer> coordinates, Consumer<InventoryClickEvent> delegate) {
         Coordinates = coordinates;
         Action      = delegate;
         Name        = "ClickArea";
         Lore        = "ClickAreaLore";
     }
 
-    public ClickArea(int firstCoordinate, int secondCoordinate, Consumer<ComponentClickEvent> delegate, String name, String lore) {
+    public ClickArea(int firstCoordinate, int secondCoordinate, Consumer<InventoryClickEvent> delegate, String name, String lore) {
         Coordinates = positions2coordinates(firstCoordinate, secondCoordinate);
         Action      = delegate;
         Name        = name;
         Lore        = lore;
     }
 
-    public ClickArea(List<Integer> coordinates, Consumer<ComponentClickEvent> delegate, String name, String lore) {
+    public ClickArea(List<Integer> coordinates, Consumer<InventoryClickEvent> delegate, String name, String lore) {
         Coordinates = coordinates;
         Action      = delegate;
         Name        = name;
         Lore        = lore;
     }
 
     private final List<Integer> Coordinates;
-    private final Consumer<ComponentClickEvent> Action;
+    private final Consumer<InventoryClickEvent> Action;
 
     @Override
     public void place(Inventory inventory) { return; }
@@ -78,7 +78,7 @@ public List<Integer> getCoordinates() {
     }
 
     @Override
-    public void action(ComponentClickEvent event) {
+    public void action(InventoryClickEvent event) {
         if (Action != null) Action.accept(event);
     }
 

diff --git a/src/main/java/org/j1sk1ss/menuframework/objects/interactive/components/ItemArea.java b/src/main/java/org/j1sk1ss/menuframework/objects/interactive/components/ItemArea.java
@@ -1,10 +1,10 @@
 package org.j1sk1ss.menuframework.objects.interactive.components;
 
 import lombok.experimental.ExtensionMethod;
+import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.j1sk1ss.itemmanager.manager.Manager;
-import org.j1sk1ss.menuframework.events.ComponentClickEvent;
 import org.j1sk1ss.menuframework.objects.interactive.Component;
 
 import java.util.ArrayList;
@@ -20,19 +20,19 @@ public ItemArea(ItemArea itemArea) {
         Items = itemArea.Items;
     }
 
-    public ItemArea(List<Integer> coordinates, List<ItemStack> items, Consumer<ComponentClickEvent> delegate) {
+    public ItemArea(List<Integer> coordinates, List<ItemStack> items, Consumer<InventoryClickEvent> delegate) {
         Coordinates = coordinates;
         Items       = items;
         Action      = delegate;
     }
 
-    public ItemArea(int firstSlot, int secondSlot, List<ItemStack> items, Consumer<ComponentClickEvent> delegate) {
+    public ItemArea(int firstSlot, int secondSlot, List<ItemStack> items, Consumer<InventoryClickEvent> delegate) {
         Coordinates = positions2coordinates(firstSlot, secondSlot);
         Items       = items;
         Action      = delegate;
     }
 
-    private final Consumer<ComponentClickEvent> Action;
+    private final Consumer<InventoryClickEvent> Action;
     private final List<ItemStack> Items;
     private final List<Integer> Coordinates;
 
@@ -57,7 +57,7 @@ public List<Integer> getCoordinates() {
     }
 
     @Override
-    public void action(ComponentClickEvent event) {
+    public void action(InventoryClickEvent event) {
         if (Action != null) Action.accept(event);
     }