diff --git a/src/main/java/modtweaker2/helpers/StackHelper.java b/src/main/java/modtweaker2/helpers/StackHelper.java index 694e84c..9304d21 100644 --- a/src/main/java/modtweaker2/helpers/StackHelper.java +++ b/src/main/java/modtweaker2/helpers/StackHelper.java @@ -48,8 +48,8 @@ public class StackHelper { return false; } - // Do we have a wildcard (<*>) or an actual item? - if(ingredient.getItems() != null) { + // Check for Botania special flowers + if(ingredient.getItems() != null && Botania.isSubtile(toStack(itemStack))) { for(IItemStack item : ingredient.getItems()) { if(areEqual(toStack(item), toStack(itemStack))) { return true; diff --git a/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java b/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java index 578765f..cb03265 100644 --- a/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java +++ b/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java @@ -1,8 +1,9 @@ package modtweaker2.mods.appeng.handlers; import static modtweaker2.helpers.InputHelper.getStackDescription; -import static modtweaker2.helpers.InputHelper.toIngredient; +import static modtweaker2.helpers.InputHelper.toIItemStack; import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; @@ -78,7 +79,7 @@ public class Grind { LinkedList result = new LinkedList(); for(IGrinderEntry entry : AEApi.instance().registries().grinder().getRecipes()) { - if(entry != null && entry.getOutput() != null && output.contains(toIngredient(entry.getOutput()))) { + if(entry != null && entry.getOutput() != null && matches(output, toIItemStack(entry.getOutput()))) { result.add(entry); } } @@ -98,7 +99,7 @@ public class Grind { @Override public String getRecipeInfo(IGrinderEntry recipe) { - return getStackDescription(recipe.getOutput()); + return getStackDescription(recipe.getInput()); } } diff --git a/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java b/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java index fae2561..dc5da59 100644 --- a/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java +++ b/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java @@ -1,9 +1,11 @@ package modtweaker2.mods.appeng.handlers; import static modtweaker2.helpers.InputHelper.getStackDescription; -import static modtweaker2.helpers.InputHelper.toIngredient; +import static modtweaker2.helpers.InputHelper.toIItemStack; import static modtweaker2.helpers.InputHelper.toStack; import static modtweaker2.helpers.InputHelper.toStacks; +import static modtweaker2.helpers.StackHelper.matches; + import java.util.LinkedList; @@ -98,7 +100,7 @@ public class Inscriber { LinkedList result = new LinkedList(); for(IInscriberRecipe entry : AEApi.instance().registries().inscriber().getRecipes()) { - if(entry != null && entry.getOutput() != null && output.contains(toIngredient(entry.getOutput()))) { + if(entry != null && entry.getOutput() != null && matches(output, toIItemStack(entry.getOutput()))) { result.add(entry); } }