Merge remote-tracking branch 'brandyyn/master' into dev

.github/workflows/optimize-images.yml

@@ -1,17 +0,0 @@
-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

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.11.12:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.9.48:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.7:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.9.20:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.88-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.68-GTNH:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.57:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

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/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/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/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a4c09dd2e2d7079373d30e524bbc2829/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
+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/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/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/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/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/832229f0f6f0be60ed817c5a5e5848eb/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/redirect
 toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

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

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

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

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

src/main/java/binnie/core/machines/MachinePackage.java

@@ -1,5 +1,6 @@
 package binnie.core.machines;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.tileentity.TileEntity;
 
 import binnie.core.util.I18N;
@@ -52,7 +53,8 @@ public abstract class MachinePackage {
         this.group = group;
     }
 
-    public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick);
+    public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+            RenderBlocks renderer);
 
     public boolean isActive() {
         return active;

src/main/java/binnie/core/machines/RendererMachine.java

@@ -5,6 +5,7 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 
 import binnie.Binnie;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@@ -12,27 +13,30 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 // Hmm. It's used class
 public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler {
 
+    RenderBlocks blockRenderer;
+
     @Override
     public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float partialTick) {
-        renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick);
+        renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick, blockRenderer);
     }
 
-    private void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick) {
+    public void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick,
+            RenderBlocks renderer) {
         if (entity != null && entity.getMachine() != null) {
             MachinePackage machinePackage = entity.getMachine().getPackage();
-            machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick);
+            machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick, renderer);
         }
     }
 
-    private void renderInvBlock(Block block, int i, int j) {
+    public void renderInvBlock(RenderBlocks renderblocks, Block block, int i, int j) {
         TileEntity entity = block.createTileEntity(null, i);
-        renderTileEntity((TileEntityMachine) entity, 0.0, -0.1, 0.0, 0.0625f);
+        renderTileEntity((TileEntityMachine) entity, 0.0, -0.1, 0.0, 0.0625f, renderblocks);
     }
 
     @Override
     public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
         if (modelID == Binnie.Machine.getMachineRenderID()) {
-            renderInvBlock(block, metadata, modelID);
+            renderInvBlock(renderer, block, metadata, modelID);
         }
     }
 
@@ -44,7 +48,7 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl
                 && tile.getMachine().getPackage() != null
                 && tile.getMachine().getPackage().getGroup() != null
                 && !tile.getMachine().getPackage().getGroup().customRenderer) {
-            renderTileEntity(tile, x, y, z, 1.0f);
+            renderTileEntity(tile, x, y, z, 1.0f, renderer);
         }
         return true;
     }
@@ -58,4 +62,9 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl
     public int getRenderId() {
         return Binnie.Machine.getMachineRenderID();
     }
+
+    @Override
+    public void func_147496_a(World par1World) {
+        blockRenderer = new RenderBlocks(par1World);
+    }
 }

src/main/java/binnie/core/machines/storage/Compartment.java

@@ -1,5 +1,6 @@
 package binnie.core.machines.storage;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
@@ -50,7 +51,8 @@ enum Compartment implements IMachineType {
         }
 
         @Override
-        public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+        public void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+                RenderBlocks renderer) {
             MachineRendererCompartment.instance.renderMachine(machine, renderTexture, x, y, z);
         }
     }

src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java

@@ -1,5 +1,6 @@
 package binnie.extrabees.apiary.machine;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
@@ -65,7 +66,8 @@ public enum AlvearyMachine implements IMachineType {
         }
 
         @Override
-        public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+        public void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+                RenderBlocks renderer) {
             MachineRendererBlock.instance.renderMachine(machineTexture, x, y, z, partialTick);
         }
     }

src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java

@@ -1,5 +1,6 @@
 package binnie.extratrees.machines;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -80,7 +81,8 @@ public enum ExtraTreeMachine implements IMachineType {
         }
 
         @Override
-        public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+        public void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+                RenderBlocks renderer) {
             MachineRendererForestry.renderMachine(textureName.getShortPath(), x, y, z);
         }
     }

src/main/java/binnie/genetics/machine/PackageGeneticBase.java

@@ -1,5 +1,6 @@
 package binnie.genetics.machine;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.tileentity.TileEntity;
 
 import binnie.core.machines.Machine;
@@ -25,7 +26,7 @@ public abstract class PackageGeneticBase extends MachinePackage {
     }
 
     @Override
-    public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+    public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) {
         MachineRendererGenetics.instance.renderMachine(machine, renderTexture, x, y, z);
     }
 }

src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java

@@ -43,7 +43,14 @@ 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,6 +48,9 @@ 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.75, 0.0, 0.0, 0.0) {
+                .addEffect(new EntityFX(world, x + 0.5, y + 1, z + 0.5, 0.0, 0.0, 0.0) {
 
-                    final double axisX = posX;
-                    final double axisZ = posZ - 0.25;
+                    final double axisX = 0.0;
+                    final double axisZ = 0.0;
                     double angle = 0.0;
 
                     {

src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java

@@ -1,5 +1,7 @@
 package binnie.genetics.machine.lab;
 
+import net.minecraft.client.renderer.RenderBlocks;
+
 import binnie.core.machines.Machine;
 import binnie.genetics.core.GeneticsTexture;
 import binnie.genetics.machine.ComponentGUIHolder;
@@ -18,7 +20,7 @@ public class LabMachinePackage extends PackageGeneticBase {
     }
 
     @Override
-    public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+    public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) {
         MachineRendererLab.instance.renderMachine(machine, renderTexture, x, y, z);
     }
 }

src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java

@@ -37,6 +37,9 @@ 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,6 +34,9 @@ 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,6 +49,9 @@ 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;