From 355c85598ec53326c09f5890d2d21aec7af84845 Mon Sep 17 00:00:00 2001 From: DarkShadow44 Date: Sat, 21 Mar 2026 04:33:14 +0100 Subject: [PATCH 1/2] Move out larvae from splicer even when no serum is present anymore (#76) Co-authored-by: Martin Robertz --- .../binnie/core/machines/power/IProcess.java | 7 ++++ .../splicer/SplicerComponentLogic.java | 35 +++++++++++++++++++ .../machine/splicer/SplicerPackage.java | 17 +++++++-- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/main/java/binnie/core/machines/power/IProcess.java b/src/main/java/binnie/core/machines/power/IProcess.java index ba70a6ad..fc2b996b 100644 --- a/src/main/java/binnie/core/machines/power/IProcess.java +++ b/src/main/java/binnie/core/machines/power/IProcess.java @@ -9,4 +9,11 @@ public interface IProcess extends IErrorStateSource { boolean isInProgress(); ProcessInfo getInfo(); + + /*** + * Returns true if the current target got worked on at least once. + */ + default boolean workedOnTarget() { + return false; + } } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java index 5d8f1055..6fea9bf6 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java @@ -19,6 +19,10 @@ import forestry.api.genetics.IIndividual; public class SplicerComponentLogic extends ComponentProcessSetCost implements IProcess { + // Needed to keep stack. If user takes out target slot and it gets automatically refilled, this happens in the same + // tick + private ItemStack workedOnStack = null; + public int nOfGenes; public SplicerComponentLogic(Machine machine) { @@ -50,6 +54,11 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP public void onInventoryUpdate() { super.onInventoryUpdate(); nOfGenes = getGenesToUse(); + ItemStack newTarget = getUtil().getStack(Splicer.SLOT_TARGET); + + if (newTarget == null || !ItemStack.areItemStacksEqual(workedOnStack, newTarget)) { + workedOnStack = null; + } } protected int getGenesToUse() { @@ -190,5 +199,31 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP Splicer.setGene(gene, target, 1); } getUtil().damageItem(Splicer.SLOT_SERUM_VIAL, 1); + workedOnStack = getUtil().getStack(Splicer.SLOT_TARGET).copy(); + } + + @Override + public boolean workedOnTarget() { + return ItemStack.areItemStacksEqual(workedOnStack, getUtil().getStack(Splicer.SLOT_TARGET)); + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + NBTTagCompound tagWorkedOnStack = (NBTTagCompound) nbt.getTag("workedOnStack"); + if (tagWorkedOnStack != null) { + workedOnStack = ItemStack.loadItemStackFromNBT(tagWorkedOnStack); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + if (workedOnStack != null) { + NBTTagCompound tagWorkedOnStack = new NBTTagCompound(); + workedOnStack.writeToNBT(tagWorkedOnStack); + // Need to save, in case inventory is full it might need to get moved out way later. + nbt.setTag("workedOnStack", tagWorkedOnStack); + } } } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java b/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java index 174bd616..44335eb2 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java @@ -3,6 +3,7 @@ package binnie.genetics.machine.splicer; import net.minecraft.item.ItemStack; import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.ComponentInventoryTransfer; @@ -79,8 +80,20 @@ public class SplicerPackage extends AdvGeneticMachine.PackageAdvGeneticBase impl @Override public boolean fufilled(ItemStack stack) { - return stack != null && transfer.getMachine().getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null - && transfer.getMachine().getInterface(SplicerComponentLogic.class).isValidSerum() != null; + if (stack == null) { + return false; + } + IMachine machine = transfer.getMachine(); + boolean hasSerum = machine.getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null; + + if (hasSerum) { + // Move item if it can't be processed anymore with current serum. + boolean validSerum = machine.getInterface(SplicerComponentLogic.class).isValidSerum() == null; + return !validSerum; + } else { + // Move item if there is no serum and item got processed already + return machine.getMachineUtil().getProcess().workedOnTarget(); + } } }); From 65e11fa5642faf7292c61da29272a72d16daea9e Mon Sep 17 00:00:00 2001 From: TweksTY <59334540+TweksTY@users.noreply.github.com> Date: Sat, 21 Mar 2026 04:56:15 +0100 Subject: [PATCH 2/2] Fix Genetics machines' VFX incorrectly appearing at 0;0;0 coordinates (#89) Co-authored-by: UltraProdigy <187078471+UltraProdigy@users.noreply.github.com> --- .../genetics/machine/analyser/AnalyserComponentFX.java | 7 ------- .../genetics/machine/inoculator/InoculatorComponentFX.java | 3 --- .../genetics/machine/isolator/IsolatorComponentFX.java | 6 +++--- .../machine/polymeriser/PolymeriserComponentFX.java | 3 --- .../genetics/machine/sequencer/SequencerComponentFX.java | 3 --- .../genetics/machine/splicer/SplicerComponentFX.java | 3 --- 6 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java index d17e6165..5d47d898 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java @@ -43,14 +43,7 @@ public class AnalyserComponentFX extends MachineComponent BinnieCore.proxy.getMinecraftInstance().effectRenderer .addEffect(new EntityFX(world, x + 0.5, y + 1.3 + rand.nextDouble() * 0.2, z + 0.5, 0.0, 0.0, 0.0) { - double axisX = posX; - double axisZ = posZ; - double angle = rand.nextDouble() * 2.0 * 3.1415; - { - axisX = 0.0; - axisZ = 0.0; - angle = 0.0; motionX = 0.05 * (rand.nextDouble() - 0.5); motionZ = 0.05 * (rand.nextDouble() - 0.5); motionY = 0.0; diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java index 1578fd00..32409f57 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java @@ -48,9 +48,6 @@ public class InoculatorComponentFX extends MachineComponent double angle = (int) (worldObj.getTotalWorldTime() % 4L) * 0.5 * 3.1415; { - axisX = 0.0; - axisZ = 0.0; - angle = 0.0; motionX = 0.0; motionZ = 0.0; motionY = 0.007 + rand.nextDouble() * 0.002; diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java index 30cc83e8..39b6df6a 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java @@ -65,10 +65,10 @@ public class IsolatorComponentFX extends MachineComponent implements IRender.Ran } BinnieCore.proxy.getMinecraftInstance().effectRenderer - .addEffect(new EntityFX(world, x + 0.5, y + 1, z + 0.5, 0.0, 0.0, 0.0) { + .addEffect(new EntityFX(world, x + 0.5, y + 1, z + 0.75, 0.0, 0.0, 0.0) { - final double axisX = 0.0; - final double axisZ = 0.0; + final double axisX = posX; + final double axisZ = posZ - 0.25; double angle = 0.0; { diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java index 8e43b6e0..16fc03a0 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java @@ -37,9 +37,6 @@ public class PolymeriserComponentFX extends MachineComponent implements IRender. double angle = 0.7 + (int) (worldObj.getTotalWorldTime() % 2L) * 3.1415; { - axisX = 0.0; - axisZ = 0.0; - angle = 0.0; motionX = 0.0; motionZ = 0.0; motionY = -0.006; diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java index 1cc03f64..2038fb85 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java @@ -34,9 +34,6 @@ public class SequencerComponentFX extends MachineComponent implements IRender.Ra double angle = rand.nextDouble() * 2.0 * 3.1415; { - axisX = 0.0; - axisZ = 0.0; - angle = 0.0; motionX = 0.0; motionZ = 0.0; motionY = 0.0; diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java index 7b943346..627354dc 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java @@ -49,9 +49,6 @@ public class SplicerComponentFX extends MachineComponent double angle = (int) (worldObj.getTotalWorldTime() % 4L) * 0.5 * 3.1415; { - axisX = 0.0; - axisZ = 0.0; - angle = 0.0; motionX = 0.0; motionZ = 0.0; motionY = (rand.nextDouble() - 0.5) * 0.02;