Update item properly on event cancellation.

Fox2Code · Fox2Code · commit c5073a14cff4 · 2025-07-05T00:11:13.000+02:00
diff --git a/loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemEvent.java b/loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemEvent.java
@@ -31,10 +31,10 @@
 import org.jetbrains.annotations.Nullable;
 
 @Event.DelegateEvent
-public abstract class PlayerUseItem extends PlayerEvent implements Event.Cancellable {
+public abstract class PlayerUseItemEvent extends PlayerEvent implements Event.Cancellable {
     private final ItemStack heldItem;
 
-    public PlayerUseItem(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem) {
+    public PlayerUseItemEvent(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem) {
         super(entityPlayer);
         this.heldItem = heldItem;
     }
diff --git a/loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemOnAirEvent.java b/loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemOnAirEvent.java
@@ -30,7 +30,7 @@
 import org.jetbrains.annotations.Nullable;
 
 @Event.DelegateEvent
-public final class PlayerUseItemOnAirEvent extends PlayerUseItem {
+public final class PlayerUseItemOnAirEvent extends PlayerUseItemEvent {
     public PlayerUseItemOnAirEvent(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem) {
         super(entityPlayer, heldItem);
     }
diff --git a/loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemOnBlockEvent.java b/loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemOnBlockEvent.java
@@ -30,7 +30,7 @@
 import org.jetbrains.annotations.Nullable;
 
 @Event.DelegateEvent
-public final class PlayerUseItemOnBlockEvent extends PlayerUseItem {
+public final class PlayerUseItemOnBlockEvent extends PlayerUseItemEvent {
     private final int x, y, z, facing;
     private final float xOffset, yOffset, zOffset;
 
diff --git a/loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemOnEntityEvent.java b/loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerUseItemOnEntityEvent.java
@@ -31,7 +31,7 @@
 import org.jetbrains.annotations.Nullable;
 
 @Event.DelegateEvent
-public final class PlayerUseItemOnEntityEvent extends PlayerUseItem {
+public final class PlayerUseItemOnEntityEvent extends PlayerUseItemEvent {
     private final Entity target;
 
     public PlayerUseItemOnEntityEvent(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem,@NotNull Entity target) {
diff --git a/loader/src/main/java/com/fox2code/foxloader/event/inventory/PlayerDropItemEvent.java b/loader/src/main/java/com/fox2code/foxloader/event/inventory/PlayerDropItemEvent.java
@@ -34,15 +34,16 @@
 public final class PlayerDropItemEvent extends PlayerEvent implements Event.Cancellable {
     private final ItemStack itemToDrop;
     private final int slotId, maxAmountToDrop;
-    private final boolean creative;
+    private final boolean creative, hotbar;
 
     public PlayerDropItemEvent(@NotNull EntityPlayer entityPlayer, @NotNull ItemStack itemToDrop,
-                               int slotId, int maxAmountToDrop, boolean creative) {
+                               int slotId, int maxAmountToDrop, boolean creative, boolean hotbar) {
         super(entityPlayer);
         this.itemToDrop = Objects.requireNonNull(itemToDrop);
         this.slotId = slotId;
         this.maxAmountToDrop = maxAmountToDrop;
         this.creative = creative;
+        this.hotbar = hotbar;
     }
 
     public @NotNull ItemStack getItemToDrop() {
@@ -64,4 +65,8 @@ public int getSlotId() {
     public boolean isCreative() {
         return this.creative;
     }
+
+    public boolean isHotbar() {
+        return this.hotbar;
+    }
 }
diff --git a/loader/src/main/java/com/fox2code/foxloader/internal/InternalInteractionHooks.java b/loader/src/main/java/com/fox2code/foxloader/internal/InternalInteractionHooks.java
@@ -31,6 +31,7 @@
 import net.minecraft.common.block.container.Slot;
 import net.minecraft.common.entity.Entity;
 import net.minecraft.common.entity.player.EntityPlayer;
+import net.minecraft.common.entity.player.InventoryPlayer;
 import net.minecraft.common.item.ItemStack;
 import net.minecraft.common.networking.Packet103SetSlot;
 import net.minecraft.common.util.math.Vec3D;
@@ -77,6 +78,7 @@ public static boolean sendPlayerBreakBlockEvent(
         PlayerBreakBlockEvent playerStartBreakBlockEvent = new PlayerBreakBlockEvent(
                 entityPlayer, x, y, z, entityPlayer.inventory.getCurrentItem());
         PLAYER_BREAK_BLOCK_EVENT.callEvent(playerStartBreakBlockEvent);
+        updateSlotItemIfCancelled(playerStartBreakBlockEvent);
         return playerStartBreakBlockEvent.isCancelled();
     }
 
@@ -93,6 +95,7 @@ public static boolean sendPlayerUseItemOnAirEvent(
         PlayerUseItemOnAirEvent playerUseItemOnAirEvent =
                 new PlayerUseItemOnAirEvent(player, itemStack);
         PLAYER_USE_ITEM_ON_AIR_EVENT.callEvent(playerUseItemOnAirEvent);
+        updateSlotItemIfCancelled(playerUseItemOnAirEvent);
         return playerUseItemOnAirEvent.isCancelled();
     }
 
@@ -103,6 +106,7 @@ public static boolean sendPlayerUseItemOnBlockEvent(
         PlayerUseItemOnBlockEvent playerUseItemOnBlockEvent = new PlayerUseItemOnBlockEvent(
                 player, itemstack, x, y, z, facing, xVec, yVec, zVec);
         PLAYER_USE_ITEM_ON_BLOCK_EVENT.callEvent(playerUseItemOnBlockEvent);
+        updateSlotItemIfCancelled(playerUseItemOnBlockEvent);
         return playerUseItemOnBlockEvent.isCancelled();
     }
 
@@ -111,6 +115,7 @@ public static boolean sendPlayerUseItemOnEntityEvent(EntityPlayer player, Entity
         PlayerUseItemOnEntityEvent playerUseItemOnEntityEvent =
                 new PlayerUseItemOnEntityEvent(player, player.inventory.getCurrentItem(), target);
         PLAYER_USE_ITEM_ON_ENTITY_EVENT.callEvent(playerUseItemOnEntityEvent);
+        updateSlotItemIfCancelled(playerUseItemOnEntityEvent);
         return playerUseItemOnEntityEvent.isCancelled();
     }
 
@@ -148,7 +153,7 @@ public static boolean onHandleClickSlot(Container container, int slotId, int mou
                 slotId < container.slots.size() && (slot = container.getSlot(slotId)) != null &&
                 (slotStack = slot.getStack()) != null) {
             PlayerDropItemEvent playerDropItemEvent = new PlayerDropItemEvent(
-                    player, slotStack, slotId, mouseButton == 0 ? 64 : 1, false);
+                    player, slotStack, slotId, mouseButton == 0 ? 64 : 1, false, false);
             PLAYER_DROP_ITEM_EVENT.callEvent(playerDropItemEvent);
             updateSlotItemIfCancelled(playerDropItemEvent);
             return playerDropItemEvent.isCancelled();
@@ -159,7 +164,7 @@ public static boolean onHandleClickSlot(Container container, int slotId, int mou
     public static boolean onDropCurrentItem(EntityPlayer player) {
         if (PLAYER_DROP_ITEM_EVENT.isEmpty()) return false;
         PlayerDropItemEvent playerDropItemEvent = new PlayerDropItemEvent(
-                player, player.inventory.getCurrentItem(), player.inventory.currentItem, 1, false);
+                player, player.inventory.getCurrentItem(), player.inventory.currentItem, 1, false, true);
         PLAYER_DROP_ITEM_EVENT.callEvent(playerDropItemEvent);
         updateSlotItemIfCancelled(playerDropItemEvent);
         return playerDropItemEvent.isCancelled();
@@ -168,7 +173,7 @@ public static boolean onDropCurrentItem(EntityPlayer player) {
     public static boolean onDropCurrentItemStack(EntityPlayer player) {
         if (PLAYER_DROP_ITEM_EVENT.isEmpty()) return false;
         PlayerDropItemEvent playerDropItemEvent = new PlayerDropItemEvent(
-                player, player.inventory.getCurrentItem(), player.inventory.currentItem, 64, false);
+                player, player.inventory.getCurrentItem(), player.inventory.currentItem, 64, false, true);
         PLAYER_DROP_ITEM_EVENT.callEvent(playerDropItemEvent);
         updateSlotItemIfCancelled(playerDropItemEvent);
         return playerDropItemEvent.isCancelled();
@@ -177,7 +182,7 @@ public static boolean onDropCurrentItemStack(EntityPlayer player) {
     public static boolean onDropCursorItem(EntityPlayer player) {
         if (PLAYER_DROP_ITEM_EVENT.isEmpty()) return false;
         PlayerDropItemEvent playerDropItemEvent = new PlayerDropItemEvent(
-                player, player.inventory.getCursorStack(), -999, 1, false);
+                player, player.inventory.getCursorStack(), -999, 1, false, false);
         PLAYER_DROP_ITEM_EVENT.callEvent(playerDropItemEvent);
         updateSlotItemIfCancelled(playerDropItemEvent);
         return playerDropItemEvent.isCancelled();
@@ -186,7 +191,7 @@ public static boolean onDropCursorItem(EntityPlayer player) {
     public static boolean onDropCursorItemStack(EntityPlayer player) {
         if (PLAYER_DROP_ITEM_EVENT.isEmpty()) return false;
         PlayerDropItemEvent playerDropItemEvent = new PlayerDropItemEvent(
-                player, player.inventory.getCursorStack(), -999, 64, false);
+                player, player.inventory.getCursorStack(), -999, 64, false, false);
         PLAYER_DROP_ITEM_EVENT.callEvent(playerDropItemEvent);
         updateSlotItemIfCancelled(playerDropItemEvent);
         return playerDropItemEvent.isCancelled();
@@ -195,19 +200,51 @@ public static boolean onDropCursorItemStack(EntityPlayer player) {
     public static boolean onDropCreativeItemStack(EntityPlayer player, ItemStack itemStack) {
         if (PLAYER_DROP_ITEM_EVENT.isEmpty()) return false;
         PlayerDropItemEvent playerDropItemEvent = new PlayerDropItemEvent(
-                player, itemStack, -999, 64, true);
+                player, itemStack, -999, 64, true, false);
         PLAYER_DROP_ITEM_EVENT.callEvent(playerDropItemEvent);
         return playerDropItemEvent.isCancelled();
     }
 
+    private static void updateSlotItemIfCancelled(PlayerUseItemEvent playerUseItemEvent) {
+        if (playerUseItemEvent.isCancelled() && playerUseItemEvent.getHeldItem() != null) {
+            updateHotbarSlotItem(playerUseItemEvent.getEntityPlayer(), playerUseItemEvent.getHeldItem(),
+                    playerUseItemEvent.getEntityPlayer().inventory.currentItem);
+        }
+    }
+
+    private static void updateSlotItemIfCancelled(PlayerBreakBlockEvent playerBreakBlockEvent) {
+        if (playerBreakBlockEvent.isCancelled()) {
+            InventoryPlayer inventoryPlayer = playerBreakBlockEvent.getEntitySource().inventory;
+            updateHotbarSlotItem(playerBreakBlockEvent.getEntitySource(),
+                    inventoryPlayer.getCurrentItem(), inventoryPlayer.currentItem);
+        }
+    }
+
     private static void updateSlotItemIfCancelled(PlayerDropItemEvent playerDropItemEvent) {
-        int slotId = playerDropItemEvent.getSlotId();
-        EntityPlayer entityPlayer = playerDropItemEvent.getEntityPlayer();
-        if (playerDropItemEvent.isCancelled() && entityPlayer instanceof EntityPlayerMP) {
+        if (playerDropItemEvent.isCancelled()) {
+            if (playerDropItemEvent.isHotbar()) {
+                updateHotbarSlotItem(playerDropItemEvent.getEntityPlayer(),
+                        playerDropItemEvent.getItemToDrop(), playerDropItemEvent.getSlotId());
+            } else {
+                updateSlotItem(playerDropItemEvent.getEntityPlayer(),
+                        playerDropItemEvent.getItemToDrop(), playerDropItemEvent.getSlotId());
+            }
+        }
+    }
+
+    private static void updateSlotItem(EntityPlayer entityPlayer, ItemStack itemStack, int slotId) {
+        if (entityPlayer instanceof EntityPlayerMP) {
+            ((EntityPlayerMP) entityPlayer).playerNetServerHandler.sendPacket(slotId == -999 ?
+                    new Packet103SetSlot(-1, -1, entityPlayer.inventory.getCursorStack()) :
+                    new Packet103SetSlot(((EntityPlayerMP) entityPlayer).currentWindowId, slotId, itemStack));
+        }
+    }
+
+    private static void updateHotbarSlotItem(EntityPlayer entityPlayer, ItemStack itemStack, int slotId) {
+        if (entityPlayer instanceof EntityPlayerMP) {
             ((EntityPlayerMP) entityPlayer).playerNetServerHandler.sendPacket(slotId == -999 ?
                     new Packet103SetSlot(-1, -1, entityPlayer.inventory.getCursorStack()) :
-                    new Packet103SetSlot(((EntityPlayerMP) entityPlayer).currentWindowId,
-                            slotId, playerDropItemEvent.getItemToDrop()));
+                    new Packet103SetSlot(0, slotId < 36 ? 36 + slotId : slotId, itemStack));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`import org.jetbrains.annotations.Nullable;`
`31`	`31`
`32`	`32`	`@Event.DelegateEvent`
`33`		`-public final class PlayerUseItemOnAirEvent extends PlayerUseItem {`
	`33`	`+public final class PlayerUseItemOnAirEvent extends PlayerUseItemEvent {`
`34`	`34`	`public PlayerUseItemOnAirEvent(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem) {`
`35`	`35`	`super(entityPlayer, heldItem);`
`36`	`36`	`}`