From cd03bfc2ff3290300edc121b51e4ed96cbaceccd Mon Sep 17 00:00:00 2001 From: penguin Date: Thu, 10 Jul 2025 02:55:51 -0400 Subject: [PATCH 1/4] fixed waypoint block fov drifting --- .../skytils/skytilsmod/utils/rendering/DrawHelper.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt index c7b524afc..82af35db2 100644 --- a/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt +++ b/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt @@ -53,7 +53,11 @@ object DrawHelper { * This is useful for rendering things in world space, as it will negate the camera rotation. */ fun cameraRotation(matrices: UMatrixStack) { - matrices.multiply(mc.gameRenderer.camera.rotation.conjugate(Quaternionf())) + //#if MC>12000 + matrices.multiply(mc.gameRenderer.camera.rotation.conjugate(Quaternionf()).mul(70f/mc.options.fov.value)) + //#else + //$$matrices.multiply(mc.gameRenderer.camera.rotation.conjugate(Quaternionf())) + //#endif } /** @@ -223,9 +227,9 @@ object DrawHelper { fun drawNametag(matrices: UMatrixStack, text: String, x: Double, y: Double, z: Double, shadow: Boolean = true, scale: Float = 1f, background: Boolean = true, throughWalls: Boolean = false) { matrices.push() matrices.translate(x, y + 0.5, z) - matrices.multiply(mc.entityRenderDispatcher.rotation) + matrices.multiply(mc.gameRenderer.camera.rotation) + // TODO: fix fov drifting issues for nametags matrices.scale(0.025f, -0.025f, 0.025f) - matrices.scale(scale, scale, scale) val centerPos = UGraphics.getStringWidth(text) / -2f val backgroundColor = if (!background) 0 else (mc.options.getTextBackgroundOpacity(0.25f) * 255).toInt() shl 24 From 48f2a421ab12b8d235a28c5ec0a8299afe480769 Mon Sep 17 00:00:00 2001 From: penguin <136866320+P3nguinMinecraft@users.noreply.github.com> Date: Sat, 26 Jul 2025 11:50:34 -0400 Subject: [PATCH 2/4] Update mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt Co-authored-by: Sychic <47618543+Sychic@users.noreply.github.com> Signed-off-by: penguin <136866320+P3nguinMinecraft@users.noreply.github.com> --- .../kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt index 82af35db2..db2516449 100644 --- a/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt +++ b/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt @@ -54,7 +54,7 @@ object DrawHelper { */ fun cameraRotation(matrices: UMatrixStack) { //#if MC>12000 - matrices.multiply(mc.gameRenderer.camera.rotation.conjugate(Quaternionf()).mul(70f/mc.options.fov.value)) + matrices.multiply(mc.gameRenderer.camera.rotation.conjugate(Quaternionf()).mul(70f/mc.options.fov.value.coerceAtLeast(1)) //#else //$$matrices.multiply(mc.gameRenderer.camera.rotation.conjugate(Quaternionf())) //#endif From 624e9f59cc98ab199935a8136c61c4d95c6f3732 Mon Sep 17 00:00:00 2001 From: penguin Date: Sat, 26 Jul 2025 12:13:41 -0400 Subject: [PATCH 3/4] yikes lol --- .../kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt index 08c5006f3..06a01ac59 100644 --- a/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt +++ b/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt @@ -55,7 +55,7 @@ object DrawHelper { */ fun cameraRotation(matrices: UMatrixStack) { //#if MC>12000 - matrices.multiply(mc.gameRenderer.camera.rotation.conjugate(Quaternionf()).mul(70f/mc.options.fov.value.coerceAtLeast(1)) + matrices.multiply(mc.gameRenderer.camera.rotation.conjugate(Quaternionf()).mul(70f/mc.options.fov.value.coerceAtLeast(1))) //#else //$$matrices.multiply(mc.gameRenderer.camera.rotation.conjugate(Quaternionf())) //#endif From 228a3b88812f9330848889aecc2766e6735c6f2f Mon Sep 17 00:00:00 2001 From: penguin <136866320+P3nguinMinecraft@users.noreply.github.com> Date: Tue, 12 Aug 2025 23:15:52 +0800 Subject: [PATCH 4/4] revert rotation Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Signed-off-by: penguin <136866320+P3nguinMinecraft@users.noreply.github.com> --- .../kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt index 06a01ac59..deb1adec3 100644 --- a/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt +++ b/mod/src/main/kotlin/gg/skytils/skytilsmod/utils/rendering/DrawHelper.kt @@ -234,7 +234,7 @@ object DrawHelper { fun drawNametag(matrices: UMatrixStack, text: String, x: Double, y: Double, z: Double, shadow: Boolean = true, scale: Float = 1f, background: Boolean = true, throughWalls: Boolean = false) { matrices.push() matrices.translate(x, y + 0.5, z) - matrices.multiply(mc.gameRenderer.camera.rotation) +matrices.multiply(mc.entityRenderDispatcher.rotation) // TODO: fix fov drifting issues for nametags matrices.scale(0.025f, -0.025f, 0.025f) matrices.scale(scale, scale, scale)