diff --git a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index 72f1467d..502e66fb 100644 --- a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -4,6 +4,7 @@ import binnie.core.integration.jei.Drawables; import binnie.core.integration.jei.SimpleRecipeHandler; import binnie.genetics.Genetics; import binnie.genetics.api.IItemChargeable; +import binnie.genetics.integration.jei.database.DatabaseRecipeMaker; import binnie.genetics.integration.jei.genepool.GenepoolRecipeCategory; import binnie.genetics.integration.jei.genepool.GenepoolRecipeMaker; import binnie.genetics.integration.jei.genepool.GenepoolRecipeWrapper; @@ -26,6 +27,8 @@ import binnie.genetics.integration.jei.polymeriser.PolymeriserRecipeWrapper; import binnie.genetics.integration.jei.sequencer.SequencerRecipeCategory; import binnie.genetics.integration.jei.sequencer.SequencerRecipeMaker; import binnie.genetics.integration.jei.sequencer.SequencerRecipeWrapper; +import binnie.genetics.integration.jei.database.DatabaseRecipeCategory; +import binnie.genetics.integration.jei.database.DatabaseRecipeWrapper; import binnie.genetics.machine.AdvGeneticMachine; import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.LaboratoryMachine; @@ -55,7 +58,7 @@ public class GeneticsJeiPlugin extends BlankModPlugin { List chargeables = Arrays.asList(Genetics.itemSequencer, Genetics.itemSerum, Genetics.itemSerumArray); ChargeableSubtypeInterpreter chargeableSubtypeInterpreter = new ChargeableSubtypeInterpreter(); for (Item chargeable : chargeables) { - subtypeRegistry.registerNbtInterpreter(chargeable, chargeableSubtypeInterpreter); + subtypeRegistry.registerSubtypeInterpreter(chargeable, chargeableSubtypeInterpreter); } } @@ -73,7 +76,8 @@ public class GeneticsJeiPlugin extends BlankModPlugin { new SequencerRecipeCategory(), new InoculatorRecipeCategory(), new SplicerRecipeCategory(), - new GenepoolRecipeCategory() + new GenepoolRecipeCategory(), + new DatabaseRecipeCategory() ); registry.addRecipeHandlers( @@ -84,7 +88,8 @@ public class GeneticsJeiPlugin extends BlankModPlugin { new SimpleRecipeHandler<>(SequencerRecipeWrapper.class, RecipeUids.SEQUENCER), new SimpleRecipeHandler<>(InoculatorRecipeWrapper.class, RecipeUids.INOCULATOR), new SimpleRecipeHandler<>(SplicerRecipeWrapper.class, RecipeUids.SPLICER), - new SimpleRecipeHandler<>(GenepoolRecipeWrapper.class, RecipeUids.GENEPOOL) + new SimpleRecipeHandler<>(GenepoolRecipeWrapper.class, RecipeUids.GENEPOOL), + new SimpleRecipeHandler<>(DatabaseRecipeWrapper.class, RecipeUids.DATABASE) ); registry.addRecipeCategoryCraftingItem(LaboratoryMachine.Incubator.get(1), RecipeUids.INCUBATOR, RecipeUids.INCUBATOR_LARVAE); @@ -94,6 +99,8 @@ public class GeneticsJeiPlugin extends BlankModPlugin { registry.addRecipeCategoryCraftingItem(GeneticMachine.Inoculator.get(1), RecipeUids.INOCULATOR); registry.addRecipeCategoryCraftingItem(AdvGeneticMachine.Splicer.get(1), RecipeUids.SPLICER); registry.addRecipeCategoryCraftingItem(LaboratoryMachine.Genepool.get(1), RecipeUids.GENEPOOL); + registry.addRecipeCategoryCraftingItem(new ItemStack(Genetics.database), RecipeUids.DATABASE); + registry.addRecipeCategoryCraftingItem(new ItemStack(Genetics.database, 1, 1), RecipeUids.DATABASE); registry.addRecipes(Incubator.getRecipes()); registry.addRecipes(LarvaeIncubatorRecipeMaker.create(Incubator.getLarvaeRecipe())); @@ -102,6 +109,7 @@ public class GeneticsJeiPlugin extends BlankModPlugin { registry.addRecipes(SequencerRecipeMaker.create()); registry.addRecipes(InoculatorRecipeMaker.create()); registry.addRecipes(GenepoolRecipeMaker.create()); + registry.addRecipes(DatabaseRecipeMaker.create()); } private static class ChargeableSubtypeInterpreter implements ISubtypeRegistry.ISubtypeInterpreter { diff --git a/src/main/java/binnie/genetics/integration/jei/RecipeUids.java b/src/main/java/binnie/genetics/integration/jei/RecipeUids.java index cc0f3038..ca866ca9 100644 --- a/src/main/java/binnie/genetics/integration/jei/RecipeUids.java +++ b/src/main/java/binnie/genetics/integration/jei/RecipeUids.java @@ -9,4 +9,5 @@ public class RecipeUids { public static final String INOCULATOR = "binnie.genetics.inoculator"; public static final String SPLICER = "binnie.genetics.splicer"; public static final String GENEPOOL = "binnie.genetics.genepool"; + public static final String DATABASE = "binnie.genetics.database"; } diff --git a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java new file mode 100644 index 00000000..cf58f7af --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java @@ -0,0 +1,52 @@ +package binnie.genetics.integration.jei.database; + +import binnie.genetics.integration.jei.GeneticsJeiPlugin; +import binnie.genetics.integration.jei.RecipeUids; +import mezz.jei.api.gui.IDrawable; +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; +import net.minecraft.item.ItemStack; + +import java.util.List; + +public class DatabaseRecipeCategory extends BlankRecipeCategory { + @Override + public String getUid() { + return RecipeUids.DATABASE; + } + + @Override + public String getTitle() { + return "Genetic Database"; + } + + @Override + public IDrawable getBackground() { + return GeneticsJeiPlugin.guiHelper.createBlankDrawable(140, 75); + } + + @Override + public void drawExtras(Minecraft minecraft) { + IDrawable slot = GeneticsJeiPlugin.guiHelper.getSlotDrawable(); + slot.draw(minecraft, 30, 0); + slot.draw(minecraft, 85, 0); + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, DatabaseRecipeWrapper recipeWrapper, IIngredients ingredients) { + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + itemStacks.init(0, true, 30, 0); + itemStacks.init(1, true, 58, 18); + itemStacks.init(2, false, 85, 0); + + // workaround to support multiple outputs in one slot on 1.10. + // Todo: 1.11 use simpler itemStack.set(ingredients) + List> inputs = ingredients.getInputs(ItemStack.class); + itemStacks.set(0, inputs.get(0)); + itemStacks.set(1, inputs.get(1)); + itemStacks.set(2, ingredients.getOutputs(ItemStack.class)); + } +} diff --git a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java new file mode 100644 index 00000000..43f0c157 --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java @@ -0,0 +1,47 @@ +package binnie.genetics.integration.jei.database; + +import binnie.genetics.Genetics; +import binnie.genetics.integration.jei.GeneticsJeiPlugin; +import binnie.genetics.item.GeneticsItems; +import mezz.jei.api.recipe.IStackHelper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.ArrayList; +import java.util.List; + +public class DatabaseRecipeMaker { + public static List create() { + List recipes = new ArrayList<>(); + + { + ItemStack emptySerum = GeneticsItems.EmptySerum.get(1); + ItemStack resultSerum = new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE); + IStackHelper stackHelper = GeneticsJeiPlugin.jeiHelpers.getStackHelper(); + List subtypes = stackHelper.toItemStackList(resultSerum); + List resultSerums = new ArrayList<>(); + for (ItemStack subtype : subtypes) { + subtype = subtype.copy(); + subtype.setItemDamage(subtype.getMaxDamage()); + resultSerums.add(subtype); + } + recipes.add(new DatabaseRecipeWrapper(emptySerum, resultSerums)); + } + + { + ItemStack emptySerumArray = GeneticsItems.EmptyGenome.get(1); + ItemStack resultSerumArray = new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE); + IStackHelper stackHelper = GeneticsJeiPlugin.jeiHelpers.getStackHelper(); + List subtypes = stackHelper.toItemStackList(resultSerumArray); + List resultSerumArrays = new ArrayList<>(); + for (ItemStack subtype : subtypes) { + subtype = subtype.copy(); + subtype.setItemDamage(subtype.getMaxDamage()); + resultSerumArrays.add(subtype); + } + recipes.add(new DatabaseRecipeWrapper(emptySerumArray, resultSerumArrays)); + } + + return recipes; + } +} diff --git a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java new file mode 100644 index 00000000..4ebac0b0 --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java @@ -0,0 +1,47 @@ +package binnie.genetics.integration.jei.database; + +import binnie.genetics.Genetics; +import binnie.genetics.integration.jei.GeneticsJeiPlugin; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableAnimated; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + +import java.awt.Color; +import java.util.Arrays; +import java.util.List; + +public class DatabaseRecipeWrapper extends BlankRecipeWrapper { + private final ItemStack input; + private final List outputs; + private final IDrawableAnimated arrowAnimated; + + public DatabaseRecipeWrapper(ItemStack input, List outputs) { + this.input = input; + this.outputs = outputs; + + this.arrowAnimated = GeneticsJeiPlugin.drawables.createArrowAnimated(20); + } + + @Override + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + IDrawable arrow = GeneticsJeiPlugin.drawables.getArrow(); + arrow.draw(minecraft, 60, 4); + arrowAnimated.draw(minecraft, 60, 4); + + String instructions = "Open the database and pick up an empty serum. Click the serum on a Sequenced gene to apply."; + minecraft.fontRendererObj.drawSplitString(instructions, 0, 40, recipeWidth, Color.gray.getRGB()); + } + + @Override + public void getIngredients(IIngredients ingredients) { + ingredients.setInputs(ItemStack.class, Arrays.asList( + input, + new ItemStack(Genetics.database) + )); + + ingredients.setOutputs(ItemStack.class, outputs); + } +} diff --git a/src/main/java/binnie/genetics/integration/jei/database/package-info.java b/src/main/java/binnie/genetics/integration/jei/database/package-info.java new file mode 100644 index 00000000..837d016a --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/database/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@FieldsAreNonnullByDefault +@MethodsReturnNonnullByDefault +package binnie.genetics.integration.jei.database; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file