Merge remote-tracking branch 'origin/splicer_fix' into dev

This always exists

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.11.4:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.9.13:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.0:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.7.3:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.63-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -39,34 +39,14 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Enables modern Java syntax support. Valid values:
-# - false: No modern syntax, Java 8 only
-# - jabel: Jabel syntax-only support, compiles to J8 bytecode
-# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
-# - modern: Native modern Java bytecode, no downgrading
-enableModernJavaSyntax = jabel
+# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
+# See https://github.com/bsideup/jabel for details on how this works.
+enableModernJavaSyntax = true
 
 # If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
 # and should *not* be used in most situations. -1 disables this.
 # forceToolchainVersion = -1
 
-# Target JVM version for JVM Downgrader bytecode downgrading.
-# Only used when enableModernJavaSyntax = jvmDowngrader
-# downgradeTargetVersion = 8
-
-# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
-# Classes will be available in META-INF/versions/N/ for each version N in this list.
-# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
-# jvmDowngraderMultiReleaseVersions = 21,25
-
-# Specifies how JVM Downgrader API stubs are provided. Options:
-# - shade: Shade minimized stubs into the jar
-# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
-# - external: Another dependency provides stubs (no constraint, no warning)
-# - (empty): Warning reminding you to configure stubs
-# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
-# jvmDowngraderStubsProvider =
-
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
 enableGenericInjection = true

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.19'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.6'
 }

src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java

@@ -1,6 +1,7 @@
 package binnie.core.machines.inventory;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -15,13 +16,10 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import binnie.core.machines.IMachine;
-import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
 
 public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots {
 
-    private final Int2ObjectLinkedOpenHashMap<InventorySlot> inventory = new Int2ObjectLinkedOpenHashMap<>();
-    private int cachedSize = 0;
-    private int[] cachedAccessibleSlots = null;
+    private final Map<Integer, InventorySlot> inventory = new LinkedHashMap<>();
 
     public ComponentInventorySlots(IMachine machine) {
         super(machine);
@@ -29,20 +27,25 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public int getSizeInventory() {
-        return cachedSize;
+        int size = 0;
+        for (Integer index : inventory.keySet()) {
+            size = Math.max(size, index + 1);
+        }
+        return size;
     }
 
     @Override
     public ItemStack getStackInSlot(int index) {
-        InventorySlot slot = inventory.get(index);
-        return slot != null ? slot.getContent() : null;
+        if (inventory.containsKey(index)) {
+            return inventory.get(index).getContent();
+        }
+        return null;
     }
 
     @Override
     public ItemStack decrStackSize(int index, int amount) {
-        InventorySlot slot = inventory.get(index);
-        if (slot != null) {
-            ItemStack stack = slot.decrStackSize(amount);
+        if (inventory.containsKey(index)) {
+            ItemStack stack = inventory.get(index).decrStackSize(amount);
             markDirty();
             return stack;
         }
@@ -56,9 +59,8 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public void setInventorySlotContents(int index, ItemStack itemStack) {
-        InventorySlot slot = inventory.get(index);
-        if (slot != null && (itemStack == null || slot.isValid(itemStack))) {
-            slot.setContent(itemStack);
+        if (inventory.containsKey(index) && (itemStack == null || inventory.get(index).isValid(itemStack))) {
+            inventory.get(index).setContent(itemStack);
         }
         markDirty();
     }
@@ -111,7 +113,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
     public void writeToNBT(NBTTagCompound nbttagcompound) {
         super.writeToNBT(nbttagcompound);
         NBTTagList inventoryNBT = new NBTTagList();
-        for (Map.Entry<Integer, InventorySlot> entry : inventory.int2ObjectEntrySet()) {
+        for (Map.Entry<Integer, InventorySlot> entry : inventory.entrySet()) {
             NBTTagCompound slotNBT = new NBTTagCompound();
             slotNBT.setInteger("id", entry.getKey());
             entry.getValue().writeToNBT(slotNBT);
@@ -123,8 +125,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
     @Override
     public InventorySlot addSlot(int index, String unlocalizedName) {
         inventory.put(index, new InventorySlot(index, unlocalizedName));
-        cachedSize = Math.max(cachedSize, index + 1);
-        cachedAccessibleSlots = null;
         return getSlot(index);
     }
 
@@ -138,7 +138,10 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public InventorySlot getSlot(int index) {
-        return inventory.get(index);
+        if (inventory.containsKey(index)) {
+            return inventory.get(index);
+        }
+        return null;
     }
 
     @Override
@@ -148,7 +151,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public InventorySlot[] getSlots(int[] indexes) {
-        List<InventorySlot> list = new ArrayList<>(indexes.length);
+        List<InventorySlot> list = new ArrayList<>();
         for (int i : indexes) {
             if (getSlot(i) != null) {
                 list.add(getSlot(i));
@@ -210,20 +213,18 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public int[] getAccessibleSlotsFromSide(int var1) {
-        if (cachedAccessibleSlots == null) {
-            List<Integer> slots = new ArrayList<>();
-            for (InventorySlot slot : inventory.values()) {
-                if (slot.canInsert() || slot.canExtract()) {
-                    slots.add(slot.getIndex());
-                }
-            }
-
-            cachedAccessibleSlots = new int[slots.size()];
-            for (int i = 0; i < slots.size(); ++i) {
-                cachedAccessibleSlots[i] = slots.get(i);
+        List<Integer> slots = new ArrayList<>();
+        for (InventorySlot slot : inventory.values()) {
+            if (slot.canInsert() || slot.canExtract()) {
+                slots.add(slot.getIndex());
             }
         }
-        return cachedAccessibleSlots;
+
+        int[] ids = new int[slots.size()];
+        for (int i = 0; i < slots.size(); ++i) {
+            ids[i] = slots.get(i);
+        }
+        return ids;
     }
 
     @Override
@@ -233,7 +234,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public boolean canExtractItem(int slot, ItemStack itemstack, int direction) {
-        InventorySlot iSlot = getSlot(slot);
-        return iSlot != null && iSlot.canExtract(ForgeDirection.getOrientation(direction));
+        return getSlot(slot).canExtract(ForgeDirection.getOrientation(direction));
     }
 }

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;
+    }
 }

src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java

@@ -387,7 +387,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
         if (ripeningTime >= ripeningPeriod) {
             return 1.0f;
         }
-        return (float) ripeningTime / ripeningPeriod;
+        return ripeningTime / ripeningPeriod;
     }
 
     @Override

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);
+        }
     }
 }

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();
+                }
             }
         });