From 99616a503fbabb0522a0fd7f16b71a9a445b6725 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 26 Jun 2016 12:18:02 -0700 Subject: [PATCH] Remove duplicated universal buckets from the creative list (#3035) --- .../net/minecraftforge/fluids/UniversalBucket.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraftforge/fluids/UniversalBucket.java b/src/main/java/net/minecraftforge/fluids/UniversalBucket.java index 7a2281cad..2c75bc699 100644 --- a/src/main/java/net/minecraftforge/fluids/UniversalBucket.java +++ b/src/main/java/net/minecraftforge/fluids/UniversalBucket.java @@ -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); + } } } }