diff --git a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedOreRecipe.java b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedOreRecipe.java index cb7b6e3..792e86c 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedOreRecipe.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedOreRecipe.java @@ -6,6 +6,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -224,10 +225,25 @@ public class ExtremeShapedOreRecipe implements IRecipe { if (target instanceof ItemStack) { + ItemStack targetStack = (ItemStack) target; if (!OreDictionary.itemMatches((ItemStack)target, slot, false)) { return false; } + if (targetStack.hasTagCompound()) + { + NBTTagCompound tagCompound = targetStack.getTagCompound(); + if (!slot.hasTagCompound()) + { + return false; + } + NBTTagCompound slotTagCompound = slot.getTagCompound(); + // I forget, how to compare NBT... + if (!slotTagCompound.equals(tagCompound)) + { + return false; + } + } } else if (target instanceof ArrayList) { diff --git a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedRecipe.java b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedRecipe.java index f55a3fc..edc6272 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedRecipe.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapedRecipe.java @@ -97,6 +97,11 @@ public class ExtremeShapedRecipe implements IRecipe { return false; } + + if (itemstack.hasTagCompound() && !ItemStack.areItemStackTagsEqual(itemstack, itemstack1)) + { + return false; + } } } } diff --git a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapelessRecipe.java b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapelessRecipe.java index 8202213..2373114 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapelessRecipe.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeShapelessRecipe.java @@ -51,9 +51,12 @@ public class ExtremeShapelessRecipe implements IRecipe if (itemstack.getItem() == itemstack1.getItem() && (itemstack1.getItemDamage() == 32767 || itemstack.getItemDamage() == itemstack1.getItemDamage())) { - flag = true; - arraylist.remove(itemstack1); - break; + if (!itemstack1.hasTagCompound() || ItemStack.areItemStackTagsEqual(itemstack1, itemstack)) + { + flag = true; + arraylist.remove(itemstack1); + break; + } } }