Skip to content

26.2 refactorish #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Greek wants to merge 4 commits into
base: main
Choose a base branch
from
+21 −16
Open

26.2 refactorish #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
095c22c
chore: avoid using else statements for older versioned code
Greek Aug 4, 2026
016ccd4
chore: use `MinecraftClient.gui` in places
Greek Aug 5, 2026
1d4b90b
chore: consolidate target into else
Greek Aug 5, 2026
740fda0
chore: some moar changes
Greek Aug 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/sh/ndy/ToggleNametagsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}));
Expand Down
11 changes: 8 additions & 3 deletions src/main/java/sh/ndy/mixin/client/MixinNametagsBackgroundOpacity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@

//? 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
//?} 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(
Expand All @@ -32,7 +35,9 @@ public class MixinNametagsBackgroundOpacity {
private float changeOpacity(float original) {
return (float) Config.getOptions().getNametagOpacity();
}
*///?} else {
*///?}

//? if >= 26.2 {
@ModifyArg(
method = "prepareText",
at = @At(
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/sh/ndy/mixin/client/MixinNametagsTextShadow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,25 @@

@Mixin(NameTagFeatureRenderer.class)
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 {
"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 {
@ModifyArg(method = "renderTranslucent", at = @At(value = "INVOKE", target = TARGET))
private boolean render(boolean original) {
return listener.handleMixin();
}
*///?}

//? if >= 26.2 {
@ModifyArg(method = "prepareText",
at = @At(value = "INVOKE", target = TARGET),
index = 4
Expand All @@ -35,5 +36,4 @@ private static boolean render(boolean drawShadow) {
return listener.handleMixin();
}
//?}

}
2 changes: 1 addition & 1 deletion src/main/java/sh/ndy/screens/ConfigScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,6 @@ public void onClose() {
//? if < 26.2 {
// this.minecraft.setScreen(parent);
//?} else
this.minecraft.setScreenAndShow(parent);
this.minecraft.gui.setScreen(parent);
}
}
Loading