Port to 1.21.11

Author: Rektroth

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 {
@@ -212,14 +213,14 @@ val generatePatchedTable by tasks.registering {
 
         val previous = entries.filterIsInstance<PatchedFileEntry.Previous>()
 
-        val timestamp = `java.time`.LocalDateTime.now().format(`java.time.format`.DateTimeFormatter.ISO_DATE_TIME)
+        //val timestamp = `java.time`.LocalDateTime.now().format(`java.time.format`.DateTimeFormatter.ISO_DATE_TIME)
 
         val markdownTable = """
             - <!--
             - !!!! DO NOT UPDATE THIS FILE MANUALLY !!!!
             - Generated by `./gradlew generatePatchedTable`
             - Sourced from `${inputFile.name}`
-            - Generated $timestamp
+            - Generated now
             - -->
             -
             - # List of Patched Bugs

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.jar

@@ -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

gradle/wrapper/gradle-wrapper.properties

@@ -6,6 +6,7 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.input.MouseButtonEvent;
+import net.minecraft.client.multiplayer.chat.ChatListener;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
@@ -62,15 +63,14 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         }
     }
 
-
-    @Override
+    /*@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);
+        return this.handleComponentClicked(style);
     }
 
     protected Style getStyle(int mouseX, int mouseY) {
@@ -84,5 +84,5 @@ protected Style getStyle(int mouseX, int mouseY) {
         int x = mouseX - (width / 2 - font.width(text) / 2);
 
         return font.getSplitter().componentStyleAtWidth(wrappedText.get(line), x);
-    }
+    }*/
 }

src/client/java/dev/isxander/debugify/client/gui/NoYACLScreen.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/helpers/mc237493/DebugifyTelemetry.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;

src/client/java/dev/isxander/debugify/client/mixins/basic/mc115092/SquidRendererMixin.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/mc122477/EditBoxMixin.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);
     }
 }