From 1a8ad6bbee9d9ffc167279901a1830fb2a1ea70a Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 26 Jun 2016 12:18:26 -0700 Subject: [PATCH] Fix legacy handling for ItemBucket subclasses and non-universal buckets (#3038) --- .../net/minecraft/item/ItemBucket.java.patch | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/item/ItemBucket.java.patch b/patches/minecraft/net/minecraft/item/ItemBucket.java.patch index 22d87a8e82..42de7cf0f9 100644 --- a/patches/minecraft/net/minecraft/item/ItemBucket.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemBucket.java.patch @@ -9,13 +9,27 @@ if (raytraceresult == null) { -@@ -175,4 +177,9 @@ +@@ -175,4 +177,23 @@ } } } + + @Override + public net.minecraftforge.common.capabilities.ICapabilityProvider initCapabilities(ItemStack stack, net.minecraft.nbt.NBTTagCompound nbt) { -+ return new net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper(stack); ++ if (this.getClass() == ItemBucket.class) ++ { ++ if (net.minecraftforge.fluids.FluidRegistry.isUniversalBucketEnabled()) ++ { ++ return new net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper(stack); ++ } ++ else ++ { ++ return new net.minecraftforge.fluids.capability.wrappers.FluidContainerRegistryWrapper(stack); // when fluid container registry is gone, just use FluidBucketWrapper ++ } ++ } ++ else ++ { ++ return super.initCapabilities(stack, nbt); ++ } + } }