Update MCP mappings to snapshot_nodoc_20161220 (#3551)

This commit is contained in:
James Mitchell authored and LexManos committed 2016-12-21 15:52:30 -08:00
1 parent 1f4007e5d8
commit 5165dc52bf
88 files changed
+445 -436

No files matched your search

@@ -73,12 +73,12 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
FluidActionResult actionResult = FluidUtil.tryPickUpFluid(stack, null, world, blockpos, dispenserFacing.getOpposite());
ItemStack resultStack = actionResult.getResult();
if (!actionResult.isSuccess() || resultStack.func_190926_b())
if (!actionResult.isSuccess() || resultStack.isEmpty())
{
return super.dispenseStack(source, stack);
}
if (stack.func_190916_E() == 1)
if (stack.getCount() == 1)
{
return resultStack;
}
@@ -88,7 +88,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
}
ItemStack stackCopy = stack.copy();
stackCopy.func_190918_g(1);
stackCopy.shrink(1);
return stackCopy;
}
@@ -99,7 +99,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
private ItemStack dumpContainer(IBlockSource source, @Nonnull ItemStack stack)
{
ItemStack singleStack = stack.copy();
singleStack.func_190920_e(1);
singleStack.setCount(1);
IFluidHandlerItem fluidHandler = FluidUtil.getFluidHandler(singleStack);
if (fluidHandler == null)
{
@@ -115,17 +115,17 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
{
ItemStack drainedStack = result.getResult();
if (drainedStack.func_190916_E() == 1)
if (drainedStack.getCount() == 1)
{
return drainedStack;
}
else if (!drainedStack.func_190926_b() && ((TileEntityDispenser)source.getBlockTileEntity()).addItemStack(drainedStack) < 0)
else if (!drainedStack.isEmpty() && ((TileEntityDispenser)source.getBlockTileEntity()).addItemStack(drainedStack) < 0)
{
this.dispenseBehavior.dispense(source, drainedStack);
}
ItemStack stackCopy = drainedStack.copy();
stackCopy.func_190918_g(1);
stackCopy.shrink(1);
return stackCopy;
}
else