From 47fcd33c65582c6eda8de46fa6f167feee6ca067 Mon Sep 17 00:00:00 2001 From: Cricket Date: Sat, 30 May 2015 17:54:51 -0400 Subject: [PATCH] fix the boo boo --- .../chisel/block/BlockCarvableGlow.java | 10 +--- .../render/RenderLayeredGlowNoColor.java | 51 ------------------- 2 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 src/main/java/com/cricketcraft/chisel/client/render/RenderLayeredGlowNoColor.java diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java index ff8a1682..ebc7c772 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java @@ -15,13 +15,11 @@ public class BlockCarvableGlow extends BlockCarvableColor { private IIcon glowTexture; private String glowTexturePath; - private boolean isColored; - public BlockCarvableGlow(String glowTexture, boolean colorized) { + public BlockCarvableGlow(String glowTexture) { super(); setLightLevel(0.5f); this.glowTexturePath = glowTexture; - this.isColored = colorized; } public BlockCarvableGlow(Material mat, String glowTexture) { @@ -41,10 +39,6 @@ public class BlockCarvableGlow extends BlockCarvableColor { @Override public int getRenderType() { - if(this.isColored){ - return Chisel.renderGlowId; - } else { - return Chisel.renderNoColorGlowId; - } + return Chisel.renderGlowId; } } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderLayeredGlowNoColor.java b/src/main/java/com/cricketcraft/chisel/client/render/RenderLayeredGlowNoColor.java deleted file mode 100644 index 95986691..00000000 --- a/src/main/java/com/cricketcraft/chisel/client/render/RenderLayeredGlowNoColor.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cricketcraft.chisel.client.render; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.BlockCarvableGlow; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.utils.Drawing; -import com.cricketcraft.chisel.utils.GeneralClient; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.IBlockAccess; -import org.lwjgl.opengl.GL11; - -public class RenderLayeredGlowNoColor implements ISimpleBlockRenderingHandler{ - - public RenderLayeredGlowNoColor() { - Chisel.renderNoColorGlowId = RenderingRegistry.getNextAvailableRenderId(); - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - GL11.glColor3f(1, 1, 1); - GL11.glDisable(GL11.GL_LIGHTING); - Drawing.drawBlock(block, ((BlockCarvableGlow) block).getGlowTexture(), renderer); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glColor3f(1, 1, 1); - Drawing.drawBlock(block, metadata, renderer); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - Tessellator.instance.setBrightness(0xF000F0); - Drawing.renderAllFaces(renderer, block, x, y, z, ((BlockCarvableGlow) block).getGlowTexture()); - renderer.renderStandardBlock(block, x, y, z); - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return Chisel.renderNoColorGlowId; - } -}