Update to 1.21.9

DrexHD · DrexHD · commit b2bf0fb5c64b · 2025-09-30T19:54:57.000+02:00
diff --git a/settings.gradle b/settings.gradle
@@ -15,7 +15,7 @@ plugins {
 
 stonecutter {
     create(rootProject) {
-        versions("1.21.1", "1.21.4", "1.21.5", "1.21.8")
-        vcsVersion = "1.21.8"
+        versions("1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.9")
+        vcsVersion = "1.21.9"
     }
 }
diff --git a/src/main/java/me/drex/essentials/command/impl/home/DeleteHomeCommand.java b/src/main/java/me/drex/essentials/command/impl/home/DeleteHomeCommand.java
@@ -42,11 +42,11 @@ protected void registerArguments(LiteralArgumentBuilder<CommandSourceStack> lite
     }
 
     protected int deleteHome(CommandSourceStack src, String name, GameProfile target, boolean self) throws CommandSyntaxException {
-        PlayerData playerData = DataStorage.getOfflinePlayerData(src.getServer(), target.getId());
+        PlayerData playerData = DataStorage.getOfflinePlayerData(src.getServer(), target);
         Home home = playerData.homes.get(name);
         if (home != null) {
             playerData.homes.remove(name);
-            DataStorage.updateOfflinePlayerData(src.getServer(), target.getId(), playerData);
+            DataStorage.updateOfflinePlayerData(src.getServer(), target, playerData);
             if (self) {
                 src.sendSystemMessage(localized("fabric-essentials.commands.deletehome.self", home.placeholders(name)));
             } else {
diff --git a/src/main/java/me/drex/essentials/command/impl/home/HomeCommand.java b/src/main/java/me/drex/essentials/command/impl/home/HomeCommand.java
@@ -51,7 +51,7 @@ protected void registerArguments(LiteralArgumentBuilder<CommandSourceStack> lite
 
     protected int teleportHome(CommandSourceStack src, String name, GameProfile target, boolean self) throws CommandSyntaxException {
         ServerPlayer serverPlayer = src.getPlayerOrException();
-        PlayerData playerData = DataStorage.getOfflinePlayerData(src.getServer(), target.getId());
+        PlayerData playerData = DataStorage.getOfflinePlayerData(src.getServer(), target);
         Home home = playerData.homes.get(name);
         if (home == null) throw UNKNOWN.create();
         ServerLevel targetLevel = home.location().getLevel(src.getServer());
@@ -76,9 +76,4 @@ protected int teleportHome(CommandSourceStack src, String name, GameProfile targ
         return SharedSuggestionProvider.suggest(playerData.homes.keySet(), builder);
     };
 
-    public static final SuggestionProvider<CommandSourceStack> OTHER_HOMES_PROVIDER = (ctx, builder) -> {
-        PlayerData playerData = DataStorage.getOfflinePlayerData(ctx.getSource().getServer(), getGameProfile(ctx, "player").getId());
-        return SharedSuggestionProvider.suggest(playerData.homes.keySet(), builder);
-    };
-
 }
diff --git a/src/main/java/me/drex/essentials/command/impl/home/HomesCommand.java b/src/main/java/me/drex/essentials/command/impl/home/HomesCommand.java
@@ -57,7 +57,7 @@ protected int listHomes(CommandSourceStack src) throws CommandSyntaxException {
     }
 
     protected int listOtherHomes(CommandSourceStack src, GameProfile target) {
-        PlayerData dataStorage = DataStorage.getOfflinePlayerData(src.getServer(), target.getId());
+        PlayerData dataStorage = DataStorage.getOfflinePlayerData(src.getServer(), target);
         Map<String, Home> homes = dataStorage.homes;
         if (homes.isEmpty()) {
             src.sendSystemMessage(localized("fabric-essentials.commands.homes.other.empty", PlaceholderContext.of(target, src.getServer())));
diff --git a/src/main/java/me/drex/essentials/command/impl/home/SetHomeCommand.java b/src/main/java/me/drex/essentials/command/impl/home/SetHomeCommand.java
@@ -52,7 +52,7 @@ protected void registerArguments(LiteralArgumentBuilder<CommandSourceStack> lite
     }
 
     protected int setHome(CommandSourceStack src, String name, GameProfile target, boolean self, boolean confirm) {
-        PlayerData playerData = DataStorage.getOfflinePlayerData(src.getServer(), target.getId());
+        PlayerData playerData = DataStorage.getOfflinePlayerData(src.getServer(), target);
         Map<String, Home> homes = playerData.homes;
         Home previousHome = homes.get(name);
         if (previousHome != null && !confirm) {
@@ -71,7 +71,7 @@ protected int setHome(CommandSourceStack src, String name, GameProfile target, b
         }
         Home home = new Home(new Location(src));
         homes.put(name, home);
-        DataStorage.updateOfflinePlayerData(src.getServer(), target.getId(), playerData);
+        DataStorage.updateOfflinePlayerData(src.getServer(), target, playerData);
         if (self) {
             src.sendSystemMessage(localized("fabric-essentials.commands.sethome.self", home.placeholders(name)));
         } else {
diff --git a/src/main/java/me/drex/essentials/command/util/CommandUtil.java b/src/main/java/me/drex/essentials/command/util/CommandUtil.java
@@ -33,14 +33,19 @@ public class CommandUtil {
     private static final SimpleCommandExceptionType NO_PLAYERS_FOUND = new SimpleCommandExceptionType(Component.translatable("argument.entity.notfound.player"));
 
     public static GameProfile getGameProfile(CommandContext<CommandSourceStack> context, String argument) throws CommandSyntaxException {
-        Collection<GameProfile> profiles = getGameProfiles(context, argument);
+        Collection</*?if >= 1.21.9 {*/ net.minecraft.server.players.NameAndId /*?} else {*/ /*GameProfile*/ /*?}*/> profiles = getGameProfiles(context, argument);
         if (profiles.isEmpty()) {
             throw NO_PLAYERS_FOUND.create();
         } else {
             if (profiles.size() != 1) {
                 throw ERROR_NOT_SINGLE_PLAYER.create();
             } else {
-                return profiles.iterator().next();
+                var profile = profiles.iterator().next();
+                //? if >= 1.21.9 {
+                return new GameProfile(profile.id(), profile.name());
+                //? } else {
+                // return profile;
+                //? }
             }
         }
     }
@@ -60,7 +65,7 @@ public static CompletableFuture<ChunkAccess> asyncTeleport(CommandSourceStack sr
         final ServerChunkCache chunkCache = level.getChunkSource();
         //? if < 1.21.5 {
         /*final DistanceManager ticketManager = chunkCache.chunkMap.getDistanceManager();
-        *///?}
+         *///?}
         CompletableFuture<Void> waitFuture = asyncTeleportPlayer.delayedTeleport(src, config);
         CompletableFuture<ChunkResult<ChunkAccess>> chunkAccessFuture = AsyncChunkLoadUtil.scheduleChunkLoadWithRadius(level, pos, RADIUS);
         chunkAccessFuture.whenCompleteAsync((chunkResult, throwable) -> {
@@ -80,7 +85,7 @@ public static CompletableFuture<ChunkAccess> asyncTeleport(CommandSourceStack sr
                 chunkCache.removeTicketWithRadius(ASYNC_CHUNK_LOAD, pos, RADIUS);
                 //?} else {
                 /*ticketManager.removeTicket(ASYNC_CHUNK_LOAD, pos, 33 - RADIUS, Unit.INSTANCE);
-                *///?}
+                 *///?}
                 ((IServerChunkCache) chunkCache).invokeRunDistanceManagerUpdates();
             } else {
                 chunkAccessFuture.whenCompleteAsync((chunkResult, chunkThrowable) -> {
@@ -100,7 +105,7 @@ public static CompletableFuture<ChunkAccess> asyncTeleport(CommandSourceStack sr
                     chunkCache.removeTicketWithRadius(ASYNC_CHUNK_LOAD, pos, RADIUS);
                     //?} else {
                     /*ticketManager.removeTicket(ASYNC_CHUNK_LOAD, pos, 33 - RADIUS, Unit.INSTANCE);
-                    *///?}
+                     *///?}
                     ((IServerChunkCache) chunkCache).invokeRunDistanceManagerUpdates();
                 }, src.getServer());
             }
diff --git a/src/main/java/me/drex/essentials/datagen/ModItemTagProvider.java b/src/main/java/me/drex/essentials/datagen/ModItemTagProvider.java
@@ -15,11 +15,11 @@ public ModItemTagProvider(FabricDataOutput output, CompletableFuture<HolderLooku
 
     @Override
     protected void addTags(HolderLookup.Provider wrapperLookup) {
-        //? if >= 1.21.6-rc1 {
+        //? if >= 1.21.6 {
         this.valueLookupBuilder(ModItemTags.HAT_DENY)
-        //? } else {
+        //?} else {
         /*this.getOrCreateTagBuilder(ModItemTags.HAT_DENY)*/
-        //? }
+        //?}
             .add(Items.BEDROCK);
     }
 }
diff --git a/src/main/java/me/drex/essentials/mixin/async/ServerPlayerMixin.java b/src/main/java/me/drex/essentials/mixin/async/ServerPlayerMixin.java
@@ -29,15 +29,15 @@
 
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayerMixin extends Player implements AsyncTeleportPlayer {
-    //? if >= 1.21.6-rc1 {
+    //? if >= 1.21.6 {
     public ServerPlayerMixin(Level level, GameProfile gameProfile) {
         super(level, gameProfile);
     }
-    //? } else {
+    //?} else {
     /*public ServerPlayerMixin(Level level, BlockPos blockPos, float f, GameProfile gameProfile) {
         super(level, blockPos, f, gameProfile);
     }*/
-    //? }
+    //?}
 
     @Shadow
     public abstract void sendSystemMessage(Component component);
diff --git a/src/main/java/me/drex/essentials/mixin/command/EntitySelectorMixin.java b/src/main/java/me/drex/essentials/mixin/command/EntitySelectorMixin.java
@@ -28,7 +28,7 @@ public ServerPlayer allowPartialName(PlayerList playerList, String input, Operat
         if (ConfigManager.config().commands.allowPartialNames) {
             String lowercasePartial = input.toLowerCase();
             List<ServerPlayer> matches = playerList.getPlayers().stream()
-                .filter(player -> player.getGameProfile().getName().toLowerCase().startsWith(lowercasePartial))
+                .filter(player -> player.getGameProfile()./*?if >= 1.21.9 {*/ name() /*?} else {*/ /*getName()*/ /*?}*/.toLowerCase().startsWith(lowercasePartial))
                 .toList();
 
             if (matches.isEmpty()) {
diff --git a/src/main/java/me/drex/essentials/mixin/spy/ServerGamePacketListenerImplMixin.java b/src/main/java/me/drex/essentials/mixin/spy/ServerGamePacketListenerImplMixin.java
@@ -56,7 +56,7 @@ private void handleCommand(String command) {
         MutableComponent spyMessage = localized("fabric-essentials.commandspy", new HashMap<>(){{
             put("command", Component.literal(command));
         }}, PlaceholderContext.of(player));
-        for (ServerPlayer player : player.getServer().getPlayerList().getPlayers()) {
+        for (ServerPlayer player : player.level().getServer().getPlayerList().getPlayers()) {
             if (DataStorage.getPlayerData(player).commandSpy && player != this.player) {
                 player.sendSystemMessage(spyMessage);
             }
diff --git a/src/main/java/me/drex/essentials/storage/DataStorage.java b/src/main/java/me/drex/essentials/storage/DataStorage.java
@@ -92,8 +92,12 @@ public static PlayerData getPlayerData(CommandContext<CommandSourceStack> ctx) t
     }
 
     @NotNull
-    public static PlayerData getOfflinePlayerData(CommandContext<CommandSourceStack> ctx, GameProfile target) {
-        return getOfflinePlayerData(ctx.getSource().getServer(), target.getId());
+    public static PlayerData getOfflinePlayerData(MinecraftServer server, GameProfile profile) {
+        PlayerData playerData = PlayerDataApi.getCustomDataFor(server, profile./*?if >= 1.21.9 {*/ id() /*?} else {*/ /*getId()*/ /*?}*/, USER_DATA_STORAGE);
+        if (playerData == null) {
+            playerData = new PlayerData();
+        }
+        return playerData;
     }
 
     @NotNull
@@ -105,8 +109,8 @@ public static PlayerData getOfflinePlayerData(MinecraftServer server, UUID uuid)
         return playerData;
     }
 
-    public static void updateOfflinePlayerData(CommandContext<CommandSourceStack> ctx, GameProfile target, PlayerData playerData) {
-        updateOfflinePlayerData(ctx.getSource().getServer(), target.getId(), playerData);
+    public static void updateOfflinePlayerData(MinecraftServer server, GameProfile profile, PlayerData playerData) {
+        PlayerDataApi.setCustomDataFor(server, profile./*?if >= 1.21.9 {*/ id() /*?} else {*/ /*getId()*/ /*?}*/, USER_DATA_STORAGE, playerData);
     }
 
     public static void updateOfflinePlayerData(MinecraftServer server, UUID uuid, PlayerData playerData) {
diff --git a/src/main/java/me/drex/essentials/util/AsyncChunkLoadUtil.java b/src/main/java/me/drex/essentials/util/AsyncChunkLoadUtil.java
@@ -18,8 +18,10 @@
 
 public class AsyncChunkLoadUtil {
 
-    //? if >= 1.21.5 {
-    public static final TicketType ASYNC_CHUNK_LOAD = register("essentials_async_chunk_load", 0L, false, TicketType.TicketUse.LOADING);
+    //? if >= 1.21.9 {
+    public static final TicketType ASYNC_CHUNK_LOAD = new TicketType(0L, TicketType.FLAG_LOADING);
+    //? } else if >= 1.21.5 {
+//    public static final TicketType ASYNC_CHUNK_LOAD = register("essentials_async_chunk_load", 0L, false, TicketType.TicketUse.LOADING);
     //?} else {
     /*public static final TicketType<Unit> ASYNC_CHUNK_LOAD = TicketType.create("essentials_async_chunk_load", (unit, unit2) -> 0);
     *///?}
@@ -65,9 +67,9 @@ public static CompletableFuture<ChunkResult<ChunkAccess>> scheduleChunkLoadWithL
         return future;
     }
 
-    //? if >= 1.21.5 {
-    private static TicketType register(String string, long l, boolean bl, TicketType.TicketUse ticketUse) {
+    //? if >= 1.21.5 && <= 1.21.8 {
+    /*private static TicketType register(String string, long l, boolean bl, TicketType.TicketUse ticketUse) {
         return Registry.register(BuiltInRegistries.TICKET_TYPE, string, new TicketType(l, bl, ticketUse));
-    }
+    }*/
     //?}
 }
diff --git a/src/main/java/me/drex/essentials/util/teleportation/Location.java b/src/main/java/me/drex/essentials/util/teleportation/Location.java
@@ -45,7 +45,7 @@ public boolean teleport(@NotNull Entity entity, boolean saveLocation) {
         if (!Level.isInSpawnableBounds(blockPos)) {
             return false;
         } else {
-            ServerLevel level = getLevel(entity.getServer());
+            ServerLevel level = getLevel(entity.level().getServer());
             Location currentLocation = new Location(entity);
             if (entity.teleportTo(level, pos.x, pos.y, pos.z, Collections.emptySet(),  Mth.wrapDegrees(yaw),  Mth.wrapDegrees(pitch)/*? if >= 1.21.2 {*/, true /*?}*/)) {
                 if (saveLocation && entity instanceof ServerPlayer player) {
diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("dev.kikugie.stonecutter")
     id("org.jetbrains.changelog") version "2.2.0"
 }
-stonecutter active "1.21.8"
+stonecutter active "1.21.9"
 
 changelog {
     path = rootProject.file("CHANGELOG.md").path
diff --git a/versions/1.21.9/gradle.properties b/versions/1.21.9/gradle.properties
@@ -0,0 +1,13 @@
+# Fabric Properties
+minecraft_version=1.21.9
+curseforge_minecraft_versions=1.21.9
+modrinth_minecraft_versions=1.21.9
+java_version=21
+# Dependencies
+fabric_version=0.133.14+1.21.9
+permission_api_version=0.4.1
+sgui_version=1.11.0+1.21.9
+placeholder_api_version=2.8.0+1.21.9
+player_data_api_version=0.9.0+1.21.9
+common_protection_api_version=1.0.0
+message_api_version=0.3.3+1.21.9

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ plugins {`
`15`	`15`
`16`	`16`	`stonecutter {`
`17`	`17`	`create(rootProject) {`
`18`		`- versions("1.21.1", "1.21.4", "1.21.5", "1.21.8")`
`19`		`- vcsVersion = "1.21.8"`
	`18`	`+ versions("1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.9")`
	`19`	`+ vcsVersion = "1.21.9"`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected int listHomes(CommandSourceStack src) throws CommandSyntaxException {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`protected int listOtherHomes(CommandSourceStack src, GameProfile target) {`
`60`		`- PlayerData dataStorage = DataStorage.getOfflinePlayerData(src.getServer(), target.getId());`
	`60`	`+ PlayerData dataStorage = DataStorage.getOfflinePlayerData(src.getServer(), target);`
`61`	`61`	`Map<String, Home> homes = dataStorage.homes;`
`62`	`62`	`if (homes.isEmpty()) {`
`63`	`63`	`src.sendSystemMessage(localized("fabric-essentials.commands.homes.other.empty", PlaceholderContext.of(target, src.getServer())));`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ public ModItemTagProvider(FabricDataOutput output, CompletableFuture<HolderLooku`
`15`	`15`
`16`	`16`	`@Override`
`17`	`17`	`protected void addTags(HolderLookup.Provider wrapperLookup) {`
`18`		`- //? if >= 1.21.6-rc1 {`
	`18`	`+ //? if >= 1.21.6 {`
`19`	`19`	`this.valueLookupBuilder(ModItemTags.HAT_DENY)`
`20`		`- //? } else {`
	`20`	`+ //?} else {`
`21`	`21`	`/this.getOrCreateTagBuilder(ModItemTags.HAT_DENY)/`
`22`		`- //? }`
	`22`	`+ //?}`
`23`	`23`	`.add(Items.BEDROCK);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ private void handleCommand(String command) {`
`56`	`56`	`MutableComponent spyMessage = localized("fabric-essentials.commandspy", new HashMap<>(){{`
`57`	`57`	`put("command", Component.literal(command));`
`58`	`58`	`}}, PlaceholderContext.of(player));`
`59`		`- for (ServerPlayer player : player.getServer().getPlayerList().getPlayers()) {`
	`59`	`+ for (ServerPlayer player : player.level().getServer().getPlayerList().getPlayers()) {`
`60`	`60`	`if (DataStorage.getPlayerData(player).commandSpy && player != this.player) {`
`61`	`61`	`player.sendSystemMessage(spyMessage);`
`62`	`62`	`}`