From f87e2373f80eea644031b7a230532b27715b8dcb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 13:22:54 -0600 Subject: [PATCH] Tiny planet bauble render --- .../botania/client/core/handler/BaubleRenderHandler.java | 3 +++ .../botania/common/item/equipment/bauble/ItemTinyPlanet.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 6d8d2f8ec..9eaa84e4b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.item.IBaubleRender.RenderType; @@ -80,6 +81,7 @@ public final class BaubleRenderHandler implements LayerRenderer { ItemStack cosmetic = attachable.getCosmeticItem(stack); if(cosmetic != null) { GlStateManager.pushMatrix(); + GL11.glColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); // Some of the baubles use this so we must restore it manually as well GlStateManager.color(1F, 1F, 1F, 1F); ((IBaubleRender) cosmetic.getItem()).onPlayerBaubleRender(cosmetic, player, type, partialTicks); GlStateManager.popMatrix(); @@ -89,6 +91,7 @@ public final class BaubleRenderHandler implements LayerRenderer { if(item instanceof IBaubleRender) { GlStateManager.pushMatrix(); + GL11.glColor3ub(((byte) 255), ((byte) 255), ((byte) 255)); // Some of the baubles use this so we must restore it manually as well GlStateManager.color(1F, 1F, 1F, 1F); ((IBaubleRender) stack.getItem()).onPlayerBaubleRender(stack, player, type, partialTicks); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index ee0a498b1..b91483524 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -105,8 +105,8 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.translate(0.25F, -0.5F, 0F); GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.translate(0, -1.5F, 0.5F); Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(ModBlocks.tinyPlanet.getDefaultState(), 1.0F); } }