From 25be7fd254fac1c5f8ede144ae85c7034db49de8 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 27 Oct 2016 02:42:11 -0700 Subject: [PATCH] Complete JEI integration of the Incubator --- .../core/integration/jei/Drawables.java | 61 +++++++++++++++++++ .../binnie/genetics/api/IIncubatorRecipe.java | 6 +- .../integration/jei/GeneticsJeiPlugin.java | 16 ++++- .../genetics/integration/jei/RecipeUids.java | 1 + .../incubator/IncubatorRecipeCategory.java | 54 ++++++++-------- .../jei/incubator/IncubatorRecipeHandler.java | 3 +- .../jei/incubator/IncubatorRecipeWrapper.java | 21 +++++++ .../LarvaeIncubatorRecipeCategory.java | 15 +++++ .../LarvaeIncubatorRecipeHandler.java | 32 ++++++++++ .../incubator/LarvaeIncubatorRecipeMaker.java | 37 +++++++++++ .../LarvaeIncubatorRecipeWrapper.java | 9 +++ .../binnie/genetics/machine/Incubator.java | 22 ++++--- .../genetics/machine/IncubatorRecipe.java | 20 ++++-- .../machine/IncubatorRecipeLarvae.java | 10 +++ 14 files changed, 265 insertions(+), 42 deletions(-) create mode 100644 src/main/java/binnie/core/integration/jei/Drawables.java create mode 100644 src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeCategory.java create mode 100644 src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeHandler.java create mode 100644 src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java create mode 100644 src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeWrapper.java create mode 100644 src/main/java/binnie/genetics/machine/IncubatorRecipeLarvae.java diff --git a/src/main/java/binnie/core/integration/jei/Drawables.java b/src/main/java/binnie/core/integration/jei/Drawables.java new file mode 100644 index 00000000..f6c456b1 --- /dev/null +++ b/src/main/java/binnie/core/integration/jei/Drawables.java @@ -0,0 +1,61 @@ +package binnie.core.integration.jei; + +import binnie.genetics.integration.jei.GeneticsJeiPlugin; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableStatic; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; + +public class Drawables { + private static Drawables INSTANCE; + + public static Drawables getDrawables(IGuiHelper guiHelper) { + if (INSTANCE == null) { + INSTANCE = new Drawables(guiHelper); + } + return INSTANCE; + } + + @Nonnull + public static final ResourceLocation guiTank = new ResourceLocation("binniecore:textures/gui/craftgui-slots.png"); + @Nonnull + public static final ResourceLocation guiArrow = new ResourceLocation("binniecore:textures/gui/craftgui-panels.png"); + + @Nonnull + private final IDrawable tank; + @Nonnull + private final IDrawable tankOverlay; + @Nonnull + private final IDrawable arrow; + @Nonnull + private final IDrawableStatic arrowWhite; + + private Drawables(IGuiHelper guiHelper) { + this.tank = guiHelper.createDrawable(guiTank, 8, 28, 18, 60); + this.tankOverlay = guiHelper.createDrawable(guiTank, 33, 29, 16, 58); + this.arrow = guiHelper.createDrawable(guiArrow, 191, 79, 14, 10); + this.arrowWhite = guiHelper.createDrawable(guiArrow, 207, 79, 14, 10); + } + + @Nonnull + public IDrawable getTank() { + return tank; + } + + @Nonnull + public IDrawable getTankOverlay() { + return tankOverlay; + } + + @Nonnull + public IDrawable getArrow() { + return arrow; + } + + @Nonnull + public IDrawableStatic getArrowWhite() { + return arrowWhite; + } +} diff --git a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java b/src/main/java/binnie/genetics/api/IIncubatorRecipe.java index 34cf6e7d..4b0dfd07 100644 --- a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java +++ b/src/main/java/binnie/genetics/api/IIncubatorRecipe.java @@ -4,6 +4,7 @@ import binnie.core.machines.MachineUtil; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import javax.annotation.Nullable; import java.util.List; public interface IIncubatorRecipe { @@ -14,11 +15,14 @@ public interface IIncubatorRecipe { void doTask(final MachineUtil p0); float getChance(); + float getLossChance(); boolean roomForOutput(final MachineUtil p0); FluidStack getInput(); FluidStack getOutput(); - List getValidItemStacks(); + ItemStack getInputStack(); + @Nullable + ItemStack getExpectedOutput(); } diff --git a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index 80ad7981..91b610ec 100644 --- a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -1,28 +1,40 @@ package binnie.genetics.integration.jei; +import binnie.core.integration.jei.Drawables; import binnie.genetics.integration.jei.incubator.IncubatorRecipeCategory; +import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeCategory; import binnie.genetics.integration.jei.incubator.IncubatorRecipeHandler; +import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeHandler; +import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeMaker; import binnie.genetics.machine.Incubator; +import binnie.genetics.machine.LaboratoryMachine; import mezz.jei.api.*; @JEIPlugin public class GeneticsJeiPlugin extends BlankModPlugin { public static IJeiHelpers jeiHelpers; public static IGuiHelper guiHelper; + public static Drawables drawables; @Override public void register(IModRegistry registry) { GeneticsJeiPlugin.jeiHelpers = registry.getJeiHelpers(); GeneticsJeiPlugin.guiHelper = jeiHelpers.getGuiHelper(); + GeneticsJeiPlugin.drawables = Drawables.getDrawables(guiHelper); registry.addRecipeCategories( - new IncubatorRecipeCategory() + new IncubatorRecipeCategory(), + new LarvaeIncubatorRecipeCategory() ); registry.addRecipeHandlers( - new IncubatorRecipeHandler() + new IncubatorRecipeHandler(), + new LarvaeIncubatorRecipeHandler() ); + registry.addRecipeCategoryCraftingItem(LaboratoryMachine.Incubator.get(1), RecipeUids.INCUBATOR, RecipeUids.INCUBATOR_LARVAE); + registry.addRecipes(Incubator.getRecipes()); + registry.addRecipes(LarvaeIncubatorRecipeMaker.create(Incubator.getLarvaeRecipe())); } } diff --git a/src/main/java/binnie/genetics/integration/jei/RecipeUids.java b/src/main/java/binnie/genetics/integration/jei/RecipeUids.java index 5fd80373..b108f662 100644 --- a/src/main/java/binnie/genetics/integration/jei/RecipeUids.java +++ b/src/main/java/binnie/genetics/integration/jei/RecipeUids.java @@ -2,4 +2,5 @@ package binnie.genetics.integration.jei; public class RecipeUids { public static final String INCUBATOR = "binnie.genetics.incubator"; + public static final String INCUBATOR_LARVAE = "binnie.genetics.incubator.bees"; } diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java index 7135e299..358fe21b 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java @@ -3,41 +3,29 @@ package binnie.genetics.integration.jei.incubator; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.Incubator; +import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IDrawableAnimated.StartDirection; import mezz.jei.api.gui.IDrawableStatic; +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 mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; public class IncubatorRecipeCategory extends BlankRecipeCategory { - - @Nonnull - private final ResourceLocation guiTank = new ResourceLocation("binniecore:textures/gui/craftgui-slots.png"); - @Nonnull - private final ResourceLocation guiArrow = new ResourceLocation("binniecore:textures/gui/craftgui-panels.png"); - - @Nonnull - private final IDrawable tank; - @Nonnull - private final IDrawable tankOverlay; - @Nonnull - private final IDrawable arrow; @Nonnull private final IDrawableAnimated arrowAnimated; public IncubatorRecipeCategory() { - this.tank = GeneticsJeiPlugin.guiHelper.createDrawable(guiTank, 8, 28, 18, 60); - this.tankOverlay = GeneticsJeiPlugin.guiHelper.createDrawable(guiTank, 33, 29, 16, 58); - this.arrow = GeneticsJeiPlugin.guiHelper.createDrawable(guiArrow, 191, 79, 14, 10); - IDrawableStatic arrowWhite = GeneticsJeiPlugin.guiHelper.createDrawable(guiArrow, 207, 79, 14, 10); - this.arrowAnimated = GeneticsJeiPlugin.guiHelper.createAnimatedDrawable(arrowWhite, 56, StartDirection.LEFT, false); + IGuiHelper guiHelper = GeneticsJeiPlugin.guiHelper; + IDrawableStatic arrowWhite = GeneticsJeiPlugin.drawables.getArrowWhite(); + this.arrowAnimated = guiHelper.createAnimatedDrawable(arrowWhite, 56, StartDirection.LEFT, false); } @Override @@ -52,22 +40,36 @@ public class IncubatorRecipeCategory extends BlankRecipeCategory { @Override public IDrawable getBackground() { - return GeneticsJeiPlugin.guiHelper.createBlankDrawable(120, 60); + return GeneticsJeiPlugin.guiHelper.createBlankDrawable(94+18, 60); } @Override public void drawExtras(Minecraft minecraft) { super.drawExtras(minecraft); - tank.draw(minecraft, 16, 0); - tank.draw(minecraft, 80, 0); - arrow.draw(minecraft, 52, 25); - arrowAnimated.draw(minecraft, 52, 25); + IDrawable tank = GeneticsJeiPlugin.drawables.getTank(); + tank.draw(minecraft, 0, 0); + tank.draw(minecraft, 94, 0); + + IDrawable arrow = GeneticsJeiPlugin.drawables.getArrow(); + arrow.draw(minecraft, 49, 26); + arrowAnimated.draw(minecraft, 49, 26); + + IDrawable slot = GeneticsJeiPlugin.guiHelper.getSlotDrawable(); + slot.draw(minecraft, 22, 22); + slot.draw(minecraft, 72, 22); } @Override public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients) { - recipeLayout.getFluidStacks().init(Incubator.tankInput, true, 17, 1, 16, 58, 10000, true, tankOverlay); - recipeLayout.getFluidStacks().init(Incubator.tankOutput, false, 81, 1, 16, 58, 10000, true, tankOverlay); - recipeLayout.getFluidStacks().set(ingredients); + IDrawable tankOverlay = GeneticsJeiPlugin.drawables.getTankOverlay(); + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + fluidStacks.init(Incubator.tankInput, true, 1, 1, 16, 58, 50, false, tankOverlay); + fluidStacks.init(Incubator.tankOutput, false, 95, 1, 16, 58, 50, false, tankOverlay); + fluidStacks.set(ingredients); + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + itemStacks.init(0, true, 22, 22); + itemStacks.init(1, false, 72, 22); + itemStacks.set(ingredients); } } diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java index 13c0cd9e..8e0bdc0e 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java @@ -2,6 +2,7 @@ package binnie.genetics.integration.jei.incubator; import binnie.genetics.api.IIncubatorRecipe; import binnie.genetics.integration.jei.RecipeUids; +import binnie.genetics.machine.IncubatorRecipeLarvae; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; @@ -28,6 +29,6 @@ public class IncubatorRecipeHandler implements IRecipeHandler @Override public boolean isRecipeValid(IIncubatorRecipe recipe) { - return true; + return !(recipe instanceof IncubatorRecipeLarvae); } } diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java index 522237c3..5376249e 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java @@ -3,8 +3,13 @@ package binnie.genetics.integration.jei.incubator; import binnie.genetics.api.IIncubatorRecipe; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import java.awt.*; +import java.util.Collections; + public class IncubatorRecipeWrapper extends BlankRecipeWrapper { private final IIncubatorRecipe recipe; @@ -16,5 +21,21 @@ public class IncubatorRecipeWrapper extends BlankRecipeWrapper { public void getIngredients(IIngredients ingredients) { ingredients.setInput(FluidStack.class, recipe.getInput()); ingredients.setOutput(FluidStack.class, recipe.getOutput()); + + ingredients.setInput(ItemStack.class, recipe.getInputStack()); + ItemStack output = recipe.getExpectedOutput(); + if (output != null) { + ingredients.setOutput(ItemStack.class, output); + } + } + + @Override + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + float loss = recipe.getLossChance(); + if (loss > 0) { + minecraft.fontRendererObj.drawString("Item", 24, 0, Color.gray.getRGB()); + String lossString = String.format("Loss: %.0f%%", loss * 100); + minecraft.fontRendererObj.drawString(lossString, 24, 10, Color.gray.getRGB()); + } } } diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeCategory.java new file mode 100644 index 00000000..2203d749 --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeCategory.java @@ -0,0 +1,15 @@ +package binnie.genetics.integration.jei.incubator; + +import binnie.genetics.integration.jei.RecipeUids; + +public class LarvaeIncubatorRecipeCategory extends IncubatorRecipeCategory { + @Override + public String getUid() { + return RecipeUids.INCUBATOR_LARVAE; + } + + @Override + public String getTitle() { + return "Larvae Incubation"; + } +} diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeHandler.java b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeHandler.java new file mode 100644 index 00000000..6a88b170 --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeHandler.java @@ -0,0 +1,32 @@ +package binnie.genetics.integration.jei.incubator; + +import binnie.genetics.integration.jei.RecipeUids; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class LarvaeIncubatorRecipeHandler implements IRecipeHandler { + @Override + public Class getRecipeClass() { + return LarvaeIncubatorRecipeWrapper.class; + } + + @Override + public String getRecipeCategoryUid() { + return RecipeUids.INCUBATOR_LARVAE; + } + + @Override + public String getRecipeCategoryUid(LarvaeIncubatorRecipeWrapper recipe) { + return RecipeUids.INCUBATOR_LARVAE; + } + + @Override + public IRecipeWrapper getRecipeWrapper(LarvaeIncubatorRecipeWrapper recipe) { + return recipe; + } + + @Override + public boolean isRecipeValid(LarvaeIncubatorRecipeWrapper recipe) { + return true; + } +} diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java new file mode 100644 index 00000000..e33fdf4f --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java @@ -0,0 +1,37 @@ +package binnie.genetics.integration.jei.incubator; + +import binnie.Binnie; +import binnie.genetics.integration.jei.GeneticsJeiPlugin; +import binnie.genetics.machine.IncubatorRecipe; +import binnie.genetics.machine.IncubatorRecipeLarvae; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class LarvaeIncubatorRecipeMaker { + public static List create(@Nullable IncubatorRecipeLarvae recipeLarvae) { + if (recipeLarvae == null) { + return Collections.emptyList(); + } + + List recipes = new ArrayList<>(); + + ItemStack inputStack = recipeLarvae.getInputStack(); + List subtypes = GeneticsJeiPlugin.jeiHelpers.getStackHelper().getSubtypes(inputStack); + for (ItemStack larvae : subtypes) { + IncubatorRecipe recipe = new IncubatorRecipe(larvae, recipeLarvae.getInput(), recipeLarvae.getOutput(), recipeLarvae.getLossChance(), recipeLarvae.getChance()); + final IBee bee = Binnie.Genetics.getBeeRoot().getMember(larvae); + ItemStack drone = Binnie.Genetics.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); + recipe.setOutputStack(drone); + recipes.add(new LarvaeIncubatorRecipeWrapper(recipe)); + } + + return recipes; + } + +} diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeWrapper.java new file mode 100644 index 00000000..d7667378 --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeWrapper.java @@ -0,0 +1,9 @@ +package binnie.genetics.integration.jei.incubator; + +import binnie.genetics.api.IIncubatorRecipe; + +public class LarvaeIncubatorRecipeWrapper extends IncubatorRecipeWrapper { + public LarvaeIncubatorRecipeWrapper(IIncubatorRecipe recipe) { + super(recipe); + } +} diff --git a/src/main/java/binnie/genetics/machine/Incubator.java b/src/main/java/binnie/genetics/machine/Incubator.java index d3f19a2d..a57965bf 100644 --- a/src/main/java/binnie/genetics/machine/Incubator.java +++ b/src/main/java/binnie/genetics/machine/Incubator.java @@ -26,7 +26,9 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -39,6 +41,7 @@ public class Incubator { public static final int tankInput = 0; public static final int tankOutput = 1; private static List RECIPES = new ArrayList<>(); + private static IncubatorRecipeLarvae LARVAE_RECIPE; public static void addRecipes() { Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), Binnie.Liquid.getFluidStack("water", 25), GeneticLiquid.GrowthMedium.get(25), 0.2f)); @@ -51,13 +54,18 @@ public class Incubator { Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.DYE, 1, 15), GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaPoly.get(10), 0.1f)); Incubator.RECIPES.add( new IncubatorRecipe(new ItemStack(Items.BLAZE_POWDER), GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaVector.get(10), 0.05f)); if (BinnieCore.isApicultureActive()) { - Incubator.RECIPES.add(new IncubatorRecipe(Mods.Forestry.stack("beeLarvaeGE"), GeneticLiquid.GrowthMedium.get(50), null, 1.0f, 0.05f) { + Incubator.RECIPES.add(LARVAE_RECIPE = new IncubatorRecipeLarvae(Mods.Forestry.stack("beeLarvaeGE", 1, OreDictionary.WILDCARD_VALUE), GeneticLiquid.GrowthMedium.get(50), null, 1.0f, 0.05f) { @Override public ItemStack getOutputStack(final MachineUtil machine) { final ItemStack larvae = machine.getStack(3); final IBee bee = Binnie.Genetics.getBeeRoot().getMember(larvae); return Binnie.Genetics.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); } + + @Override + public ItemStack getExpectedOutput() { + return Mods.Forestry.stack("beeDroneGE", 1, OreDictionary.WILDCARD_VALUE); + } }); } } @@ -66,6 +74,11 @@ public class Incubator { return Collections.unmodifiableList(RECIPES); } + @Nullable + public static IncubatorRecipeLarvae getLarvaeRecipe() { + return LARVAE_RECIPE; + } + public static class PackageIncubator extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageIncubator() { super("incubator", GeneticsTexture.Incubator, 16767313, true); @@ -161,12 +174,7 @@ public class Incubator { } private static boolean isStackValid(ItemStack stack, IIncubatorRecipe recipe) { - for (ItemStack validItemStack : recipe.getValidItemStacks()) { - if (ItemStack.areItemsEqual(validItemStack, stack)) { - return true; - } - } - return false; + return ItemStack.areItemsEqual(recipe.getInputStack(), stack); } @Override diff --git a/src/main/java/binnie/genetics/machine/IncubatorRecipe.java b/src/main/java/binnie/genetics/machine/IncubatorRecipe.java index 21fa0374..85542e82 100644 --- a/src/main/java/binnie/genetics/machine/IncubatorRecipe.java +++ b/src/main/java/binnie/genetics/machine/IncubatorRecipe.java @@ -13,7 +13,7 @@ import java.util.Random; public class IncubatorRecipe implements IIncubatorRecipe { private final FluidStack input; private final FluidStack output; - private final List itemStacks; + private final ItemStack itemStack; private final float lossChance; private final float tickChance; private ItemStack outputStack; @@ -23,7 +23,7 @@ public class IncubatorRecipe implements IIncubatorRecipe { } public IncubatorRecipe(ItemStack itemStack, final FluidStack input, final FluidStack output, final float lossChance, final float chance) { - this.itemStacks = Collections.singletonList(itemStack); + this.itemStack = itemStack; this.input = input; this.output = output; this.lossChance = lossChance; @@ -35,6 +35,11 @@ public class IncubatorRecipe implements IIncubatorRecipe { return this.tickChance; } + @Override + public float getLossChance() { + return lossChance; + } + @Override public boolean isInputLiquid(final FluidStack fluid) { return fluid != null && this.input.isFluidEqual(fluid); @@ -56,8 +61,13 @@ public class IncubatorRecipe implements IIncubatorRecipe { } @Override - public List getValidItemStacks() { - return Collections.unmodifiableList(itemStacks); + public ItemStack getInputStack() { + return itemStack; + } + + @Override + public ItemStack getExpectedOutput() { + return outputStack; } @Override @@ -84,7 +94,7 @@ public class IncubatorRecipe implements IIncubatorRecipe { } protected ItemStack getOutputStack(final MachineUtil util) { - return this.outputStack; + return getExpectedOutput(); } @Override diff --git a/src/main/java/binnie/genetics/machine/IncubatorRecipeLarvae.java b/src/main/java/binnie/genetics/machine/IncubatorRecipeLarvae.java new file mode 100644 index 00000000..8800e71f --- /dev/null +++ b/src/main/java/binnie/genetics/machine/IncubatorRecipeLarvae.java @@ -0,0 +1,10 @@ +package binnie.genetics.machine; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class IncubatorRecipeLarvae extends IncubatorRecipe { + public IncubatorRecipeLarvae(ItemStack itemStack, FluidStack input, FluidStack output, float lossChance, float chance) { + super(itemStack, input, output, lossChance, chance); + } +}