From 405a16aea1714f8e2bd44ca227569f7e3a40319f Mon Sep 17 00:00:00 2001 From: LexManos Date: Sat, 24 Jun 2017 14:46:51 -0700 Subject: [PATCH] Fix minecraft:item_nbt ingredient type. --- .../common/crafting/IngredientNBT.java | 42 +++++++++++++++++++ src/main/resources/forge_at.cfg | 5 ++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/main/java/net/minecraftforge/common/crafting/IngredientNBT.java diff --git a/src/main/java/net/minecraftforge/common/crafting/IngredientNBT.java b/src/main/java/net/minecraftforge/common/crafting/IngredientNBT.java new file mode 100644 index 000000000..66cb92737 --- /dev/null +++ b/src/main/java/net/minecraftforge/common/crafting/IngredientNBT.java @@ -0,0 +1,42 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package net.minecraftforge.common.crafting; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; + +public class IngredientNBT extends Ingredient +{ + private final ItemStack stack; + protected IngredientNBT(ItemStack stack) + { + super(stack); + this.stack = stack; + } + + @Override + public boolean apply(@Nullable ItemStack input) + { + if (input == null) + return false; + return ItemStack.areItemStacksEqualUsingNBTShareTag(this.stack, input); + } +} diff --git a/src/main/resources/forge_at.cfg b/src/main/resources/forge_at.cfg index 1b131ba21..d42f1bf0f 100644 --- a/src/main/resources/forge_at.cfg +++ b/src/main/resources/forge_at.cfg @@ -315,4 +315,7 @@ protected net.minecraft.world.Teleporter field_85192_a # world protected net.minecraft.world.Teleporter field_77187_a # random protected net.minecraft.world.Teleporter field_85191_c # destinationCoordinateCache -public net.minecraft.util.ResourceLocation func_177516_a(Ljava/lang/String;)[Ljava/lang/String; # splitObjectName \ No newline at end of file +public net.minecraft.util.ResourceLocation func_177516_a(Ljava/lang/String;)[Ljava/lang/String; # splitObjectName + +# Ingredient +protected net.minecraft.item.crafting.Ingredient ([Lnet/minecraft/item/ItemStack;)V # Ingredient \ No newline at end of file