feat: replace triconsumers with biconsumers to be able to remove log4j (#197)

Author: Snabeldier

pom.xml

@@ -85,12 +85,6 @@
             <version>LATEST</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.20.0</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

src/main/java/minevalley/core/api/Core.java

@@ -45,7 +45,6 @@
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
-import org.apache.logging.log4j.util.TriConsumer;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -55,7 +54,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.ClickType;
+import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -513,109 +512,62 @@ public static GuiItem createGuiItem(ItemStack itemStack, Consumer<OnlineUser> co
 
     /**
      * Creates new gui-item, based on a specific itemstack with a specific callback.
-     * Gui-items can be added to inventory-guis (built by gui-builder). If a player clicks the gui-item, the callback is called with the player-object.
-     *
-     * @param itemBuilder item which should be displayed in the inventory
-     * @param consumer    consumer which gets called if a player clicks the item
-     * @return gui-item-object to add to the gui-builder
-     */
-    public static GuiItem createGuiItem(ItemBuilder itemBuilder, Consumer<OnlineUser> consumer) {
-        return server.createGuiItem(itemBuilder.build(), consumer);
-    }
-
-    /**
-     * Creates new gui-item, based on a specific itemstack with a specific callback.
-     * Gui-items can be added to inventory-guis (built by gui-builder). If a player clicks the gui-item, the callback is called with the player-object.
-     *
-     * @param item     item which should be displayed in the inventory
-     * @param consumer consumer which gets called if a player clicks the item
-     * @return gui-item-object to add to the gui-builder
-     */
-    public static GuiItem createGuiItem(InterfaceItem item, Consumer<OnlineUser> consumer) {
-        return server.createGuiItem(item.toItemStack(), consumer);
-    }
-
-    /**
-     * Creates new gui-item, based on a specific itemstack with a specific callback.
-     * Gui-items can be added to inventory-guis (built by gui-builder). If a player clicks the gui-item, the callback is called with the player-object.
-     *
-     * @param itemStack item which should be displayed in the inventory
-     * @param consumer  consumer which gets called if a player clicks the item
-     * @return gui-item-object to add to the gui-builder
-     */
-    public static GuiItem createGuiItem(ItemStack itemStack, BiConsumer<OnlineUser, ClickType> consumer) {
-        return server.createAdvancedGuiItem(itemStack, consumer);
-    }
-
-    /**
-     * Creates new gui-item, based on a specific itemstack with a specific callback.
-     * Gui-items can be added to inventory-guis (built by gui-builder). If a player clicks the gui-item, the callback is called with the player-object.
+     * Gui-items can be added to inventory-guis (built by gui-builder).
      *
      * @param itemBuilder item which should be displayed in the inventory
-     * @param consumer    consumer which gets called if a player clicks the item
+     * @param callback    consumer which gets called if a player clicks the item
      * @return gui-item-object to add to the gui-builder
      */
-    public static GuiItem createGuiItem(ItemBuilder itemBuilder, BiConsumer<OnlineUser, ClickType> consumer) {
-        return server.createAdvancedGuiItem(itemBuilder.build(), consumer);
+    public static GuiItem createGuiItem(ItemBuilder itemBuilder, Consumer<OnlineUser> callback) {
+        return server.createGuiItem(itemBuilder.build(), callback);
     }
 
     /**
      * Creates new gui-item, based on a specific itemstack with a specific callback.
-     * Gui-items can be added to inventory-guis (built by gui-builder). If a player clicks the gui-item, the callback is called with the player-object.
+     * Gui-items can be added to inventory-guis (built by gui-builder).
      *
      * @param item     item which should be displayed in the inventory
-     * @param consumer consumer which gets called if a player clicks the item
+     * @param callback consumer which gets called if a player clicks the item
      * @return gui-item-object to add to the gui-builder
      */
-    public static GuiItem createGuiItem(InterfaceItem item, BiConsumer<OnlineUser, ClickType> consumer) {
-        return server.createAdvancedGuiItem(item.toItemStack(), consumer);
+    public static GuiItem createGuiItem(InterfaceItem item, Consumer<OnlineUser> callback) {
+        return server.createGuiItem(item.toItemStack(), callback);
     }
 
     /**
      * Creates new gui-item, based on a specific itemstack with a specific callback.
      * Gui-items can be added to inventory-guis (built by gui-builder). If a player clicks the gui-item, the callback is called with the player-object.
      *
      * @param itemStack item which should be displayed in the inventory
-     * @param consumer  consumer which gets called if a player clicks the item
+     * @param callback  consumer which gets called if a player clicks the item
      * @return gui-item-object to add to the gui-builder
      */
-    public static GuiItem createGuiItem(ItemStack itemStack, TriConsumer<OnlineUser, ClickType, Inventory> consumer) {
-        return server.createAdvancedGuiItem(itemStack, consumer);
+    public static GuiItem createGuiItem(ItemStack itemStack, BiConsumer<OnlineUser, InventoryClickEvent> callback) {
+        return server.createAdvancedGuiItem(itemStack, callback);
     }
 
     /**
      * Creates new gui-item, based on a specific itemstack with a specific callback.
      * Gui-items can be added to inventory-guis (built by gui-builder). If a player clicks the gui-item, the callback is called with the player-object.
      *
      * @param itemBuilder item which should be displayed in the inventory
-     * @param consumer    consumer which gets called if a player clicks the item
+     * @param callback    consumer which gets called if a player clicks the item
      * @return gui-item-object to add to the gui-builder
      */
-    public static GuiItem createGuiItem(ItemBuilder itemBuilder, TriConsumer<OnlineUser, ClickType, Inventory> consumer) {
-        return server.createAdvancedGuiItem(itemBuilder.build(), consumer);
+    public static GuiItem createGuiItem(ItemBuilder itemBuilder, BiConsumer<OnlineUser, InventoryClickEvent> callback) {
+        return server.createAdvancedGuiItem(itemBuilder.build(), callback);
     }
 
     /**
      * Creates new gui-item, based on a specific itemstack with a specific callback.
      * Gui-items can be added to inventory-guis (built by gui-builder). If a player clicks the gui-item, the callback is called with the player-object.
      *
      * @param item     item which should be displayed in the inventory
-     * @param consumer consumer which gets called if a player clicks the item
-     * @return gui-item-object to add to the gui-builder
-     */
-    public static GuiItem createGuiItem(InterfaceItem item, TriConsumer<OnlineUser, ClickType, Inventory> consumer) {
-        return server.createAdvancedGuiItem(item.toItemStack(), consumer);
-    }
-
-    /**
-     * Creates new gui-item, based on a specific itemstack without any callback.
-     * Gui-items can be added to inventory-guis (built by gui-builder). If a player clicks the gui-item, the callback is called with the player-object.
-     *
-     * @param itemStack item which should be displayed in the inventory (use item-builder to create this item)
+     * @param callback consumer which gets called if a player clicks the item
      * @return gui-item-object to add to the gui-builder
      */
-    public static GuiItem createGuiItem(ItemStack itemStack) {
-        return server.createGuiItem(itemStack, null);
+    public static GuiItem createGuiItem(InterfaceItem item, BiConsumer<OnlineUser, InventoryClickEvent> callback) {
+        return server.createAdvancedGuiItem(item.toItemStack(), callback);
     }
 
     /**

src/main/java/minevalley/core/api/CoreServer.java

@@ -41,7 +41,6 @@
 import minevalley.smart.api.Session;
 import minevalley.smart.api.SmartApp;
 import net.md_5.bungee.api.chat.BaseComponent;
-import org.apache.logging.log4j.util.TriConsumer;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -51,7 +50,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.ClickType;
+import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -162,9 +161,7 @@ public interface CoreServer {
 
     GuiItem createGuiItem(ItemStack itemStack, Consumer<OnlineUser> consumer);
 
-    GuiItem createAdvancedGuiItem(ItemStack itemStack, BiConsumer<OnlineUser, ClickType> consumer);
-
-    GuiItem createAdvancedGuiItem(ItemStack itemStack, TriConsumer<OnlineUser, ClickType, Inventory> consumer);
+    GuiItem createAdvancedGuiItem(ItemStack itemStack, BiConsumer<OnlineUser, InventoryClickEvent> callback);
 
     ItemBuilder createItem(ItemStack itemStack);
 

src/main/java/minevalley/core/api/npc/NPC.java

@@ -5,7 +5,6 @@
 import minevalley.core.api.ChatMenu;
 import minevalley.core.api.users.OnlineUser;
 import net.md_5.bungee.api.chat.BaseComponent;
-import org.apache.logging.log4j.util.TriConsumer;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -79,9 +78,9 @@ default void zoomIn(OnlineUser user) {
 
     void setSneaking(boolean sneaking);
 
-    NPC onClick(TriConsumer<OnlineUser, Click, NPC> callback);
+    NPC onClick(BiConsumer<OnlineUser, Click> callback);
 
-    NPC onComingClose(BiConsumer<OnlineUser, NPC> callback);
+    NPC onComingClose(Consumer<OnlineUser> callback);
 
     String getChatName();