fix MC-159283 and MC-201723 (from Thorium) (#429)

MicrocontrollersDev · isXander · web-flow · commit 55ca97063ba9 · 2025-07-20T20:45:27.000+01:00
* fix MC-159283 and MC-201723 (from Thorium)

* add explanation and comment as to what this does.

---------

Co-authored-by: isxander &lt;xander@isxander.dev&gt;
diff --git a/PATCHED.md b/PATCHED.md
@@ -25,6 +25,7 @@
 | Basic    | [MC-176559](https://bugs.mojang.com/browse/MC-176559) | Breaking process resets when a pickaxe enchanted with Mending mends by XP / Mending slows down breaking blocks again                |
 | Basic    | [MC-183776](https://bugs.mojang.com/browse/MC-183776) | After switching gamemodes using F3+F4, you need to press F3 twice to toggle the debug screen                                        |
 | Basic    | [MC-197260](https://bugs.mojang.com/browse/MC-197260) | Armor Stand renders itself and armor dark if its head is in a solid block                                                           |
+| Basic    | [MC-201723](https://bugs.mojang.com/browse/MC-201723) | Statistics sprites don't look pressed when clicked                                                                                  |
 | Basic    | [MC-206540](https://bugs.mojang.com/browse/MC-206540) | Increased input delay when riding an entity                                                                                         |
 | Basic    | [MC-211561](https://bugs.mojang.com/browse/MC-211561) | Fishing line appears in opposite hand when switching slots                                                                          |
 | Basic    | [MC-215531](https://bugs.mojang.com/browse/MC-215531) | The carved pumpkin overlay isn't removed when switching into spectator mode                                                         |
@@ -56,6 +57,7 @@
 | Basic    | [MC-129909](https://bugs.mojang.com/browse/MC-129909) | Players in spectator mode continue to consume foods and liquids shortly after switching game modes                                             |
 | Basic    | [MC-132878](https://bugs.mojang.com/browse/MC-132878) | Armor stands destroyed by explosions/lava/fire don't produce particles                                                                         |
 | Basic    | [MC-155509](https://bugs.mojang.com/browse/MC-155509) | Puffed pufferfish can hurt the player while dying                                                                                              |
+| Basic    | [MC-159283](https://bugs.mojang.com/browse/MC-159283) | The End terrain does not generate in multiple rings centered around the world center                                                           |
 | Basic    | [MC-160095](https://bugs.mojang.com/browse/MC-160095) | End Rods only break Cactus when moved by pistons                                                                                               |
 | Basic    | [MC-170462](https://bugs.mojang.com/browse/MC-170462) | Bad Omen is considered a positive effect in potion item tooltips                                                                               |
 | Basic    | [MC-179072](https://bugs.mojang.com/browse/MC-179072) | Creepers do not defuse when switching from Survival to Creative/Spectator                                                                      |
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -109,6 +109,7 @@ tasks.processResources {
         j-Tai's TieFix - Code used licensed under LGPLv3
         FlashyReese's Sodium Extra - Code used licensed under LGPLv3
         Ampflower's 2x2 Surrounded Saplings Fix - Code used licensed under Zlib
+        NoahvdAa's Thorium - Code used licensed under LGPLv3
         """.trimIndent()
     inputs.property("version", project.version)
     inputs.property("description", modDescription)
diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc201723/StatsScreenMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc201723/StatsScreenMixin.java
@@ -0,0 +1,45 @@
+package dev.isxander.debugify.client.mixins.basic.mc201723;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import dev.isxander.debugify.fixes.BugFix;
+import dev.isxander.debugify.fixes.FixCategory;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.MouseHandler;
+import net.minecraft.client.gui.components.ObjectSelectionList;
+import net.minecraft.client.gui.screens.achievement.StatsScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+
+/**
+ * Taken from Thorium
+ * https://github.com/PotassiumMC/thorium
+ * under LGPLv3 license
+ *
+ * @author NoahvdAa
+ */
+@BugFix(id = "MC-201723", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, description = "Statistics sprites don't look pressed when clicked")
+@Mixin(StatsScreen.ItemStatisticsList.class)
+public class StatsScreenMixin extends ObjectSelectionList {
+    @Shadow
+    protected int headerPressed;
+
+    public StatsScreenMixin(Minecraft minecraft, int i, int j, int k, int l) {
+        super(minecraft, i, j, k, l);
+    }
+
+    @WrapOperation(method = "renderHeader", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MouseHandler;isLeftPressed()Z"))
+    private boolean forceLeftClick(MouseHandler instance, Operation<Boolean> original) {
+        return true;
+    }
+
+    @Override
+    public boolean mouseReleased(double mouseX, double mouseY, int button) {
+        if (button == 0) {
+            this.headerPressed = -1;
+        }
+
+        return super.mouseReleased(mouseX, mouseY, button);
+    }
+}
diff --git a/src/client/resources/debugify.client.mixins.json b/src/client/resources/debugify.client.mixins.json
@@ -20,6 +20,7 @@
     "basic.mc183776.KeyboardHandlerMixin",
     "basic.mc197260.ArmorStandRendererMixin",
     "basic.mc197260.LivingEntityRendererMixin",
+    "basic.mc201723.StatsScreenMixin",
     "basic.mc211561.FishingHookRendererMixin",
     "basic.mc215531.GuiMixin",
     "basic.mc217716.GameRendererMixin",
diff --git a/src/main/java/dev/isxander/debugify/mixins/basic/mc159283/DensityFunctionsMixin.java b/src/main/java/dev/isxander/debugify/mixins/basic/mc159283/DensityFunctionsMixin.java
@@ -0,0 +1,30 @@
+package dev.isxander.debugify.mixins.basic.mc159283;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import dev.isxander.debugify.fixes.BugFix;
+import dev.isxander.debugify.fixes.FixCategory;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.levelgen.DensityFunctions;
+import net.minecraft.world.level.levelgen.synth.SimplexNoise;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+/**
+ * Taken from Thorium
+ * https://github.com/PotassiumMC/thorium
+ * under LGPLv3 license
+ *
+ * @author NoahvdAa
+ */
+@BugFix(id = "MC-159283", category = FixCategory.BASIC, env = BugFix.Env.SERVER, description = "The End terrain does not generate in multiple rings centered around the world center")
+@Mixin(DensityFunctions.EndIslandDensityFunction.class)
+public class DensityFunctionsMixin {
+    /**
+     * Explicitly cast `x` and `z` to long (from int) to prevent integer overflow when squaring
+     */
+    @WrapOperation(method = "getHeightValue", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Mth;sqrt(F)F", ordinal = 0))
+    private static float castToLongs(float f, Operation<Float> original, SimplexNoise simplexNoise, int x, int z) {
+        return Mth.sqrt((long) x * (long) x + (long) z * (long) z);
+    }
+}
diff --git a/src/main/resources/assets/debugify/lang/en_us.json b/src/main/resources/assets/debugify/lang/en_us.json
@@ -50,7 +50,7 @@
   "debugify.fix_explanation.mc-197260": "Overrides the light level passed to the armour stand renderer with a maximum of: the block below the armor stand, bottom of the armor stand, top of the armor stand and the block above of the armor stand.",
   "debugify.fix_explanation.mc-237493": "Adds an option in the telemetry menu to completely disable telemetry. Telemetry is disabled by overriding all outgoing telemetry events to be an empty telemetry event, which is not sent.",
 
-  "debugify.fix_explanation.mc-2025": "Due to floating point inaccuracies, sometimes the hitbox of entities end up being slightly smaller than desired. Then, if this happens before the entities are pushed against eachother, they will intersect with the wall. Then, when the AABB is recalculated on chunk load, they will be determined as inside the wall, where they are then pushed. This fix simply writes an 'AABB' tag to entity NBT data with double-precision hitbox sizes which then get loaded back in.",
+  "debugify.fix_explanation.mc-2025": "Due to floating point inaccuracies, sometimes the hitbox of entities end up being slightly smaller than desired. Then, if this happens before the entities are pushed against each-other, they will intersect with the wall. Then, when the AABB is recalculated on chunk load, they will be determined as inside the wall, where they are then pushed. This fix simply writes an 'AABB' tag to entity NBT data with double-precision hitbox sizes which then get loaded back in.",
   "debugify.fix_effect.mc-2025": "This fix means loading Debugify for the first time will not fix the issue until the chunks are saved and loaded with Debugify.",
   "debugify.fix_explanation.mc-7569": "Appends a new line to the end of every system message.",
   "debugify.fix_explanation.mc-30391": "Adds edge-case checks for chicken, blaze and the wither to fall damage spawn particles to not spawn them.",
@@ -68,6 +68,8 @@
   "debugify.fix_explanation.mc-132878": "Spawns breaking particles when armour stands are hurt.",
   "debugify.fix_explanation.mc-135971": "Overrides CTRL+Q behaviour in crafting slot to repeatedly CTRL+Q until there are no items left in the crafting slot.",
   "debugify.fix_explanation.mc-155509": "Checks if the pufferfish is alive before attempting to sting the player.",
+  "debugify.fix_explanation.mc-159283": "Casts 32-bit integers to 64-bit equivalents to prevent integer overflow at high X and Z values.",
+  "debugify.fix_effect.mc-159283": "Affects world generation.",
   "debugify.fix_explanation.mc-160095": "If cacti encounter a piston head, the block that is being moved by the piston is considered instead of the piston.",
   "debugify.fix_explanation.mc-179072": "Checks if the entity the creeper sees is an enemy before igniting.",
   "debugify.fix_explanation.mc-183990": "When a mob is ticked, it checks to see if its target is dead, and removes it if so. This fix also applies to a long list of entities that have group attacks, not just silverfish.",
diff --git a/src/main/resources/debugify.accesswidener b/src/main/resources/debugify.accesswidener
@@ -4,3 +4,5 @@ accessible class net/minecraft/client/Options$FieldAccess
 #accessible method net/minecraft/client/Options$FieldAccess process (Ljava/lang/String;Lnet/minecraft/client/OptionInstance;)V
 accessible class net/minecraft/client/gui/screens/telemetry/TelemetryEventWidget$ContentBuilder
 accessible class net/minecraft/client/gui/screens/telemetry/TelemetryEventWidget$Content
+accessible class net/minecraft/client/gui/screens/achievement/StatsScreen$ItemStatisticsList
+accessible class net/minecraft/world/level/levelgen/DensityFunctions$EndIslandDensityFunction
diff --git a/src/main/resources/debugify.mixins.json b/src/main/resources/debugify.mixins.json
@@ -17,6 +17,7 @@
     "basic.mc129909.ServerPlayerMixin",
     "basic.mc132878.ArmorStandMixin",
     "basic.mc155509.PufferfishMixin",
+    "basic.mc159283.DensityFunctionsMixin",
     "basic.mc160095.CactusBlockMixin",
     "basic.mc170462.MobEffectsMixin",
     "basic.mc179072.SwellGoalMixin",
