tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

fixed Fluid item container helpers

Browse source 
At least i think i fixed it this time.
This commit is contained in:
DarkGuardsman 2013-09-18 04:25:26 -04:00
parent a41c3c7117
commit 14073150e5
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/dark/core/prefab/helpers/FluidHelper.java
View file

@ -299,18 +299,22 @@ public class FluidHelper
/** Does all the work needed to fill or drain an item of fluid when a player clicks on the block. */
public static boolean playerActivatedFluidItem(World world, int x, int y, int z, EntityPlayer entityplayer, int side)
{
if (entityplayer != null && !entityplayer.isSneaking())
if (world.isRemote)
{
return true;
}
else if (entityplayer != null && !entityplayer.isSneaking())
{
ItemStack current = entityplayer.inventory.getCurrentItem().copy();
if (current != null && world.getBlockTileEntity(x, y, z) instanceof IFluidHandler)
{
IFluidHandler tank = (IFluidHandler) world.getBlockTileEntity(x, y, z);
ItemStack reStack = FluidHelper.drainItem(current, tank, ForgeDirection.getOrientation(side), !entityplayer.capabilities.isCreativeMode);
ItemStack reStack = FluidHelper.drainItem(current, tank, ForgeDirection.getOrientation(side));
boolean stackChanged = false;
if (reStack != null && reStack.isItemEqual(current))
{
reStack = FluidHelper.fillItem(current, tank, ForgeDirection.getOrientation(side), !entityplayer.capabilities.isCreativeMode);
reStack = FluidHelper.fillItem(current, tank, ForgeDirection.getOrientation(side));
}
stackChanged = reStack == null || !reStack.isItemEqual(current);
if (!entityplayer.capabilities.isCreativeMode && stackChanged)
@ -328,6 +332,7 @@ public class FluidHelper
{
entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, reStack);
}
entityplayer.inventoryContainer.detectAndSendChanges();
}
return stackChanged;
}
@ -341,17 +346,16 @@ public class FluidHelper
* does effect the return of the method
* @return Item stack that would be returned if the item was drain of its fluid. Water bucket ->
* empty bucket */
public static ItemStack drainItem(ItemStack stack, IFluidHandler tank, ForgeDirection side, boolean consumeItem)
public static ItemStack drainItem(ItemStack stack, IFluidHandler tank, ForgeDirection side)
{
if (stack != null && tank != null)
{
FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(stack);
if (liquid != null)
{
int fill = tank.fill(side, liquid, true);
if (fill > 0 && consumeItem)
if (tank.fill(side, liquid, true) > 0)
{
return AutoCraftingManager.consumeItem(stack.copy(), 1);
return stack.getItem().getContainerItemStack(stack);
}
}
}
@ -364,7 +368,7 @@ public class FluidHelper
* does effect the return of the method
* @return Item stack that would be returned if the item was filled with fluid. empty bucket ->
* water bucket */
public static ItemStack fillItem(ItemStack stack, IFluidHandler tank, ForgeDirection side, boolean consumeItem)
public static ItemStack fillItem(ItemStack stack, IFluidHandler tank, ForgeDirection side)
{
if (stack != null && tank != null)
{
@ -373,16 +377,9 @@ public class FluidHelper
if (liquid == null && drainStack != null)
{
ItemStack liquidItem = FluidContainerRegistry.fillFluidContainer(drainStack, stack);
liquid = FluidContainerRegistry.getFluidForFilledItem(liquidItem);
tank.drain(side, liquid, true);
if (liquid != null)
if (tank.drain(side, FluidContainerRegistry.getFluidForFilledItem(liquidItem), true) != null)
{
if (consumeItem)
{
return liquidItem;
}
return liquidItem;
}
}
}