From 46bea5a0a36cf10df5c526518eff49e451dc4ece Mon Sep 17 00:00:00 2001 From: Cricket Date: Sat, 30 May 2015 17:34:02 -0400 Subject: [PATCH] Those are the textures for it, I can't figure out the CTM logic. Plus I made it so carvable glow can be colored by the dye or regular --- .../chisel/block/BlockCarvableGlow.java | 10 +++- .../render/RenderLayeredGlowNoColor.java | 51 ++++++++++++++++++ .../textures/blocks/futura/WIP/controller.png | Bin 0 -> 594 bytes .../blocks/futura/WIP/controllerAnim.png | Bin 0 -> 3397 bytes .../futura/WIP/controllerAnim.png.mcmeta | 19 +++++++ .../blocks/futura/WIP/controllerWIP-ctm.png | Bin 7444 -> 0 bytes 6 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/cricketcraft/chisel/client/render/RenderLayeredGlowNoColor.java create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerAnim.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerAnim.png.mcmeta delete mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/WIP/controllerWIP-ctm.png diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java index ebc7c772..ff8a1682 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java @@ -15,11 +15,13 @@ public class BlockCarvableGlow extends BlockCarvableColor { private IIcon glowTexture; private String glowTexturePath; + private boolean isColored; - public BlockCarvableGlow(String glowTexture) { + public BlockCarvableGlow(String glowTexture, boolean colorized) { super(); setLightLevel(0.5f); this.glowTexturePath = glowTexture; + this.isColored = colorized; } public BlockCarvableGlow(Material mat, String glowTexture) { @@ -39,6 +41,10 @@ public class BlockCarvableGlow extends BlockCarvableColor { @Override public int getRenderType() { - return Chisel.renderGlowId; + if(this.isColored){ + return Chisel.renderGlowId; + } else { + return Chisel.renderNoColorGlowId; + } } } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderLayeredGlowNoColor.java b/src/main/java/com/cricketcraft/chisel/client/render/RenderLayeredGlowNoColor.java new file mode 100644 index 00000000..95986691 --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/client/render/RenderLayeredGlowNoColor.java @@ -0,0 +1,51 @@ +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; + } +} diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png b/src/main/resources/assets/chisel/textures/blocks/futura/WIP/controller.png new file mode 100644 index 0000000000000000000000000000000000000000..d8eeda8851329f962d13f3a0fb0a7ab58787289f GIT binary patch literal 594 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 VQ~BoMzKho&FAg3VR3Df$@4v^8n}q-X