From 2d3c0747676b41c686305e3dc337c73eba1b25a7 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 29 Aug 2018 18:23:56 +0300 Subject: [PATCH] Fix for cells in CT scripts. Some work on #1590 --- .../techreborn/compat/crafttweaker/CTFusionReactor.java | 3 ++- src/main/java/techreborn/compat/crafttweaker/CTGeneric.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java b/src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java index 33b64f911..37048dc28 100644 --- a/src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java +++ b/src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java @@ -101,7 +101,8 @@ public class CTFusionReactor { @Override public void apply() { for (FusionReactorRecipe recipeType : FusionReactorRecipeHelper.reactorRecipes) { - if (ItemUtils.isItemEqual(recipeType.getOutput(), output, true, false)) { + boolean matchNBT = output.hasTagCompound(); + if (ItemUtils.isItemEqual(recipeType.getOutput(), output, true, matchNBT)) { removedRecipes.add(recipeType); FusionReactorRecipeHelper.reactorRecipes.remove(recipeType); break; diff --git a/src/main/java/techreborn/compat/crafttweaker/CTGeneric.java b/src/main/java/techreborn/compat/crafttweaker/CTGeneric.java index 002c30cea..b8c2c3ea3 100644 --- a/src/main/java/techreborn/compat/crafttweaker/CTGeneric.java +++ b/src/main/java/techreborn/compat/crafttweaker/CTGeneric.java @@ -75,7 +75,8 @@ public class CTGeneric { public void apply() { for (IBaseRecipeType recipeType : RecipeHandler.getRecipeClassFromName(name)) { for (ItemStack stack : recipeType.getOutputs()) { - if (ItemUtils.isItemEqual(stack, output, true, false)) { + boolean matchNBT = output.hasTagCompound(); + if (ItemUtils.isItemEqual(stack, output, true, matchNBT)) { removedRecipes.add((BaseRecipe) recipeType); RecipeHandler.recipeList.remove(recipeType); break; @@ -106,7 +107,8 @@ public class CTGeneric { for (Object recipeInput : recipeType.getInputs()) { ItemStack ingredientStack = CraftTweakerMC.getItemStack(ingredient); if (!ingredientStack.isEmpty()) { - if (ItemUtils.isInputEqual(recipeInput, ingredientStack, true, false, true)) { + boolean matchNBT = ingredientStack.hasTagCompound(); + if (ItemUtils.isInputEqual(recipeInput, ingredientStack, true, matchNBT, true)) { removedRecipes.add((BaseRecipe) recipeType); RecipeHandler.recipeList.remove(recipeType); break;