keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Remove duplicated universal buckets from the creative list (#3035)

This commit is contained in:
mezz 2016-06-26 12:18:02 -07:00 committed by LexManos
parent 0b1e94babd
commit 99616a503f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minecraftforge/fluids/UniversalBucket.java
View File

@ -85,12 +85,15 @@ public class UniversalBucket extends Item implements IFluidContainerItem
{
for (Fluid fluid : FluidRegistry.getRegisteredFluids().values())
{
// add all fluids that the bucket can be filled with
FluidStack fs = new FluidStack(fluid, getCapacity());
ItemStack stack = new ItemStack(this);
if (fill(stack, fs, true) == fs.amount)
if (fluid != FluidRegistry.WATER && fluid != FluidRegistry.LAVA && !fluid.getName().equals("milk"))
{
subItems.add(stack);
// add all fluids that the bucket can be filled with
FluidStack fs = new FluidStack(fluid, getCapacity());
ItemStack stack = new ItemStack(this);
if (fill(stack, fs, true) == fs.amount)
{
subItems.add(stack);
}
}
}
}