From 18367ee7219bf2e858ea481bab0608e7998f9068 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 31 Mar 2020 21:49:47 -0500 Subject: [PATCH] Fix body cosmetics --- .../api/item/AccessoryRenderHelper.java | 28 ------------ .../equipment/bauble/ItemBaubleCosmetic.java | 45 ++++++++++--------- 2 files changed, 25 insertions(+), 48 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java b/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java index d262aabc4..5ce77674d 100644 --- a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java +++ b/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java @@ -53,32 +53,4 @@ public final class AccessoryRenderHelper { // GlStateManager.translatef(0.25F * MathHelper.sin(player.rotationPitch * (float) Math.PI / 180), 0.25F * MathHelper.cos(player.rotationPitch * (float) Math.PI / 180), 0F); } - /** - * Shifts the render for a bauble correctly to the face. - * Use for renders after calling {@link AccessoryRenderHelper#translateToHeadLevel}. - */ - public static void translateToFace(MatrixStack ms) { - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90)); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); - ms.translate(0f, -4.35f, -1.27f); - } - - /** - * Scales down the render to a correct size. - * Use for any render. - */ - public static void defaultTransforms(MatrixStack ms) { - ms.translate(0.0, 3.0, 1.0); - ms.scale(0.55F, 0.55F, 0.55F); - } - - /** - * Shifts the render for a bauble correctly to the chest. - * Use for renders after calling {@link AccessoryRenderHelper#rotateIfSneaking}. - */ - public static void translateToChest(MatrixStack ms) { - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); - ms.translate(0F, -3.2F, -0.85F); - } - } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 1ac422e51..24869da3f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -230,52 +230,57 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; } } else { // body cosmetics - AccessoryRenderHelper.rotateIfSneaking(ms, player); - AccessoryRenderHelper.translateToChest(ms); - AccessoryRenderHelper.defaultTransforms(ms); + layer.getEntityModel().bipedBody.rotate(ms); switch (variant) { case BLACK_BOWTIE: - ms.translate(0F, 0.15F, 0F); + ms.translate(0, 0.1, -0.13); + ms.scale(0.6F, -0.6F, -0.6F); renderItem(stack, ms, buffers, light); break; case BLACK_TIE: case PUFFY_SCARF: - ms.translate(0F, -0.15F, 0F); + ms.translate(0, 0.25, -0.15); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case WITCH_PIN: - ms.scale(0.35F, 0.35F, 0.35F); - ms.translate(-0.35F, 0.35F, 0.15F); + ms.translate(-0.1, 0.15, -0.15); + ms.scale(0.2F, -0.2F, -0.2F); renderItem(stack, ms, buffers, light); break; case DEVIL_TAIL: - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); - ms.translate(0.5F, -0.75F, 0F); + ms.translate(0, 0.55, 0.2); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.scale(0.6F, -0.6F, -0.6F); renderItem(stack, ms, buffers, light); break; case KAMUI_EYE: // DON'T LOSE YOUR WAAAAAAAAY - ms.scale(0.9F, 0.9F, 0.9F); - ms.translate(0.9F, 0.35F, 0F); + ms.push(); + ms.translate(0.4, 0.1, -0.2); + ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); - ms.translate(-1.3F, -0.5F, 0.5F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); + ms.pop(); + + ms.translate(-0.4, 0.1, -0.2); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.scale(0.5F, -0.5F, -0.5F); RenderHelper.renderItemCustomColor(player, stack, 0xFF00004C, ms, buffers, light, OverlayTexture.DEFAULT_UV); break; case FOUR_LEAF_CLOVER: - ms.scale(0.5F, 0.5F, 0.5F); - ms.translate(0.35F, 0.3F, -0.075F); + ms.translate(0.1, 0.1, -0.13); + ms.scale(0.3F, -0.3F, -0.3F); renderItem(stack, ms, buffers, light); break; case BOTANIST_EMBLEM: - ms.scale(0.5F, 0.5F, 0.5F); - ms.translate(0F, -0.75F, 0F); + ms.translate(0F, 0.375, -0.13); + ms.scale(0.3F, -0.3F, -0.3F); renderItem(stack, ms, buffers, light); break; case LUSITANIC_SHIELD: - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); - ms.translate(0.035F, -0.2F, 0.55F); + ms.translate(0F, 0.35, 0.13); ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(8F)); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.scale(0.6F, -0.6F, -0.6F); renderItem(stack, ms, buffers, light); break; default: