From 86ce88f0683d425f4a36972d1bf345d704b62eb7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 18 Jan 2016 14:55:28 -0600 Subject: [PATCH] Diva charm and golden laurel baubles render --- .../common/item/equipment/bauble/ItemDivaCharm.java | 7 +++---- .../common/item/equipment/bauble/ItemGoldenLaurel.java | 10 ++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 616f5b3b9..1e04a6824 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -100,10 +100,9 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble boolean armor = player.getCurrentArmor(3) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.4F, 0.1F, armor ? -0.35F : -0.3F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.scale(0.8F, 0.8F, 0.8F); + GlStateManager.rotate(90, 0, 0, 1); + GlStateManager.translate(1.475F, armor ? -0.57F : -0.5F, 0.53F); Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this, 1), ItemCameraTransforms.TransformType.THIRD_PERSON); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index 33ad02e67..43fe0981d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -67,13 +67,11 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { boolean armor = player.getCurrentArmor(3) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.rotate(-100F, 1F, 0F, 0F); - GlStateManager.translate(-0.5F, -0.55F, 0.3F); + GlStateManager.rotate(-90F, 0F, 1F, 0F); + GlStateManager.scale(2.2F, 2.2F, 2.2F); // TODO 1.8 could use further refinement + GlStateManager.translate(0, 0.425F, 0.425); if(armor) { - GlStateManager.scale(1.1F, 1.1F, 1F); - GlStateManager.translate(-0.05F, -0.1F, 0F); + GlStateManager.scale(1.1F, 1.1F, 1.1F); } Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON); }