1.21.11

build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
-    id("dev.isxander.modstitch.base") version "0.6.2-unstable"
+    id("dev.isxander.modstitch.base") version "0.7.1-unstable"
+    id("fabric-loom") version "1.13-SNAPSHOT" apply false
     id("me.modmuss50.mod-publish-plugin") version "0.8.4"
     `maven-publish`
     id("org.ajoberstar.grgit") version "5.3.2"
@@ -8,11 +9,11 @@ plugins {
 val debugifyVersion = "1.1"
 
 modstitch {
-    minecraftVersion = "1.21.10"
+    minecraftVersion = "1.21.11"
     modLoaderVersion = "0.18.0"
 
     parchment {
-        mappingsVersion = "2025.10.12"
+        mappingsVersion = "2025.12.20"
     }
 
     metadata {

gradle.properties

@@ -9,6 +9,6 @@ curseforgeId=596224
 githubProject=isXander/Debugify
 
 # Libraries
-fabricApiVersion=0.138.3+1.21.10
-yaclVersion=3.8.0+1.21.9-fabric
-modMenuVersion=16.0.0-rc.1
+fabricApiVersion=0.139.4+1.21.11
+yaclVersion=3.8.1+1.21.11-fabric
+modMenuVersion=17.0.0-alpha.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/client/java/dev/isxander/debugify/client/gui/NoYACLScreen.java

@@ -2,6 +2,7 @@
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.ActiveTextCollector;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
@@ -15,6 +16,7 @@
 
 import java.net.URI;
 import java.util.List;
+import org.jspecify.annotations.Nullable;
 
 public class NoYACLScreen extends Screen {
     private final Screen parent;
@@ -38,12 +40,12 @@ public NoYACLScreen(Screen parent) {
 
     @Override
     protected void init() {
-        this.wrappedText = font.split(unwrappedText, width - 50);
+        this.wrappedText = this.font.split(unwrappedText, width - 50);
         this.addRenderableWidget(
                 Button.builder(CommonComponents.GUI_BACK, button -> minecraft.setScreen(parent))
                         .pos(
                                 (this.width - 150) / 2,
-                                Mth.clamp(90 + wrappedText.size() * 9 + 12, this.height / 6 + 96, this.height - 24)
+                                Mth.clamp(90 + this.wrappedText.size() * 9 + 12, this.height / 6 + 96, this.height - 24)
                         )
                         .size(150, 20)
                         .build()
@@ -54,35 +56,44 @@ protected void init() {
     public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         super.render(graphics, mouseX, mouseY, delta);
 
-        graphics.drawCenteredString(font, title, width / 2, 70, -1);
+        graphics.drawCenteredString(this.font, title, this.width / 2, 70, -1);
         int y = 90;
         for (FormattedCharSequence line : wrappedText) {
-            graphics.drawCenteredString(font, line, width / 2, y, -1);
-            y += font.lineHeight;
+            graphics.drawCenteredString(this.font, line, this.width / 2, y, -1);
+            y += this.font.lineHeight;
         }
     }
 
-
     @Override
     public boolean mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl) {
         if (super.mouseClicked(mouseButtonEvent, bl)) {
             return true;
         }
 
-        Style style = getStyle((int) mouseButtonEvent.x(), (int) mouseButtonEvent.y());
-        return handleComponentClicked(style);
+        Style style = this.getStyle((int) mouseButtonEvent.x(), (int) mouseButtonEvent.y());
+        return this.handleClickEvent(style.getClickEvent());
     }
 
     protected Style getStyle(int mouseX, int mouseY) {
         int y = mouseY - 90;
-        int line = y / font.lineHeight;
+        int line = y / this.font.lineHeight;
+
+        if (y < 0 || y > y + this.wrappedText.size() * this.font.lineHeight) return null;
+        if (line < 0 || line >= this.wrappedText.size()) return null;
 
-        if (y < 0 || y > y + wrappedText.size() * font.lineHeight) return null;
-        if (line < 0 || line >= wrappedText.size()) return null;
+        FormattedCharSequence text = this.wrappedText.get(line);
+        int x = mouseX - (this.width / 2 - this.font.width(text) / 2);
 
-        FormattedCharSequence text = wrappedText.get(line);
-        int x = mouseX - (width / 2 - font.width(text) / 2);
+        ActiveTextCollector.ClickableStyleFinder clickableStyleFinder = new ActiveTextCollector.ClickableStyleFinder(this.font, mouseX, mouseY);
+        return clickableStyleFinder.result();
+    }
+
+    protected boolean handleClickEvent(@Nullable ClickEvent clickEvent) {
+        if (clickEvent == null) {
+            return false;
+        }
 
-        return font.getSplitter().componentStyleAtWidth(wrappedText.get(line), x);
+        defaultHandleGameClickEvent(clickEvent, this.minecraft, this);
+        return true;
     }
 }

src/client/java/dev/isxander/debugify/client/helpers/mc237493/DebugifyTelemetry.java

@@ -1,50 +1,37 @@
 package dev.isxander.debugify.client.helpers.mc237493;
 
+import com.mojang.serialization.Codec;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.function.IntFunction;
 
 import net.minecraft.network.chat.Component;
+import net.minecraft.util.ByIdMap;
 import net.minecraft.util.Mth;
-import net.minecraft.util.OptionEnum;
+import net.minecraft.util.StringRepresentable;
 
-public enum DebugifyTelemetry implements OptionEnum {
+public enum DebugifyTelemetry {
     OFF(0, "options.telemetry.state.none", "debugify.mc_237493.tooltip.off"),
     MINIMAL(1, "options.telemetry.state.minimal", "debugify.mc_237493.tooltip.minimal"),
     ALL(2, "options.telemetry.state.all", "debugify.mc_237493.tooltip.all");
 
-    private static final DebugifyTelemetry[] VALUES = Arrays.stream(values())
-            .sorted(Comparator.comparingInt(DebugifyTelemetry::getId))
-            .toArray(DebugifyTelemetry[]::new);
-
+    private static final IntFunction<DebugifyTelemetry> BY_ID = ByIdMap.continuous(value -> value.id, values(), ByIdMap.OutOfBoundsStrategy.WRAP);
+    public static final Codec<DebugifyTelemetry> LEGACY_CODEC = Codec.INT.xmap(BY_ID::apply, value -> value.id);
     private final int id;
-    private final String translationKey;
-    private final String tooltipTranslationKey;
+    private final Component caption;
+    private final Component tooltip;
 
-    DebugifyTelemetry(int id, String translationKey, String tooltipTranslationKey) {
+    DebugifyTelemetry(int id, final String key, final String translationKey) {
         this.id = id;
-        this.translationKey = translationKey;
-        this.tooltipTranslationKey = tooltipTranslationKey;
-    }
-
-    @Override
-    public int getId() {
-        return this.id;
-    }
-
-    @Override
-    public String getKey() {
-        return this.translationKey;
-    }
-
-    public String getTooltipKey() {
-        return this.tooltipTranslationKey;
+        this.caption = Component.translatable(key);
+        this.tooltip = Component.translatable(translationKey);
     }
 
-    public Component getTooltipText() {
-        return Component.translatable(getTooltipKey(), getCaption());
+    public Component caption() {
+        return this.caption;
     }
 
-    public static DebugifyTelemetry byId(int id) {
-        return VALUES[Mth.positiveModulo(id, VALUES.length)];
+    public Component tooltip() {
+        return this.tooltip;
     }
 }

src/client/java/dev/isxander/debugify/client/mixins/basic/mc115092/SquidRendererMixin.java

@@ -6,7 +6,7 @@
 import dev.isxander.debugify.fixes.FixCategory;
 import net.minecraft.client.renderer.entity.SquidRenderer;
 import net.minecraft.client.renderer.entity.state.SquidRenderState;
-import net.minecraft.world.entity.animal.Squid;
+import net.minecraft.world.entity.animal.squid.Squid;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -19,7 +19,7 @@ public class SquidRendererMixin<T extends Squid> {
     @Unique
     T squidEntity;
 
-    @Inject(method = "extractRenderState(Lnet/minecraft/world/entity/animal/Squid;Lnet/minecraft/client/renderer/entity/state/SquidRenderState;F)V", at = @At("TAIL"))
+    @Inject(method = "extractRenderState(Lnet/minecraft/world/entity/animal/squid/Squid;Lnet/minecraft/client/renderer/entity/state/SquidRenderState;F)V", at = @At("TAIL"))
     private void getSquidEntity(T squid, SquidRenderState squidRenderState, float f, CallbackInfo ci) {
         squidEntity = squid;
     }

src/client/java/dev/isxander/debugify/client/mixins/basic/mc122477/EditBoxMixin.java

@@ -4,11 +4,11 @@
 import dev.isxander.debugify.fixes.FixCategory;
 import dev.isxander.debugify.client.helpers.mc122477.KeyboardPollCounter;
 import dev.isxander.debugify.fixes.OS;
-import net.minecraft.Util;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.input.CharacterEvent;
 import net.minecraft.network.chat.Component;
+import net.minecraft.util.Util;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

src/client/java/dev/isxander/debugify/client/mixins/basic/mc197260/ArmorStandRendererMixin.java

@@ -1,6 +1,5 @@
 package dev.isxander.debugify.client.mixins.basic.mc197260;
 
-import com.mojang.datafixers.util.Pair;
 import dev.isxander.debugify.fixes.BugFix;
 import dev.isxander.debugify.fixes.FixCategory;
 import net.minecraft.client.Minecraft;
@@ -9,9 +8,7 @@
 import net.minecraft.client.renderer.entity.state.ArmorStandRenderState;
 import org.spongepowered.asm.mixin.Mixin;
 
-import java.util.Comparator;
-import java.util.stream.IntStream;
-import net.minecraft.client.model.ArmorStandArmorModel;
+import net.minecraft.client.model.object.armorstand.ArmorStandArmorModel;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.entity.ArmorStandRenderer;
 import net.minecraft.core.BlockPos;
@@ -39,13 +36,14 @@ protected ArmorStandRendererMixin(EntityRendererProvider.Context context) {
         BlockPos mainPos = BlockPos.containing(livingEntity.x, livingEntity.y, livingEntity.z);
         ClientLevel level = Minecraft.getInstance().level;
 
-        livingEntity.lightCoords = IntStream.of(-1, 0, 2, 3)
-                .mapToObj(operand -> {
-                    BlockPos pos = mainPos.offset(0, operand, 0);
-                    return Pair.of(level.getBrightness(LightLayer.BLOCK, pos), pos);
-                })
-                .max(Comparator.comparingInt(Pair::getFirst))
-                .map(p -> LightTexture.pack(p.getFirst(), level.getBrightness(LightLayer.SKY, p.getSecond())))
-                .orElse(livingEntity.lightCoords);
+        int maxSkyLight = 0;
+        int maxBlockLight = 0;
+        for (int offset : new int[] { -1, 0, 2, 3 }) {
+            BlockPos pos = mainPos.offset(0, offset, 0);
+            maxSkyLight = Math.max(maxSkyLight, level.getBrightness(LightLayer.SKY, pos));
+            maxBlockLight = Math.max(maxBlockLight, level.getBrightness(LightLayer.BLOCK, pos));
+        }
+
+        livingEntity.lightCoords = LightTexture.pack(maxBlockLight, maxSkyLight);
     }
 }

src/client/java/dev/isxander/debugify/client/mixins/basic/mc237493/OptionsMixin.java

@@ -27,9 +27,9 @@ public abstract class OptionsMixin implements DebugifyTelemetryAccessor {
     @Unique
     private final OptionInstance<DebugifyTelemetry> debugifyTelemetry = new OptionInstance<>(
             "options.telemetry.button",
-            value -> Tooltip.create(value.getTooltipText()),
-            OptionInstance.forOptionEnum(),
-            new OptionInstance.Enum<>(Arrays.asList(DebugifyTelemetry.values()), Codec.INT.xmap(DebugifyTelemetry::byId, DebugifyTelemetry::getId)),
+            value -> Tooltip.create(value.tooltip()),
+            (component, value) -> value.caption(),
+            new OptionInstance.Enum<>(Arrays.asList(DebugifyTelemetry.values()), DebugifyTelemetry.LEGACY_CODEC),
             DebugifyTelemetry.OFF,
             value -> telemetryOptInExtra().set(value == DebugifyTelemetry.ALL)
     );

src/client/java/dev/isxander/debugify/client/mixins/basic/mc237493/TelemetryInfoScreenMixin.java

@@ -1,32 +1,56 @@
 package dev.isxander.debugify.client.mixins.basic.mc237493;
 
+import com.llamalad7.mixinextras.expression.Definition;
+import com.llamalad7.mixinextras.expression.Expression;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import dev.isxander.debugify.client.helpers.mc237493.DebugifyTelemetry;
 import dev.isxander.debugify.client.helpers.mc237493.DebugifyTelemetryAccessor;
 import dev.isxander.debugify.fixes.BugFix;
 import dev.isxander.debugify.fixes.FixCategory;
 import net.minecraft.client.Options;
 import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.layouts.LayoutElement;
+import net.minecraft.client.gui.layouts.LinearLayout;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.telemetry.TelemetryEventWidget;
 import net.minecraft.client.gui.screens.telemetry.TelemetryInfoScreen;
+import net.minecraft.network.chat.Component;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @BugFix(id = "MC-237493", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, modConflicts = "no-telemetry", description = "Telemetry cannot be disabled")
 @Mixin(TelemetryInfoScreen.class)
-public class TelemetryInfoScreenMixin {
-    @Shadow @Final private Options options;
+public abstract class TelemetryInfoScreenMixin extends Screen {
+    protected TelemetryInfoScreenMixin(Component title) {
+        super(title);
+    }
 
+    @Shadow @Final private Options options;
 
     @Shadow private TelemetryEventWidget telemetryEventWidget;
 
-    /**
-     * @author
-     * @reason
-     */
-    @Overwrite
-    private AbstractWidget createTelemetryCheckbox() {
-        return ((DebugifyTelemetryAccessor) options).getTelemetryOption().createButton(options, 0, 0, 308, state -> telemetryEventWidget.onOptInChanged(state == DebugifyTelemetry.ALL));
+    @Unique private AbstractWidget cycleButton;
+
+    @Definition(id = "addChild", method = "Lnet/minecraft/client/gui/layouts/LinearLayout;addChild(Lnet/minecraft/client/gui/layouts/LayoutElement;)Lnet/minecraft/client/gui/layouts/LayoutElement;")
+    @Definition(id = "builder", method = "Lnet/minecraft/client/gui/components/Checkbox;builder(Lnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/Font;)Lnet/minecraft/client/gui/components/Checkbox$Builder;")
+    @Definition(id = "CHECKBOX_OPT_IN", field = "Lnet/minecraft/client/gui/screens/telemetry/TelemetryInfoScreen;CHECKBOX_OPT_IN:Lnet/minecraft/network/chat/Component;")
+    @Expression("?.addChild(builder(CHECKBOX_OPT_IN, ?).?(?).?(?.?.?()).?(?).?())")
+    @WrapOperation(method = "init", at = @At("MIXINEXTRAS:EXPRESSION"))
+    private LayoutElement createTelemetryCheckbox(LinearLayout instance, LayoutElement child, Operation<LayoutElement> original) {
+        this.cycleButton = instance.addChild(((DebugifyTelemetryAccessor) options).getTelemetryOption().createButton(options, 0, 0, 308, state -> telemetryEventWidget.onOptInChanged(state == DebugifyTelemetry.ALL)));
+        return null;
+    }
+
+    @Inject(method = "repositionElements", at = @At("TAIL"))
+    private void repositionCycleButton(CallbackInfo ci) {
+        if (this.cycleButton != null) {
+            this.cycleButton.setWidth(308);
+        }
     }
 }