From eb028d6c05d833e5a6fdda74f73f4d537d7dd965 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 15 Jan 2016 21:20:49 -0600 Subject: [PATCH] Fully fix mana pool models --- .../client/render/tile/RenderTilePool.java | 24 ++++--------------- .../render/tile/RenderTileStarfield.java | 6 +---- .../assets/botania/blockstates/pool.json | 7 ++---- 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index b07257938..48f9328af 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -75,28 +75,14 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); } else { - color = pool.getColor().getMapColor().colorValue | 0xFF000000; // Add alpha + color = pool.getColor().getMapColor().colorValue; } IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool.getWorld().getBlockState(pool.getPos())); - Tessellator tess = Tessellator.getInstance(); - - tess.getWorldRenderer().begin(GL11.GL_QUADS, Attributes.DEFAULT_BAKED_FORMAT); - - GlStateManager.disableLighting(); - for (BakedQuad quad : model.getGeneralQuads()) { - LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); - } - - for (EnumFacing e : EnumFacing.VALUES) { - for (BakedQuad quad: model.getFaceQuads(e)) { - LightUtil.renderQuadColor(tess.getWorldRenderer(), quad, color); - } - } - - tess.draw(); - - GlStateManager.enableLighting(); + int red = (color & 0xFF0000) >> 16; + int green = (color & 0xFF00) >> 8; + int blue = (color & 0xFF) >> 0; + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F); GlStateManager.translate(0.5F, 1.5F, 0.5F); GlStateManager.color(1, 1, 1, a); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 56e7d689a..d1e1b1297 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -22,11 +22,7 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.common.block.tile.TileStarfield; -// THIS CODE WAS STOLEN FROM THE END PORTAL -// OH GOD -// I HAVE NO IDEA WHAT I'M DOING -// SO MUCH STUFF I DON'T UNDERSTAND D: -// HELP +// This is copied from the vanilla end portal TESR, relevant edits are commented public class RenderTileStarfield extends TileEntitySpecialRenderer { private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png"); diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index 77eb376ee..c904678a3 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "botania:pool", + "model": "botania:pool_tinted", "transform": "forge:default-block" }, "variants": { @@ -9,10 +9,7 @@ "default": { "textures": { "all": "botania:model/poolCopy" } }, "diluted": { "textures": { "all": "botania:model/dilutedPoolCopy" } }, "creative": { "textures": { "all": "botania:model/infinitePoolCopy" } }, - "fabulous": { - "model": "botania:pool_tinted", - "textures": { "all": "botania:model/poolCopy" } - } + "fabulous": { "textures": { "all": "botania:model/poolCopy" } } }, "inventory_creative": [{ "model": "botania:pool_filled",