Initial 1.11-pre1 update

This commit is contained in:
cpw committed 2016-11-13 17:09:55 -05:00
1 parent c177219ff3
commit 4e6a774075
294 files changed
+3099 -2846

No files matched your search

@@ -29,6 +29,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fluids.capability.IFluidHandler;
import javax.annotation.Nonnull;
/**
* Fills or drains a fluid container item using a Dispenser.
*/
@@ -60,7 +62,8 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
/**
* Picks up fluid in front of a Dispenser and fills a container with it.
*/
private ItemStack fillContainer(IBlockSource source, ItemStack stack)
@Nonnull
private ItemStack fillContainer(IBlockSource source, @Nonnull ItemStack stack)
{
World world = source.getWorld();
EnumFacing dispenserFacing = source.getBlockState().getValue(BlockDispenser.FACING);
@@ -72,7 +75,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
return super.dispenseStack(source, stack);
}
if (--stack.stackSize == 0)
if (stack.func_190916_E() == 1)
{
stack.deserializeNBT(result.serializeNBT());
}
@@ -81,6 +84,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
this.dispenseBehavior.dispense(source, result);
}
stack.func_190918_g(1);
return stack;
}
@@ -90,7 +94,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
private ItemStack dumpContainer(IBlockSource source, ItemStack stack)
{
ItemStack dispensedStack = stack.copy();
dispensedStack.stackSize = 1;
dispensedStack.func_190920_e(1);
IFluidHandler fluidHandler = FluidUtil.getFluidHandler(dispensedStack);
if (fluidHandler == null)
{
@@ -105,7 +109,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
{
fluidHandler.drain(Fluid.BUCKET_VOLUME, true);
if (--stack.stackSize == 0)
if (stack.func_190916_E() == 1)
{
stack.deserializeNBT(dispensedStack.serializeNBT());
}