Update to 1.21.6-rc1

Author: misode

gradle.properties

@@ -4,13 +4,13 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.5
-loader_version=0.16.10
+minecraft_version=1.21.6-rc1
+loader_version=0.16.14
 
 # Mod Properties
-mod_version=2.1.1
+mod_version=2.2.0
 maven_group=io.github.misode
 archives_base_name=packtest
 
 # Dependencies
-fabric_version=0.119.3+1.21.5
+fabric_version=0.126.1+1.21.6

src/main/java/io/github/misode/packtest/PackTest.java

@@ -15,6 +15,7 @@
 import net.minecraft.commands.synchronization.ArgumentUtils;
 import net.minecraft.data.registries.VanillaRegistries;
 import net.minecraft.gametest.framework.GameTestServer;
+import net.minecraft.gametest.framework.GameTestTicker;
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.level.storage.LevelStorageSource;
@@ -97,7 +98,11 @@ private static void registerCommands(CommandDispatcher<CommandSourceStack> dispa
 	}
 
 	public static void runHeadlessServer(LevelStorageSource.LevelStorageAccess storage, PackRepository packRepository) {
-		GameTestServer.spin(thread -> GameTestServer.create(thread, storage, packRepository, Optional.empty(), false));
+		GameTestServer.spin(thread -> {
+			GameTestServer server = GameTestServer.create(thread, storage, packRepository, Optional.empty(), false);
+			GameTestTicker.SINGLETON.startTicking();
+			return server;
+		});
 	}
 
 	public static String wrapError(String message) {

src/main/java/io/github/misode/packtest/commands/AssertCommand.java

@@ -9,13 +9,11 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.Dynamic3CommandExceptionType;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import com.mojang.brigadier.suggestion.SuggestionProvider;
 import io.github.misode.packtest.*;
 import it.unimi.dsi.fastutil.ints.IntList;
 import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.SharedSuggestionProvider;
 import net.minecraft.commands.arguments.*;
 import net.minecraft.commands.arguments.blocks.BlockPredicateArgument;
 import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
@@ -28,11 +26,9 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.gametest.framework.GameTestHelper;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.server.ReloadableServerRegistries;
 import net.minecraft.server.commands.data.DataCommands;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
@@ -71,10 +67,6 @@ public class AssertCommand {
     private static final Dynamic3CommandExceptionType ERROR_SOURCE_NOT_A_CONTAINER = new Dynamic3CommandExceptionType(
             (x, y, z) -> Component.translatableEscape("commands.item.source.not_a_container", x, y, z)
     );
-    private static final SuggestionProvider<CommandSourceStack> SUGGEST_PREDICATE = (ctx, suggestions) -> {
-        ReloadableServerRegistries.Holder registries = ctx.getSource().getServer().reloadableRegistries();
-        return SharedSuggestionProvider.suggestResource(registries.getKeys(Registries.PREDICATE), suggestions);
-    };
 
     public static void register(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext buildContext) {
         LiteralArgumentBuilder<CommandSourceStack> assertBuilder = literal("assert")
@@ -100,7 +92,6 @@ public static void addConditions(LiteralArgumentBuilder<CommandSourceStack> buil
                                         .executes(expect.apply(AssertCommand::assertEntityInside)))))
                 .then(literal("predicate")
                         .then(argument("predicate", ResourceOrIdArgument.lootPredicate(buildContext))
-                                .suggests(SUGGEST_PREDICATE)
                                 .executes(expect.apply(AssertCommand::assertPredicate))))
                 .then(literal("items")
                         .then(literal("entity")

src/main/java/io/github/misode/packtest/commands/DummyCommand.java

@@ -248,7 +248,7 @@ private static int useBlock(CommandContext<CommandSourceStack> ctx, Direction hi
         for (InteractionHand hand : InteractionHand.values()) {
             ItemStack handItem = dummy.getItemInHand(hand);
             BlockHitResult blockHit = new BlockHitResult(pos, hitDirection, BlockPos.containing(pos), false);
-            InteractionResult result = dummy.gameMode.useItemOn(dummy, dummy.serverLevel(), handItem, hand, blockHit);
+            InteractionResult result = dummy.gameMode.useItemOn(dummy, dummy.level(), handItem, hand, blockHit);
             if (result.consumesAction()) {
                 dummy.swing(hand);
                 return 1;

src/main/java/io/github/misode/packtest/dummy/Dummy.java

@@ -90,12 +90,12 @@ public String getUsername() {
     }
 
     public void leave(Component reason) {
-        server.getPlayerList().remove(this);
+        Objects.requireNonNull(this.getServer()).getPlayerList().remove(this);
         this.connection.onDisconnect(new DisconnectionDetails(reason));
     }
 
     public void respawn() {
-        server.getPlayerList().respawn(this, false, Entity.RemovalReason.KILLED);
+        Objects.requireNonNull(this.getServer()).getPlayerList().respawn(this, false, Entity.RemovalReason.KILLED);
     }
 
     @Override
@@ -112,7 +112,7 @@ public void forceSetRotation(float f, float g) {
     public void tick() {
         if (Objects.requireNonNull(this.getServer()).getTickCount() % 10 == 0) {
             this.connection.resetPosition();
-            this.serverLevel().getChunkSource().move(this);
+            this.level().getChunkSource().move(this);
         }
         try {
             super.tick();
@@ -124,8 +124,8 @@ public void tick() {
     @Override
     public void die(DamageSource cause) {
         super.die(cause);
-        if (this.serverLevel().getGameRules().getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN)) {
-            this.server.schedule(new TickTask(this.server.getTickCount(),
+        if (this.level().getGameRules().getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN)) {
+            Objects.requireNonNull(this.getServer()).schedule(new TickTask(this.getServer().getTickCount(),
                     () -> this.connection.handleClientCommand(new ServerboundClientCommandPacket(ServerboundClientCommandPacket.Action.PERFORM_RESPAWN))
             ));
         }

src/main/java/io/github/misode/packtest/mixin/PlayerListMixin.java

@@ -5,15 +5,16 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.authlib.GameProfile;
 import io.github.misode.packtest.dummy.Dummy;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.players.PlayerList;
+import net.minecraft.util.ProblemReporter;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.storage.PlayerDataStorage;
+import net.minecraft.world.level.storage.ValueInput;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -32,19 +33,19 @@
 @Mixin(PlayerList.class)
 public class PlayerListMixin {
     @Inject(method = "load", at = @At(value = "RETURN", shift = At.Shift.BEFORE))
-    private void fixStartingPos(ServerPlayer player, CallbackInfoReturnable<CompoundTag> cir) {
+    private void fixStartingPos(ServerPlayer player, ProblemReporter problemReporter, CallbackInfoReturnable<Optional<ValueInput>> cir) {
         if (player instanceof Dummy dummy) {
             Vec3 pos = dummy.originalSpawn;
             dummy.snapTo(pos.x, pos.y, pos.z, 0, 0);
         }
     }
 
-    @WrapOperation(method = "load", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/storage/PlayerDataStorage;load(Lnet/minecraft/world/entity/player/Player;)Ljava/util/Optional;"))
-    private Optional<CompoundTag> skipLoadDummy(PlayerDataStorage playerIo, Player player, Operation<Optional<CompoundTag>> original) {
+    @WrapOperation(method = "load", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/storage/PlayerDataStorage;load(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/util/ProblemReporter;)Ljava/util/Optional;"))
+    private Optional<ValueInput> skipLoadDummy(PlayerDataStorage playerIo, Player player, ProblemReporter problemReporter, Operation<Optional<ValueInput>> original) {
         if (player instanceof Dummy) {
             return Optional.empty();
         } else {
-            return original.call(playerIo, player);
+            return original.call(playerIo, player, problemReporter);
         }
     }
 
@@ -78,7 +79,7 @@ private void teleportDummy(ServerPlayer serverPlayer, boolean bl, Entity.Removal
         if (player instanceof Dummy dummy) {
             Vec3 pos = dummy.originalSpawn;
             dummy.snapTo(pos.x, pos.y, pos.z, 0, 0);
-            dummy.teleportTo(dummy.serverLevel(), pos.x, pos.y, pos.z, Set.of(), 0, 0, true);
+            dummy.teleportTo(dummy.level(), pos.x, pos.y, pos.z, Set.of(), 0, 0, true);
         }
     }
 }

src/main/resources/fabric.mod.json

@@ -24,7 +24,7 @@
 	"accessWidener": "packtest.accesswidener",
 	"depends": {
 		"fabricloader": ">=0.15.10",
-		"minecraft": ">=1.21.5",
+		"minecraft": ">=1.21.6",
 		"java": ">=21",
 		"fabric-api": "*"
 	}