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

Fix container item issue

Browse source
This commit is contained in:
Aidan Brady 2013-11-17 20:14:00 -05:00
parent 0e0594a69b
commit cc5d4281a2
2 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java
View file

@ -93,17 +93,17 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
{
waterTank.fill(fluid, true);
if(inventory[0].isItemEqual(new ItemStack(Item.bucketWater)))
if(inventory[0].getItem().hasContainerItem())
{
inventory[0] = new ItemStack(Item.bucketEmpty);
inventory[0] = inventory[0].getItem().getContainerItemStack(inventory[0]);
}
else {
inventory[0].stackSize--;
if(inventory[0].stackSize == 0)
{
inventory[0] = null;
}
}
if(inventory[0].stackSize == 0)
{
inventory[0] = null;
}
}
}

33
common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java
View file

@ -53,17 +53,17 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
{
lavaTank.fill(fluid, true);
if(FluidContainerRegistry.isBucket(inventory[0]))
if(inventory[0].getItem().hasContainerItem())
{
inventory[0] = new ItemStack(Item.bucketEmpty);
inventory[0] = inventory[0].getItem().getContainerItemStack(inventory[0]);
}
else {
inventory[0].stackSize--;
if(inventory[0].stackSize == 0)
{
inventory[0] = null;
}
}
if(inventory[0].stackSize == 0)
{
inventory[0] = null;
}
}
}
@ -77,12 +77,19 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
if(fuel <= fuelNeeded)
{
lavaTank.fill(new FluidStack(FluidRegistry.LAVA, fuel), true);
inventory[0].stackSize--;
}
if(inventory[0].stackSize == 0)
{
inventory[0] = null;
if(inventory[0].getItem().hasContainerItem())
{
inventory[0] = inventory[0].getItem().getContainerItemStack(inventory[0]);
}
else {
inventory[0].stackSize--;
}
if(inventory[0].stackSize == 0)
{
inventory[0] = null;
}
}
}
}