Bump forge version, improve brewery JEI integration

This commit is contained in:
Vincent Lee committed 2016-01-23 12:22:33 -06:00
1 parent 2a738209b7
commit fabedeb31a
3 files changed
+9 -7

No files matched your search

@@ -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());
}
}
@@ -23,11 +23,11 @@ import java.util.List;
public class BreweryRecipeWrapper implements IRecipeWrapper {
private final List input;
private final ItemStack output;
private final List<ItemStack> 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<ItemStack> getOutputs() {
return ImmutableList.of(output);
return output;
}
@Override