diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/main/java/net/cflems/mc/penguin_dust/listener/CraftingListener.java | 18 |
2 files changed, 12 insertions, 9 deletions
@@ -6,6 +6,7 @@ build/ .kotlin ### IntelliJ IDEA ### +.idea .idea/modules.xml .idea/jarRepositories.xml .idea/compiler.xml @@ -40,4 +41,4 @@ bin/ .vscode/ ### Mac OS ### -.DS_Store
\ No newline at end of file +.DS_Store diff --git a/src/main/java/net/cflems/mc/penguin_dust/listener/CraftingListener.java b/src/main/java/net/cflems/mc/penguin_dust/listener/CraftingListener.java index 1f7052c..cd6357d 100644 --- a/src/main/java/net/cflems/mc/penguin_dust/listener/CraftingListener.java +++ b/src/main/java/net/cflems/mc/penguin_dust/listener/CraftingListener.java @@ -71,12 +71,20 @@ public final class CraftingListener implements Listener { if (success) craftingInventory.setResult(enchantedItem); } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.NORMAL) public void onInventoryClick(InventoryClickEvent event) { if (!(event.getClickedInventory() instanceof CraftingInventory craftingInventory) || event.getSlotType() != InventoryType.SlotType.RESULT) return; - int dustCount = 0, blazePowderCount = 0, copperIngotCount = 0; + int dustCount = 0; + for (ItemStack stack : craftingInventory.getMatrix()) { + if (stack == null || !DustUtils.isDust(stack)) continue; + dustCount += stack.getAmount(); + stack.setAmount(0); + } + if (dustCount <= 0) return; + + int blazePowderCount = 0, copperIngotCount = 0; for (ItemStack stack : craftingInventory.getMatrix()) { if (stack == null) continue; switch (stack.getType()) { @@ -88,12 +96,6 @@ public final class CraftingListener implements Listener { copperIngotCount += stack.getAmount(); stack.setAmount(0); break; - case PUMPKIN_SEEDS: - if (DustUtils.isDust(stack)) { - dustCount += stack.getAmount(); - stack.setAmount(0); - } - break; } } |