update

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

dependencies.gradle

@@ -1,10 +1,10 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.11.8:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.9.40:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.11:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.9.45:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.75-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.81-GTNH:dev')
 
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.57:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

gradle/gradle-daemon-jvm.properties

@@ -1,12 +1,12 @@
 #This file is generated by updateDaemonJvm
 toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
 toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
 toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect
 toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect
 toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
 toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3689d0bcdd77ac01674ba3c9dbbe94d0/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/redirect
 toolchainVersion=25

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

@@ -130,7 +130,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 
     @Override
     public IIcon getIcon(int side, int meta) {
-        return getType(meta).getIcon(MultipassBlockRenderer.getLayer());
+        return TileType.get(meta >>> 16 & 0xFF).icons[MultipassBlockRenderer.getLayer()];
     }
 
     @Override
@@ -167,16 +167,10 @@ 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);
+            return EnumFlowerColor.get(meta & 0xFF).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
@@ -186,14 +180,14 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
 
     @Override
     public int colorMultiplier(int meta) {
-        BlockType type = getType(meta);
-        if (MultipassBlockRenderer.getLayer() == 0) {
+        int layer = MultipassBlockRenderer.getLayer();
+        if (layer == 0) {
             return 0xffffff;
         }
-        if (MultipassBlockRenderer.getLayer() == 1) {
-            return type.color1.getColor(false);
+        if (layer == 1) {
+            return EnumFlowerColor.get(meta & 0xFF).getColor(false);
         }
-        return type.color2.getColor(false);
+        return EnumFlowerColor.get(meta >>> 8 & 0xFF).getColor(false);
     }
 
     @Override

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

@@ -28,64 +28,45 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
         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) {
+        IMultipassBlock multipassBlock = (IMultipassBlock) block;
+        int passes = multipassBlock.getNumberOfPasses();
+
         block.setBlockBoundsForItemRender();
         renderer.setRenderBoundsFromBlock(block);
         GL11.glTranslatef(-0.5f, -0.5f, -0.5f);
 
         MultipassBlockRenderer.rendering = true;
-        MultipassBlockRenderer.layer = 0;
-        while (MultipassBlockRenderer.layer < getPassesSafe(block)) {
-            renderItem(block, renderer, meta);
-            MultipassBlockRenderer.layer++;
+        try {
+            for (int pass = 0; pass < passes; ++pass) {
+                MultipassBlockRenderer.layer = pass;
+                renderItem(block, multipassBlock, renderer, meta);
+            }
+        } finally {
+            MultipassBlockRenderer.layer = 0;
+            MultipassBlockRenderer.rendering = false;
         }
-        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;
+        IMultipassBlock multipassBlock = (IMultipassBlock) block;
+        int passes = multipassBlock.getNumberOfPasses();
+        boolean rendered = 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;
+        try {
+            for (int pass = 0; pass < passes; ++pass) {
+                MultipassBlockRenderer.layer = pass;
+                rendered = renderer.renderStandardBlock(block, x, y, z);
             }
-            MultipassBlockRenderer.layer++;
+            return rendered;
+        } finally {
+            MultipassBlockRenderer.layer = 0;
+            MultipassBlockRenderer.rendering = false;
         }
-        MultipassBlockRenderer.layer = 0;
-        MultipassBlockRenderer.rendering = false;
-        return r;
     }
 
     @Override
@@ -98,8 +79,8 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
         return BinnieCore.multipassRenderID;
     }
 
-    public void renderItem(Block block, RenderBlocks renderer, int meta) {
-        setColor(getColorSafe(block, meta));
+    private void renderItem(Block block, IMultipassBlock multipassBlock, RenderBlocks renderer, int meta) {
+        setColor(multipassBlock.colorMultiplier(meta));
         Tessellator tessellator = Tessellator.instance;
         tessellator.startDrawingQuads();
         tessellator.setNormal(0.0f, -1.0f, 0.0f);

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;