From 77df089900ffdbe4bcb78dbfb7f83249e7ebfc24 Mon Sep 17 00:00:00 2001 From: miozune Date: Fri, 25 Feb 2022 20:18:14 +0900 Subject: [PATCH] Fix irrelevant Botania flowers show up in NEI (#16) --- dependencies.gradle | 2 +- .../client/nei/NEIAlchemyRecipeHandler.java | 4 ++-- .../alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java | 4 ++-- .../client/nei/NEIBindingRitualHandler.java | 4 ++-- .../client/nei/NEIBloodOrbShapedHandler.java | 2 +- .../client/nei/NEIBloodOrbShapelessHandler.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index fde1f39a..253b000a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -10,7 +10,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.2.7:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev") { + compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.2.7-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Chisel:2.10.6-GTNH:api") { diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java index 229fae8c..2e176f4d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java @@ -111,7 +111,7 @@ public class NEIAlchemyRecipeHandler extends TemplateRecipeHandler { public void loadCraftingRecipes(ItemStack result) { for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) { if (recipe == null) continue; - if (NEIServerUtils.areStacksSameTypeCrafting(result, recipe.getResult())) { + if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(result, recipe.getResult())) { arecipes.add(new CachedAlchemyRecipe(recipe)); } } @@ -131,7 +131,7 @@ public class NEIAlchemyRecipeHandler extends TemplateRecipeHandler { if (recipe == null) continue; ItemStack[] stacks = recipe.getRecipe(); for (ItemStack stack : stacks) { - if (NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)) { + if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(stack, ingredient)) { arecipes.add(new CachedAlchemyRecipe(recipe)); break; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java index 79f216dd..7d3f6fba 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java @@ -66,7 +66,7 @@ public class NEIAltarRecipeHandler extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(ItemStack result) { for(AltarRecipe recipe: AltarRecipeRegistry.altarRecipes) { - if(NEIServerUtils.areStacksSameTypeCrafting(recipe.result, result)) { + if(NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.result, result)) { if(recipe != null && recipe.result != null) arecipes.add(new CachedAltarRecipe(recipe)); } } @@ -75,7 +75,7 @@ public class NEIAltarRecipeHandler extends TemplateRecipeHandler { @Override public void loadUsageRecipes(ItemStack ingredient) { for(AltarRecipe recipe: AltarRecipeRegistry.altarRecipes) { - if(NEIServerUtils.areStacksSameTypeCrafting(recipe.requiredItem, ingredient)) { + if(NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.requiredItem, ingredient)) { if(recipe != null && recipe.result != null) arecipes.add(new CachedAltarRecipe(recipe)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java index 21f2fba8..0ebc6f60 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java @@ -65,7 +65,7 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler { for (BindingRecipe recipe: BindingRegistry.bindingRecipes) { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.outputItem, result)) + if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.outputItem, result)) { if (recipe != null && recipe.outputItem != null) { @@ -80,7 +80,7 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler { for (BindingRecipe recipe: BindingRegistry.bindingRecipes) { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.requiredItem, ingredient)) + if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.requiredItem, ingredient)) { if (recipe != null && recipe.outputItem != null) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java index c573ecda..30662f98 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java @@ -83,7 +83,7 @@ public class NEIBloodOrbShapedHandler extends ShapedRecipeHandler { for (IRecipe irecipe : (List) CraftingManager.getInstance().getRecipeList()) { if (irecipe instanceof ShapedBloodOrbRecipe) { CachedBloodOrbRecipe recipe = forgeShapedRecipe((ShapedBloodOrbRecipe) irecipe); - if (recipe == null || !NEIServerUtils.areStacksSameTypeCrafting(recipe.result.item, result)) + if (recipe == null || !NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.result.item, result)) continue; recipe.computeVisuals(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java index 25215e21..339b0a8b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java @@ -77,7 +77,7 @@ public class NEIBloodOrbShapelessHandler extends ShapelessRecipeHandler { public void loadCraftingRecipes(ItemStack result) { List allrecipes = CraftingManager.getInstance().getRecipeList(); for (IRecipe irecipe : allrecipes) { - if (NEIServerUtils.areStacksSameTypeCrafting(irecipe.getRecipeOutput(), result)) { + if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(irecipe.getRecipeOutput(), result)) { CachedBloodOrbRecipe recipe = null; if (irecipe instanceof ShapelessBloodOrbRecipe) recipe = forgeShapelessRecipe((ShapelessBloodOrbRecipe) irecipe);