tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Metallurgic Infuser upgrade slot conflict

Browse source
This commit is contained in:
aidancbrady 2015-12-31 14:25:26 -05:00
parent a71b6bda01
commit bd3bc4402f
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java
View file

@ -1,14 +1,13 @@
package mekanism.common.inventory.container; package mekanism.common.inventory.container;
import mekanism.api.infuse.InfuseRegistry; 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.inventory.slot.SlotOutput;
import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.recipe.inputs.InfusionInput; import mekanism.common.recipe.inputs.InfusionInput;
import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityMetallurgicInfuser;
import mekanism.common.util.ChargeUtils; import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
@ -22,10 +21,10 @@ public class ContainerMetallurgicInfuser extends Container
public ContainerMetallurgicInfuser(InventoryPlayer inventory, TileEntityMetallurgicInfuser tentity) public ContainerMetallurgicInfuser(InventoryPlayer inventory, TileEntityMetallurgicInfuser tentity)
{ {
tileEntity = tentity; tileEntity = tentity;
addSlotToContainer(new SlotDischarge(tentity, 0, 143, 35));
addSlotToContainer(new Slot(tentity, 1, 17, 35)); addSlotToContainer(new Slot(tentity, 1, 17, 35));
addSlotToContainer(new Slot(tentity, 2, 51, 43)); addSlotToContainer(new Slot(tentity, 2, 51, 43));
addSlotToContainer(new SlotOutput(tentity, 3, 109, 43)); addSlotToContainer(new SlotOutput(tentity, 3, 109, 43));
addSlotToContainer(new SlotEnergy.SlotDischarge(tentity, 4, 143, 35));
int slotY; int slotY;
@ -83,7 +82,7 @@ public class ContainerMetallurgicInfuser extends Container
} }
else if(ChargeUtils.canBeDischarged(slotStack)) else if(ChargeUtils.canBeDischarged(slotStack))
{ {
if(!mergeItemStack(slotStack, 0, 1, false)) if(!mergeItemStack(slotStack, 3, 4, false))
{ {
return null; return null;
} }

2
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
View file

@ -124,7 +124,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i
} }
} }
ChargeUtils.discharge(0, this); ChargeUtils.discharge(4, this);
if(inventory[1] != null) if(inventory[1] != null)
{ {