diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index eef591a1..b1a0a823 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -164,9 +164,9 @@ public class MachineUtil { return machine.getInterface(IProcess.class); } - public List getNonNullStacks(int[] slotAcclimatiser) { - List stacks = new ArrayList(); - for (ItemStack stack : getStacks(slotAcclimatiser)) { + public List getNonNullStacks(int[] slot) { + List stacks = new ArrayList<>(); + for (ItemStack stack : getStacks(slot)) { if (stack != null) { stacks.add(stack); } diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java index 6487a85e..69327f62 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java @@ -25,10 +25,10 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem public ComponentProcessIndefinate(IMachine machine, float energyPerTick) { super(machine); + this.energyPerTick = energyPerTick; actionPauseProcess = 0.0f; actionCancelTask = 0.0f; clientEnergyPerSecond = 0; - this.energyPerTick = energyPerTick; } protected IPoweredMachine getPower() { diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java index bea3a8d3..43a05350 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java @@ -22,7 +22,7 @@ public class GenepoolComponentLogic extends ComponentProcessSetCost implements I @Override public ErrorState canWork() { - if (getUtil().isSlotEmpty(0)) { + if (getUtil().isSlotEmpty(Genepool.SLOT_BEE)) { return new ErrorState.NoItem( I18N.localise("genetics.machine.genepool.error.noIndividual"), Genepool.SLOT_BEE @@ -39,7 +39,7 @@ public class GenepoolComponentLogic extends ComponentProcessSetCost implements I Genepool.TANK_DNA ); } - if (!getUtil().liquidInTank(1, 1)) { + if (!getUtil().liquidInTank(Genepool.TANK_ETHANOL, 1)) { return new ErrorState.InsufficientLiquid( I18N.localise("genetics.machine.genepool.error.noEthanol"), Genepool.TANK_ETHANOL @@ -64,9 +64,9 @@ public class GenepoolComponentLogic extends ComponentProcessSetCost implements I private int getDNAAmount(ItemStack stack) { ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); - if (root == null - || root != Binnie.Genetics.getBeeRoot() - || Binnie.Genetics.getBeeRoot().isDrone(stack)) { + if (root == null || + root != Binnie.Genetics.getBeeRoot() || + Binnie.Genetics.getBeeRoot().isDrone(stack)) { return 10; }