Update to 1.21.10

misode · misode · commit a62ee8037959 · 2025-11-20T21:28:51.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version '1.12-SNAPSHOT'
 	id 'maven-publish'
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -4,13 +4,13 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.7
-loader_version=0.16.14
+minecraft_version=1.21.10
+loader_version=0.17.3
 
 # Mod Properties
 mod_version=2.2.0
 maven_group=io.github.misode
 archives_base_name=packtest
 
 # Dependencies
-fabric_version=0.128.1+1.21.7
+fabric_version=0.138.3+1.21.10
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/io/github/misode/packtest/PackTest.java b/src/main/java/io/github/misode/packtest/PackTest.java
@@ -15,7 +15,6 @@
 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;
@@ -98,11 +97,7 @@ private static void registerCommands(CommandDispatcher<CommandSourceStack> dispa
 	}
 
 	public static void runHeadlessServer(LevelStorageSource.LevelStorageAccess storage, PackRepository packRepository) {
-		GameTestServer.spin(thread -> {
-			GameTestServer server = GameTestServer.create(thread, storage, packRepository, Optional.empty(), false);
-			GameTestTicker.SINGLETON.startTicking();
-			return server;
-		});
+		GameTestServer.spin(thread -> GameTestServer.create(thread, storage, packRepository, Optional.empty(), false));
 	}
 
 	public static String wrapError(String message) {
diff --git a/src/main/java/io/github/misode/packtest/PackTestLibrary.java b/src/main/java/io/github/misode/packtest/PackTestLibrary.java
@@ -14,7 +14,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 import net.minecraft.server.packs.resources.Resource;
-import net.minecraft.server.packs.resources.ResourceManager;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.BufferedReader;
@@ -47,9 +46,9 @@ public void setPermissionLevel(int permissionLevel) {
     }
 
     @Override
-    public @NotNull CompletableFuture<Void> reload(PreparationBarrier barrier, ResourceManager resources, Executor executor1, Executor executor2) {
+    public @NotNull CompletableFuture<Void> reload(PreparableReloadListener.SharedState sharedState, Executor executor1, PreparableReloadListener.PreparationBarrier barrier, Executor executor2) {
         CompletableFuture<Map<ResourceLocation, CompletableFuture<PackTestFunction>>> prep = CompletableFuture.supplyAsync(
-                () -> LISTER.listMatchingResources(resources), executor1
+                () -> LISTER.listMatchingResources(sharedState.resourceManager()), executor1
         ).thenComposeAsync(map -> {
             Map<ResourceLocation, CompletableFuture<PackTestFunction>> result = Maps.newHashMap();
             for(Map.Entry<ResourceLocation, Resource> entry : map.entrySet()) {
diff --git a/src/main/java/io/github/misode/packtest/commands/DummyCommand.java b/src/main/java/io/github/misode/packtest/commands/DummyCommand.java
@@ -59,6 +59,9 @@ public class DummyCommand {
     private static final SimpleCommandExceptionType ERROR_NO_NAME = new SimpleCommandExceptionType(
             Component.literal("Cannot spawn dummy without a name")
     );
+    private static final SimpleCommandExceptionType ERROR_INVALID_DIRECTION = new SimpleCommandExceptionType(
+            Component.literal("Not a valid direction")
+    );
     private static final DynamicCommandExceptionType ERROR_DUMMY_EXISTS = createError("is already logged on");
     private static final DynamicCommandExceptionType ERROR_PLAYER_EXISTS = createError("is already a player");
     private static final DynamicCommandExceptionType ERROR_NOT_ON_GROUND = createError("is not on the ground");
@@ -243,6 +246,9 @@ private static int useItem(CommandContext<CommandSourceStack> ctx) throws Comman
     }
 
     private static int useBlock(CommandContext<CommandSourceStack> ctx, Direction hitDirection) throws CommandSyntaxException {
+        if (hitDirection == null) {
+            throw ERROR_INVALID_DIRECTION.create();
+        }
         Dummy dummy = getDummy(ctx);
         Vec3 pos = Vec3Argument.getVec3(ctx, "pos");
         for (InteractionHand hand : InteractionHand.values()) {
diff --git a/src/main/java/io/github/misode/packtest/commands/FailCommand.java b/src/main/java/io/github/misode/packtest/commands/FailCommand.java
@@ -13,8 +13,6 @@
 import net.minecraft.commands.execution.ExecutionControl;
 import net.minecraft.commands.execution.Frame;
 import net.minecraft.gametest.framework.GameTestHelper;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.ComponentUtils;
 
 import static net.minecraft.commands.Commands.argument;
 import static net.minecraft.commands.Commands.literal;
diff --git a/src/main/java/io/github/misode/packtest/dummy/Dummy.java b/src/main/java/io/github/misode/packtest/dummy/Dummy.java
@@ -2,22 +2,19 @@
 
 import com.mojang.authlib.GameProfile;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.UUIDUtil;
 import net.minecraft.network.DisconnectionDetails;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.PacketFlow;
 import net.minecraft.network.protocol.game.ClientboundEntityPositionSyncPacket;
 import net.minecraft.network.protocol.game.ClientboundRotateHeadPacket;
 import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
-import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.TickTask;
 import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.CommonListenerCookie;
-import net.minecraft.server.players.GameProfileCache;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
@@ -29,8 +26,7 @@
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Heavily inspired by <a href="https://github.com/gnembon/fabric-carpet/blob/master/src/main/java/carpet/patches/EntityPlayerMPFake.java">Carpet</a>
@@ -52,18 +48,8 @@ public static Dummy createRandom(MinecraftServer server, ResourceKey<Level> dime
 
     public static Dummy create(String username, MinecraftServer server, ResourceKey<Level> dimensionId, Vec3 pos) {
         ServerLevel level = server.getLevel(dimensionId);
-        GameProfileCache.setUsesAuthentication(false);
-        GameProfile profile;
-        try {
-            var profileCache = server.getProfileCache();
-            profile = profileCache == null ? null : profileCache.get(username).orElse(null);
-        }
-        finally {
-            GameProfileCache.setUsesAuthentication(server.isDedicatedServer() && server.usesAuthentication());
-        }
-        if (profile == null) {
-            profile = new GameProfile(UUIDUtil.createOfflinePlayerUUID(username), username);
-        }
+        UUID id = UUID.randomUUID();
+        GameProfile profile = new GameProfile(id, username);
         Vec3 originalSpawn = Vec3.atBottomCenterOf(BlockPos.containing(pos));
         Dummy dummy = new Dummy(server, level, profile, ClientInformation.createDefault(), originalSpawn);
         server.getPlayerList().placeNewPlayer(
@@ -86,31 +72,29 @@ public Dummy(MinecraftServer server, ServerLevel level, GameProfile profile, Cli
     }
 
     public String getUsername() {
-        return this.getGameProfile().getName();
+        return this.getGameProfile().name();
     }
 
+    @SuppressWarnings("resource")
     public void leave(Component reason) {
-        Objects.requireNonNull(this.getServer()).getPlayerList().remove(this);
+        Objects.requireNonNull(this.level().getServer()).getPlayerList().remove(this);
         this.connection.onDisconnect(new DisconnectionDetails(reason));
     }
 
+    @SuppressWarnings("resource")
     public void respawn() {
-        Objects.requireNonNull(this.getServer()).getPlayerList().respawn(this, false, Entity.RemovalReason.KILLED);
+        Objects.requireNonNull(this.level().getServer()).getPlayerList().respawn(this, false, Entity.RemovalReason.KILLED);
     }
 
     @Override
-    public void forceSetRotation(float f, float g) {
-        this.setYRot(f);
-        this.setXRot(g);
-        this.setOldRot();
-
-        this.connection.send(new ServerboundMovePlayerPacket.Rot(f, g, false, false));
+    public @NotNull BlockPos adjustSpawnLocation(ServerLevel serverLevel, BlockPos blockPos) {
+        return BlockPos.containing(this.originalSpawn);
     }
 
     @SuppressWarnings("resource")
     @Override
     public void tick() {
-        if (Objects.requireNonNull(this.getServer()).getTickCount() % 10 == 0) {
+        if (Objects.requireNonNull(this.level().getServer()).getTickCount() % 10 == 0) {
             this.connection.resetPosition();
             this.level().getChunkSource().move(this);
         }
@@ -125,7 +109,8 @@ public void tick() {
     public void die(DamageSource cause) {
         super.die(cause);
         if (this.level().getGameRules().getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN)) {
-            Objects.requireNonNull(this.getServer()).schedule(new TickTask(this.getServer().getTickCount(),
+            MinecraftServer server = Objects.requireNonNull(this.level().getServer());
+            server.schedule(new TickTask(server.getTickCount(),
                     () -> this.connection.handleClientCommand(new ServerboundClientCommandPacket(ServerboundClientCommandPacket.Action.PERFORM_RESPAWN))
             ));
         }
diff --git a/src/main/java/io/github/misode/packtest/mixin/EntityArgumentMixin.java b/src/main/java/io/github/misode/packtest/mixin/EntityArgumentMixin.java
@@ -25,7 +25,7 @@ private void getCursor(StringReader stringReader, CallbackInfoReturnable<EntityS
     }
 
     @ModifyReturnValue(method = "parse(Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/selector/EntitySelector;", at = @At("RETURN"))
-    private EntitySelector returnSelector(EntitySelector selector, @Local StringReader reader, @Share("cursor") LocalIntRef cursorRef) {
+    private EntitySelector returnSelector(EntitySelector selector, @Local(argsOnly = true) StringReader reader, @Share("cursor") LocalIntRef cursorRef) {
         ((PackTestArgumentSource)selector).packtest$setSource(reader.getRead().substring(cursorRef.get()));
         return selector;
     }
diff --git a/src/main/java/io/github/misode/packtest/mixin/GameTestServerMixin.java b/src/main/java/io/github/misode/packtest/mixin/GameTestServerMixin.java
@@ -1,11 +1,9 @@
 package io.github.misode.packtest.mixin;
 
-import com.google.common.collect.Lists;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import io.github.misode.packtest.LoadDiagnostics;
-import io.github.misode.packtest.PackTest;
 import net.minecraft.core.BlockPos;
 import net.minecraft.gametest.framework.*;
 import net.minecraft.server.level.ServerLevel;
@@ -19,8 +17,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.BooleanSupplier;
diff --git a/src/main/java/io/github/misode/packtest/mixin/PlayerListMixin.java b/src/main/java/io/github/misode/packtest/mixin/PlayerListMixin.java
@@ -10,45 +10,19 @@
 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;
 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.Map;
-import java.util.Optional;
-import java.util.Set;
 
 /**
- * Fixes starting position of dummies when they load in.
- * Respawns dummies and in the correct position.
+ * Prevent player data and advancements from being saved for dummies.
+ * Create Dummy object when respawning.
  */
 @Mixin(PlayerList.class)
 public class PlayerListMixin {
-    @Inject(method = "load", at = @At(value = "RETURN", shift = At.Shift.BEFORE))
-    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;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, problemReporter);
-        }
-    }
-
     @Inject(method = "save", at = @At(value = "HEAD"), cancellable = true)
     private void skipSaveDummy(ServerPlayer player, CallbackInfo ci) {
         if (player instanceof Dummy) {
@@ -73,13 +47,4 @@ private ServerPlayer createDummy(MinecraftServer server, ServerLevel level, Game
             return original.call(server, level, profile, cli);
         }
     }
-
-    @Inject(method = "respawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;restoreFrom(Lnet/minecraft/server/level/ServerPlayer;Z)V"))
-    private void teleportDummy(ServerPlayer serverPlayer, boolean bl, Entity.RemovalReason removalReason, CallbackInfoReturnable<ServerPlayer> cir, @Local(ordinal = 1) ServerPlayer player) {
-        if (player instanceof Dummy dummy) {
-            Vec3 pos = dummy.originalSpawn;
-            dummy.snapTo(pos.x, pos.y, pos.z, 0, 0);
-            dummy.teleportTo(dummy.level(), pos.x, pos.y, pos.z, Set.of(), 0, 0, true);
-        }
-    }
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -24,7 +24,7 @@
 	"accessWidener": "packtest.accesswidener",
 	"depends": {
 		"fabricloader": ">=0.15.10",
-		"minecraft": ">=1.21.6",
+		"minecraft": ">=1.21.9",
 		"java": ">=21",
 		"fabric-api": "*"
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id 'fabric-loom' version '1.10-SNAPSHOT'`
	`2`	`+ id 'fabric-loom' version '1.12-SNAPSHOT'`
`3`	`3`	`id 'maven-publish'`
`4`	`4`	`}`
`5`	`5`