Remove items from the queue when they are smelted or picked up

sweetrpg · Nov 23, 2024 · 21766f6 · 21766f6
1 parent 3079a47
commit 21766f6
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/src/main/java/com/sweetrpg/crafttracker/common/event/EventHandler.java b/src/main/java/com/sweetrpg/crafttracker/common/event/EventHandler.java
@@ -81,12 +81,38 @@ public void onItemCrafted(final ItemCraftedEvent event) {
     public void onItemSmelted(final ItemSmeltedEvent event) {
         CraftTracker.LOGGER.debug("EventHandler#onItemSmelted: {}", event);
 
+        if (event.getPlayer().level.isClientSide) {
+            DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
+                var itemId = event.getSmelting().getItem().getRegistryName();
+                var quantity = event.getSmelting().getCount();
+                var player = Minecraft.getInstance().player;
+
+                CraftingQueueManager.INSTANCE.removeProduct(player, itemId, quantity);
+            });
+        }
+        else {
+            // send packet
+            PacketHandler.sendToPlayer((ServerPlayer)event.getPlayer(), new QueueCommandData(RECALCULATE));
+        }
     }
 
     @SubscribeEvent
     public void onItemPickedUp(final ItemPickupEvent event) {
         CraftTracker.LOGGER.debug("EventHandler#onItemPickedUp: {}", event);
 
+        if (event.getPlayer().level.isClientSide) {
+            DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
+                var itemId = event.getStack().getItem().getRegistryName();
+                var quantity = event.getStack().getCount();
+                var player = Minecraft.getInstance().player;
+
+                CraftingQueueManager.INSTANCE.removeProduct(player, itemId, quantity);
+            });
+        }
+        else {
+            // send packet
+            PacketHandler.sendToPlayer((ServerPlayer)event.getPlayer(), new QueueCommandData(RECALCULATE));
+        }
     }
 
 }