diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java index 8f77cac6e..4eef30707 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java @@ -2,6 +2,7 @@ package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import net.minecraft.client.Minecraft; @@ -115,7 +116,7 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { public void loadCraftingRecipes(String outputId, Object... results) { if(outputId.equals("botania.elvenTrade") && hasElvenKnowledge()) { if(hasElvenKnowledge()) { - for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { + for(RecipeElvenTrade recipe : filteredElvenTradeRecipes()) { if(recipe == null) continue; @@ -128,7 +129,7 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(ItemStack result) { if(hasElvenKnowledge()) { - for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { + for(RecipeElvenTrade recipe : filteredElvenTradeRecipes()) { if(recipe == null) continue; @@ -141,7 +142,7 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { @Override public void loadUsageRecipes(ItemStack ingredient) { if(hasElvenKnowledge()) { - for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { + for(RecipeElvenTrade recipe : filteredElvenTradeRecipes()) { if(recipe == null) continue; @@ -152,4 +153,28 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { } } + // hide dummy recipes + private List filteredElvenTradeRecipes() { + List list = new ArrayList<>(); + for (RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { + if (recipe == null) + continue; + + if (recipe.getInputs().size() == 1 && stackSame(recipe.getOutput(), recipe.getInputs().get(0))) { + continue; + } + + list.add(recipe); + } + return list; + } + + private boolean stackSame(ItemStack stack, Object obj) { + if (obj instanceof String) { + return OreDictionary.getOres((String) obj).stream().anyMatch(s -> ItemNBTHelper.areStacksSameTypeCraftingWithNBT(stack, s)); + } else { + return Arrays.stream(NEIServerUtils.extractRecipeItems(obj)).anyMatch(s -> ItemNBTHelper.areStacksSameTypeCraftingWithNBT(stack, s)); + } + } + }