1.21.5 port

isXander · isXander · commit 5520e2024e21 · 2025-03-25T18:27:34.000Z
diff --git a/PATCHED.md b/PATCHED.md
@@ -13,7 +13,6 @@
 | Basic    | [MC-90683](https://bugs.mojang.com/browse/MC-90683)   | "Received unknown passenger" - Entities with differing render distances as passengers outputs error                                 |
 | Basic    | [MC-93384](https://bugs.mojang.com/browse/MC-93384)   | Bubbles appear at the feet of drowning mobs                                                                                         |
 | Basic    | [MC-105068](https://bugs.mojang.com/browse/MC-105068) | Hitting another player blocking with a shield plays normal hurt sound                                                               |
-| Basic    | [MC-108948](https://bugs.mojang.com/browse/MC-108948) | Boat on top of slime blocks hover over block                                                                                        |
 | Basic    | [MC-112730](https://bugs.mojang.com/browse/MC-112730) | Beacon beam and structure block render twice per frame                                                                              |
 | Basic    | [MC-116379](https://bugs.mojang.com/browse/MC-116379) | Punching with a cast fishing rod in the off-hand detaches fishing line from rod                                                     |
 | Basic    | [MC-122627](https://bugs.mojang.com/browse/MC-122627) | Tab suggestion box has missing padding on right side                                                                                |
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,9 +4,9 @@ import ru.vyarus.gradle.plugin.python.task.PythonTask
 plugins {
     java
 
-    id("fabric-loom") version "1.9.+"
+    id("fabric-loom") version "1.10.+"
 
-    id("me.modmuss50.mod-publish-plugin") version "0.8.+"
+    id("me.modmuss50.mod-publish-plugin") version "0.8.4"
     `maven-publish`
 
     id("org.ajoberstar.grgit") version "5.0.0"
diff --git a/gradle.properties b/gradle.properties
@@ -2,15 +2,15 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 org.gradle.parallel.threads=4
 
-minecraftVersion=1.21.4
-fabricLoaderVersion=0.16.9
+minecraftVersion=1.21.5
+fabricLoaderVersion=0.16.10
 qmBuild=0
 
 modrinthId=QwxR6Gcd
 curseforgeId=596224
 githubProject=isXander/Debugify
 
 # Libraries
-fabricApiVersion=0.112.0+1.21.4
-yaclVersion=3.6.2+1.21.4-fabric
-modMenuVersion=13.0.0-beta.1
+fabricApiVersion=0.119.2+1.21.5
+yaclVersion=3.6.6+1.21.5-fabric
+modMenuVersion=14.0.0-beta.2
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/scripts/check_bug_fixes.py b/scripts/check_bug_fixes.py
diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc108948/BoatMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc108948/BoatMixin.java
diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc143474/ClientPacketListenerMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc143474/ClientPacketListenerMixin.java
@@ -23,7 +23,7 @@ protected ClientPacketListenerMixin(Minecraft client, Connection connection, Com
 
     @ModifyExpressionValue(method = "handleRespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/MultiPlayerGameMode;createPlayer(Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/stats/StatsCounter;Lnet/minecraft/client/ClientRecipeBook;ZZ)Lnet/minecraft/client/player/LocalPlayer;"))
     private LocalPlayer persistInventorySlot(LocalPlayer newPlayer) {
-        newPlayer.getInventory().selected = minecraft.player.getInventory().selected;
+        newPlayer.getInventory().setSelectedSlot(minecraft.player.getInventory().getSelectedSlot());
         return newPlayer;
     }
 }
diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc237493/TelemetryEventWidgetMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc237493/TelemetryEventWidgetMixin.java
@@ -1,6 +1,7 @@
 package dev.isxander.debugify.client.mixins.basic.mc237493;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Local;
 import dev.isxander.debugify.client.helpers.mc237493.DebugifyTelemetry;
 import dev.isxander.debugify.client.helpers.mc237493.DebugifyTelemetryAccessor;
 import dev.isxander.debugify.fixes.BugFix;
@@ -33,8 +34,8 @@ private List<TelemetryEventType> modifyInUseTelemetry(List<TelemetryEventType> i
         return inUse;
     }
 
-    @Inject(method = "buildContent", at = @At(value = "INVOKE", target = "Ljava/util/List;sort(Ljava/util/Comparator;)V"), locals = LocalCapture.CAPTURE_FAILHARD)
-    private void addDebugifyContent(boolean bl, CallbackInfoReturnable<TelemetryEventWidget.Content> cir, TelemetryEventWidget.ContentBuilder contentBuilder) {
+    @Inject(method = "buildContent", at = @At(value = "INVOKE", target = "Ljava/util/List;sort(Ljava/util/Comparator;)V"))
+    private void addDebugifyContent(boolean bl, CallbackInfoReturnable<TelemetryEventWidget.Content> cir, @Local TelemetryEventWidget.ContentBuilder contentBuilder) {
         if (((DebugifyTelemetryAccessor) Minecraft.getInstance().options).getTelemetryOption().get() == DebugifyTelemetry.OFF) {
             contentBuilder.addHeader(this.font, Component.translatable("debugify.mc_237493.header"));
             contentBuilder.addLine(this.font, Component.translatable("debugify.mc_237493.line", Component.translatable("options.telemetry.state.none")).withStyle(ChatFormatting.GRAY));
diff --git a/src/client/java/dev/isxander/debugify/client/mixins/basic/mc93384/LivingEntityMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/basic/mc93384/LivingEntityMixin.java
@@ -1,5 +1,6 @@
 package dev.isxander.debugify.client.mixins.basic.mc93384;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import dev.isxander.debugify.fixes.BugFix;
 import dev.isxander.debugify.fixes.FixCategory;
 import net.minecraft.world.entity.Entity;
@@ -17,8 +18,8 @@ public LivingEntityMixin(EntityType<?> type, Level world) {
         super(type, world);
     }
 
-    @ModifyArg(method = "baseTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;addParticle(Lnet/minecraft/core/particles/ParticleOptions;DDDDDD)V"), index = 2)
-    private double modifyY(double y) {
-        return y + getEyeHeight();
+    @ModifyExpressionValue(method = "makeDrownParticles", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;getY()D"))
+    private double addEyeHeightToBubblePos(double footY) {
+        return footY + getEyeHeight();
     }
 }
diff --git a/src/client/java/dev/isxander/debugify/client/mixins/gameplay/mc159163/ClientPacketListenerMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/gameplay/mc159163/ClientPacketListenerMixin.java
@@ -1,4 +1,4 @@
-package dev.isxander.debugify.client.mixins.basic.mc159163;
+package dev.isxander.debugify.client.mixins.gameplay.mc159163;
 
 import dev.isxander.debugify.fixes.BugFix;
 import dev.isxander.debugify.fixes.FixCategory;
diff --git a/src/client/resources/debugify.client.mixins.json b/src/client/resources/debugify.client.mixins.json
@@ -9,15 +9,14 @@
   "plugin": "dev.isxander.debugify.mixinplugin.MixinPlugin",
   "client": [
     "basic.mc105068.LivingEntityMixin",
-    "basic.mc108948.BoatMixin",
     "basic.mc112730.SectionCompilerMixin",
     "basic.mc116379.FishingHookRendererMixin",
     "basic.mc122477.EditBoxMixin",
     "basic.mc122477.RenderSystemMixin",
     "basic.mc122627.CommandSuggestionsMixin",
     "basic.mc127970.ItemInHandRendererMixin",
     "basic.mc143474.ClientPacketListenerMixin",
-    "basic.mc159163.ClientPacketListenerMixin",
+    "gameplay.mc159163.ClientPacketListenerMixin",
     "basic.mc165381.LocalPlayerMixin",
     "basic.mc176559.MultiPlayerGameModeMixin",
     "basic.mc183776.KeyboardHandlerMixin",
diff --git a/src/main/java/dev/isxander/debugify/helpers/mc2025/AABBSerialization.java b/src/main/java/dev/isxander/debugify/helpers/mc2025/AABBSerialization.java
@@ -0,0 +1,16 @@
+package dev.isxander.debugify.helpers.mc2025;
+
+import com.mojang.serialization.Codec;
+import net.minecraft.Util;
+import net.minecraft.world.phys.AABB;
+
+import java.util.List;
+
+public class AABBSerialization {
+    public static final Codec<AABB> CODEC = Codec.DOUBLE
+            .listOf()
+            .comapFlatMap(
+                    list -> Util.fixedSize(list, 6).map(listx -> new AABB(listx.get(0), listx.get(1), listx.get(2), listx.get(3), listx.get(4), listx.get(5))),
+                    aabb -> List.of(aabb.minX, aabb.minY, aabb.minZ, aabb.maxX, aabb.maxY, aabb.maxZ)
+            );
+}
diff --git a/src/main/java/dev/isxander/debugify/mixins/basic/mc121903/MinecraftCommandBlockMixin.java b/src/main/java/dev/isxander/debugify/mixins/basic/mc121903/MinecraftCommandBlockMixin.java
@@ -18,7 +18,7 @@ public class MinecraftCommandBlockMixin {
     @Inject(method = "readAdditionalSaveData", at = @At("RETURN"))
     private void readNbt(CompoundTag nbt, CallbackInfo ci) {
         if (nbt.contains("LastExecuted"))
-            lastActivated = nbt.getInt("LastExecuted");
+            lastActivated = nbt.getInt("LastExecuted").orElse(0);
     }
 
     @Inject(method = "addAdditionalSaveData", at = @At("RETURN"))
diff --git a/src/main/java/dev/isxander/debugify/mixins/basic/mc2025/EntityMixin.java b/src/main/java/dev/isxander/debugify/mixins/basic/mc2025/EntityMixin.java
@@ -2,45 +2,47 @@
 
 import dev.isxander.debugify.fixes.BugFix;
 import dev.isxander.debugify.fixes.FixCategory;
+import dev.isxander.debugify.helpers.mc2025.AABBSerialization;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import java.util.function.Function;
+
 @BugFix(id = "MC-2025", category = FixCategory.BASIC, env = BugFix.Env.SERVER)
 @Mixin(Entity.class)
 public abstract class EntityMixin {
     @Shadow public abstract AABB getBoundingBox();
 
-    @Shadow protected abstract ListTag newDoubleList(double... values);
-
     @Shadow public abstract void setBoundingBox(AABB boundingBox);
 
-    @Inject(method = "saveWithoutId", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundTag;putFloat(Ljava/lang/String;F)V", ordinal = 0))
+    @Inject(method = "saveWithoutId", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;addAdditionalSaveData(Lnet/minecraft/nbt/CompoundTag;)V", ordinal = 0))
     private void writeAABB(CompoundTag nbt, CallbackInfoReturnable<CompoundTag> cir) {
         AABB aabb = this.getBoundingBox();
-        nbt.put("AABB", newDoubleList(aabb.minX, aabb.minY, aabb.minZ, aabb.maxX, aabb.maxY, aabb.maxZ));
+
+        nbt.store("AABB", AABBSerialization.CODEC, aabb);
     }
 
-    @Inject(method = "load", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;reapplyPosition()V", shift = At.Shift.BY, by = 2))
+    @Inject(
+            method = "load",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/world/entity/Entity;readAdditionalSaveData(Lnet/minecraft/nbt/CompoundTag;)V"
+            )
+    )
     private void readAABB(CompoundTag nbt, CallbackInfo ci) {
         if (nbt.contains("AABB")) {
-            ListTag aabbNbt = nbt.getList("AABB", Tag.TAG_DOUBLE);
-            this.setBoundingBox(new AABB(
-                    aabbNbt.getDouble(0),
-                    aabbNbt.getDouble(1),
-                    aabbNbt.getDouble(2),
-                    aabbNbt.getDouble(3),
-                    aabbNbt.getDouble(4),
-                    aabbNbt.getDouble(5)
-            ));
+            AABB aabb = nbt.read("AABB", AABBSerialization.CODEC).orElseThrow();
+            this.setBoundingBox(aabb);
         }
     }
 }
diff --git a/src/main/java/dev/isxander/debugify/mixins/basic/mc206922/EntityMixin.java b/src/main/java/dev/isxander/debugify/mixins/basic/mc206922/EntityMixin.java
@@ -1,10 +1,13 @@
 package dev.isxander.debugify.mixins.basic.mc206922;
 
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import dev.isxander.debugify.fixes.BugFix;
 import dev.isxander.debugify.fixes.FixCategory;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LightningBolt;
+import net.minecraft.world.entity.item.ItemEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -16,6 +19,8 @@
 public class EntityMixin {
     @Shadow public int tickCount;
 
-    @Inject(method = "thunderHit", at = @At("HEAD"), cancellable = true)
-    protected void struckByLightningHead(ServerLevel world, LightningBolt lightning, CallbackInfo ci) {}
+    @WrapMethod(method = "thunderHit")
+    protected void bypassStruckByLightning(ServerLevel world, LightningBolt lightning, Operation<Void> operation) {
+        operation.call(world, lightning);
+    }
 }
diff --git a/src/main/java/dev/isxander/debugify/mixins/basic/mc206922/ItemEntityMixin.java b/src/main/java/dev/isxander/debugify/mixins/basic/mc206922/ItemEntityMixin.java
@@ -1,5 +1,6 @@
 package dev.isxander.debugify.mixins.basic.mc206922;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import dev.isxander.debugify.fixes.BugFix;
 import dev.isxander.debugify.fixes.FixCategory;
 import net.minecraft.server.level.ServerLevel;
@@ -11,10 +12,11 @@
 @BugFix(id = "MC-206922", category = FixCategory.BASIC, env = BugFix.Env.SERVER)
 @Mixin(ItemEntity.class)
 public abstract class ItemEntityMixin extends EntityMixin {
+
     @Override
-    protected void struckByLightningHead(ServerLevel world, LightningBolt lightning, CallbackInfo ci) {
-        if (tickCount <= 8) {
-            ci.cancel();
+    protected void bypassStruckByLightning(ServerLevel world, LightningBolt lightning, Operation<Void> operation) {
+        if (tickCount > 8) {
+            super.bypassStruckByLightning(world, lightning, operation);
         }
     }
 }
diff --git a/src/main/java/dev/isxander/debugify/mixins/basic/mc93018/AnimalMixin.java b/src/main/java/dev/isxander/debugify/mixins/basic/mc93018/AnimalMixin.java
@@ -4,7 +4,7 @@
 import dev.isxander.debugify.fixes.BugFix;
 import dev.isxander.debugify.fixes.FixCategory;
 import net.minecraft.world.entity.animal.Animal;
-import net.minecraft.world.entity.animal.Wolf;
+import net.minecraft.world.entity.animal.wolf.Wolf;
 import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/dev/isxander/debugify/mixins/gameplay/mc8187/MixinTreeFeature.java b/src/main/java/dev/isxander/debugify/mixins/gameplay/mc8187/MixinTreeFeature.java
@@ -18,6 +18,7 @@
 import net.minecraft.world.level.levelgen.feature.TreeFeature;
 import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.Slice;
@@ -64,8 +65,8 @@ private int fixOffset2(int startValue, LevelSimulatedReader world, int i, BlockP
 		return fixOffsetImpl(startValue, i, config);
 	}
 
-
-	private static int fixOffsetImpl(int startValue, int i, TreeConfiguration config) {
+	@Unique
+    private static int fixOffsetImpl(int startValue, int i, TreeConfiguration config) {
 		//  Roughly height == 0 && trunk == 1
 		if (startValue == -1 && config.minimumSize.getSizeAtHeight(i, 0) == 1) {
 			return 0;

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected ClientPacketListenerMixin(Minecraft client, Connection connection, Com`
`23`	`23`
`24`	`24`	`@ModifyExpressionValue(method = "handleRespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/MultiPlayerGameMode;createPlayer(Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/stats/StatsCounter;Lnet/minecraft/client/ClientRecipeBook;ZZ)Lnet/minecraft/client/player/LocalPlayer;"))`
`25`	`25`	`private LocalPlayer persistInventorySlot(LocalPlayer newPlayer) {`
`26`		`- newPlayer.getInventory().selected = minecraft.player.getInventory().selected;`
	`26`	`+ newPlayer.getInventory().setSelectedSlot(minecraft.player.getInventory().getSelectedSlot());`
`27`	`27`	`return newPlayer;`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package dev.isxander.debugify.client.mixins.basic.mc93384;`
`2`	`2`
	`3`	`+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;`
`3`	`4`	`import dev.isxander.debugify.fixes.BugFix;`
`4`	`5`	`import dev.isxander.debugify.fixes.FixCategory;`
`5`	`6`	`import net.minecraft.world.entity.Entity;`
`@@ -17,8 +18,8 @@ public LivingEntityMixin(EntityType<?> type, Level world) {`
`17`	`18`	`super(type, world);`
`18`	`19`	`}`
`19`	`20`
`20`		`- @ModifyArg(method = "baseTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;addParticle(Lnet/minecraft/core/particles/ParticleOptions;DDDDDD)V"), index = 2)`
`21`		`- private double modifyY(double y) {`
`22`		`- return y + getEyeHeight();`
	`21`	`+ @ModifyExpressionValue(method = "makeDrownParticles", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;getY()D"))`
	`22`	`+ private double addEyeHeightToBubblePos(double footY) {`
	`23`	`+ return footY + getEyeHeight();`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package dev.isxander.debugify.client.mixins.basic.mc159163;`
	`1`	`+package dev.isxander.debugify.client.mixins.gameplay.mc159163;`
`2`	`2`
`3`	`3`	`import dev.isxander.debugify.fixes.BugFix;`
`4`	`4`	`import dev.isxander.debugify.fixes.FixCategory;`