fix: use BlockRenderer

src/main/java/net/anvilcraft/thaummach/ClientProxy.java

@@ -48,14 +48,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 public class ClientProxy extends CommonProxy {
-    @Override
-    public void preInit() {
-        super.preInit();
-
-        BlockApparatusRenderer.RI = RenderingRegistry.getNextAvailableRenderId();
-        RenderingRegistry.registerBlockHandler(new BlockApparatusRenderer());
-    }
-
     @Override
     public void init() {
         RenderingRegistry.registerEntityRenderingHandler(
@@ -63,6 +55,9 @@ public class ClientProxy extends CommonProxy {
         );
 
         FMLCommonHandler.instance().bus().register(new RenderTicker());
+
+        BlockApparatusRenderer.RI = RenderingRegistry.getNextAvailableRenderId();
+        RenderingRegistry.registerBlockHandler(new BlockApparatusRenderer());
     }
 
     @Override

src/main/java/net/anvilcraft/thaummach/CommonProxy.java

@@ -28,7 +28,6 @@ import net.anvilcraft.thaummach.tiles.TileSeal;
 import net.anvilcraft.thaummach.tiles.TileSoulBrazier;
 import net.anvilcraft.thaummach.tiles.TileVoidChest;
 import net.anvilcraft.thaummach.tiles.TileVoidInterface;
-import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.tileentity.TileEntity;

src/main/java/net/anvilcraft/thaummach/gui/GuiCondenser.java

@@ -1,6 +1,5 @@
 package net.anvilcraft.thaummach.gui;
 
-import net.anvilcraft.thaummach.TMItems;
 import net.anvilcraft.thaummach.container.ContainerCondenser;
 import net.anvilcraft.thaummach.tiles.TileCondenser;
 import net.anvilcraft.thaummach.utils.UtilsFX;

src/main/java/net/anvilcraft/thaummach/render/BlockApparatusRenderer.java

@@ -16,8 +16,9 @@ public class BlockApparatusRenderer implements ISimpleBlockRenderingHandler {
         if (block instanceof BlockApparatus) {
             IApparatusRenderer ren
                 = ((BlockApparatus) block).getApparatusRenderer(metadata);
-            if (ren != null)
+            if (ren != null) {
                 ren.renderApparatus(null, renderer, 0, 0, 0, block, metadata, true);
+            }
         }
     }
 
@@ -33,8 +34,7 @@ public class BlockApparatusRenderer implements ISimpleBlockRenderingHandler {
     ) {
         if (block instanceof BlockApparatus) {
             int meta = world.getBlockMetadata(x, y, z);
-            IApparatusRenderer ren
+            IApparatusRenderer ren = ((BlockApparatus) block).getApparatusRenderer(meta);
-                = ((BlockApparatus) block).getApparatusRenderer(meta);
             if (ren != null)
                 ren.renderApparatus(world, renderer, x, y, z, block, meta, false);
             if (block.getRenderBlockPass() == 0)

src/main/java/net/anvilcraft/thaummach/render/apparatus/AbstractTankApparatusRenderer.java

@@ -10,8 +10,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
-public abstract class AbstractTankApparatusRenderer<Apparatus extends BlockApparatus> implements IApparatusRenderer {
+public abstract class AbstractTankApparatusRenderer<Apparatus extends BlockApparatus>
+    implements IApparatusRenderer {
     public abstract IIcon getBottomIcon(Apparatus block);
     public abstract IIcon getSideIcon(Apparatus block);
 
@@ -32,20 +34,18 @@ public abstract class AbstractTankApparatusRenderer<Apparatus extends BlockAppar
         if (block.getRenderBlockPass() == 0 || inv) {
             w1 = 0.0625F;
             w2 = 0.125F;
-            IIcon t1 = this.getBottomIcon((Apparatus)block);
+            IIcon t1 = this.getBottomIcon((Apparatus) block);
-            IIcon t2 = this.getSideIcon((Apparatus)block);
+            IIcon t2 = this.getSideIcon((Apparatus) block);
 
             rb.setRenderBounds(w1, 0.0F, w1, 1.0F - w1, 1.0F, 1.0F - w1);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(rb, block, t1, t1, t2, t2, t2, t2, false);
-                    rb, block, t1, t1, t2, t2, t2, t2, false
-                );
             } else {
                 rb.renderStandardBlock(block, i, j, k);
             }
 
             if (!inv) {
-                rb.overrideBlockTexture = this.getBottomIcon((Apparatus)block);
+                rb.overrideBlockTexture = this.getBottomIcon((Apparatus) block);
                 TileConduitTank tc = (TileConduitTank) w.getTileEntity(i, j, k);
                 HelperLocation loc = new HelperLocation(tc);
                 loc.facing = ForgeDirection.WEST;

src/main/java/net/anvilcraft/thaummach/render/apparatus/ApparatusRenderingHelper.java

@@ -1,62 +0,0 @@
-package net.anvilcraft.thaummach.render.apparatus;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.IIcon;
-import org.lwjgl.opengl.GL11;
-
-public class ApparatusRenderingHelper {
-    public static void
-    drawFaces(RenderBlocks renderblocks, Block block, IIcon i, boolean st) {
-        drawFaces(renderblocks, block, i, i, i, i, i, i, st);
-    }
-
-    public static void drawFaces(
-        RenderBlocks renderblocks,
-        Block block,
-        IIcon i1,
-        IIcon i2,
-        IIcon i3,
-        IIcon i4,
-        IIcon i5,
-        IIcon i6,
-        boolean solidtop
-    ) {
-        Tessellator tessellator = Tessellator.instance;
-        GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(0.0F, -1.0F, 0.0F);
-        renderblocks.renderFaceYNeg(block, 0.0, 0.0, 0.0, i1);
-        tessellator.draw();
-        if (solidtop) {
-            GL11.glDisable(3008);
-        }
-
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(0.0F, 1.0F, 0.0F);
-        renderblocks.renderFaceYPos(block, 0.0, 0.0, 0.0, i2);
-        tessellator.draw();
-        if (solidtop) {
-            GL11.glEnable(3008);
-        }
-
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(0.0F, 0.0F, 1.0F);
-        renderblocks.renderFaceZNeg(block, 0.0, 0.0, 0.0, i3);
-        tessellator.draw();
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(0.0F, 0.0F, -1.0F);
-        renderblocks.renderFaceZPos(block, 0.0, 0.0, 0.0, i4);
-        tessellator.draw();
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(1.0F, 0.0F, 0.0F);
-        renderblocks.renderFaceXPos(block, 0.0, 0.0, 0.0, i5);
-        tessellator.draw();
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(-1.0F, 0.0F, 0.0F);
-        renderblocks.renderFaceXNeg(block, 0.0, 0.0, 0.0, i6);
-        tessellator.draw();
-        GL11.glTranslatef(0.5F, 0.5F, 0.5F);
-    }
-}

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/ConduitApparatusRenderer.java

@@ -3,7 +3,6 @@ package net.anvilcraft.thaummach.render.apparatus.apparati.fragile;
 import dev.tilera.auracore.api.HelperLocation;
 import dev.tilera.auracore.api.machine.IConnection;
 import net.anvilcraft.thaummach.blocks.BlockApparatusFragile;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.anvilcraft.thaummach.tiles.TileConduit;
 import net.minecraft.block.Block;
@@ -13,6 +12,7 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class ConduitApparatusRenderer implements IApparatusRenderer {
     public static ConduitApparatusRenderer INSTANCE = new ConduitApparatusRenderer();
@@ -154,7 +154,7 @@ public class ConduitApparatusRenderer implements IApparatusRenderer {
             }
         } else {
             rb.setRenderBounds(w6, 0.0F, w6, w6 + w4, 1.0F, w6 + w4);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb, block, block.iconConduitInventory, false
             );
         }

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/ConduitPumpApparatusRenderer.java

@@ -1,11 +1,11 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.fragile;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusFragile;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class ConduitPumpApparatusRenderer implements IApparatusRenderer {
     public static ConduitPumpApparatusRenderer INSTANCE
@@ -28,7 +28,7 @@ public class ConduitPumpApparatusRenderer implements IApparatusRenderer {
         float w2 = 0.125F;
         if (inv) {
             rb.setRenderBounds(w2, 0.0F, w2, 1.0F - w2, w2, 1.0F - w2);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb,
                 block,
                 block.iconConduitPumpTop,
@@ -40,7 +40,7 @@ public class ConduitPumpApparatusRenderer implements IApparatusRenderer {
                 false
             );
             rb.setRenderBounds(w3, w2, w3, 1.0F - w3, w4, 1.0F - w3);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb,
                 block,
                 block.iconConduitPumpTop,
@@ -52,7 +52,7 @@ public class ConduitPumpApparatusRenderer implements IApparatusRenderer {
                 false
             );
             rb.setRenderBounds(0.0F, w4, 0.0F, 1.0F, 0.5F + w2, 1.0F);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb,
                 block,
                 block.iconConduitPumpTop,
@@ -64,7 +64,7 @@ public class ConduitPumpApparatusRenderer implements IApparatusRenderer {
                 false
             );
             rb.setRenderBounds(w2, 0.5F + w2, w2, 1.0F - w2, 1.0F, 1.0F - w2);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb,
                 block,
                 block.iconConduitPumpTop,

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/ConduitValveAdvancedApparatusRenderer.java

@@ -3,7 +3,6 @@ package net.anvilcraft.thaummach.render.apparatus.apparati.fragile;
 import dev.tilera.auracore.api.HelperLocation;
 import dev.tilera.auracore.api.machine.IConnection;
 import net.anvilcraft.thaummach.blocks.BlockApparatusFragile;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.anvilcraft.thaummach.tiles.TileConduitValveAdvanced;
 import net.minecraft.block.Block;
@@ -13,6 +12,7 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer {
     public static final ConduitValveAdvancedApparatusRenderer INSTANCE
@@ -139,11 +139,11 @@ public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer
             }
         } else {
             rb.setRenderBounds(w6, 0.0F, w6, 1.0F - w6, 1.0F, 1.0F - w6);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb, block, block.iconConduitInventory, false
             );
             rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb, block, block.iconValveAdvancedOff, false
             );
         }

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/ConduitValveApparatusRenderer.java

@@ -1,9 +1,7 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.fragile;
 
 import dev.tilera.auracore.api.HelperLocation;
-import dev.tilera.auracore.api.machine.IConnection;
 import net.anvilcraft.thaummach.blocks.BlockApparatusFragile;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.anvilcraft.thaummach.tiles.TileConduitValve;
 import net.minecraft.block.Block;
@@ -13,6 +11,7 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class ConduitValveApparatusRenderer implements IApparatusRenderer {
     public static final ConduitValveApparatusRenderer INSTANCE
@@ -152,11 +151,11 @@ public class ConduitValveApparatusRenderer implements IApparatusRenderer {
             }
         } else {
             rb.setRenderBounds(w6, 0.0F, w6, 1.0F - w6, 1.0F, 1.0F - w6);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb, block, block.iconConduitInventory, false
             );
             rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4);
-            ApparatusRenderingHelper.drawFaces(rb, block, block.iconValveOn, false);
+            BlockRenderer.drawFaces(rb, block, block.iconValveOn, false);
         }
 
         rb.overrideBlockTexture = null;

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/FilterApparatusRenderer.java

@@ -3,7 +3,6 @@ package net.anvilcraft.thaummach.render.apparatus.apparati.fragile;
 import dev.tilera.auracore.api.HelperLocation;
 import dev.tilera.auracore.api.machine.IConnection;
 import net.anvilcraft.thaummach.blocks.BlockApparatusFragile;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.anvilcraft.thaummach.tiles.TileConduit;
 import net.minecraft.block.Block;
@@ -12,6 +11,7 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class FilterApparatusRenderer implements IApparatusRenderer {
     public static final FilterApparatusRenderer INSTANCE = new FilterApparatusRenderer();
@@ -34,7 +34,7 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
         if (block.getRenderBlockPass() == 0 || inv) {
             rb.setRenderBounds(w2, 0.0F, w2, 1.0F - w2, w3, 1.0F - w2);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconFilterBottom,
@@ -51,7 +51,7 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(w2, 1.0F - w3, w2, 1.0F - w2, 1.0F, 1.0F - w2);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconFilterBottom,
@@ -68,7 +68,7 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(w3, w3, w3, 1.0F - w3, 1.0F - w3, 1.0F - w3);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconFilterBottom,

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/PurifierApparatusRenderer.java

@@ -1,11 +1,11 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.fragile;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusFragile;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class PurifierApparatusRenderer implements IApparatusRenderer {
     public static PurifierApparatusRenderer INSTANCE = new PurifierApparatusRenderer();
@@ -25,7 +25,7 @@ public class PurifierApparatusRenderer implements IApparatusRenderer {
         if (block.getRenderBlockPass() == 0 || inv) {
             rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconPurifierTop,

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/ArcaneFurnaceApparatusRenderer.java

@@ -1,11 +1,11 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.metal;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class ArcaneFurnaceApparatusRenderer implements IApparatusRenderer {
     public static ArcaneFurnaceApparatusRenderer INSTANCE
@@ -64,7 +64,7 @@ public class ArcaneFurnaceApparatusRenderer implements IApparatusRenderer {
             );
         } else if (inv) {
             rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb,
                 block,
                 block.iconArcaneFurnaceBottom,
@@ -76,7 +76,7 @@ public class ArcaneFurnaceApparatusRenderer implements IApparatusRenderer {
                 true
             );
             rb.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 0.99F, 0.9F);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb, block, block.iconArcaneFurnaceInside, false
             );
         }

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/BoreApparatusRenderer.java

@@ -1,13 +1,13 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.metal;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.anvilcraft.thaummach.tiles.TileBore;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class BoreApparatusRenderer implements IApparatusRenderer {
     public static final BoreApparatusRenderer INSTANCE = new BoreApparatusRenderer();
@@ -51,7 +51,7 @@ public class BoreApparatusRenderer implements IApparatusRenderer {
             rb.overrideBlockTexture = tx;
             rb.setRenderBounds(t2x, t2x, t2x, 1.0F - t2x, 1.0F - t2x, 1.0F - t2x);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, t1, true);
+                BlockRenderer.drawFaces(rb, block, t1, true);
             } else {
                 rb.renderStandardBlock(block, i, j, k);
             }
@@ -65,14 +65,14 @@ public class BoreApparatusRenderer implements IApparatusRenderer {
             rb.overrideBlockTexture = tx;
             rb.setRenderBounds(t4x, 0.0F, t4x, 1.0F - t4x, t2x, 1.0F - t4x);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, tx, true);
+                BlockRenderer.drawFaces(rb, block, tx, true);
             } else {
                 rb.renderStandardBlock(block, i, j, k);
             }
 
             rb.setRenderBounds(t4x, 1.0F - t2x, t4x, 1.0F - t4x, 1.0F, 1.0F - t4x);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, tx, true);
+                BlockRenderer.drawFaces(rb, block, tx, true);
             } else {
                 rb.renderStandardBlock(block, i, j, k);
             }
@@ -86,14 +86,14 @@ public class BoreApparatusRenderer implements IApparatusRenderer {
             rb.overrideBlockTexture = tx;
             rb.setRenderBounds(0.0F, t4x, t4x, t2x, 1.0F - t4x, 1.0F - t4x);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, tx, true);
+                BlockRenderer.drawFaces(rb, block, tx, true);
             } else {
                 rb.renderStandardBlock(block, i, j, k);
             }
 
             rb.setRenderBounds(1.0F - t2x, t4x, t4x, 1.0F, 1.0F - t4x, 1.0F - t4x);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, tx, true);
+                BlockRenderer.drawFaces(rb, block, tx, true);
             } else {
                 rb.renderStandardBlock(block, i, j, k);
             }
@@ -107,14 +107,14 @@ public class BoreApparatusRenderer implements IApparatusRenderer {
             rb.overrideBlockTexture = tx;
             rb.setRenderBounds(t4x, t4x, 0.0F, 1.0F - t4x, 1.0F - t4x, t2x);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, tx, true);
+                BlockRenderer.drawFaces(rb, block, tx, true);
             } else {
                 rb.renderStandardBlock(block, i, j, k);
             }
 
             rb.setRenderBounds(t4x, t4x, 1.0F - t2x, 1.0F - t4x, 1.0F - t4x, 1.0F);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, tx, true);
+                BlockRenderer.drawFaces(rb, block, tx, true);
             } else {
                 rb.renderStandardBlock(block, i, j, k);
             }

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/CrucibleApparatusRenderer.java

@@ -2,7 +2,6 @@ package net.anvilcraft.thaummach.render.apparatus.apparati.metal;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
 import net.anvilcraft.thaummach.blocks.BlockApparatusMetal.MetaVals;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.anvilcraft.thaummach.tiles.TileCrucible;
 import net.minecraft.block.Block;
@@ -11,6 +10,7 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class CrucibleApparatusRenderer implements IApparatusRenderer {
     public static CrucibleApparatusRenderer INSTANCE = new CrucibleApparatusRenderer();
@@ -38,7 +38,7 @@ public class CrucibleApparatusRenderer implements IApparatusRenderer {
                  || md == MetaVals.THAUMIUM_CRUCIBLE)
         ) {
             rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb,
                 block,
                 icons[3],
@@ -51,7 +51,7 @@ public class CrucibleApparatusRenderer implements IApparatusRenderer {
             );
         } else if (inv && md == MetaVals.SOUL_CRUCIBLE) {
             rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb,
                 block,
                 block.iconSoulCrucibleBottom,

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/CrystallizerApparatusRenderer.java

@@ -1,11 +1,11 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.metal;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class CrystallizerApparatusRenderer implements IApparatusRenderer {
     public static CrystallizerApparatusRenderer INSTANCE
@@ -27,7 +27,7 @@ public class CrystallizerApparatusRenderer implements IApparatusRenderer {
         if (block.getRenderBlockPass() == 0 || inv) {
             rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F + w2, 1.0F);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconCrystallizerBottom,

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/GeneratorApparatusRenderer.java

@@ -1,12 +1,11 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.metal;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.init.Blocks;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class GeneratorApparatusRenderer implements IApparatusRenderer {
     public static final GeneratorApparatusRenderer INSTANCE
@@ -29,14 +28,14 @@ public class GeneratorApparatusRenderer implements IApparatusRenderer {
         if (block.getRenderBlockPass() == 0 || inv) {
             rb.setRenderBounds(w4, 0.0F, w4, 1.0F - w4, w2, 1.0F - w4);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, block.iconGenerator1, true);
+                BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
             } else {
                 rb.renderStandardBlock(block, x, y, z);
             }
 
             rb.setRenderBounds(w4, 1.0F - w2, w4, 1.0F - w4, 1.0F, 1.0F - w4);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, block.iconGenerator1, true);
+                BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
             } else {
                 rb.renderStandardBlock(block, x, y, z);
             }
@@ -45,14 +44,14 @@ public class GeneratorApparatusRenderer implements IApparatusRenderer {
                 1.0F - w2, 0.5F - w4, 0.5F - w4, 1.0F, 0.5F + w4, 0.5F + w4
             );
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, block.iconGenerator1, true);
+                BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
             } else {
                 rb.renderStandardBlock(block, x, y, z);
             }
 
             rb.setRenderBounds(0.0F, 0.5F - w4, 0.5F - w4, w2, 0.5F + w4, 0.5F + w4);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, block.iconGenerator1, true);
+                BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
             } else {
                 rb.renderStandardBlock(block, x, y, z);
             }
@@ -61,14 +60,14 @@ public class GeneratorApparatusRenderer implements IApparatusRenderer {
                 0.5F - w4, 0.5F - w4, 1.0F - w2, 0.5F + w4, 0.5F + w4, 1.0F
             );
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, block.iconGenerator1, true);
+                BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
             } else {
                 rb.renderStandardBlock(block, x, y, z);
             }
 
             rb.setRenderBounds(0.5F - w4, 0.5F - w4, 0.0F, 0.5F + w4, 0.5F + w4, w2);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, block.iconGenerator1, true);
+                BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
             } else {
                 rb.renderStandardBlock(block, x, y, z);
             }
@@ -78,7 +77,7 @@ public class GeneratorApparatusRenderer implements IApparatusRenderer {
             rb.overrideBlockTexture = null;
             rb.setRenderBounds(w2, w2, w2, 1.0F - w2, 1.0F - w2, 1.0F - w2);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(rb, block, block.iconGenerator4, true);
+                BlockRenderer.drawFaces(rb, block, block.iconGenerator4, true);
             } else {
                 rb.renderFaceYNeg(block, x, y, z, block.iconGenerator4);
                 rb.renderFaceYPos(block, x, y, z, block.iconGenerator4);

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/SoulBrazierApparatusRenderer.java

@@ -1,11 +1,11 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.metal;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class SoulBrazierApparatusRenderer implements IApparatusRenderer {
     public static SoulBrazierApparatusRenderer INSTANCE
@@ -30,7 +30,7 @@ public class SoulBrazierApparatusRenderer implements IApparatusRenderer {
             float t6 = 0.375F;
             rb.setRenderBounds(t2, 0.5F, t6, t4, 1.0F, 1.0F - t6);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconSoulBrazierBottom,
@@ -47,7 +47,7 @@ public class SoulBrazierApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(t6, 0.5F, t2, 1.0F - t6, 1.0F, t4);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconSoulBrazierBottom,
@@ -64,7 +64,7 @@ public class SoulBrazierApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(1.0F - t4, 0.5F, t6, 1.0F - t2, 1.0F, 1.0F - t6);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconSoulBrazierBottom,
@@ -81,7 +81,7 @@ public class SoulBrazierApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(t6, 0.5F, 1.0F - t4, 1.0F - t6, 1.0F, 1.0F - t2);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconSoulBrazierBottom,
@@ -98,7 +98,7 @@ public class SoulBrazierApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(t4, 0.0F, t4, 1.0F - t4, 0.5F + t4, 1.0F - t4);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconSoulBrazierBottom,

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/VoidChestApparatusRenderer.java

@@ -1,11 +1,11 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.metal;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class VoidChestApparatusRenderer implements IApparatusRenderer {
     public static final VoidChestApparatusRenderer INSTANCE
@@ -25,7 +25,7 @@ public class VoidChestApparatusRenderer implements IApparatusRenderer {
         BlockApparatusMetal block = (BlockApparatusMetal) block_;
         if (inv) {
             rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
-            ApparatusRenderingHelper.drawFaces(
+            BlockRenderer.drawFaces(
                 rb,
                 block,
                 block.iconVoidChestBottom,

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/VoidInterfaceApparatusRenderer.java

@@ -1,11 +1,11 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.metal;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class VoidInterfaceApparatusRenderer implements IApparatusRenderer {
     public static VoidInterfaceApparatusRenderer INSTANCE
@@ -29,7 +29,7 @@ public class VoidInterfaceApparatusRenderer implements IApparatusRenderer {
         if (block.getRenderBlockPass() == 0 || inv) {
             rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, t3x, 1.0F);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconVoidInterfaceBottom,
@@ -46,7 +46,7 @@ public class VoidInterfaceApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(0.0F, 0.5F - t4x, 0.0F, 1.0F, 0.5F - t1x, 1.0F);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconVoidInterfaceBottom,
@@ -63,7 +63,7 @@ public class VoidInterfaceApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(t4x, 0.5F - t1x, t4x, 1.0F - t4x, 0.5F + t4x, 1.0F - t4x);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconVoidInterfaceBottom,
@@ -95,7 +95,7 @@ public class VoidInterfaceApparatusRenderer implements IApparatusRenderer {
             );
         } else {
             rb.overrideBlockTexture = block.iconTcubeanim;
-            ApparatusRenderingHelper.drawFaces(rb, block, block.iconTcubeanim, true);
+            BlockRenderer.drawFaces(rb, block, block.iconTcubeanim, true);
         }
 
         rb.overrideBlockTexture = null;

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/wood/CondenserApparatusRenderer.java

@@ -1,12 +1,12 @@
 package net.anvilcraft.thaummach.render.apparatus.apparati.wood;
 
 import net.anvilcraft.thaummach.blocks.BlockApparatusWood;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.anvilcraft.thaummach.tiles.TileCondenser;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class CondenserApparatusRenderer implements IApparatusRenderer {
     public static final CondenserApparatusRenderer INSTANCE
@@ -31,7 +31,7 @@ public class CondenserApparatusRenderer implements IApparatusRenderer {
         if (block.getRenderBlockPass() == 0 || inv) {
             rb.setRenderBounds(w3, 1.0F - w4, w3, 1.0F - w3, 1.0F, 1.0F - w3);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconCondenserTop,
@@ -48,7 +48,7 @@ public class CondenserApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(w3, 0.0F, w3, 1.0F - w3, w4, 1.0F - w3);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconCondenserTop,
@@ -66,7 +66,7 @@ public class CondenserApparatusRenderer implements IApparatusRenderer {
             rb.overrideBlockTexture = block.iconCondenserPart;
             rb.setRenderBounds(0.5F - w2, w2, 0.0F, 0.5F + w2, 1.0F - w2, 1.0F);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb, block, block.iconCondenserPart, false
                 );
             } else {
@@ -75,7 +75,7 @@ public class CondenserApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(0.0F, w2, 0.5F - w2, 1.0F, 1.0F - w2, 0.5F + w2);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb, block, block.iconCondenserPart, false
                 );
             } else {
@@ -84,7 +84,7 @@ public class CondenserApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(0.5F - w2, w2, 0.0F, 0.5F + w2, 1.0F - w2, 1.0F);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb, block, block.iconCondenserPart, false
                 );
             } else {
@@ -93,7 +93,7 @@ public class CondenserApparatusRenderer implements IApparatusRenderer {
 
             rb.setRenderBounds(0.0F, w2, 0.5F - w2, 1.0F, 1.0F - w2, 0.5F + w2);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb, block, block.iconCondenserPart, false
                 );
             } else {

src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/wood/RepairerApparatusRenderer.java

@@ -3,11 +3,11 @@ package net.anvilcraft.thaummach.render.apparatus.apparati.wood;
 import net.anvilcraft.thaummach.TMBlocks;
 import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
 import net.anvilcraft.thaummach.blocks.BlockApparatusWood;
-import net.anvilcraft.thaummach.render.apparatus.ApparatusRenderingHelper;
 import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
+import thaumcraft.client.renderers.block.BlockRenderer;
 
 public class RepairerApparatusRenderer implements IApparatusRenderer {
     public static final RepairerApparatusRenderer INSTANCE
@@ -28,7 +28,7 @@ public class RepairerApparatusRenderer implements IApparatusRenderer {
         if (block.getRenderBlockPass() == 0 || inv) {
             rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
             if (inv) {
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     block.iconRestorerBottom,
@@ -88,7 +88,7 @@ public class RepairerApparatusRenderer implements IApparatusRenderer {
                 );
             } else {
                 rb.setRenderBounds(0.01F, 0.01F, 0.01F, 0.99F, 0.99F, 0.99F);
-                ApparatusRenderingHelper.drawFaces(
+                BlockRenderer.drawFaces(
                     rb,
                     block,
                     ((BlockApparatusMetal) TMBlocks.apparatusMetal)