diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index c9ee15b3..38fde239 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/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()); diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java b/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java index 159a17a4..cca73438 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/ZombieGeneratorRenderer.java +++ b/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(); } diff --git a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java b/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java index f238dce8..029c291b 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/ObeliskRenderer.java +++ b/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 diff --git a/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java b/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java index db39327a..46fafbe5 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PaintedItemRenderer.java +++ b/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(); } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java index d52d2d01..3d87beee 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderRenderer.java +++ b/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; - } } diff --git a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java b/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java index 7acc0728..47a99490 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BrokenSpawnerRenderer.java +++ b/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); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java index 5b6da7fe..c44d2282 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java +++ b/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 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); - // } - // } - // - // } - // - // } - } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java b/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java index d9c1865e..07fafc22 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/VacuumChestRenderer.java +++ b/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(); } diff --git a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java index d52d782c..df06e7ff 100644 --- a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java +++ b/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(); + } } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java index 366a1c33..518a3ff8 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java +++ b/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 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(); + } + } }