update+gradle+deps+bs

Co-authored-by: Alexdoru <[email protected]>
Co-authored-by: Martin Robertz <[email protected]>

dependencies.gradle

@@ -2,26 +2,26 @@
 
 dependencies {
     api('com.github.GTNewHorizons:EnderCore:0.5.14:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.30:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.110-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.11.22:dev")
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.61:dev')
+    compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.32:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.118-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.11.35:dev")
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.63:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
-    api("com.github.GTNewHorizons:TinkersConstruct:1.14.93-GTNH:dev")
+    api("com.github.GTNewHorizons:TinkersConstruct:1.14.96-GTNH:dev")
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:waila:1.19.30:dev') {transitive = false}
+    devOnlyNonPublishable('com.github.GTNewHorizons:waila:1.19.31:dev') {transitive = false}
     compileOnly('ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.48-GTNH:dev') {transitive = false}
     runtimeOnlyNonPublishable('com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:Backhand:1.8.11:dev") { transitive = false }
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-997-GTNH:api') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:Backhand:1.8.13:dev") { transitive = false }
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-999-GTNH:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.21-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.14:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.79-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.17.28:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.73:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.85-1.7.10:dev") {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.17.30:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.26-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.17.26-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.48-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.17.31-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.55-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
@@ -29,7 +29,7 @@ dependencies {
     compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
     compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
 
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:2.1.49:api') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.166:dev")
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:2.1.60:api') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.179:dev")
     compileOnly('curse.maven:automagy-222153:2285272')
 }

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/cf726b4a1c84b50457225f9bba6d7650/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/97d46b5ff4df0bf61e95652a190a5567/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/9ef54a08e06b0754cee9fc95ed3a3134/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/97d46b5ff4df0bf61e95652a190a5567/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/9ef54a08e06b0754cee9fc95ed3a3134/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1df82b76031285ef2e6a4f59ffe9299d/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/c7d5be6a02945ac2e045048ee54a7d32/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/97d46b5ff4df0bf61e95652a190a5567/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/9ef54a08e06b0754cee9fc95ed3a3134/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/643f404f769811f5f265fd66f7af5d89/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/38256085a73e137cb4937ea9c4807fec/redirect
 toolchainVersion=25

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.26'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.27'
 }
 
 

src/main/java/crazypants/enderio/ClientProxy.java

@@ -238,6 +238,8 @@ public class ClientProxy extends CommonProxy {
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPainter), machRen);
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCrafter), machRen);
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockBuffer), machRen);
+        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPoweredSpawner), machRen);
+        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSliceAndSplice), machRen);
 
         MinecraftForgeClient.registerItemRenderer(EnderIO.itemBrokenSpawner, new BrokenSpawnerRenderer());
 
@@ -256,7 +258,9 @@ public class ClientProxy extends CommonProxy {
         ClientRegistry.bindTileEntitySpecialRenderer(TileFarmStation.class, new FarmingStationSpecialRenderer());
 
         BlockSoulBinder.renderId = RenderingRegistry.getNextAvailableRenderId();
-        RenderingRegistry.registerBlockHandler(new SoulBinderRenderer());
+        SoulBinderRenderer soulBinderRenderer = new SoulBinderRenderer();
+        RenderingRegistry.registerBlockHandler(soulBinderRenderer);
+        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockSoulFuser), soulBinderRenderer);
 
         ObeliskRenderer defaultObeliskRenderer = new ObeliskRenderer();
         BlockObeliskAbstract.defaultObeliskRenderId = RenderingRegistry.getNextAvailableRenderId();
@@ -360,6 +364,7 @@ public class ClientProxy extends CommonProxy {
         TelePadRenderer telePadRenderer = new TelePadRenderer();
         RenderingRegistry.registerBlockHandler(telePadRenderer);
         ClientRegistry.bindTileEntitySpecialRenderer(TileTelePad.class, new TelePadSpecialRenderer(telePadRenderer));
+        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTelePad), telePadRenderer);
 
         MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer());
         MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer());

src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java

@@ -6,6 +6,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
@@ -425,7 +427,7 @@ public class NetworkedInventory {
         return inv;
     }
 
-    public ISidedInventory getInventoryRecheck() {
+    public @Nullable ISidedInventory getInventoryRecheck() {
         if (isInvalid()) {
             updateInventory();
         }

src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java

@@ -4,7 +4,6 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
@@ -33,7 +32,6 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
 
     @Override
     public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) {
-
         World world = te.getWorldObj();
         TileZombieGenerator gen = (TileZombieGenerator) te;
 
@@ -104,26 +102,26 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
     }
 
     private void renderModel(GeneratorType gen, int facing) {
-
         GL11.glPushMatrix();
 
-        GL11.glTranslatef(0.5F, 0, 0.5F);
-        GL11.glRotatef(180F, 1F, 0F, 0F);
+        GL11.glTranslatef(0.5f, 0, 0.5f);
+        GL11.glRotatef(180f, 1f, 0f, 0f);
         GL11.glScalef(1.2f, 0.9f, 1.2f);
 
         ForgeDirection dir = ForgeDirection.getOrientation(facing);
         if (dir == ForgeDirection.SOUTH) {
             facing = 0;
-
         } else if (dir == ForgeDirection.WEST) {
             facing = -1;
         }
-        GL11.glRotatef(facing * -90F, 0F, 1F, 0F);
+        GL11.glRotatef(facing * -90f, 0f, 1f, 0f);
+
+        // Move the model in center of block
+        GL11.glTranslatef(0.0f, 0.0f, -0.0625f);
 
         RenderUtil.bindTexture(gen.getTexture());
-        model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
+        model.render(null, 0.0f, 0.0f, -0.1f, 0.0f, 0.0f, 0.0625f);
 
-        GL11.glTranslatef(-0.5F, 0, -0.5F);
         GL11.glPopMatrix();
     }
 

src/main/java/crazypants/enderio/machine/invpanel/server/NormalInventory.java

@@ -16,50 +16,53 @@ class NormalInventory extends AbstractInventory {
     @Override
     int scanInventory(InventoryDatabaseServer db) {
         ISidedInventory inv = ni.getInventoryRecheck();
-        int side = ni.getInventorySide();
-        int[] slotIndices = inv.getAccessibleSlotsFromSide(side);
-        if (slotIndices == null || slotIndices.length == 0) {
-            setEmpty(db);
-            return 0;
-        }
-        int count = slotIndices.length;
-        if (count != slotKeys.length) {
-            reset(db, count);
-        }
-        for (int slot = 0; slot < count; slot++) {
-            int invSlot = slotIndices[slot];
-            ItemStack stack = inv.getStackInSlot(invSlot);
-            if (stack != null && !inv.canExtractItem(invSlot, stack, side)) {
-                stack = null;
+        if (inv != null) {
+            int side = ni.getInventorySide();
+            int[] slotIndices = inv.getAccessibleSlotsFromSide(side);
+            if (slotIndices != null && slotIndices.length > 0) {
+                int count = slotIndices.length;
+                if (count != slotKeys.length) {
+                    reset(db, count);
+                }
+                for (int slot = 0; slot < count; slot++) {
+                    int invSlot = slotIndices[slot];
+                    ItemStack stack = inv.getStackInSlot(invSlot);
+                    if (stack != null && !inv.canExtractItem(invSlot, stack, side)) {
+                        stack = null;
+                    }
+                    updateSlot(db, slot, stack);
+                }
+                return count;
             }
-            updateSlot(db, slot, stack);
         }
-        return count;
+
+        setEmpty(db);
+        return 0;
     }
 
     @Override
     public int extractItem(InventoryDatabaseServer db, ItemEntry entry, int slot, int count) {
         ISidedInventory inv = ni.getInventoryRecheck();
-        int side = ni.getInventorySide();
-        int[] slotIndices = inv.getAccessibleSlotsFromSide(side);
-        if (slotIndices == null || slot >= slotIndices.length) {
-            return 0;
+        if (inv != null) {
+            int side = ni.getInventorySide();
+            int[] slotIndices = inv.getAccessibleSlotsFromSide(side);
+            if (slotIndices != null && slot < slotIndices.length) {
+                int invSlot = slotIndices[slot];
+                ItemStack stack = inv.getStackInSlot(invSlot);
+                if (stack != null && inv.canExtractItem(invSlot, stack, side)
+                        && db.lookupItem(stack, entry, false) == entry) {
+                    int remaining = stack.stackSize;
+                    if (count > remaining) {
+                        count = remaining;
+                    }
+                    ni.itemExtracted(invSlot, count);
+                    remaining -= count;
+                    updateCount(db, slot, entry, remaining);
+                    return count;
+                }
+            }
         }
-        int invSlot = slotIndices[slot];
-        ItemStack stack = inv.getStackInSlot(invSlot);
-        if (stack == null || !inv.canExtractItem(invSlot, stack, side)) {
-            return 0;
-        }
-        if (db.lookupItem(stack, entry, false) != entry) {
-            return 0;
-        }
-        int remaining = stack.stackSize;
-        if (count > remaining) {
-            count = remaining;
-        }
-        ni.itemExtracted(invSlot, count);
-        remaining -= count;
-        updateCount(db, slot, entry, remaining);
-        return count;
+
+        return 0;
     }
 }

src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java

@@ -42,13 +42,21 @@ public class ObeliskRenderer implements ISimpleBlockRenderingHandler {
     @Override
     public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
         final Tessellator tessellator = Tessellator.instance;
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL11.GL_ALPHA_TEST);
-        tessellator.startDrawingQuads();
-        renderWorldBlock(null, 0, 0, 0, block, 0, renderer);
-        tessellator.draw();
-        GL11.glDisable(GL11.GL_ALPHA_TEST);
-        GL11.glEnable(GL11.GL_LIGHTING);
+
+        // Preserve GL state so this custom item renderer does not leak alpha/blend/color
+        // state into subsequent item renders, such as Backhand offhand items.
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_CURRENT_BIT | GL11.GL_LIGHTING_BIT);
+
+        try {
+            GL11.glDisable(GL11.GL_LIGHTING);
+            GL11.glEnable(GL11.GL_ALPHA_TEST);
+
+            tessellator.startDrawingQuads();
+            renderWorldBlock(null, 0, 0, 0, block, 0, renderer);
+            tessellator.draw();
+        } finally {
+            GL11.glPopAttrib();
+        }
     }
 
     @Override

src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java

@@ -27,7 +27,6 @@ public class PaintedItemRenderer implements IItemRenderer {
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-
         if (data != null && data.length > 0) {
             if (type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.EQUIPPED) {
                 renderEquipped(item, (RenderBlocks) data[0]);
@@ -38,9 +37,12 @@ public class PaintedItemRenderer implements IItemRenderer {
     }
 
     public void renderEquipped(ItemStack item, RenderBlocks renderBlocks) {
-
         GL11.glPushMatrix();
-        GL11.glTranslatef(0.5F, 0.5F, 0.5F);
+
+        if (item.getItem() != Item.getItemFromBlock(EnderIO.blockTravelPlatform)) {
+            GL11.glTranslatef(0.5F, 0.5F, 0.5F);
+        }
+
         renderToInventory(item, renderBlocks);
         GL11.glPopMatrix();
     }

src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java

@@ -4,8 +4,10 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
@@ -22,7 +24,7 @@ import crazypants.enderio.EnderIO;
 import crazypants.util.ForgeDirections;
 
 @ThreadSafeISBRH(perThread = true)
-public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
+public class SoulBinderRenderer implements ISimpleBlockRenderingHandler, IItemRenderer {
 
     private static final float skullScale = 0.5f;
     private final BoundingBox scaledBB = BoundingBox.UNIT_CUBE.scale(skullScale, skullScale, skullScale);
@@ -31,13 +33,23 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
 
     @Override
     public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
+        GL11.glPushMatrix();
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT | GL11.GL_CURRENT_BIT | GL11.GL_COLOR_BUFFER_BIT);
 
-        GL11.glDisable(GL11.GL_LIGHTING);
-        final Tessellator tessellator = Tessellator.instance;
-        tessellator.startDrawingQuads();
-        renderWorldBlock(null, 0, 0, 0, block, 0, renderer);
-        tessellator.draw();
-        GL11.glEnable(GL11.GL_LIGHTING);
+        try {
+            GL11.glDisable(GL11.GL_LIGHTING);
+
+            // Move the inventory render slightly down in the slot.
+            GL11.glTranslatef(0.0f, -0.1f, 0.0f);
+
+            final Tessellator tessellator = Tessellator.instance;
+            tessellator.startDrawingQuads();
+            renderWorldBlock(null, 0, 0, 0, block, 0, renderer);
+            tessellator.draw();
+        } finally {
+            GL11.glPopAttrib();
+            GL11.glPopMatrix();
+        }
     }
 
     @Override
@@ -97,6 +109,47 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
         return true;
     }
 
+    @Override
+    public boolean shouldRender3DInInventory(int modelId) {
+        return true;
+    }
+
+    @Override
+    public int getRenderId() {
+        return BlockSoulBinder.renderId;
+    }
+
+    @Override
+    public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+        return type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON;
+    }
+
+    @Override
+    public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
+        return true;
+    }
+
+    @Override
+    public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
+        GL11.glPushMatrix();
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT | GL11.GL_CURRENT_BIT | GL11.GL_COLOR_BUFFER_BIT);
+
+        try {
+            GL11.glDisable(GL11.GL_LIGHTING);
+
+            final RenderBlocks renderer = (RenderBlocks) data[0];
+            final Block block = Block.getBlockFromItem(item.getItem());
+            final Tessellator tessellator = Tessellator.instance;
+
+            tessellator.startDrawingQuads();
+            renderWorldBlock(null, 0, 0, 0, block, 0, renderer);
+            tessellator.draw();
+        } finally {
+            GL11.glPopAttrib();
+            GL11.glPopMatrix();
+        }
+    }
+
     private ForgeDirection forFacing(ForgeDirection side, int facing) {
         return ForgeDirections.DIRECTIONS[ClientProxy.sideAndFacingToSpriteOffset[side.ordinal()][facing]];
     }
@@ -113,14 +166,4 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
             icons[dir.ordinal()] = override != null ? override : dir == faceSide ? faceIcon : defaultIcon;
         }
     }
-
-    @Override
-    public boolean shouldRender3DInInventory(int modelId) {
-        return true;
-    }
-
-    @Override
-    public int getRenderId() {
-        return BlockSoulBinder.renderId;
-    }
 }

src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java

@@ -31,6 +31,10 @@ public class BrokenSpawnerRenderer implements IItemRenderer {
             GL11.glScalef(0.5f, 0.5f, 0.5f);
         }
 
+        if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
+            GL11.glTranslatef(0.5f, 0.5f, 0.5f);
+        }
+
         RenderBlocks rb = (RenderBlocks) data[0];
         rb.setOverrideBlockTexture(EnderIO.itemBrokenSpawner.getIconFromDamage(0));
         rb.renderBlockAsItem(Blocks.stone, 0, 1);

src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java

@@ -121,24 +121,20 @@ public class TransceiverRenderer extends TileEntitySpecialRenderer implements II
 
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        if (adjustForItem) {
-            switch (type) {
-                case ENTITY:
-                    renderItem(0f, 0f, 0f);
-                    return;
-                case EQUIPPED:
-                case EQUIPPED_FIRST_PERSON:
-                    renderItem(0f, 1f, 1f);
-                    return;
-                case INVENTORY:
-                    renderItem(0f, 0f, 0f);
-                    return;
-                default:
-                    renderItem(0f, 0f, 0f);
-                    return;
+        GL11.glPushMatrix();
+
+        try {
+            if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
+                if (adjustForItem) {
+                    GL11.glTranslatef(0f, 1f, 1f);
+                } else {
+                    GL11.glTranslatef(0.5f, 0.5f, 0.5f);
+                }
             }
-        } else {
-            renderItem(0, 0, 0);
+
+            model.render();
+        } finally {
+            GL11.glPopMatrix();
         }
     }
 
@@ -168,32 +164,4 @@ public class TransceiverRenderer extends TileEntitySpecialRenderer implements II
         GL11.glEnable(GL11.GL_TEXTURE_2D);
         GL11.glDisable(GL11.GL_BLEND);
     }
-
-    private void renderItem(float x, float y, float z) {
-        GL11.glPushMatrix();
-        GL11.glTranslatef(x, y, z);
-        model.render();
-        GL11.glPopMatrix();
-    }
-
-    // private class OverlayRenderer implements IRenderFace {
-    //
-    // @Override
-    // public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double
-    // z, IIcon texture, List<Vertex> refVertices,
-    // boolean translateToXyz) {
-    //
-    // ccr.getCustomRenderBlocks().doDefaultRenderFace(face,par1Block,x,y,z,texture);
-    // if(curEnt != null && par1Block instanceof AbstractMachineBlock) {
-    // IoMode mode = curEnt.getIoMode(face);
-    // IIcon tex = ((AbstractMachineBlock)par1Block).getOverlayIconForMode(mode);
-    // if(tex != null) {
-    // ccr.getCustomRenderBlocks().doDefaultRenderFace(face,par1Block,x,y,z, tex);
-    // }
-    // }
-    //
-    // }
-    //
-    // }
-
 }

src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java

@@ -23,9 +23,17 @@ public class VacuumChestRenderer implements ISimpleBlockRenderingHandler, IItemR
     public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
         final Tessellator tessellator = Tessellator.instance;
         final CubeRenderer cr = CubeRenderer.get();
+
         tessellator.startDrawingQuads();
-        cr.render(BoundingBox.UNIT_CUBE.scale(0.6, 0.6, 0.6), EnderIO.blockHyperCube.getIcon(0, 0));
-        cr.render(BoundingBox.UNIT_CUBE.scale(0.90, 0.90, 0.90), EnderIO.blockVacuumChest.getIcon(0, 0));
+
+        cr.render(
+                BoundingBox.UNIT_CUBE.scale(0.7f, 0.7f, 0.7f).translate(0f, -0.1f, 0f),
+                EnderIO.blockHyperCube.getIcon(0, 0));
+
+        cr.render(
+                BoundingBox.UNIT_CUBE.scale(1f, 1f, 1f).translate(0f, -0.1f, 0f),
+                EnderIO.blockVacuumChest.getIcon(0, 0));
+
         tessellator.draw();
     }
 

src/main/java/crazypants/enderio/material/MachinePartRenderer.java

@@ -69,10 +69,18 @@ public class MachinePartRenderer implements IItemRenderer {
     }
 
     private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) {
-        GL11.glEnable(GL11.GL_ALPHA_TEST);
-        renderBlocks.setOverrideBlockTexture(EnderIO.itemMachinePart.getIconFromDamage(item.getItemDamage()));
-        renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F);
-        renderBlocks.clearOverrideBlockTexture();
-        GL11.glDisable(GL11.GL_ALPHA_TEST);
+        // Preserve GL state so this custom item renderer does not leak alpha/blend/color
+        // state into subsequent item renders, such as Backhand offhand items.
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_CURRENT_BIT | GL11.GL_LIGHTING_BIT);
+
+        try {
+            GL11.glEnable(GL11.GL_ALPHA_TEST);
+
+            renderBlocks.setOverrideBlockTexture(EnderIO.itemMachinePart.getIconFromDamage(item.getItemDamage()));
+            renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F);
+        } finally {
+            renderBlocks.clearOverrideBlockTexture();
+            GL11.glPopAttrib();
+        }
     }
 }

src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java

@@ -22,6 +22,7 @@ import crazypants.enderio.machine.alloy.GuiAlloySmelter;
 import crazypants.enderio.machine.recipe.IRecipe;
 import crazypants.enderio.machine.recipe.RecipeInput;
 import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.util.ColorUtils;
 
 public class AlloySmelterRecipeHandler extends TemplateRecipeHandler {
 
@@ -114,7 +115,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler {
         drawProgressBar(99, 31, 166, 0, 22, 13, 48, 3);
         AlloySmelterRecipe recipe = (AlloySmelterRecipe) arecipes.get(recipeIndex);
         String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
-        GuiDraw.drawString(energyString, 100, 52, 0x808080, false);
+        GuiDraw.drawString(energyString, 100, 52, ColorUtils.neiEnergyString.getColor(), false);
     }
 
     public List<ItemStack> getInputs(RecipeInput input) {

src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java

@@ -24,6 +24,7 @@ import crazypants.enderio.machine.enchanter.EnchanterRecipeManager;
 import crazypants.enderio.machine.enchanter.GuiEnchanter;
 import crazypants.enderio.machine.enchanter.TileEnchanter;
 import crazypants.enderio.machine.recipe.RecipeInput;
+import crazypants.util.ColorUtils;
 
 public class EnchanterRecipeHandler extends TemplateRecipeHandler {
 
@@ -113,7 +114,7 @@ public class EnchanterRecipeHandler extends TemplateRecipeHandler {
     public void drawExtras(int recipeIndex) {
         EnchanterRecipeNEI recipe = (EnchanterRecipeNEI) arecipes.get(recipeIndex);
 
-        GuiDraw.drawStringC(recipe.getEnchantName(), 83, 10, 0x808080, false);
+        GuiDraw.drawStringC(recipe.getEnchantName(), 83, 10, ColorUtils.neiEnchantString.getColor(), false);
 
         int level = 1;
         List<PositionedStack> ingredients = recipe.getIngredients();

src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java

@@ -25,6 +25,7 @@ import crazypants.enderio.machine.recipe.Recipe;
 import crazypants.enderio.machine.recipe.RecipeInput;
 import crazypants.enderio.machine.recipe.RecipeOutput;
 import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.util.ColorUtils;
 
 public class SagMillRecipeHandler extends TemplateRecipeHandler {
 
@@ -123,7 +124,7 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler {
 
         MillRecipe recipe = (MillRecipe) arecipes.get(recipeIndex);
         String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
-        GuiDraw.drawString(energyString, 96, 33, 0x808080, false);
+        GuiDraw.drawString(energyString, 96, 33, ColorUtils.neiEnergyString.getColor(), false);
     }
 
     @Override

src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java

@@ -22,6 +22,7 @@ import crazypants.enderio.machine.slicensplice.ContainerSliceAndSplice;
 import crazypants.enderio.machine.slicensplice.GuiSliceAndSplice;
 import crazypants.enderio.machine.slicensplice.SliceAndSpliceRecipeManager;
 import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.util.ColorUtils;
 
 public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler {
 
@@ -109,7 +110,7 @@ public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler {
 
         SliceAndSpliceRecipe recipe = (SliceAndSpliceRecipe) arecipes.get(recipeIndex);
         String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
-        GuiDraw.drawString(energyString, 100, 57, 0x808080, false);
+        GuiDraw.drawString(energyString, 100, 57, ColorUtils.neiEnergyString.getColor(), false);
     }
 
     public List<ItemStack> getInputs(RecipeInput input) {

src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java

@@ -24,6 +24,7 @@ import crazypants.enderio.machine.MachineRecipeRegistry;
 import crazypants.enderio.machine.soul.GuiSoulBinder;
 import crazypants.enderio.machine.soul.ISoulBinderRecipe;
 import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.util.ColorUtils;
 
 public class SoulBinderRecipeHandler extends TemplateRecipeHandler {
 
@@ -132,7 +133,7 @@ public class SoulBinderRecipeHandler extends TemplateRecipeHandler {
         SoulBinderRecipeNEI recipe = (SoulBinderRecipeNEI) arecipes.get(recipeIndex);
 
         String energyString = PowerDisplayUtil.formatPower(recipe.getEnergy()) + " " + PowerDisplayUtil.abrevation();
-        GuiDraw.drawStringC(energyString, 83, 45, 0x808080, false);
+        GuiDraw.drawStringC(energyString, 83, 45, ColorUtils.neiEnergyString.getColor(), false);
 
         int cost = recipe.getExperience();
         if (cost > 0) {

src/main/java/crazypants/enderio/nei/VatRecipeHandler.java

@@ -34,6 +34,7 @@ import crazypants.enderio.machine.recipe.RecipeInput;
 import crazypants.enderio.machine.vat.GuiVat;
 import crazypants.enderio.machine.vat.VatRecipeManager;
 import crazypants.enderio.power.PowerDisplayUtil;
+import crazypants.util.ColorUtils;
 
 public class VatRecipeHandler extends TemplateRecipeHandler {
 
@@ -183,7 +184,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
         }
 
         String energyString = PowerDisplayUtil.formatPower(rec.energy) + " " + PowerDisplayUtil.abrevation();
-        GuiDraw.drawStringC(energyString, 86, 54, 0x808080, false);
+        GuiDraw.drawStringC(energyString, 86, 54, ColorUtils.neiEnergyString.getColor(), false);
 
         Fluid outputFluid = rec.result.getFluid();
         List<PositionedStack> stacks = rec.getIngredients();
@@ -191,7 +192,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler {
             float mult = VatRecipeManager.getInstance()
                     .getMultiplierForInput(rec.inFluid.getFluid(), ps.item, outputFluid);
             String str = "x" + mult;
-            GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, 0x808080, false);
+            GuiDraw.drawStringC(str, ps.relx + 8, ps.rely + 19, ColorUtils.neiMultiplierString.getColor(), false);
         }
 
     }

src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java

@@ -6,11 +6,15 @@ import java.util.Map;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.client.model.obj.GroupObject;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.lwjgl.opengl.GL11;
+
 import com.enderio.core.client.render.CubeRenderer;
 import com.enderio.core.client.render.TechneModelRenderer;
 import com.enderio.core.client.render.TechneUtil;
@@ -19,7 +23,7 @@ import com.google.common.collect.Lists;
 
 import crazypants.enderio.EnderIO;
 
-public class TelePadRenderer extends TechneModelRenderer {
+public class TelePadRenderer extends TechneModelRenderer implements IItemRenderer {
 
     private final Collection<GroupObject> strippedModel = Lists.newArrayList();
 
@@ -97,4 +101,29 @@ public class TelePadRenderer extends TechneModelRenderer {
         CubeRenderer.get().render(block, metadata);
         tessellator.draw();
     }
+
+    @Override
+    public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+        return type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON;
+    }
+
+    @Override
+    public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
+        return true;
+    }
+
+    @Override
+    public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
+        GL11.glPushMatrix();
+
+        try {
+            renderInventoryBlock(
+                    Block.getBlockFromItem(item.getItem()),
+                    item.getItemDamage(),
+                    0,
+                    (RenderBlocks) data[0]);
+        } finally {
+            GL11.glPopMatrix();
+        }
+    }
 }

src/main/java/crazypants/util/ColorUtils.java

@@ -8,7 +8,10 @@ public class ColorUtils {
 
     public static final ColorResource
     // spotless:off
-        priorityString  = color.rgb("priorityString",   "0x000000"),
-        suctionString   = color.rgb("suctionString",    "0x000000");
+        priorityString      = color.rgb("priorityString",       "0x000000"),
+        suctionString       = color.rgb("suctionString",        "0x000000"),
+        neiMultiplierString = color.rgb("neiMultiplierString",  "0x808080"),
+        neiEnchantString    = color.rgb("neiEnchantString",     "0x808080"),
+        neiEnergyString     = color.rgb("neiEnergyString",      "0x808080");
     // spotless:on
 }