From 0d2b11d4e516181a9829b4616266b4df2459c222 Mon Sep 17 00:00:00 2001 From: glisco Date: Fri, 24 Mar 2023 23:20:34 +0100 Subject: [PATCH] 1.19.4 --- gradle.properties | 14 +++++++------- .../okboomer/mixin/GameRendererMixin.java | 16 +++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index bc1f239..960b81c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,20 +2,20 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop/ -minecraft_base_version=1.19.3 -minecraft_version=1.19.3 -yarn_mappings=1.19.3+build.2 -loader_version=0.14.11 +minecraft_base_version=1.19.4 +minecraft_version=1.19.4 +yarn_mappings=1.19.4+build.1 +loader_version=0.14.17 # Mod Properties mod_version=0.1.1 maven_group=io.wispforest archives_base_name=ok-boomer # Dependencies # check this on https://fabricmc.net/develop/ -fabric_version=0.73.0+1.19.3 +fabric_version=0.76.0+1.19.4 # https://maven.wispforest.io/io/wispforest/owo-lib/ -owo_version=0.10.1+1.19.3 +owo_version=0.10.3+1.19.4 # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/ -modmenu_version=5.0.2 +modmenu_version=6.1.0-rc.4 diff --git a/src/main/java/io/wispforest/okboomer/mixin/GameRendererMixin.java b/src/main/java/io/wispforest/okboomer/mixin/GameRendererMixin.java index e242edb..21aa548 100644 --- a/src/main/java/io/wispforest/okboomer/mixin/GameRendererMixin.java +++ b/src/main/java/io/wispforest/okboomer/mixin/GameRendererMixin.java @@ -22,6 +22,8 @@ @Mixin(GameRenderer.class) public abstract class GameRendererMixin { + @Unique private static final MatrixStack BOOM$BOTTOM_STACK = new MatrixStack(); + @Unique private double boom$lastBoomDivisor = OkBoomer.boomDivisor; @Unique private float boom$lastScreenBoom = (float) OkBoomer.screenBoom; @@ -110,13 +112,13 @@ private void injectScreenBoomer(float tickDelta, long startTime, boolean tick, C @SuppressWarnings("InvalidInjectorMethodSignature") private void bottomText(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int i, int j, MatrixStack matrixStack) { if (OkBoomer.CONFIG.iDoNotEndorseTomfoolery()) return; - if (this.boom$lastScreenBoom <= 1 && OkBoomer.screenRotation == 0) return; + if (this.boom$lastScreenBoom >= 1 && OkBoomer.screenRotation == 0) return; var client = MinecraftClient.getInstance(); var window = client.getWindow(); var textRenderer = client.textRenderer; - Drawer.fill(matrixStack, + Drawer.fill(BOOM$BOTTOM_STACK, 0, 0, window.getScaledWidth(), @@ -124,7 +126,7 @@ private void bottomText(float tickDelta, long startTime, boolean tick, CallbackI Color.BLACK.argb() ); - Drawer.fill(matrixStack, + Drawer.fill(BOOM$BOTTOM_STACK, 0, window.getScaledHeight(), window.getScaledWidth(), @@ -145,10 +147,10 @@ private void bottomText(float tickDelta, long startTime, boolean tick, CallbackI if (oneRotat > 22.5 + 315) bottom_text = "Bottom Text"; float factor = window.getScaledWidth() / (textRenderer.getWidth(bottom_text) + 2f); - matrixStack.push(); - matrixStack.scale(factor, 3, 1); - textRenderer.draw(matrixStack, bottom_text, 1, (window.getScaledHeight() + 6) / 3f, Color.WHITE.argb()); - matrixStack.pop(); + BOOM$BOTTOM_STACK.push(); + BOOM$BOTTOM_STACK.scale(factor, 3, 1); + textRenderer.draw(BOOM$BOTTOM_STACK, bottom_text, 1, (window.getScaledHeight() + 6) / 3f, Color.WHITE.argb()); + BOOM$BOTTOM_STACK.pop(); } @ModifyArgs(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderWithTooltip(Lnet/minecraft/client/util/math/MatrixStack;IIF)V"))