Fix bad GL in layered item render, fix water/lavastone textures

This commit is contained in:
tterrag1098 committed 2015-07-01 23:41:52 -04:00
1 parent f09628ff30
commit 32b6929b76
6 files changed
+27 -8

No files matched your search

@@ -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");
@@ -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
Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

@@ -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
]
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

@@ -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
]
}
}