From 9bdb607fb4f9d347f960fc9e9adc614ba5fb569b Mon Sep 17 00:00:00 2001 From: Jens Bauer Date: Mon, 14 Dec 2015 23:27:20 +0100 Subject: [PATCH] Fixed Right-Click for Industrial Wand Recharger --- .../ContainerIndustrialWandRecharge.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java index a668475..3e64a35 100644 --- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java +++ b/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java @@ -42,29 +42,14 @@ public class ContainerIndustrialWandRecharge extends Container { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); - if (par2 == 1) { - if (!this.mergeItemStack(itemstack1, 2, 38, true)) { + if (par2 == 36) { + if (!this.mergeItemStack(itemstack1, 0, 35, false)) { return null; } slot.onSlotChange(itemstack1, itemstack); } - else if (par2 != 0) { - if (FurnaceRecipes.smelting().getSmeltingResult(itemstack1) != null) { - if (!this.mergeItemStack(itemstack1, 0, 1, false)) { - return null; - } - } - else if (par2 >= 2 && par2 < 29) { - if (!this.mergeItemStack(itemstack1, 29, 38, false)) { - return null; - } - } - else if (par2 >= 29 && par2 < 38 && !this.mergeItemStack(itemstack1, 2, 29, false)) { - return null; - } - } - else if (!this.mergeItemStack(itemstack1, 2, 38, false)) { + else if (!charger.isItemValidForSlot(0, itemstack1) || !this.mergeItemStack(itemstack1, 36, 37, false)) { return null; }