mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 20:22:28 +00:00
Fix Universal bucket handling for Fluids with NBT (Fix #3757)
This commit is contained in:
1 parent
0e9820c51c
commit
423f9fc04b
4 files changed
+68
-83
No files matched your search
+16
-24
@@ -33,12 +33,11 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
import net.minecraftforge.fluids.capability.FluidTankProperties;
|
||||
import net.minecraftforge.fluids.capability.IFluidHandlerItem;
|
||||
import net.minecraftforge.fluids.capability.IFluidTankProperties;
|
||||
import net.minecraftforge.fluids.UniversalBucket;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.IFluidHandler;
|
||||
|
||||
/**
|
||||
* Wrapper for vanilla and forge buckets.
|
||||
@@ -96,27 +95,20 @@ public class FluidBucketWrapper implements IFluidHandlerItem, ICapabilityProvide
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated use the NBT-sensitive version {@link #setFluid(FluidStack)}
|
||||
*/
|
||||
@Deprecated
|
||||
protected void setFluid(@Nullable Fluid fluid) {
|
||||
if (fluid == null)
|
||||
{
|
||||
setFluid(new FluidStack(fluid, Fluid.BUCKET_VOLUME));
|
||||
}
|
||||
|
||||
protected void setFluid(@Nullable FluidStack fluidStack)
|
||||
{
|
||||
if (fluidStack == null)
|
||||
container = new ItemStack(Items.BUCKET);
|
||||
}
|
||||
else if (fluid == FluidRegistry.WATER)
|
||||
{
|
||||
container = new ItemStack(Items.WATER_BUCKET);
|
||||
}
|
||||
else if (fluid == FluidRegistry.LAVA)
|
||||
{
|
||||
container = new ItemStack(Items.LAVA_BUCKET);
|
||||
}
|
||||
else if (fluid.getName().equals("milk"))
|
||||
{
|
||||
container = new ItemStack(Items.MILK_BUCKET);
|
||||
}
|
||||
else if (FluidRegistry.isUniversalBucketEnabled() && FluidRegistry.getBucketFluids().contains(fluid))
|
||||
{
|
||||
container = UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, fluid);
|
||||
}
|
||||
else
|
||||
container = FluidUtil.getFilledBucket(fluidStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -135,7 +127,7 @@ public class FluidBucketWrapper implements IFluidHandlerItem, ICapabilityProvide
|
||||
|
||||
if (doFill)
|
||||
{
|
||||
setFluid(resource.getFluid());
|
||||
setFluid(resource);
|
||||
}
|
||||
|
||||
return Fluid.BUCKET_VOLUME;
|
||||
@@ -155,7 +147,7 @@ public class FluidBucketWrapper implements IFluidHandlerItem, ICapabilityProvide
|
||||
{
|
||||
if (doDrain)
|
||||
{
|
||||
setFluid(null);
|
||||
setFluid((FluidStack) null);
|
||||
}
|
||||
return fluidStack;
|
||||
}
|
||||
@@ -177,7 +169,7 @@ public class FluidBucketWrapper implements IFluidHandlerItem, ICapabilityProvide
|
||||
{
|
||||
if (doDrain)
|
||||
{
|
||||
setFluid(null);
|
||||
setFluid((FluidStack) null);
|
||||
}
|
||||
return fluidStack;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user