diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 8cf4d22a6..cee6ca7af 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -495,16 +495,26 @@ public final class BotaniaAPI { /** * Registers a Elven Trade recipe (throw an item in an Alfheim Portal). - * @param output The ItemStack to return. + * @param outputs The ItemStacks to return. * @param inputs The items required, can be ItemStack or ore dictionary entry string. * @return The recipe created. */ - public static RecipeElvenTrade registerElvenTradeRecipe(ItemStack output, Object... inputs) { - RecipeElvenTrade recipe = new RecipeElvenTrade(output, inputs); + public static RecipeElvenTrade registerElvenTradeRecipe(ItemStack[] outputs, Object... inputs) { + RecipeElvenTrade recipe = new RecipeElvenTrade(outputs, inputs); elvenTradeRecipes.add(recipe); return recipe; } + /** + * Registers a Elven Trade recipe (throw an item into an Alfeim Portal). + * @param output The ItemStack to return + * @param inputs The items required, can be an ItemStack or an Ore Dictionary entry string. + * @return The recipe created. + */ + public static RecipeElvenTrade registerElvenTradeRecipe(ItemStack output, Object... inputs) { + return registerElvenTradeRecipe(new ItemStack[]{ output }, inputs); + } + /** * Registers a Brew Recipe (for the Botanical Brewery). * @param brew The brew in to be set in this recipe. diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index 04e96274d..834d5993f 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -9,11 +9,11 @@ import java.util.List; public class RecipeElvenTrade { - private final ItemStack output; + private final ImmutableList outputs; private final ImmutableList inputs; - public RecipeElvenTrade(ItemStack output, Object... inputs) { - this.output = output; + public RecipeElvenTrade(ItemStack[] outputs, Object... inputs) { + this.outputs = ImmutableList.copyOf(outputs); ImmutableList.Builder inputsToSet = ImmutableList.builder(); for(Object obj : inputs) { @@ -88,8 +88,8 @@ public class RecipeElvenTrade { return inputs; } - public ItemStack getOutput() { - return output; + public List getOutputs() { + return outputs; } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index 52bf709ac..b76ac1c6f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -22,7 +22,7 @@ import java.util.List; public class ElvenTradeRecipeWrapper implements IRecipeWrapper { private final List input; - private final ItemStack output; + private final List outputs; @SuppressWarnings("unchecked") public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) { @@ -36,7 +36,7 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { } } input = builder.build(); - output = recipe.getOutput(); + outputs = ImmutableList.copyOf(recipe.getOutputs()); } @Override @@ -46,7 +46,7 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { @Override public List getOutputs() { - return ImmutableList.of(output); + return outputs; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 25f606725..acb38778b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -222,7 +222,8 @@ public class TileAlfPortal extends TileMod { for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes) { if(recipe.matches(stacksIn, false)) { recipe.matches(stacksIn, true); - spawnItem(recipe.getOutput().copy()); + for(ItemStack output : recipe.getOutputs()) + spawnItem(output.copy()); break; } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 8f84d67e0..a5ee24418 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -43,7 +43,8 @@ public class PageElvenRecipe extends PageRecipe { @Override public void onPageAdded(LexiconEntry entry, int index) { for(RecipeElvenTrade recipe : recipes) - LexiconRecipeMappings.map(recipe.getOutput(), entry, index); + for(ItemStack output : recipe.getOutputs()) + LexiconRecipeMappings.map(output, entry, index); } @Override @@ -58,7 +59,10 @@ public class PageElvenRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); GlStateManager.disableBlend(); - renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false); + List outputs = recipe.getOutputs(); + for(int i = 0; i < outputs.size(); i++) { + renderItemAtOutputPos(gui, i % 2, i / 2, outputs.get(i)); + } List inputs = recipe.getInputs(); int i = 0; @@ -94,6 +98,26 @@ public class PageElvenRecipe extends PageRecipe { renderItem(gui, xPos, yPos, stack1, false); } + @SideOnly(Side.CLIENT) + public void renderItemAtOutputPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack) { + if(stack == null || stack.getItem() == null) + return; + stack = stack.copy(); + + if(stack.getItemDamage() == Short.MAX_VALUE) + stack.setItemDamage(0); + + int xPos = gui.getLeft() + x * 20 + 94; + int yPos = gui.getTop() + y * 20 + 52; + + ItemStack stack1 = stack.copy(); + if (stack1.getItemDamage() == -1) { + stack1.setItemDamage(0); + } + + renderItem(gui, xPos, yPos, stack1, false); + } + @Override @SideOnly(Side.CLIENT) @@ -114,7 +138,7 @@ public class PageElvenRecipe extends PageRecipe { public List getDisplayedRecipes() { ArrayList list = new ArrayList<>(); for(RecipeElvenTrade r : recipes) - list.add(r.getOutput()); + list.addAll(r.getOutputs()); return list; } diff --git a/src/main/resources/assets/botania/textures/gui/elvenTradeOverlay.png b/src/main/resources/assets/botania/textures/gui/elvenTradeOverlay.png index c7479f17a..8c89f61d8 100644 Binary files a/src/main/resources/assets/botania/textures/gui/elvenTradeOverlay.png and b/src/main/resources/assets/botania/textures/gui/elvenTradeOverlay.png differ