From e78a1f21f31542dce2c35e1a101fe3014d165b8c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 21 Jan 2020 10:21:43 -0600 Subject: [PATCH] update accessoryhelper to use matrixstack --- .../api/item/AccessoryRenderHelper.java | 49 ++++++++++--------- .../core/handler/BaubleRenderHandler.java | 2 +- .../handler/ContributorFancinessHandler.java | 6 +-- .../armor/terrasteel/ItemTerrasteelHelm.java | 2 +- .../equipment/bauble/ItemBaubleCosmetic.java | 12 ++--- .../equipment/bauble/ItemBloodPendant.java | 2 +- .../equipment/bauble/ItemCloudPendant.java | 2 +- .../item/equipment/bauble/ItemDivaCharm.java | 2 +- .../equipment/bauble/ItemFlightTiara.java | 4 +- .../equipment/bauble/ItemGoddessCharm.java | 6 +-- .../item/equipment/bauble/ItemHolyCloak.java | 2 +- .../item/equipment/bauble/ItemItemFinder.java | 2 +- .../equipment/bauble/ItemLavaPendant.java | 2 +- .../item/equipment/bauble/ItemMonocle.java | 6 +-- .../bauble/ItemSuperLavaPendant.java | 2 +- .../item/equipment/bauble/ItemTravelBelt.java | 2 +- 16 files changed, 51 insertions(+), 52 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java b/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java index 486fe307f..43816f7aa 100644 --- a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java +++ b/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java @@ -1,6 +1,7 @@ package vazkii.botania.api.item; -import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.matrix.MatrixStack; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.entity.LivingEntity; /** @@ -11,63 +12,63 @@ public final class AccessoryRenderHelper { /** * Rotates the render for a bauble correctly if the player is sneaking. */ - public static void rotateIfSneaking(LivingEntity player) { + public static void rotateIfSneaking(MatrixStack ms, LivingEntity player) { if(player.isCrouching()) - applySneakingRotation(); + applySneakingRotation(ms); } /** * Rotates the render for a bauble correctly for a sneaking player. */ - public static void applySneakingRotation() { - GlStateManager.translatef(0F, 0.2F, 0F); - GlStateManager.rotatef(90F / (float) Math.PI, 1.0F, 0.0F, 0.0F); + public static void applySneakingRotation(MatrixStack ms) { + ms.translate(0F, 0.2F, 0F); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F / (float) Math.PI)); } /** * Shifts the render for a bauble correctly to the head, including sneaking rotation. */ - public static void translateToHeadLevel(LivingEntity player, float partialTicks) { + public static void translateToHeadLevel(MatrixStack ms, 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); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-yawOffset)); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(yaw - 270)); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(pitch)); + + ms.translate(0, -player.getEyeHeight(), 0); // 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, float)}. + * Use for renders after calling {@link AccessoryRenderHelper#translateToHeadLevel}. */ - public static void translateToFace() { - GlStateManager.rotatef(90F, 0F, 1F, 0F); - GlStateManager.rotatef(180F, 1F, 0F, 0F); - GlStateManager.translatef(0f, -4.35f, -1.27f); + 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() { - GlStateManager.translated(0.0, 3.0, 1.0); - GlStateManager.scaled(0.55, 0.55, 0.55); + 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(LivingEntity)}. + * Use for renders after calling {@link AccessoryRenderHelper#rotateIfSneaking}. */ - public static void translateToChest() { - GlStateManager.rotatef(180F, 1F, 0F, 0F); - GlStateManager.translatef(0F, -3.2F, -0.85F); + 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/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 6fe8bb11a..c3c9b8d01 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -97,7 +97,7 @@ public final class BaubleRenderHandler extends LayerRenderer