From bd3bc4402fcbc7e34f2390d2cce94cc4dd917f30 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 31 Dec 2015 14:25:26 -0500 Subject: [PATCH] Fix Metallurgic Infuser upgrade slot conflict --- .../inventory/container/ContainerMetallurgicInfuser.java | 7 +++---- .../mekanism/common/tile/TileEntityMetallurgicInfuser.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index 199b14bad..141abba2d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -1,14 +1,13 @@ package mekanism.common.inventory.container; import mekanism.api.infuse.InfuseRegistry; -import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.inventory.slot.SlotEnergy; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.InfusionInput; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -22,10 +21,10 @@ public class ContainerMetallurgicInfuser extends Container public ContainerMetallurgicInfuser(InventoryPlayer inventory, TileEntityMetallurgicInfuser tentity) { tileEntity = tentity; - addSlotToContainer(new SlotDischarge(tentity, 0, 143, 35)); addSlotToContainer(new Slot(tentity, 1, 17, 35)); addSlotToContainer(new Slot(tentity, 2, 51, 43)); addSlotToContainer(new SlotOutput(tentity, 3, 109, 43)); + addSlotToContainer(new SlotEnergy.SlotDischarge(tentity, 4, 143, 35)); int slotY; @@ -83,7 +82,7 @@ public class ContainerMetallurgicInfuser extends Container } else if(ChargeUtils.canBeDischarged(slotStack)) { - if(!mergeItemStack(slotStack, 0, 1, false)) + if(!mergeItemStack(slotStack, 3, 4, false)) { return null; } diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 5bbbc5d66..9054bc8cc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -124,7 +124,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i } } - ChargeUtils.discharge(0, this); + ChargeUtils.discharge(4, this); if(inventory[1] != null) {