From 74b358f12766fbffa8e192daed40b87084f06ac5 Mon Sep 17 00:00:00 2001 From: Hubry Date: Tue, 31 Mar 2020 15:07:23 +0200 Subject: [PATCH] Hide the elven return recipes again, unhide and fix lexicon trade recipe --- .../botania/client/integration/jei/JEIBotaniaPlugin.java | 9 +++++++-- .../botania/common/crafting/LexiconElvenTradeRecipe.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 617da2af9..d246deb86 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -25,7 +25,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.BlockTags; import net.minecraft.util.ResourceLocation; @@ -188,8 +187,14 @@ public class JEIBotaniaPlugin implements IModPlugin { @Override public void onRuntimeAvailable(IJeiRuntime jeiRuntime) { IRecipeManager recipeRegistry = jeiRuntime.getRecipeManager(); - for (IRecipe recipe : Minecraft.getInstance().world.getRecipeManager().getRecipes(ModRecipeTypes.ELVEN_TRADE_TYPE).values()) { + // Hide the return recipes (iron ingot/diamond/ender pearl returns, not lexicon) + for (AbstractElvenTradeRecipe recipe : TileAlfPortal.elvenTradeRecipes(Minecraft.getInstance().world.getRecipeManager())) { if (recipe instanceof LexiconElvenTradeRecipe) { + continue; + } + List inputs = recipe.getIngredients(); + List outputs = recipe.getOutputs(); + if (inputs.size() == 1 && outputs.size() == 1 && recipe.containsItem(outputs.get(0))) { recipeRegistry.hideRecipe(recipe, ElvenTradeRecipeCategory.UID); } } diff --git a/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java index 2a3235a0d..863c1e3eb 100644 --- a/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/LexiconElvenTradeRecipe.java @@ -38,7 +38,7 @@ public class LexiconElvenTradeRecipe extends AbstractElvenTradeRecipe { @Nonnull @Override public NonNullList getIngredients() { - return NonNullList.from(Ingredient.fromItems(ModItems.lexicon)); + return NonNullList.withSize(1, Ingredient.fromItems(ModItems.lexicon)); } @Override