From b21d757d85edf092d96d5ddc8c06406dd8cf9c3a Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 25 Jan 2014 16:34:11 +0000 Subject: [PATCH] Apply the render hack directly to the forehead. --- .../client/core/proxy/ClientProxy.java | 7 +- .../botania/client/lib/LibRenderIDs.java | 3 +- .../render/block/RenderSpecialFlower.java | 107 ++++++++++++++++++ .../botania/common/block/BlockModFlower.java | 1 + .../common/block/BlockSpecialFlower.java | 6 + 5 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 MODSRC/vazkii/botania/client/render/block/RenderSpecialFlower.java diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index 7e8dc9162..a58133861 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -20,6 +20,7 @@ import vazkii.botania.client.gui.GuiLexiconEntry; import vazkii.botania.client.gui.GuiLexiconIndex; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.block.RenderAltar; +import vazkii.botania.client.render.block.RenderSpecialFlower; import vazkii.botania.client.render.tile.RenderTileAltar; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.core.proxy.CommonProxy; @@ -38,9 +39,11 @@ public class ClientProxy extends CommonProxy { private void initRenderers() { LibRenderIDs.idAltar = RenderingRegistry.getNextAvailableRenderId(); - + LibRenderIDs.idSpecialFlower = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new RenderAltar()); - + RenderingRegistry.registerBlockHandler(new RenderSpecialFlower()); + ClientRegistry.bindTileEntitySpecialRenderer(TileAltar.class, new RenderTileAltar()); } diff --git a/MODSRC/vazkii/botania/client/lib/LibRenderIDs.java b/MODSRC/vazkii/botania/client/lib/LibRenderIDs.java index 4c7ee8943..fbf98554e 100644 --- a/MODSRC/vazkii/botania/client/lib/LibRenderIDs.java +++ b/MODSRC/vazkii/botania/client/lib/LibRenderIDs.java @@ -14,5 +14,6 @@ package vazkii.botania.client.lib; public final class LibRenderIDs { public static int idAltar = -1; - + public static int idSpecialFlower = -1; + } diff --git a/MODSRC/vazkii/botania/client/render/block/RenderSpecialFlower.java b/MODSRC/vazkii/botania/client/render/block/RenderSpecialFlower.java new file mode 100644 index 000000000..71e2ad1d9 --- /dev/null +++ b/MODSRC/vazkii/botania/client/render/block/RenderSpecialFlower.java @@ -0,0 +1,107 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jan 25, 2014, 4:15:46 PM (GMT)] + */ +package vazkii.botania.client.render.block; + +import vazkii.botania.client.lib.LibRenderIDs; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + +public class RenderSpecialFlower implements ISimpleBlockRenderingHandler { + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + // NO-OP + } + + @Override + public boolean renderWorldBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + return renderCrossedSquares(blockAccess, block, x, y, z, renderer); + } + + // Copied from RenderBlocks + public boolean renderCrossedSquares(IBlockAccess blockAccess, Block par1Block, int par2, int par3, int par4, RenderBlocks render) { + Tessellator tessellator = Tessellator.instance; + tessellator.setBrightness(par1Block.getMixedBrightnessForBlock(blockAccess, par2, par3, par4)); + float f = 1.0F; + int l = par1Block.colorMultiplier(blockAccess, par2, par3, par4); + float f1 = (float)(l >> 16 & 255) / 255.0F; + float f2 = (float)(l >> 8 & 255) / 255.0F; + float f3 = (float)(l & 255) / 255.0F; + + if(EntityRenderer.anaglyphEnable) { + float f4 = (f1 * 30.0F + f2 * 59.0F + f3 * 11.0F) / 100.0F; + float f5 = (f1 * 30.0F + f2 * 70.0F) / 100.0F; + float f6 = (f1 * 30.0F + f3 * 70.0F) / 100.0F; + f1 = f4; + f2 = f5; + f3 = f6; + } + + tessellator.setColorOpaque_F(f * f1, f * f2, f * f3); + double d0 = (double)par2; + double d1 = (double)par3; + double d2 = (double)par4; + + drawCrossedSquares(blockAccess, par1Block, par2, par3, par4, d0, d1, d2, 1.0F, render); + return true; + } + + // Copied from RenderBlocks + public void drawCrossedSquares(IBlockAccess blockAccess, Block par1Block, int x, int y, int z, double par3, double par5, double par7, float par9, RenderBlocks render) { + Tessellator tessellator = Tessellator.instance; + + // Only change here, to use xyz rather than side/meta + Icon icon = render.getBlockIcon(par1Block, blockAccess, x, y, z, 0); + + double d3 = (double)icon.getMinU(); + double d4 = (double)icon.getMinV(); + double d5 = (double)icon.getMaxU(); + double d6 = (double)icon.getMaxV(); + double d7 = 0.45D * (double)par9; + double d8 = par3 + 0.5D - d7; + double d9 = par3 + 0.5D + d7; + double d10 = par7 + 0.5D - d7; + double d11 = par7 + 0.5D + d7; + tessellator.addVertexWithUV(d8, par5 + (double)par9, d10, d3, d4); + tessellator.addVertexWithUV(d8, par5 + 0.0D, d10, d3, d6); + tessellator.addVertexWithUV(d9, par5 + 0.0D, d11, d5, d6); + tessellator.addVertexWithUV(d9, par5 + (double)par9, d11, d5, d4); + tessellator.addVertexWithUV(d9, par5 + (double)par9, d11, d3, d4); + tessellator.addVertexWithUV(d9, par5 + 0.0D, d11, d3, d6); + tessellator.addVertexWithUV(d8, par5 + 0.0D, d10, d5, d6); + tessellator.addVertexWithUV(d8, par5 + (double)par9, d10, d5, d4); + tessellator.addVertexWithUV(d8, par5 + (double)par9, d11, d3, d4); + tessellator.addVertexWithUV(d8, par5 + 0.0D, d11, d3, d6); + tessellator.addVertexWithUV(d9, par5 + 0.0D, d10, d5, d6); + tessellator.addVertexWithUV(d9, par5 + (double)par9, d10, d5, d4); + tessellator.addVertexWithUV(d9, par5 + (double)par9, d10, d3, d4); + tessellator.addVertexWithUV(d9, par5 + 0.0D, d10, d3, d6); + tessellator.addVertexWithUV(d8, par5 + 0.0D, d11, d5, d6); + tessellator.addVertexWithUV(d8, par5 + (double)par9, d11, d5, d4); + } + + @Override + public boolean shouldRender3DInInventory() { + return false; + } + + @Override + public int getRenderId() { + return LibRenderIDs.idSpecialFlower; + } + +} diff --git a/MODSRC/vazkii/botania/common/block/BlockModFlower.java b/MODSRC/vazkii/botania/common/block/BlockModFlower.java index 4c099e539..93fc8dd78 100644 --- a/MODSRC/vazkii/botania/common/block/BlockModFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockModFlower.java @@ -27,6 +27,7 @@ import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.ILexiconable; import vazkii.botania.api.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModFlower; diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index e9fc72103..dc5049cbc 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -26,6 +26,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.ISpecialFlower; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -52,6 +53,11 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I setCreativeTab(BotaniaCreativeTab.INSTANCE); } + @Override + public int getRenderType() { + return LibRenderIDs.idSpecialFlower; + } + @Override public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockSpecialFlower.class, par1Str);