Fix incorrect integer division in getRipeningStage (#85)

dependencies.gradle

@@ -2,9 +2,9 @@
 
 dependencies {
     api('com.github.GTNewHorizons:ForestryMC:4.11.4:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.9.20:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.9.13:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.68-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.63-GTNH:dev')
 
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

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

src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java

@@ -167,16 +167,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
     @Override
     @SideOnly(Side.CLIENT)
     public int getRenderColor(int meta) {
-        final BlockType type = this.getType(meta);
-        if (!MultipassBlockRenderer.isRendering()) {
-            return type.color1.getColor(false);
-        }
-
-        final int layer = MultipassBlockRenderer.getLayer();
-        if (layer == 0) return 0xffffff;
-        if (layer == 1) return type.color1.getColor(false);
-        if (layer == 2) return type.color2.getColor(false);
-        return 0xffffff;
+        return colorMultiplier(meta);
     }
 
     @Override

src/main/java/binnie/core/BinnieCore.java

@@ -12,7 +12,6 @@ import net.minecraftforge.common.MinecraftForge;
 import binnie.Binnie;
 import binnie.core.block.MultipassBlockRenderer;
 import binnie.core.block.TileEntityMetadata;
-import binnie.core.config.BCConfig;
 import binnie.core.craftgui.minecraft.ModuleCraftGUI;
 import binnie.core.gui.BinnieCoreGUI;
 import binnie.core.gui.BinnieGUIHandler;
@@ -79,9 +78,7 @@ public class BinnieCore extends AbstractMod {
         }
 
         addModule(new ModuleCraftGUI());
-        if (!BCConfig.disableCompartments) {
-            addModule(new ModuleStorage());
-        }
+        addModule(new ModuleStorage());
         addModule(new ModuleItems());
         if (Loader.isModLoaded("BuildCraft|Silicon")) {
             addModule(new ModuleTrigger());

src/main/java/binnie/core/block/MultipassBlockRenderer.java

@@ -14,7 +14,6 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
 
     public static MultipassBlockRenderer instance;
     private static int layer = 0;
-    private static boolean rendering = false;
 
     public MultipassBlockRenderer() {
         MultipassBlockRenderer.instance = this;
@@ -24,67 +23,30 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
         return MultipassBlockRenderer.layer;
     }
 
-    public static boolean isRendering() {
-        return MultipassBlockRenderer.rendering;
-    }
-
-    private static int getPassesSafe(Block block) {
-        try {
-            return ((IMultipassBlock) block).getNumberOfPasses();
-        } catch (Throwable t) {
-            return 1;
-        }
-    }
-
-    private static int getColorSafe(Block block, int meta) {
-        try {
-            if (block instanceof IMultipassBlock) {
-                try {
-                    java.lang.reflect.Method m = block.getClass().getMethod("colorMultiplier", int.class);
-                    Object out = m.invoke(block, Integer.valueOf(meta));
-                    if (out instanceof Integer) {
-                        return ((Integer) out).intValue();
-                    }
-                } catch (Throwable ignored) {}
-            }
-            return block.getRenderColor(meta);
-        } catch (Throwable t) {
-            return 16777215;
-        }
-    }
-
     @Override
     public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) {
         block.setBlockBoundsForItemRender();
         renderer.setRenderBoundsFromBlock(block);
         GL11.glTranslatef(-0.5f, -0.5f, -0.5f);
 
-        MultipassBlockRenderer.rendering = true;
         MultipassBlockRenderer.layer = 0;
-        while (MultipassBlockRenderer.layer < getPassesSafe(block)) {
+        while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
             renderItem(block, renderer, meta);
             MultipassBlockRenderer.layer++;
         }
         MultipassBlockRenderer.layer = 0;
-        MultipassBlockRenderer.rendering = false;
     }
 
     @Override
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
             RenderBlocks renderer) {
         boolean r = true;
-        MultipassBlockRenderer.rendering = true;
         MultipassBlockRenderer.layer = 0;
-        while (MultipassBlockRenderer.layer < getPassesSafe(block)) {
-            try {
-                r = renderer.renderStandardBlock(block, x, y, z);
-            } catch (Throwable t) {
-                return false;
-            }
+        while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
+            r = renderer.renderStandardBlock(block, x, y, z);
             MultipassBlockRenderer.layer++;
         }
         MultipassBlockRenderer.layer = 0;
-        MultipassBlockRenderer.rendering = false;
         return r;
     }
 
@@ -99,7 +61,7 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
     }
 
     public void renderItem(Block block, RenderBlocks renderer, int meta) {
-        setColor(getColorSafe(block, meta));
+        setColor(((IMultipassBlock) block).colorMultiplier(meta));
         Tessellator tessellator = Tessellator.instance;
         tessellator.startDrawingQuads();
         tessellator.setNormal(0.0f, -1.0f, 0.0f);

src/main/java/binnie/core/config/BCConfig.java

@@ -1,14 +0,0 @@
-package binnie.core.config;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-import binnie.core.BinnieCore;
-
-@Config(modid = BinnieCore.CORE_MODID)
-public class BCConfig {
-
-    @Config.Comment("If true, disables all compartment storage machines (no blocks/recipes will be registered).")
-    @Config.DefaultBoolean(false)
-    @Config.RequiresMcRestart
-    public static boolean disableCompartments;
-}

src/main/java/binnie/core/machines/power/IProcess.java

@@ -9,11 +9,4 @@ 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 ripeningTime / ripeningPeriod;
+        return (float) ripeningTime / ripeningPeriod;
     }
 
     @Override

src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java

@@ -19,10 +19,6 @@ 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) {
@@ -54,11 +50,6 @@ 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() {
@@ -199,31 +190,5 @@ 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,7 +3,6 @@ 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;
@@ -80,20 +79,8 @@ public class SplicerPackage extends AdvGeneticMachine.PackageAdvGeneticBase impl
 
             @Override
             public boolean fufilled(ItemStack stack) {
-                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();
-                }
+                return stack != null && transfer.getMachine().getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null
+                        && transfer.getMachine().getInterface(SplicerComponentLogic.class).isValidSerum() != null;
             }
         });