From 6ca60d507da7d5731df1b2ba285e36724cc547a5 Mon Sep 17 00:00:00 2001 From: Hubry Date: Sat, 30 Nov 2019 00:24:39 +0100 Subject: [PATCH] Adjust bauble rendering so it doesn't look as broken ...until you sneak or trapdoor yourself or swim. --- .../api/item/AccessoryRenderHelper.java | 20 +- .../handler/ContributorFancinessHandler.java | 6 +- .../client/core/handler/LayerTerraHelmet.java | 10 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 4 +- .../equipment/bauble/ItemBaubleCosmetic.java | 327 +++++++++--------- .../item/equipment/bauble/ItemDivaCharm.java | 2 +- .../equipment/bauble/ItemFlightTiara.java | 2 +- .../equipment/bauble/ItemGoddessCharm.java | 2 +- .../item/equipment/bauble/ItemItemFinder.java | 2 +- .../item/equipment/bauble/ItemMonocle.java | 2 +- 10 files changed, 189 insertions(+), 188 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java b/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java index 42510aea3..1977158fc 100644 --- a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java +++ b/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java @@ -2,7 +2,6 @@ package vazkii.botania.api.item; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.entity.LivingEntity; -import net.minecraft.util.math.MathHelper; /** * A few helper methods for the render. @@ -13,7 +12,7 @@ public final class AccessoryRenderHelper { * Rotates the render for a bauble correctly if the player is sneaking. */ public static void rotateIfSneaking(LivingEntity player) { - if(player.isSneaking()) + if(player.shouldRenderSneaking()) applySneakingRotation(); } @@ -28,15 +27,24 @@ public final class AccessoryRenderHelper { /** * Shifts the render for a bauble correctly to the head, including sneaking rotation. */ - public static void translateToHeadLevel(LivingEntity player) { + public static void translateToHeadLevel(LivingEntity player, float partialTicks) { + + float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * partialTicks; + float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * partialTicks; + float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * partialTicks; + + GlStateManager.rotatef(yawOffset, 0, -1, 0); + GlStateManager.rotatef(yaw - 270, 0, 1, 0); + GlStateManager.rotatef(pitch, 0, 0, 1); + GlStateManager.translatef(0, -player.getEyeHeight(), 0); - if (player.isSneaking()) - GlStateManager.translatef(0.25F * MathHelper.sin(player.rotationPitch * (float) Math.PI / 180), 0.25F * MathHelper.cos(player.rotationPitch * (float) Math.PI / 180), 0F); +// if (player.shouldRenderSneaking()) TODO Sneaking needs a different adjustment now +// 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(LivingEntity)}. + * Use for renders after calling {@link AccessoryRenderHelper#translateToHeadLevel(LivingEntity, float)}. */ public static void translateToFace() { GlStateManager.rotatef(90F, 0F, 1F, 0F); diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 6d75f7f08..06e341a6d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -87,7 +87,7 @@ public final class ContributorFancinessHandler extends LayerRenderer quads, int color, ItemStack stack) - { + private static void renderQuads(BufferBuilder renderer, List quads, int color, ItemStack stack) { boolean flag = color == -1 && !stack.isEmpty(); int i = 0; - for (int j = quads.size(); i < j; ++i) - { + for(int j = quads.size(); i < j; ++i) { BakedQuad bakedquad = quads.get(i); int k = color; - if (flag && bakedquad.hasTintIndex()) - { + if(flag && bakedquad.hasTintIndex()) { k = Minecraft.getInstance().getItemColors().getColor(stack, bakedquad.getTintIndex()); k = k | -16777216; } 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 bdb21a2d9..395eb2ba9 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 @@ -96,7 +96,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { @Override @OnlyIn(Dist.CLIENT) public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { - AccessoryRenderHelper.translateToHeadLevel(player); + AccessoryRenderHelper.translateToHeadLevel(player, partialTicks); Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); GlStateManager.scaled(0.8, 0.8, 0.8); GlStateManager.rotatef(-90, 0, 1, 0); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 193a45c89..ea55cc949 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -442,7 +442,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { Minecraft.getInstance().textureManager.bindTexture(textureHalo); if(player != null) - AccessoryRenderHelper.translateToHeadLevel(player); + AccessoryRenderHelper.translateToHeadLevel(player, partialTicks); GlStateManager.translatef(0, 1.5F, 0); GlStateManager.rotatef(30, 1, 0, -1); GlStateManager.translatef(-0.1F, -0.5F, -0.1F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java index 8e704011e..27fff844b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -61,7 +61,7 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem { @OnlyIn(Dist.CLIENT) public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { GlStateManager.pushMatrix(); - AccessoryRenderHelper.translateToHeadLevel(player); + AccessoryRenderHelper.translateToHeadLevel(player, partialTicks); AccessoryRenderHelper.translateToFace(); AccessoryRenderHelper.defaultTransforms(); GlStateManager.rotatef(-90F, 0F, 1F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 3bd5c1126..504e61f40 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -77,7 +77,7 @@ public class ItemItemFinder extends ItemBauble { float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty(); - AccessoryRenderHelper.translateToHeadLevel(living); + AccessoryRenderHelper.translateToHeadLevel(living, partialTicks); Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); GlStateManager.rotatef(90F, 0F, 1F, 0F); GlStateManager.rotatef(180F, 1F, 0F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index aea4a71f7..dbbfc9b4a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -52,7 +52,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty(); Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - AccessoryRenderHelper.translateToHeadLevel(player); + AccessoryRenderHelper.translateToHeadLevel(player, partialTicks); AccessoryRenderHelper.translateToFace(); AccessoryRenderHelper.defaultTransforms(); GlStateManager.rotatef(180F, 0F, 1F, 0F);