upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Syncs

Browse Source
This commit is contained in:
Alexander committed 2014-02-15 00:29:24 -05:00
1 parent 3ea1d589d3
commit 6574e331fc
10 files changed
+63 -83
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/blocks/LavaTankBlock.java
+9 -6
View File
@@ -21,6 +21,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import tconstruct.TConstruct;
import tconstruct.blocks.logic.LavaTankLogic;
import tconstruct.client.block.TankRender;
import tconstruct.library.TConstructRegistry;
@@ -157,7 +159,7 @@ public class LavaTankBlock extends BlockContainer
@Override
public boolean onBlockActivated (World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9)
{
ItemStack current = entityplayer.inventory.getCurrentItem();
/**ItemStack current = entityplayer.inventory.getCurrentItem();
if (current != null)
{
@@ -181,14 +183,15 @@ public class LavaTankBlock extends BlockContainer
{
}
}
}*/
/**ItemStack current = entityplayer.inventory.getCurrentItem();
ItemStack current = entityplayer.inventory.getCurrentItem();
if (current != null)
{
FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(current);
//FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(current);
LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(x, y, z);
TConstruct.logger.error(liquid);
LavaTankLogic logic = (LavaTankLogic) world.getTileEntity(i, j, k);
if (liquid != null)
{
int amount = logic.fill(ForgeDirection.UNKNOWN, liquid, false);
@@ -202,7 +205,7 @@ public class LavaTankBlock extends BlockContainer
else
return true;
}
else if (FluidContainerRegistry.isFilledContainer(current))
else if (FluidContainerRegistry.isBucket(current))
{
FluidTankInfo[] tanks = logic.getTankInfo(ForgeDirection.UNKNOWN);
FluidStack fillFluid = tanks[0].fluid;//getFluid();
@@ -233,7 +236,7 @@ public class LavaTankBlock extends BlockContainer
return true;
}
}
}*/
}
return false;
}