From e5f01e82a232225eae2f9e297b56ca15ee43eb9b Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 22 Jan 2017 22:24:01 -0800 Subject: [PATCH] Add Brewing JEI recipes --- .../integration/jei/ExtraTreesJeiPlugin.java | 11 ++- .../integration/jei/RecipeUids.java | 1 + .../jei/brewery/BreweryRecipeCategory.java | 69 +++++++++++++++++++ .../jei/brewery/BreweryRecipeMaker.java | 23 +++++++ .../jei/brewery/BreweryRecipeWrapper.java | 31 +++++++++ .../integration/jei/brewery/package-info.java | 9 +++ .../machines/brewery/BreweryRecipes.java | 4 ++ 7 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java create mode 100644 src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java create mode 100644 src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java create mode 100644 src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java diff --git a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java index b0a8cac8..e3a7a179 100644 --- a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java +++ b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java @@ -2,6 +2,9 @@ package binnie.extratrees.integration.jei; import binnie.core.integration.jei.Drawables; import binnie.core.integration.jei.SimpleRecipeHandler; +import binnie.extratrees.integration.jei.brewery.BreweryRecipeCategory; +import binnie.extratrees.integration.jei.brewery.BreweryRecipeMaker; +import binnie.extratrees.integration.jei.brewery.BreweryRecipeWrapper; import binnie.extratrees.integration.jei.fruitpress.FruitPressRecipeCategory; import binnie.extratrees.integration.jei.fruitpress.FruitPressRecipeMaker; import binnie.extratrees.integration.jei.fruitpress.FruitPressRecipeWrapper; @@ -35,18 +38,22 @@ public class ExtraTreesJeiPlugin extends BlankModPlugin { registry.addRecipeCategories( new LumbermillRecipeCategory(), - new FruitPressRecipeCategory() + new FruitPressRecipeCategory(), + new BreweryRecipeCategory() ); registry.addRecipeHandlers( new SimpleRecipeHandler<>(LumbermillRecipeWrapper.class, RecipeUids.LUMBERMILL), - new SimpleRecipeHandler<>(FruitPressRecipeWrapper.class, RecipeUids.FRUIT_PRESS) + new SimpleRecipeHandler<>(FruitPressRecipeWrapper.class, RecipeUids.FRUIT_PRESS), + new SimpleRecipeHandler<>(BreweryRecipeWrapper.class, RecipeUids.BREWING) ); registry.addRecipeCategoryCraftingItem(ExtraTreeMachine.Lumbermill.get(1), RecipeUids.LUMBERMILL); registry.addRecipeCategoryCraftingItem(ExtraTreeMachine.Press.get(1), RecipeUids.FRUIT_PRESS); + registry.addRecipeCategoryCraftingItem(ExtraTreeMachine.Brewery.get(1), RecipeUids.BREWING); registry.addRecipes(LumbermillRecipeMaker.create()); registry.addRecipes(FruitPressRecipeMaker.create()); + registry.addRecipes(BreweryRecipeMaker.create()); } } diff --git a/src/main/java/binnie/extratrees/integration/jei/RecipeUids.java b/src/main/java/binnie/extratrees/integration/jei/RecipeUids.java index 2248902c..8b931fbf 100644 --- a/src/main/java/binnie/extratrees/integration/jei/RecipeUids.java +++ b/src/main/java/binnie/extratrees/integration/jei/RecipeUids.java @@ -3,4 +3,5 @@ package binnie.extratrees.integration.jei; public class RecipeUids { public static final String LUMBERMILL = "binnie.extratrees.lumbermill"; public static final String FRUIT_PRESS = "binnie.extratrees.fruitpress"; + public static final String BREWING = "binnie.extratrees.brewing"; } diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java new file mode 100644 index 00000000..c31af4de --- /dev/null +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java @@ -0,0 +1,69 @@ +package binnie.extratrees.integration.jei.brewery; + +import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; +import binnie.extratrees.integration.jei.RecipeUids; +import binnie.extratrees.machines.brewery.BreweryMachine; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.BlankRecipeCategory; +import net.minecraft.client.Minecraft; + +public class BreweryRecipeCategory extends BlankRecipeCategory { + private final IDrawableAnimated arrowAnimated; + + public BreweryRecipeCategory() { + this.arrowAnimated = ExtraTreesJeiPlugin.drawables.createArrowAnimated(56); + } + + @Override + public String getUid() { + return RecipeUids.BREWING; + } + + @Override + public String getTitle() { + return "Brewing"; + } + + @Override + public IDrawable getBackground() { + return ExtraTreesJeiPlugin.guiHelper.createBlankDrawable(130, 60); + } + + @Override + public void drawExtras(Minecraft minecraft) { + IDrawable tank = ExtraTreesJeiPlugin.drawables.getTank(); + tank.draw(minecraft, 0, 0); + tank.draw(minecraft, 112, 0); + + IDrawable arrow = ExtraTreesJeiPlugin.drawables.getArrow(); + arrow.draw(minecraft, 69, 25); + arrowAnimated.draw(minecraft, 69, 25); + + IDrawable slot = ExtraTreesJeiPlugin.guiHelper.getSlotDrawable(); + + slot.draw(minecraft, 42, 0); + slot.draw(minecraft, 42, 21); + slot.draw(minecraft, 42, 42); + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, BreweryRecipeWrapper recipeWrapper, IIngredients ingredients) { + IDrawable tankOverlay = ExtraTreesJeiPlugin.drawables.getTankOverlay(); + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + fluidStacks.init(BreweryMachine.TANK_INPUT, true, 1, 1, 16, 58, 10, false, tankOverlay); + fluidStacks.init(BreweryMachine.TANK_OUTPUT, false, 113, 1, 16, 58, 10, false, tankOverlay); + fluidStacks.set(ingredients); + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 42, 0); + itemStacks.init(1, true, 42, 21); + itemStacks.init(2, true, 42, 42); + itemStacks.set(ingredients); + } +} diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java new file mode 100644 index 00000000..74d4c642 --- /dev/null +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java @@ -0,0 +1,23 @@ +package binnie.extratrees.integration.jei.brewery; + +import binnie.extratrees.machines.brewery.BreweryRecipes; +import binnie.extratrees.machines.brewery.IBreweryRecipe; +import binnie.extratrees.machines.lumbermill.LumbermillRecipes; +import net.minecraft.item.ItemStack; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class BreweryRecipeMaker { + public static List create() { + List recipes = new ArrayList<>(); + + for (IBreweryRecipe breweryRecipe : BreweryRecipes.getRecipes()) { + recipes.add(new BreweryRecipeWrapper(breweryRecipe)); + } + + return recipes; + } +} diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java new file mode 100644 index 00000000..0c279190 --- /dev/null +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeWrapper.java @@ -0,0 +1,31 @@ +package binnie.extratrees.integration.jei.brewery; + +import binnie.extratrees.machines.brewery.IBreweryRecipe; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class BreweryRecipeWrapper extends BlankRecipeWrapper { + private final IBreweryRecipe recipe; + + public BreweryRecipeWrapper(IBreweryRecipe recipe) { + this.recipe = recipe; + } + + @Override + public void getIngredients(IIngredients ingredients) { + List> inputs = new ArrayList<>(); + inputs.add(recipe.getIngredients()); + inputs.add(recipe.getGrains()); + inputs.add(Collections.singletonList(recipe.getYeast())); + + ingredients.setInputLists(ItemStack.class, inputs); + ingredients.setInput(FluidStack.class, recipe.getInput()); + ingredients.setOutput(FluidStack.class, recipe.getOutput()); + } +} diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java b/src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java new file mode 100644 index 00000000..3b79d059 --- /dev/null +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package binnie.extratrees.integration.jei.brewery; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java index 9020e39b..18aeb1ba 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java @@ -100,4 +100,8 @@ public class BreweryRecipes { public static void addRecipes(IBreweryRecipe... recipes) { Collections.addAll(BreweryRecipes.recipes, recipes); } + + public static List getRecipes() { + return Collections.unmodifiableList(recipes); + } }