From 095c22c09dfad9e02ff27af8c64c888e3bdc8fcd Mon Sep 17 00:00:00 2001 From: Andreas Date: Mon, 3 Aug 2026 22:18:14 -0700 Subject: [PATCH 1/4] chore: avoid using else statements for older versioned code Signed-off-by: Andreas --- .../MixinNametagsBackgroundOpacity.java | 13 ++++++--- .../mixin/client/MixinNametagsTextShadow.java | 28 +++++++++---------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/main/java/sh/ndy/mixin/client/MixinNametagsBackgroundOpacity.java b/src/main/java/sh/ndy/mixin/client/MixinNametagsBackgroundOpacity.java index a2a7995..ffdb24f 100644 --- a/src/main/java/sh/ndy/mixin/client/MixinNametagsBackgroundOpacity.java +++ b/src/main/java/sh/ndy/mixin/client/MixinNametagsBackgroundOpacity.java @@ -12,14 +12,15 @@ //? if < 26.2 { /* @Mixin(NameTagFeatureRenderer.Storage.class) */ -//?} else { +//?} + +//? if >= 26.2 { @Mixin(NameTagFeatureRenderer.class) //?} public class MixinNametagsBackgroundOpacity { //? if < 26.2 { /* @Unique private static final String TARGET = "Lnet/minecraft/client/renderer/state/OptionsRenderState;getBackgroundOpacity(F)F"; */ - //?} else - @Unique private static final String TARGET = "Lnet/minecraft/client/gui/Font;prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZZI)Lnet/minecraft/client/gui/Font$PreparedText;"; + //?} //? if < 26.2 { /* @ModifyExpressionValue( @@ -32,7 +33,11 @@ public class MixinNametagsBackgroundOpacity { private float changeOpacity(float original) { return (float) Config.getOptions().getNametagOpacity(); } - *///?} else { + *///?} + + //? if >= 26.2 { + @Unique private static final String TARGET = "Lnet/minecraft/client/gui/Font;prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZZI)Lnet/minecraft/client/gui/Font$PreparedText;"; + @ModifyArg( method = "prepareText", at = @At( diff --git a/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java b/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java index a2f0e4a..89106fb 100644 --- a/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java +++ b/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java @@ -9,24 +9,23 @@ @Mixin(NameTagFeatureRenderer.class) public class MixinNametagsTextShadow { - //? if < 26.2 { - /* @Unique private static final String TARGET = - "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLorg/joml/Matrix4fc;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)V"; - *///?} else { - @Unique private static final String TARGET = - "Lnet/minecraft/client/gui/Font;prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZZI)Lnet/minecraft/client/gui/Font$PreparedText;"; - //?} - private static final NametagsTextShadowListener listener = new NametagsTextShadowListener(); //? if < 26.2 { /* - @ModifyArg(method = "renderTranslucent", at = @At(value = "INVOKE", target = TARGET)) - private boolean render(boolean original) { - return listener.handleMixin(); - } - */ - //?} else { + @Unique private static final String TARGET = + "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLorg/joml/Matrix4fc;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)V"; + + @ModifyArg(method = "renderTranslucent", at = @At(value = "INVOKE", target = TARGET)) + private boolean render(boolean original) { + return listener.handleMixin(); + } + *///?} + + //? if >= 26.2 { + @Unique private static final String TARGET = + "Lnet/minecraft/client/gui/Font;prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZZI)Lnet/minecraft/client/gui/Font$PreparedText;"; + @ModifyArg(method = "prepareText", at = @At(value = "INVOKE", target = TARGET), index = 4 @@ -35,5 +34,4 @@ private static boolean render(boolean drawShadow) { return listener.handleMixin(); } //?} - } From 016ccd40555d5998efe8f095d49edd3cd8d6819d Mon Sep 17 00:00:00 2001 From: Andreas Date: Tue, 4 Aug 2026 18:59:42 -0700 Subject: [PATCH 2/4] chore: use `MinecraftClient.gui` in places Signed-off-by: Andreas --- src/main/java/sh/ndy/ToggleNametagsClient.java | 2 +- src/main/java/sh/ndy/screens/ConfigScreen.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/sh/ndy/ToggleNametagsClient.java b/src/main/java/sh/ndy/ToggleNametagsClient.java index 24db879..a247ea9 100644 --- a/src/main/java/sh/ndy/ToggleNametagsClient.java +++ b/src/main/java/sh/ndy/ToggleNametagsClient.java @@ -58,7 +58,7 @@ public void onInitializeClient() { //? if < 26.2 { // context.getSource().getClient().schedule(() -> c.setScreen(new ConfigScreen(null, null))); //?} else - context.getSource().getClient().schedule(() -> c.setScreenAndShow(new ConfigScreen(null, null))); + context.getSource().getClient().schedule(() -> c.gui.setScreen(new ConfigScreen(null, null))); return 1; })); diff --git a/src/main/java/sh/ndy/screens/ConfigScreen.java b/src/main/java/sh/ndy/screens/ConfigScreen.java index 61f9e60..0fc10b2 100644 --- a/src/main/java/sh/ndy/screens/ConfigScreen.java +++ b/src/main/java/sh/ndy/screens/ConfigScreen.java @@ -154,6 +154,6 @@ public void onClose() { //? if < 26.2 { // this.minecraft.setScreen(parent); //?} else - this.minecraft.setScreenAndShow(parent); + this.minecraft.gui.setScreen(parent); } } From 1d4b90b8bfd6ad3febcb685b3f56cdcf54ce3fdb Mon Sep 17 00:00:00 2001 From: Andreas Date: Tue, 4 Aug 2026 21:49:57 -0700 Subject: [PATCH 3/4] chore: consolidate target into else Signed-off-by: Andreas --- .../mixin/client/MixinNametagsBackgroundOpacity.java | 4 ++-- .../sh/ndy/mixin/client/MixinNametagsTextShadow.java | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/sh/ndy/mixin/client/MixinNametagsBackgroundOpacity.java b/src/main/java/sh/ndy/mixin/client/MixinNametagsBackgroundOpacity.java index ffdb24f..1b71898 100644 --- a/src/main/java/sh/ndy/mixin/client/MixinNametagsBackgroundOpacity.java +++ b/src/main/java/sh/ndy/mixin/client/MixinNametagsBackgroundOpacity.java @@ -20,6 +20,8 @@ public class MixinNametagsBackgroundOpacity { //? if < 26.2 { /* @Unique private static final String TARGET = "Lnet/minecraft/client/renderer/state/OptionsRenderState;getBackgroundOpacity(F)F"; */ + //?} else { + @Unique private static final String TARGET = "Lnet/minecraft/client/gui/Font;prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZZI)Lnet/minecraft/client/gui/Font$PreparedText;"; //?} //? if < 26.2 { @@ -36,8 +38,6 @@ private float changeOpacity(float original) { *///?} //? if >= 26.2 { - @Unique private static final String TARGET = "Lnet/minecraft/client/gui/Font;prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZZI)Lnet/minecraft/client/gui/Font$PreparedText;"; - @ModifyArg( method = "prepareText", at = @At( diff --git a/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java b/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java index 89106fb..2f28ea8 100644 --- a/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java +++ b/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java @@ -11,10 +11,15 @@ public class MixinNametagsTextShadow { private static final NametagsTextShadowListener listener = new NametagsTextShadowListener(); + //? if < 26.2 { + /* @Unique private static final String TARGET = + "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLorg/joml/Matrix4fc;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)V"; */ + //} else + @Unique private static final String TARGET = + "Lnet/minecraft/client/gui/Font;prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZZI)Lnet/minecraft/client/gui/Font$PreparedText;"; + //? if < 26.2 { /* - @Unique private static final String TARGET = - "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLorg/joml/Matrix4fc;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)V"; @ModifyArg(method = "renderTranslucent", at = @At(value = "INVOKE", target = TARGET)) private boolean render(boolean original) { @@ -23,9 +28,6 @@ private boolean render(boolean original) { *///?} //? if >= 26.2 { - @Unique private static final String TARGET = - "Lnet/minecraft/client/gui/Font;prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZZI)Lnet/minecraft/client/gui/Font$PreparedText;"; - @ModifyArg(method = "prepareText", at = @At(value = "INVOKE", target = TARGET), index = 4 From 740fda09110f65c933723a8838c080f98f8924a9 Mon Sep 17 00:00:00 2001 From: Andreas Date: Sat, 15 Aug 2026 21:15:51 -0700 Subject: [PATCH 4/4] chore: some moar changes Signed-off-by: Andreas --- .../java/sh/ndy/mixin/client/MixinNametagsTextShadow.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java b/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java index 2f28ea8..ff9b72b 100644 --- a/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java +++ b/src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java @@ -14,13 +14,13 @@ public class MixinNametagsTextShadow { //? if < 26.2 { /* @Unique private static final String TARGET = "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLorg/joml/Matrix4fc;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)V"; */ - //} else + //?} else { @Unique private static final String TARGET = "Lnet/minecraft/client/gui/Font;prepareText(Lnet/minecraft/util/FormattedCharSequence;FFIZZI)Lnet/minecraft/client/gui/Font$PreparedText;"; + //?} //? if < 26.2 { /* - @ModifyArg(method = "renderTranslucent", at = @At(value = "INVOKE", target = TARGET)) private boolean render(boolean original) { return listener.handleMixin();