Fix Genetics machines' VFX incorrectly appearing at 0;0;0 coordinates (#89)

Co-authored-by: UltraProdigy <[email protected]>

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

dependencies.gradle

@@ -2,9 +2,9 @@
 
 dependencies {
     api('com.github.GTNewHorizons:ForestryMC:4.11.7: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/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;

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;

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;
 
                     {

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;

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;

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;