mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 20:22:28 +00:00
Make FluidStacks non-nullable, and implement some TODOs.
This commit is contained in:
1 parent
a788e8a475
commit
a9b3b48273
18 files changed
+289
-220
No files matched your search
@@ -103,7 +103,7 @@ public class DispenseFluidContainer extends DefaultDispenseItemBehavior
|
||||
{
|
||||
ItemStack singleStack = stack.copy();
|
||||
singleStack.setCount(1);
|
||||
IFluidHandlerItem fluidHandler = null; // TODO fluids FluidUtil.getFluidHandler(singleStack);
|
||||
IFluidHandlerItem fluidHandler = FluidUtil.getFluidHandler(singleStack).orElse(null);
|
||||
if (fluidHandler == null)
|
||||
{
|
||||
return super.dispenseStack(source, stack);
|
||||
@@ -112,7 +112,7 @@ public class DispenseFluidContainer extends DefaultDispenseItemBehavior
|
||||
FluidStack fluidStack = fluidHandler.drain(FluidAttributes.BUCKET_VOLUME, IFluidHandler.FluidAction.EXECUTE);
|
||||
Direction dispenserFacing = source.getBlockState().get(DispenserBlock.FACING);
|
||||
BlockPos blockpos = source.getBlockPos().offset(dispenserFacing);
|
||||
FluidActionResult result = fluidStack != null ? FluidUtil.tryPlaceFluid(null, source.getWorld(), Hand.MAIN_HAND, blockpos, stack, fluidStack) : FluidActionResult.FAILURE;
|
||||
FluidActionResult result = FluidUtil.tryPlaceFluid(null, source.getWorld(), Hand.MAIN_HAND, blockpos, stack, fluidStack);
|
||||
|
||||
if (result.isSuccess())
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user