Update to 1.21.6 (#328)

Author: DrexHD

libs.versions.toml

@@ -1,17 +1,17 @@
 [versions]
-minecraft = "1.21.5"
-yarn-mappings = "1.21.5+build.1"
-fabric-loader = "0.16.10"
+minecraft = "1.21.6"
+yarn-mappings = "1.21.6+build.1"
+fabric-loader = "0.16.14"
 
-fabric-api = "0.119.5+1.21.5"
+fabric-api = "0.127.1+1.21.6"
 
 # Kotlin
-kotlin = "2.1.0"
+kotlin = "2.1.21"
 # Also modrinth version in gradle.properties
-fabric-kotlin = "1.13.0+kotlin.2.1.0"
+fabric-kotlin = "1.13.3+kotlin.2.1.21"
 
-fabric-permissions = "0.3.3"
-translations = "2.5.0+1.21.5-rc1"
+fabric-permissions = "0.4.0"
+translations = "2.5.1+1.21.5"
 
 exposed = "0.58.0"
 sqlite-jdbc = "3.47.2.0"

src/main/java/com/github/quiltservertools/ledger/mixin/DyeItemMixin.java

@@ -1,6 +1,7 @@
 package com.github.quiltservertools.ledger.mixin;
 
 import com.github.quiltservertools.ledger.callbacks.EntityModifyCallback;
+import com.github.quiltservertools.ledger.utility.NbtUtils;
 import com.github.quiltservertools.ledger.utility.Sources;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -22,7 +23,7 @@ public abstract class DyeItemMixin {
 
     @Inject(method = "useOnEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/SheepEntity;setColor(Lnet/minecraft/util/DyeColor;)V"))
     private void ledgerOldEntity(ItemStack stack, PlayerEntity player, LivingEntity entity, Hand hand, CallbackInfoReturnable<ActionResult> cir) {
-        oldEntityTags = entity.writeNbt(new NbtCompound());
+        oldEntityTags = NbtUtils.INSTANCE.createNbt(entity);
     }
 
     @Inject(method = "useOnEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/SheepEntity;setColor(Lnet/minecraft/util/DyeColor;)V", shift = At.Shift.AFTER))

src/main/java/com/github/quiltservertools/ledger/mixin/blocks/cauldron/LeveledCauldronBlockMixin.java

@@ -8,6 +8,7 @@
 import net.minecraft.entity.EntityCollisionHandler;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.Fluid;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
@@ -51,11 +52,11 @@ private static void ledgerLogDecrementLevelCauldron(BlockState state, World worl
         }
     }
 
-    @Inject(method = "onEntityCollision", at = @At(value = "INVOKE",
+    @Inject(method = "method_71627", at = @At(value = "INVOKE",
             target = "Lnet/minecraft/block/LeveledCauldronBlock;onFireCollision(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)V"))
-    private void ledgerLogPlayerExtinguish(BlockState state, World world, BlockPos pos, Entity entity, EntityCollisionHandler handler, CallbackInfo ci) {
-        if (entity instanceof PlayerEntity) {
-            playerEntity = (PlayerEntity) entity;
+    private void ledgerLogPlayerExtinguish(ServerWorld serverWorld, BlockPos blockPos, BlockState blockState, World world, Entity collidedEntity, CallbackInfo ci) {
+        if (collidedEntity instanceof PlayerEntity) {
+            playerEntity = (PlayerEntity) collidedEntity;
         }
     }
 

src/main/java/com/github/quiltservertools/ledger/mixin/blocks/lectern/LecternScreenHandlerMixin.java

@@ -20,6 +20,6 @@ public class LecternScreenHandlerMixin {
     public void logPickBook(PlayerEntity player, int id, CallbackInfoReturnable<Boolean> cir, @Local ItemStack itemStack) {
         ServerPlayerEntity serverPlayer = (ServerPlayerEntity) player;
         BlockEntity blockEntity = PlayerLecternHook.getActiveHandlers().get(player);
-        ItemRemoveCallback.EVENT.invoker().remove(itemStack, blockEntity.getPos(), serverPlayer.getServerWorld(), Sources.PLAYER, serverPlayer);
+        ItemRemoveCallback.EVENT.invoker().remove(itemStack, blockEntity.getPos(), serverPlayer.getWorld(), Sources.PLAYER, serverPlayer);
     }
 }

src/main/java/com/github/quiltservertools/ledger/mixin/blocks/sign/AbstractSignBlockMixin.java

@@ -1,6 +1,7 @@
 package com.github.quiltservertools.ledger.mixin.blocks.sign;
 
 import com.github.quiltservertools.ledger.callbacks.BlockChangeCallback;
+import com.github.quiltservertools.ledger.utility.NbtUtils;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.block.AbstractSignBlock;
@@ -57,7 +58,7 @@ private boolean logSignItemInteraction(
         DynamicRegistryManager registryManager = world.getRegistryManager();
 
         // a bad hack to copy the old sign block entity for rollbacks
-        @Nullable BlockEntity oldSignEntity = BlockEntity.createFromNbt(pos, state, signBlockEntity.createNbtWithId(registryManager), registryManager);
+        @Nullable BlockEntity oldSignEntity = BlockEntity.createFromNbt(pos, state, NbtUtils.INSTANCE.createNbt(signBlockEntity, registryManager), registryManager);
 
         boolean result = original.call(instance, world, signBlockEntity, front, player);
         if (result && oldSignEntity != null) {

src/main/java/com/github/quiltservertools/ledger/mixin/blocks/sign/SignBlockEntityMixin.java

@@ -1,6 +1,7 @@
 package com.github.quiltservertools.ledger.mixin.blocks.sign;
 
 import com.github.quiltservertools.ledger.callbacks.BlockChangeCallback;
+import com.github.quiltservertools.ledger.utility.NbtUtils;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.block.BlockState;
@@ -54,7 +55,7 @@ private boolean logSignTextChange(
         BlockState state = instance.getCachedState();
 
         // a bad hack to copy the old sign block entity for rollbacks
-        @Nullable BlockEntity oldSignEntity = BlockEntity.createFromNbt(pos, state, instance.createNbtWithId(registryManager), registryManager);
+        @Nullable BlockEntity oldSignEntity = BlockEntity.createFromNbt(pos, state, NbtUtils.INSTANCE.createNbt(instance, registryManager), registryManager);
 
         boolean result = original.call(instance, textChanger, front);
         if (result && oldSignEntity != null) {

src/main/java/com/github/quiltservertools/ledger/mixin/entities/ArmorStandEntityMixin.java

@@ -2,6 +2,7 @@
 
 import com.github.quiltservertools.ledger.callbacks.EntityKillCallback;
 import com.github.quiltservertools.ledger.callbacks.EntityModifyCallback;
+import com.github.quiltservertools.ledger.utility.NbtUtils;
 import com.github.quiltservertools.ledger.utility.Sources;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
@@ -29,7 +30,7 @@ public abstract class ArmorStandEntityMixin {
     @Inject(method = "equip", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/decoration/ArmorStandEntity;equipStack(Lnet/minecraft/entity/EquipmentSlot;Lnet/minecraft/item/ItemStack;)V"))
     private void legerLogOldEntity(PlayerEntity player, EquipmentSlot slot, ItemStack playerStack, Hand hand, CallbackInfoReturnable<Boolean> cir) {
         LivingEntity entity = (LivingEntity) (Object) this;
-        this.oldEntityTags = entity.writeNbt(new NbtCompound());
+        this.oldEntityTags = NbtUtils.INSTANCE.createNbt(entity);
         this.oldEntityStack = entity.getEquippedStack(slot);
     }
 

src/main/java/com/github/quiltservertools/ledger/mixin/entities/CatEntityMixin.java

@@ -1,6 +1,7 @@
 package com.github.quiltservertools.ledger.mixin.entities;
 
 import com.github.quiltservertools.ledger.callbacks.EntityModifyCallback;
+import com.github.quiltservertools.ledger.utility.NbtUtils;
 import com.github.quiltservertools.ledger.utility.Sources;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.passive.CatEntity;
@@ -22,7 +23,7 @@ public abstract class CatEntityMixin {
     @Inject(method = "interactMob", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/CatEntity;setCollarColor(Lnet/minecraft/util/DyeColor;)V"))
     private void ledgerLogOldEntity(PlayerEntity player, Hand hand, CallbackInfoReturnable<ActionResult> cir) {
         LivingEntity entity = (LivingEntity) (Object) this;
-        this.oldEntityTags = entity.writeNbt(new NbtCompound());
+        this.oldEntityTags = NbtUtils.INSTANCE.createNbt(entity);
     }
 
     @Inject(method = "interactMob", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/CatEntity;setCollarColor(Lnet/minecraft/util/DyeColor;)V", shift = At.Shift.AFTER))

src/main/java/com/github/quiltservertools/ledger/mixin/entities/EvokerEntityWololoGoalMixin.java

@@ -1,7 +1,9 @@
 package com.github.quiltservertools.ledger.mixin.entities;
 
 import com.github.quiltservertools.ledger.callbacks.EntityModifyCallback;
+import com.github.quiltservertools.ledger.utility.NbtUtils;
 import com.github.quiltservertools.ledger.utility.Sources;
+import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.entity.mob.EvokerEntity;
 import net.minecraft.entity.passive.SheepEntity;
 import net.minecraft.item.Items;
@@ -19,15 +21,15 @@ public abstract class EvokerEntityWololoGoalMixin {
     @Unique
     private NbtCompound oldEntityTags;
 
-    @Inject(method = "castSpell", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/SheepEntity;setColor(Lnet/minecraft/util/DyeColor;)V"), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
-    public void legerLogOldEntity(CallbackInfo ci, SheepEntity sheepEntity) {
+    @Inject(method = "castSpell", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/SheepEntity;setColor(Lnet/minecraft/util/DyeColor;)V"))
+    public void legerLogOldEntity(CallbackInfo ci, @Local SheepEntity sheepEntity) {
         if (sheepEntity.getColor() != DyeColor.RED) {
-            this.oldEntityTags = sheepEntity.writeNbt(new NbtCompound());
+            this.oldEntityTags = NbtUtils.INSTANCE.createNbt(sheepEntity);
         }
     }
 
-    @Inject(method = "castSpell", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/SheepEntity;setColor(Lnet/minecraft/util/DyeColor;)V", shift = At.Shift.AFTER), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
-    public void ledgerEvokerDyeSheep(CallbackInfo ci, SheepEntity sheepEntity) {
+    @Inject(method = "castSpell", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/passive/SheepEntity;setColor(Lnet/minecraft/util/DyeColor;)V", shift = At.Shift.AFTER))
+    public void ledgerEvokerDyeSheep(CallbackInfo ci, @Local SheepEntity sheepEntity) {
         if (oldEntityTags != null) {
             EntityModifyCallback.EVENT.invoker().modify(sheepEntity.getWorld(), sheepEntity.getBlockPos(), oldEntityTags, sheepEntity, Items.RED_DYE.getDefaultStack(), null, Sources.DYE);
         }

src/main/java/com/github/quiltservertools/ledger/mixin/entities/ItemFrameEntityMixin.java

@@ -2,6 +2,7 @@
 
 import com.github.quiltservertools.ledger.callbacks.EntityKillCallback;
 import com.github.quiltservertools.ledger.callbacks.EntityModifyCallback;
+import com.github.quiltservertools.ledger.utility.NbtUtils;
 import com.github.quiltservertools.ledger.utility.Sources;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.damage.DamageSource;
@@ -31,7 +32,7 @@ public abstract class ItemFrameEntityMixin {
     @Inject(method = "interact", at = @At(value = "HEAD"))
     private void ledgerLogOldEntity(PlayerEntity player, Hand hand, CallbackInfoReturnable<ActionResult> cir) {
         Entity entity = (Entity) (Object) this;
-        oldEntityTags = entity.writeNbt(new NbtCompound());
+        oldEntityTags = NbtUtils.INSTANCE.createNbt(entity);
     }
 
     @Inject(method = "dropHeldStack", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/decoration/ItemFrameEntity;setHeldItemStack(Lnet/minecraft/item/ItemStack;)V"))
@@ -40,7 +41,7 @@ private void ledgerLogOldEntity2(ServerWorld world, Entity entityActor, boolean
             return;
         }
         Entity entity = (Entity) (Object) this;
-        oldEntityTags = entity.writeNbt(new NbtCompound());
+        oldEntityTags = NbtUtils.INSTANCE.createNbt(entity);
     }
 
     @Inject(method = "interact", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/decoration/ItemFrameEntity;setHeldItemStack(Lnet/minecraft/item/ItemStack;)V", shift = At.Shift.AFTER))