From fabedeb31a56ffaac3043ad5f85b414a90025cfe Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Jan 2016 12:22:33 -0600 Subject: [PATCH] Bump forge version, improve brewery JEI integration --- build.properties | 2 +- .../integration/jei/brewery/BreweryRecipeCategory.java | 6 ++++-- .../integration/jei/brewery/BreweryRecipeWrapper.java | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.properties b/build.properties index ec803864c..67cc63c17 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Fri Jan 08 18:17:27 GMT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=11.15.0.1688 +forge_version=11.15.0.1715 mc_version=1.8.9 dir_repo=./ build_number=249 diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 607394f58..ab8edf75e 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -18,6 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; import java.util.Collection; @@ -74,7 +75,8 @@ public class BreweryRecipeCategory implements IRecipeCategory { } int index = 1, posX = 60; - for (Object o : wrapper.getInputs()) { + for (int i = 1; i < wrapper.getInputs().size(); i++) { + Object o = wrapper.getInputs().get(i); recipeLayout.getItemStacks().init(index, true, posX, 6); if (o instanceof ItemStack) { recipeLayout.getItemStacks().set(index, ((ItemStack) o)); @@ -86,7 +88,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { } recipeLayout.getItemStacks().init(7, false, 87, 41); - recipeLayout.getItemStacks().set(7, wrapper.getOutputs().get(0)); + recipeLayout.getItemStacks().set(7, wrapper.getOutputs()); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index 8bfbd619b..305784d57 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -23,11 +23,11 @@ import java.util.List; public class BreweryRecipeWrapper implements IRecipeWrapper { private final List input; - private final ItemStack output; + private final List output; public BreweryRecipeWrapper(RecipeBrew recipeBrew) { ImmutableList.Builder builder = ImmutableList.builder(); - builder.add(new ItemStack(ModItems.vial)); + builder.add(ImmutableList.of(new ItemStack(ModItems.vial, 1, 0), new ItemStack(ModItems.vial, 1, 1))); for (Object o : recipeBrew.getInputs()) { if (o instanceof ItemStack) { builder.add(o); @@ -38,7 +38,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { } input = builder.build(); - output = recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(); + output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), recipeBrew.getOutput(new ItemStack(ModItems.vial, 1, 1)).copy()); } @Override @@ -48,7 +48,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { @Override public List getOutputs() { - return ImmutableList.of(output); + return output; } @Override