1.1.3

efekos · May 30, 2023 · 4862238 · 4862238
1 parent 1263bea
commit 4862238
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/main/java/me/efekos/simpler/events/PlayerEvents.java b/src/main/java/me/efekos/simpler/events/PlayerEvents.java
@@ -43,10 +43,10 @@ public void onPlayerInteract(PlayerInteractEvent e){
 
             switch (e.getAction()){
                 case LEFT_CLICK_AIR:case LEFT_CLICK_BLOCK:
-                    item.onLeftClick(e.getPlayer());
+                    item.onLeftClick(e);
                     break;
                 case RIGHT_CLICK_AIR:case RIGHT_CLICK_BLOCK:
-                    item.onRightClick(e.getPlayer());
+                    item.onRightClick(e);
                     break;
                 default:
                     break;
@@ -74,7 +74,7 @@ public void onPlayerPickup(EntityPickupItemEvent e){
             constructor.setAccessible(true);
             CustomItem item = constructor.newInstance();
 
-            item.onPickup((Player) e.getEntity());
+            item.onPickup(e);
         } catch (Exception ex){
             ex.printStackTrace();
         }
@@ -97,7 +97,7 @@ public void onPlayerDrop(PlayerDropItemEvent e){
             constructor.setAccessible(true);
             CustomItem item = constructor.newInstance();
 
-            item.onDrop(e.getPlayer());
+            item.onDrop(e);
         } catch (Exception ex){
             ex.printStackTrace();
         }

diff --git a/src/main/java/me/efekos/simpler/items/CustomItem.java b/src/main/java/me/efekos/simpler/items/CustomItem.java
@@ -2,6 +2,10 @@
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityDropItemEvent;
+import org.bukkit.event.entity.EntityPickupItemEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 
@@ -11,25 +15,25 @@ public abstract class CustomItem {
      * executes when a player left clicks with this item.
      * @param player Player that left-clicked to the item.
      */
-    public abstract void onLeftClick(Player player);
+    public abstract void onLeftClick(PlayerInteractEvent player);
 
     /**
      * executes when a player right clicks with this item.
      * @param player Player that right-clicked to the item
      */
-    public abstract void onRightClick(Player player);
+    public abstract void onRightClick(PlayerInteractEvent player);
 
     /**
      * executes when a player drops this item.
      * @param player Player that dropped the item
      */
-    public abstract void onDrop(Player player);
+    public abstract void onDrop(PlayerDropItemEvent player);
 
     /**
      * executes when a player picks up this item.
      * @param player Player that dropped this item
      */
-    public abstract void onPickup(Player player);
+    public abstract void onPickup(EntityPickupItemEvent player);
 
     /**
      * @return An ID for this item. This ID is unique and used to know that an {@link org.bukkit.inventory.ItemStack} is this item.