Fix universal bucket not being returned in crafting recipes (#3234)

This commit is contained in:
Marvin Rösch authored and LexManos committed 2016-09-13 00:02:01 -07:00
1 parent 853667c084
commit bf6437c12a
2 files changed
+20

No files matched your search

@@ -79,6 +79,23 @@ public class UniversalBucket extends Item implements IFluidContainerItem
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(this, DispenseFluidContainer.getInstance());
}
@Override
public boolean hasContainerItem(ItemStack stack)
{
return getEmpty() != null;
}
@Override
public ItemStack getContainerItem(ItemStack itemStack)
{
if (getEmpty() != null)
{
// Create a copy such that the game can't mess with it
return getEmpty().copy();
}
return super.getContainerItem(itemStack);
}
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(Item itemIn, CreativeTabs tab, List<ItemStack> subItems)
@@ -28,6 +28,7 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.ForgeModContainer;
import net.minecraftforge.debug.ModelFluidDebug.TestFluid;
import net.minecraftforge.debug.ModelFluidDebug.TestGas;
import net.minecraftforge.event.entity.player.FillBucketEvent;
@@ -121,6 +122,8 @@ public class DynBucketTest
//GameRegistry.registerItem(dynBucket, "dynbucket");
GameRegistry.register(dynBottle);
GameRegistry.addShapelessRecipe(new ItemStack(Items.DIAMOND),
UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, TestFluid.instance));
// register fluid containers
int i = 0;