From 6014df2b1229bd2d807224d3c37a51baceaf5035 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 31 May 2016 20:57:45 -0500 Subject: [PATCH] Fix a couple baubles --- .../common/item/equipment/bauble/ItemDivaCharm.java | 10 +++++----- .../common/item/equipment/bauble/ItemLavaPendant.java | 7 +++---- .../item/equipment/bauble/ItemSuperLavaPendant.java | 7 +++---- 3 files changed, 11 insertions(+), 13 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 4b7c87ef8..d946ea300 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 @@ -99,13 +99,13 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - 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_RIGHT_HAND); // todo 1.9 + GlStateManager.scale(0.8, 0.8, 0.8); + GlStateManager.rotate(-90, 0, 1, 0); + GlStateManager.rotate(180, 1, 0, 0); + GlStateManager.translate(0.1625, -1.625, 0.40); + Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this, 1), ItemCameraTransforms.TransformType.GROUND); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 3c6929175..189cca99d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -48,10 +48,9 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F); - GlStateManager.rotate(-45F, 0F, 0F, 1F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.scale(0.5, 0.5, 0.5); + GlStateManager.rotate(180, 0, 0, 1); + GlStateManager.translate(-0.5, -0.90, armor ? -0.4 : -0.25); TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.pyroclastGem; float f = gemIcon.getMinU(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index 4ef467f66..563eb43ae 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -59,10 +59,9 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F); - GlStateManager.rotate(-45F, 0F, 0F, 1F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.scale(0.5, 0.5, 0.5); + GlStateManager.rotate(180, 0, 0, 1); + GlStateManager.translate(-0.5, -0.90, armor ? -0.4 : -0.25); TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.crimsonGem; float f = gemIcon.getMinU();