diff --git a/src/main/java/binnie/core/integration/jei/SimpleRecipeHandler.java b/src/main/java/binnie/core/integration/jei/SimpleRecipeHandler.java new file mode 100644 index 00000000..031a20d9 --- /dev/null +++ b/src/main/java/binnie/core/integration/jei/SimpleRecipeHandler.java @@ -0,0 +1,39 @@ +package binnie.core.integration.jei; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class SimpleRecipeHandler implements IRecipeHandler { + private final Class recipeClass; + private final String recipeCategoryUid; + + public SimpleRecipeHandler(Class recipeClass, String recipeCategoryUid) { + this.recipeClass = recipeClass; + this.recipeCategoryUid = recipeCategoryUid; + } + + @Override + public Class getRecipeClass() { + return recipeClass; + } + + @Override + public String getRecipeCategoryUid() { + return recipeCategoryUid; + } + + @Override + public String getRecipeCategoryUid(T recipe) { + return recipeCategoryUid; + } + + @Override + public IRecipeWrapper getRecipeWrapper(T recipe) { + return recipe; + } + + @Override + public boolean isRecipeValid(T recipe) { + return true; + } +} diff --git a/src/main/java/binnie/genetics/api/IItemChargable.java b/src/main/java/binnie/genetics/api/IItemChargeable.java similarity index 87% rename from src/main/java/binnie/genetics/api/IItemChargable.java rename to src/main/java/binnie/genetics/api/IItemChargeable.java index dad449b6..59791514 100644 --- a/src/main/java/binnie/genetics/api/IItemChargable.java +++ b/src/main/java/binnie/genetics/api/IItemChargeable.java @@ -3,7 +3,7 @@ package binnie.genetics.api; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; -public interface IItemChargable { +public interface IItemChargeable { int getCharges(ItemStack itemStack); int getMaxCharges(ItemStack itemStack); diff --git a/src/main/java/binnie/genetics/api/IItemSerum.java b/src/main/java/binnie/genetics/api/IItemSerum.java index f27fdf16..8d23faaa 100644 --- a/src/main/java/binnie/genetics/api/IItemSerum.java +++ b/src/main/java/binnie/genetics/api/IItemSerum.java @@ -2,7 +2,7 @@ package binnie.genetics.api; import net.minecraft.item.ItemStack; -public interface IItemSerum extends IItemChargable { +public interface IItemSerum extends IItemChargeable { IGene[] getGenes(final ItemStack p0); IGene getGene(final ItemStack p0, final int p1); diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/src/main/java/binnie/genetics/genetics/Engineering.java index f79dc502..a2690ecc 100644 --- a/src/main/java/binnie/genetics/genetics/Engineering.java +++ b/src/main/java/binnie/genetics/genetics/Engineering.java @@ -2,7 +2,7 @@ package binnie.genetics.genetics; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; -import binnie.genetics.api.IItemChargable; +import binnie.genetics.api.IItemChargeable; import binnie.genetics.api.IItemSerum; import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSerum; @@ -61,6 +61,6 @@ public class Engineering { } public static int getCharges(final ItemStack serum) { - return ((IItemChargable) serum.getItem()).getCharges(serum); + return ((IItemChargeable) serum.getItem()).getCharges(serum); } } diff --git a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index 73cc664b..fb234a37 100644 --- a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -1,19 +1,23 @@ package binnie.genetics.integration.jei; import binnie.core.integration.jei.Drawables; +import binnie.core.integration.jei.SimpleRecipeHandler; import binnie.genetics.Genetics; -import binnie.genetics.api.IItemChargable; +import binnie.genetics.api.IItemChargeable; import binnie.genetics.integration.jei.incubator.IncubatorRecipeCategory; import binnie.genetics.integration.jei.incubator.IncubatorRecipeHandler; import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeCategory; -import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeHandler; import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeMaker; +import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeWrapper; import binnie.genetics.integration.jei.isolator.IsolatorRecipeCategory; -import binnie.genetics.integration.jei.isolator.IsolatorRecipeHandler; import binnie.genetics.integration.jei.isolator.IsolatorRecipeMaker; +import binnie.genetics.integration.jei.isolator.IsolatorRecipeWrapper; import binnie.genetics.integration.jei.polymeriser.PolymeriserRecipeCategory; -import binnie.genetics.integration.jei.polymeriser.PolymeriserRecipeHandler; import binnie.genetics.integration.jei.polymeriser.PolymeriserRecipeMaker; +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.machine.GeneticMachine; import binnie.genetics.machine.LaboratoryMachine; import binnie.genetics.machine.incubator.Incubator; @@ -56,24 +60,28 @@ public class GeneticsJeiPlugin extends BlankModPlugin { new IncubatorRecipeCategory(), new LarvaeIncubatorRecipeCategory(), new IsolatorRecipeCategory(), - new PolymeriserRecipeCategory() + new PolymeriserRecipeCategory(), + new SequencerRecipeCategory() ); registry.addRecipeHandlers( new IncubatorRecipeHandler(), - new LarvaeIncubatorRecipeHandler(), - new IsolatorRecipeHandler(), - new PolymeriserRecipeHandler() + new SimpleRecipeHandler<>(LarvaeIncubatorRecipeWrapper.class, RecipeUids.INCUBATOR_LARVAE), + new SimpleRecipeHandler<>(IsolatorRecipeWrapper.class, RecipeUids.ISOLATOR), + new SimpleRecipeHandler<>(PolymeriserRecipeWrapper.class, RecipeUids.POLYMERISER), + new SimpleRecipeHandler<>(SequencerRecipeWrapper.class, RecipeUids.SEQUENCER) ); registry.addRecipeCategoryCraftingItem(LaboratoryMachine.Incubator.get(1), RecipeUids.INCUBATOR, RecipeUids.INCUBATOR_LARVAE); registry.addRecipeCategoryCraftingItem(GeneticMachine.Isolator.get(1), RecipeUids.ISOLATOR); registry.addRecipeCategoryCraftingItem(GeneticMachine.Polymeriser.get(1), RecipeUids.POLYMERISER); + registry.addRecipeCategoryCraftingItem(GeneticMachine.Sequencer.get(1), RecipeUids.SEQUENCER); registry.addRecipes(Incubator.getRecipes()); registry.addRecipes(LarvaeIncubatorRecipeMaker.create(Incubator.getLarvaeRecipe())); registry.addRecipes(IsolatorRecipeMaker.create()); registry.addRecipes(PolymeriserRecipeMaker.create()); + registry.addRecipes(SequencerRecipeMaker.create()); } private static class ChargeableSubtypeInterpreter implements ISubtypeRegistry.ISubtypeInterpreter { @@ -81,11 +89,11 @@ public class GeneticsJeiPlugin extends BlankModPlugin { @Override public String getSubtypeInfo(ItemStack itemStack) { Item item = itemStack.getItem(); - if (item instanceof IItemChargable) { - IItemChargable itemChargable = (IItemChargable) item; - boolean fullyCharged = (itemChargable.getCharges(itemStack) == itemChargable.getMaxCharges(itemStack)); + if (item instanceof IItemChargeable) { + IItemChargeable itemChargeable = (IItemChargeable) item; + boolean fullyCharged = (itemChargeable.getCharges(itemStack) == itemChargeable.getMaxCharges(itemStack)); String info = fullyCharged ? "charged" : "uncharged"; - ISpeciesRoot root = itemChargable.getSpeciesRoot(itemStack); + ISpeciesRoot root = itemChargeable.getSpeciesRoot(itemStack); return info + ":" + root.getUID(); } diff --git a/src/main/java/binnie/genetics/integration/jei/RecipeUids.java b/src/main/java/binnie/genetics/integration/jei/RecipeUids.java index f718f29f..09a97d59 100644 --- a/src/main/java/binnie/genetics/integration/jei/RecipeUids.java +++ b/src/main/java/binnie/genetics/integration/jei/RecipeUids.java @@ -5,4 +5,5 @@ public class RecipeUids { public static final String INCUBATOR_LARVAE = "binnie.genetics.incubator.bees"; public static final String ISOLATOR = "binnie.genetics.isolator"; public static final String POLYMERISER = "binnie.genetics.polymeriser"; + public static final String SEQUENCER = "binnie.genetics.sequencer"; } diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeHandler.java b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeHandler.java deleted file mode 100644 index c7635574..00000000 --- a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -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/isolator/IsolatorRecipeHandler.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeHandler.java deleted file mode 100644 index 706b484e..00000000 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -package binnie.genetics.integration.jei.isolator; - -import binnie.genetics.integration.jei.RecipeUids; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class IsolatorRecipeHandler implements IRecipeHandler { - @Override - public Class getRecipeClass() { - return IsolatorRecipeWrapper.class; - } - - @Override - public String getRecipeCategoryUid() { - return RecipeUids.ISOLATOR; - } - - @Override - public String getRecipeCategoryUid(IsolatorRecipeWrapper recipe) { - return RecipeUids.ISOLATOR; - } - - @Override - public IRecipeWrapper getRecipeWrapper(IsolatorRecipeWrapper recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(IsolatorRecipeWrapper recipe) { - return true; - } -} diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java index c23472d0..6794d9fd 100644 --- a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java @@ -9,13 +9,9 @@ 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.gui.ITooltipCallback; 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 PolymeriserRecipeCategory extends BlankRecipeCategory { @Override @@ -60,12 +56,9 @@ public class PolymeriserRecipeCategory extends BlankRecipeCategory() { - @Override - public void onTooltip(int slotIndex, boolean input, ItemStack ingredient, List tooltip) { - if (slotIndex == 1) { - tooltip.add("5x Processing Speed"); - } + itemStacks.addTooltipCallback((slotIndex, input, ingredient, tooltip) -> { + if (slotIndex == 1) { + tooltip.add("5x Processing Speed"); } }); diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeHandler.java b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeHandler.java deleted file mode 100644 index 4695c276..00000000 --- a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -package binnie.genetics.integration.jei.polymeriser; - -import binnie.genetics.integration.jei.RecipeUids; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class PolymeriserRecipeHandler implements IRecipeHandler { - @Override - public Class getRecipeClass() { - return PolymeriserRecipeWrapper.class; - } - - @Override - public String getRecipeCategoryUid() { - return RecipeUids.POLYMERISER; - } - - @Override - public String getRecipeCategoryUid(PolymeriserRecipeWrapper recipe) { - return RecipeUids.POLYMERISER; - } - - @Override - public IRecipeWrapper getRecipeWrapper(PolymeriserRecipeWrapper recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(PolymeriserRecipeWrapper recipe) { - return true; - } -} diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java new file mode 100644 index 00000000..70665ff6 --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeCategory.java @@ -0,0 +1,46 @@ +package binnie.genetics.integration.jei.sequencer; + +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; + +public class SequencerRecipeCategory extends BlankRecipeCategory { + @Override + public String getUid() { + return RecipeUids.SEQUENCER; + } + + @Override + public String getTitle() { + return "Sequencing"; + } + + @Override + public IDrawable getBackground() { + return GeneticsJeiPlugin.guiHelper.createBlankDrawable(72, 41); + } + + @Override + public void drawExtras(Minecraft minecraft) { + IDrawable slot = GeneticsJeiPlugin.guiHelper.getSlotDrawable(); + slot.draw(minecraft, 0, 0); + slot.draw(minecraft, 0, 21); + + slot.draw(minecraft, 52, 21); + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, SequencerRecipeWrapper recipeWrapper, IIngredients ingredients) { + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + itemStacks.init(0, true, 0, 0); + itemStacks.init(1, true, 0, 21); + itemStacks.init(2, true, 52, 0); + itemStacks.init(3, false, 52, 21); + itemStacks.set(ingredients); + } +} diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java new file mode 100644 index 00000000..2451221a --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeMaker.java @@ -0,0 +1,34 @@ +package binnie.genetics.integration.jei.sequencer; + +import binnie.core.genetics.Gene; +import binnie.genetics.item.ItemSequence; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; +import net.minecraft.item.ItemStack; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class SequencerRecipeMaker { + public static List create() { + List recipes = new ArrayList<>(); + + Collection roots = AlleleManager.alleleRegistry.getSpeciesRoot().values(); + for (ISpeciesRoot root : roots) { + IChromosomeType speciesChromosomeType = root.getSpeciesChromosomeType(); + IAllele[] defaultTemplate = root.getDefaultTemplate(); + + IAllele species = defaultTemplate[speciesChromosomeType.ordinal()]; + ItemStack filledSequence = ItemSequence.create(new Gene(species, speciesChromosomeType, root), false); + recipes.add(new SequencerRecipeWrapper(filledSequence)); + + filledSequence = filledSequence.copy(); + filledSequence.setItemDamage(0); + recipes.add(new SequencerRecipeWrapper(filledSequence)); + } + return recipes; + } +} diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java new file mode 100644 index 00000000..2571dd7e --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/sequencer/SequencerRecipeWrapper.java @@ -0,0 +1,44 @@ +package binnie.genetics.integration.jei.sequencer; + +import binnie.genetics.Genetics; +import binnie.genetics.integration.jei.GeneticsJeiPlugin; +import binnie.genetics.item.GeneticsItems; +import binnie.genetics.machine.sequencer.SequencerLogic; +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.util.Arrays; + +public class SequencerRecipeWrapper extends BlankRecipeWrapper { + private final ItemStack input; + private final IDrawableAnimated arrowAnimated; + + public SequencerRecipeWrapper(ItemStack input) { + this.input = input; + + int time = (int) (100 * SequencerLogic.getSequenceStrength(input)); + arrowAnimated = GeneticsJeiPlugin.drawables.createArrowAnimated(time); + } + + @Override + public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + IDrawable arrow = GeneticsJeiPlugin.drawables.getArrow(); + arrow.draw(minecraft, 28, 4); + arrowAnimated.draw(minecraft, 28, 4); + } + + @Override + public void getIngredients(IIngredients ingredients) { + ingredients.setInputs(ItemStack.class, Arrays.asList( + input, + GeneticsItems.FluorescentDye.get(1), + new ItemStack(Genetics.database) + )); + + ingredients.setOutput(ItemStack.class, GeneticsItems.EmptySequencer.get(1)); + } +} diff --git a/src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java b/src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java new file mode 100644 index 00000000..8a111296 --- /dev/null +++ b/src/main/java/binnie/genetics/integration/jei/sequencer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package binnie.genetics.integration.jei.sequencer; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index d6a18308..7b1579e8 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -7,7 +7,7 @@ import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemAnalysable; -import binnie.genetics.api.IItemChargable; +import binnie.genetics.api.IItemChargeable; import binnie.genetics.genetics.GeneItem; import binnie.genetics.genetics.SequencerItem; import forestry.api.apiculture.EnumBeeChromosome; @@ -23,7 +23,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChargable { +public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChargeable { public ItemSequence() { super("sequence"); this.setMaxStackSize(1); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java b/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java index b3cfb486..ffa71e72 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java @@ -2,7 +2,7 @@ package binnie.genetics.machine.polymeriser; import binnie.core.machines.inventory.SlotValidator; import binnie.genetics.Genetics; -import binnie.genetics.api.IItemChargable; +import binnie.genetics.api.IItemChargeable; import binnie.genetics.machine.ModuleMachine; import net.minecraft.item.ItemStack; @@ -13,7 +13,7 @@ public class SlotValidatorUnfilledSerum extends SlotValidator { @Override public boolean isValid(final ItemStack itemStack) { - return itemStack.getItem() instanceof IItemChargable; + return itemStack.getItem() instanceof IItemChargeable; } @Override diff --git a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java index 9f92641c..86cc390c 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java @@ -43,8 +43,8 @@ public class PackageSequencer extends GeneticMachine.PackageGeneticBase implemen slotTarget.setValidator(new SlotValidatorUnsequenced()); slotTarget.setReadOnly(); slotTarget.forbidInteraction(); - InventorySlot slotDrone = inventory.addSlot(Sequencer.SLOT_DRONE, "output"); - slotDrone.setReadOnly(); + InventorySlot slotDone = inventory.addSlot(Sequencer.SLOT_DONE, "output"); + slotDone.setReadOnly(); ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); transfer.addRestock(Sequencer.SLOT_RESERVE, Sequencer.SLOT_TARGET, 1); new ComponentChargedSlots(machine).addCharge(0); diff --git a/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java b/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java index 68744af2..75dd78fa 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java @@ -6,7 +6,7 @@ public class Sequencer { public static final int SLOT_DYE = 0; public static final int[] SLOT_RESERVE = new int[]{1, 2, 3, 4}; public static final int SLOT_TARGET = 5; - public static final int SLOT_DRONE = 6; + public static final int SLOT_DONE = 6; public static BinnieIcon fxSeqA; public static BinnieIcon fxSeqG; public static BinnieIcon fxSeqT; diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java index 801fff89..cfaa1c49 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java @@ -15,8 +15,7 @@ public class SequencerLogic extends ComponentProcess implements IProcess { super(machine); } - public float getSequenceStrength() { - final ItemStack stack = this.getUtil().getStack(Sequencer.SLOT_TARGET); + public static float getSequenceStrength(ItemStack stack) { if (stack == null) { return 1.0f; } @@ -26,7 +25,8 @@ public class SequencerLogic extends ComponentProcess implements IProcess { @Override public int getProcessLength() { - return (int) (19200.0f * this.getSequenceStrength()); + final ItemStack stack = this.getUtil().getStack(Sequencer.SLOT_TARGET); + return (int) (19200.0f * getSequenceStrength(stack)); } @Override @@ -50,8 +50,9 @@ public class SequencerLogic extends ComponentProcess implements IProcess { if (this.getUtil().getSlotCharge(Sequencer.SLOT_DYE) == 0.0f) { return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.sequencer.errors.insufficient.dye"), Sequencer.SLOT_DYE); } - if (this.getUtil().getStack(Sequencer.SLOT_DRONE) != null && this.getUtil().getStack(Sequencer.SLOT_DRONE).stackSize >= 64) { - return new ErrorState.NoSpace(Genetics.proxy.localise("machine.machine.sequencer.errors.no.space"), new int[]{Sequencer.SLOT_DRONE}); + ItemStack stackDone = this.getUtil().getStack(Sequencer.SLOT_DONE); + if (stackDone != null && stackDone.stackSize >= 64) { + return new ErrorState.NoSpace(Genetics.proxy.localise("machine.machine.sequencer.errors.no.space"), new int[]{Sequencer.SLOT_DONE}); } return super.canProgress(); } @@ -74,10 +75,10 @@ public class SequencerLogic extends ComponentProcess implements IProcess { final SequencerItem seqItem = new SequencerItem(this.getUtil().getStack(Sequencer.SLOT_TARGET)); GeneTracker.getTracker(this.getMachine().getWorld(), this.getMachine().getOwner()).registerGene(seqItem.getGene()); this.getUtil().decreaseStack(Sequencer.SLOT_TARGET, 1); - if (this.getUtil().getStack(Sequencer.SLOT_DRONE) == null) { - this.getUtil().setStack(Sequencer.SLOT_DRONE, GeneticsItems.EmptySequencer.get(1)); + if (this.getUtil().getStack(Sequencer.SLOT_DONE) == null) { + this.getUtil().setStack(Sequencer.SLOT_DONE, GeneticsItems.EmptySequencer.get(1)); } else { - this.getUtil().decreaseStack(Sequencer.SLOT_DRONE, -1); + this.getUtil().decreaseStack(Sequencer.SLOT_DONE, -1); } }