From 77ee13d15c73460d5222aaff2206e0f841aa8e40 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 1 Jul 2015 23:41:52 -0400 Subject: [PATCH] Fix bad GL in layered item render, fix water/lavastone textures --- .../java/com/cricketcraft/chisel/Features.java | 4 ++-- .../client/render/RendererMultiLayer.java | 14 ++++++++------ .../textures/blocks/lavastone/lava_flow.png | Bin 0 -> 33459 bytes .../blocks/lavastone/lava_flow.png.mcmeta | 9 +++++++++ .../textures/blocks/waterstone/water_flow.png | Bin 0 -> 66792 bytes .../blocks/waterstone/water_flow.png.mcmeta | 8 ++++++++ 6 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/lavastone/lava_flow.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/lavastone/lava_flow.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/blocks/waterstone/water_flow.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/waterstone/water_flow.png.mcmeta diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index a54c8dd8..e5f14b4a 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -1337,7 +1337,7 @@ public enum Features { @Override void addBlocks() { - BlockLavastone lavastone = (BlockLavastone) new BlockLavastone(Material.rock, "lava_flow").setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); + BlockLavastone lavastone = (BlockLavastone) new BlockLavastone(Material.rock, "Chisel:lavastone/lava_flow").setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); lavastone.carverHelper.addVariation("tile.lavastone.0.desc", 0, "lavastone/cobble"); lavastone.carverHelper.addVariation("tile.lavastone.1.desc", 1, "lavastone/black"); lavastone.carverHelper.addVariation("tile.lavastone.2.desc", 2, "lavastone/tiles"); @@ -2780,7 +2780,7 @@ public enum Features { @Override void addBlocks() { - BlockWaterstone waterstone = (BlockWaterstone) new BlockWaterstone(Material.rock, "water_flow").setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F); + BlockWaterstone waterstone = (BlockWaterstone) new BlockWaterstone(Material.rock, "Chisel:waterstone/water_flow").setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F); waterstone.carverHelper.addVariation("tile.waterstone.0.desc", 0, "waterstone/cobble"); waterstone.carverHelper.addVariation("tile.waterstone.1.desc", 1, "waterstone/black"); waterstone.carverHelper.addVariation("tile.waterstone.2.desc", 2, "waterstone/tiles"); diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java b/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java index 3f6635a8..1bfba74d 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java @@ -10,7 +10,7 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; -import org.lwjgl.opengl.GL11; +import static org.lwjgl.opengl.GL11.*; public class RendererMultiLayer implements ISimpleBlockRenderingHandler { @@ -35,13 +35,15 @@ public class RendererMultiLayer implements ISimpleBlockRenderingHandler { } else if (block.base != null) { renderer.renderBlockAsItem(block.base, meta, 1.0f); } - - GL11.glEnable(3042); - GL11.glBlendFunc(770, 771); + + glPushMatrix(); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); renderer.setRenderBounds(bot, bot, bot, top, top, top); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + glTranslatef(-0.5F, -0.5F, -0.5F); Drawing.drawBlock(block, meta, renderer); - GL11.glDisable(3042); + glDisable(GL_BLEND); + glPopMatrix(); } @Override diff --git a/src/main/resources/assets/chisel/textures/blocks/lavastone/lava_flow.png b/src/main/resources/assets/chisel/textures/blocks/lavastone/lava_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..ddd838791e9549290571144dd197176e1430285e GIT binary patch literal 33459 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/lavastone/lava_flow.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/lavastone/lava_flow.png.mcmeta new file mode 100644 index 00000000..2e2550ec --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/lavastone/lava_flow.png.mcmeta @@ -0,0 +1,9 @@ +{ + "animation": { + "frametime": 3, + "frames": [ + 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, + 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31 + ] + } +} diff --git a/src/main/resources/assets/chisel/textures/blocks/waterstone/water_flow.png b/src/main/resources/assets/chisel/textures/blocks/waterstone/water_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..e2257a470c3b6b1968dd9dcd61efacdad7cb6609 GIT binary patch literal 66792 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 K{f)o-TmK(-pga%& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/waterstone/water_flow.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/waterstone/water_flow.png.mcmeta new file mode 100644 index 00000000..47a6183c --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/waterstone/water_flow.png.mcmeta @@ -0,0 +1,8 @@ +{ + "animation": { + "frames": [ + 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, + 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63 + ] + } +} \ No newline at end of file