diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java index 9881763a..86ef0403 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/TranslatedCubeRenderer.java @@ -25,6 +25,10 @@ public class TranslatedCubeRenderer { private CustomCubeRenderer ccr = new CustomCubeRenderer(); + public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt, boolean enableLighting) { + renderBoundingBox(x, y, z, block, bb, vt, null, enableLighting); + } + public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt) { renderBoundingBox(x, y, z, block, bb, vt, null); } diff --git a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java index f16322b9..17e12655 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.spawner; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -20,10 +22,12 @@ public class BrokenSpawnerRenderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + GL11.glEnable(GL11.GL_ALPHA_TEST); RenderBlocks rb = (RenderBlocks)data[0]; rb.setOverrideBlockTexture(EnderIO.itemBrokenSpawner.getIconFromDamage(0)); rb.renderBlockAsItem(Blocks.stone, 0, 1); - rb.setOverrideBlockTexture(null); + rb.setOverrideBlockTexture(null); + GL11.glDisable(GL11.GL_ALPHA_TEST); } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java index 4c0cf18c..e7f73dfd 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/ItemBrokenSpawner.java @@ -55,7 +55,7 @@ public class ItemBrokenSpawner extends Item { setUnlocalizedName(ModObject.itemBrokenSpawner.unlocalisedName); setHasSubtypes(true); setMaxDamage(0); - setMaxStackSize(1); + setMaxStackSize(1); } @Override @@ -63,7 +63,6 @@ public class ItemBrokenSpawner extends Item { return false; } - protected void init() { GameRegistry.registerItem(this, ModObject.itemBrokenSpawner.unlocalisedName); } diff --git a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java b/src/main/java/crazypants/enderio/machine/still/VatRenderer.java index ea1d6ed9..ec58cd31 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRenderer.java +++ b/src/main/java/crazypants/enderio/machine/still/VatRenderer.java @@ -75,14 +75,14 @@ public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer //-x side BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge); bb = bb.translate(0.5f - (0.334f/2),0,0); - TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, world != null); bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge); - TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, world != null); bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge); bb = bb.translate(-0.5f + (0.334f/2),0,0); - TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform); + TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, world != null); if(vat != null) { ccr.renderBlock(world, block, x, y, z, overlayRenderer); @@ -100,21 +100,12 @@ public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - Tessellator tes = Tessellator.instance; + GL11.glDisable(GL11.GL_LIGHTING); - - OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); - GL11.glDisable(GL11.GL_TEXTURE_2D); - OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); - - tes.startDrawingQuads(); + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); renderWorldBlock(null, 0, 0, 0, block, 0, renderer); - tes.draw(); - -// OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); -// GL11.glEnable(GL11.GL_TEXTURE_2D); -// OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); - + tes.draw(); GL11.glEnable(GL11.GL_LIGHTING); } diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index 11e71e66..fb8b1ee5 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -154,18 +154,6 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc return new GuiTank(player.inventory, (TileTank) te); } - //Causes crashes in 1.7 on some machines - //@Override - //@SideOnly(Side.CLIENT) - //public int getRenderBlockPass() { - // return 1; - //} - // - //@Override - //public boolean canRenderInPass(int pass) { - // return pass == 1; - //} - @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index d9d8f3e1..c7e037e4 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -99,18 +99,17 @@ public class BlockFusedQuartz extends BlockEio { return renderId; } - //TODO:1.7 this makes it go splat - // @Override - // @SideOnly(Side.CLIENT) - // public int getRenderBlockPass() { - // return 1; - // } - // - // @Override - // public boolean canRenderInPass(int pass) { - // FusedQuartzRenderer.renderPass = pass; - // return true; - // } + @Override + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() { + return 1; + } + + @Override + public boolean canRenderInPass(int pass) { + FusedQuartzRenderer.renderPass = pass; + return true; + } @Override public int getLightOpacity(IBlockAccess world, int x, int y, int z) { diff --git a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java index e2359f50..33ffdb41 100644 --- a/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java +++ b/src/main/java/crazypants/enderio/material/FusedQuartzRenderer.java @@ -45,14 +45,14 @@ public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler { public boolean renderWorldBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { int meta = blockAccess.getBlockMetadata(x, y, z); //TODO:1.7 this makes it go splat - //if((meta == 0 && renderPass != 0) || (meta == 1 && renderPass == 0)) { - TileEntityPaintedBlock tecb = null; - TileEntity te = blockAccess.getTileEntity(x, y, z); - if(te instanceof TileEntityPaintedBlock) { - tecb = (TileEntityPaintedBlock) te; + if((meta == 0 && renderPass != 0) || (meta == 1 && renderPass == 0)) { + TileEntityPaintedBlock tecb = null; + TileEntity te = blockAccess.getTileEntity(x, y, z); + if(te instanceof TileEntityPaintedBlock) { + tecb = (TileEntityPaintedBlock) te; + } + renderFrame(blockAccess, x, y, z, tecb, false, meta); } - renderFrame(blockAccess, x, y, z, tecb, false, meta); - // } return true; } diff --git a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java index 2cd1b0f3..e468d447 100644 --- a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java +++ b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java @@ -69,8 +69,10 @@ 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); } }