upgrade to 1.21.9

Author: John-Paul-R

build.gradle

@@ -79,7 +79,7 @@ allprojects {
     repositories {
         gradlePluginPortal()
         mavenCentral()
-        mavenLocal()
+//        mavenLocal()
         maven { name 'Fabric'; url 'https://maven.fabricmc.net/' }
 //        maven { name 'TerraformersMC'; url 'https://maven.terraformersmc.com/' }
         // Add repositories to retrieve artifacts from in here.
@@ -93,7 +93,15 @@ allprojects {
             url = 'https://maven.ladysnake.org/releases'
             content {
                 includeGroup 'io.github.ladysnake'
-                includeGroupByRegex 'io\\.github\\.onyxstudios.*'
+                includeGroupByRegex 'org\\.ladysnake.*'
+            }
+        }
+        maven {
+            name = 'jpcode'
+            url = 'https://maven.jpcode.dev/'
+            content {
+                includeGroup 'io.github.ladysnake'
+                includeGroupByRegex 'org\\.ladysnake.*'
             }
         }
         maven { url "https://api.modrinth.com/maven" } // for vanish

changelog.md

@@ -1,3 +1,7 @@
+## Essential Commands `v0.38.6` (mc 1.21.9)
+
+- upgrade to Minecraft 1.21.9
+
 ## Essential Commands `v0.38.5` (mc 1.21.8)
 
 - assorted internal dependency and tooling upgrades

gradle.properties

@@ -3,18 +3,18 @@ org.gradle.jvmargs=-Xmx2048M
 
 # Fabric Properties
 # check these on https://fabricmc.net/develup
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
 loader_version=0.17.2
 loom_version=1.11-SNAPSHOT
 
 # Fabric API
-fabric_version=0.133.0+1.21.8
+fabric_version=0.134.0+1.21.9
 
 # Mod Properties
 mod_name = Essential Commands
 mod_id = essential_commands
-mod_version = 0.38.5-joinpoints2
+mod_version = 0.38.6
 # TODO @1.0.0: migrate to dev.jpcode
 maven_group = com.fibermc
 archives_base_name = essential_commands
@@ -25,10 +25,10 @@ gh_owner=John-Paul-R
 gh_repo=essential-commands
 
 # Dependencies
-permissions_api_version=0.4.1
-placeholder_api_version=2.7.2+1.21.8
-pal_version=1.14.0
-vanish_version=1.6.0+1.21.8
+permissions_api_version=0.5.0
+placeholder_api_version=2.8.0+1.21.9
+pal_version=1.15.0
+vanish_version=1.6.1+1.21.9-rc1
 mixinextras_version=0.5.0
 snakeyaml_version=2.5
 jetbrains_annotations_version=22.0.0

src/main/java/com/fibermc/essentialcommands/EssentialCommandRegistry.java

@@ -480,7 +480,7 @@ public static void register(
                                 return;
                             }
                             context.getSource().sendFeedback(() ->
-                                Text.of(playerEntity.getPos().toString()),
+                                Text.of(playerEntity.getEntityPos().toString()),
                                 EssentialCommands.CONFIG.BROADCAST_TO_OPS);
                         });
                     return 1;

src/main/java/com/fibermc/essentialcommands/commands/BedCommand.java

@@ -20,7 +20,6 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
 
 public class BedCommand implements Command<ServerCommandSource> {
@@ -56,21 +55,22 @@ private static Optional<MinecraftLocation> getSafeSpawnPos(ServerPlayerEntity pl
             return Optional.empty();
         }
 
-        ServerWorld world = player.getServer().getWorld(respawn.dimension());
-        var spawnPos = respawn.pos();
+        var respawnPosData = respawn.respawnData().globalPos();
+        ServerWorld world = player.getEntityWorld().getServer().getWorld(respawnPosData.dimension());
+        var spawnPos = respawnPosData.pos();
 
         // Safe Position Calculation, based on the game respawn position calculation logic,
         // which was basically rewritten because the game code caused the state of the RespawnAnchorBlock to be refreshed.
         Vec3d safeSpawnPos;
         BlockState blockState = world.getBlockState(spawnPos);
         Block block = blockState.getBlock();
         if (block instanceof RespawnAnchorBlock
-            && (Integer)blockState.get(RespawnAnchorBlock.CHARGES) > 0 && RespawnAnchorBlock.isNether(world)
+            && blockState.get(RespawnAnchorBlock.CHARGES) > 0 && RespawnAnchorBlock.isNether(world)
         ) {
             Optional<Vec3d> optional = RespawnAnchorBlock.findRespawnPosition(EntityType.PLAYER, world, spawnPos);
             safeSpawnPos = optional.orElseGet(() -> new Vec3d((double) spawnPos.getX() + 0.5, (double) spawnPos.getY() + 1, (double) spawnPos.getZ() + 0.5));
         } else if (block instanceof BedBlock && BedBlock.isBedWorking(world)) {
-            Optional<Vec3d> optional = BedBlock.findWakeUpPosition(EntityType.PLAYER, world, spawnPos, (Direction)blockState.get(BedBlock.FACING), respawn.angle());
+            Optional<Vec3d> optional = BedBlock.findWakeUpPosition(EntityType.PLAYER, world, spawnPos, blockState.get(BedBlock.FACING), respawn.respawnData().pitch());
             safeSpawnPos = optional.orElseGet(() -> new Vec3d((double) spawnPos.getX() + 0.5, (double) spawnPos.getY() + 0.5625, (double) spawnPos.getZ() + 0.5));
         } else {
             boolean bl = block.canMobSpawnInside(blockState);
@@ -83,6 +83,6 @@ private static Optional<MinecraftLocation> getSafeSpawnPos(ServerPlayerEntity pl
             }
         }
 
-        return Optional.of(new MinecraftLocation(respawn.dimension(), safeSpawnPos.getX(), safeSpawnPos.getY(), safeSpawnPos.getZ()));
+        return Optional.of(new MinecraftLocation(respawnPosData.dimension(), safeSpawnPos.getX(), safeSpawnPos.getY(), safeSpawnPos.getZ()));
     }
 }

src/main/java/com/fibermc/essentialcommands/commands/NicknameClearCommand.java

@@ -22,7 +22,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         //inform command sender that the nickname has been set
         senderPlayerData.sendCommandFeedback(
             "cmd.nickname.set.feedback",
-            Text.literal(targetPlayer.getGameProfile().getName())
+            Text.literal(targetPlayer.getGameProfile().name())
         );
 
         return SINGLE_SUCCESS;

src/main/java/com/fibermc/essentialcommands/commands/NicknameSetCommand.java

@@ -61,7 +61,7 @@ public static int exec(CommandContext<ServerCommandSource> context, Text rawNick
         if (successCode >= 0) {
             senderFeedbackReceiver.sendCommandFeedback(
                 "cmd.nickname.set.feedback",
-                nicknameText != null ? nicknameText : Text.literal(targetPlayer.getGameProfile().getName())
+                nicknameText != null ? nicknameText : Text.literal(targetPlayer.getGameProfile().name())
             );
         } else {
             MutableText failReason = switch (successCode) {

src/main/java/com/fibermc/essentialcommands/commands/RandomTeleportCommand.java

@@ -94,7 +94,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         }
 
         threadExecutor.execute(() -> {
-            EssentialCommands.LOGGER.info("Starting RTP location search for {}", player.getGameProfile().getName());
+            EssentialCommands.LOGGER.info("Starting RTP location search for {}", player.getGameProfile().name());
 
             Stopwatch timer = Stopwatch.createStarted();
 

src/main/java/com/fibermc/essentialcommands/commands/RealNameCommand.java

@@ -38,7 +38,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
 
             for (PlayerData nicknamePlayer : nicknamePlayers) {
                 responseText.append("\n  ");
-                responseText.append(nicknamePlayer.getPlayer().getGameProfile().getName());
+                responseText.append(nicknamePlayer.getPlayer().getGameProfile().name());
             }
         }
 

src/main/java/com/fibermc/essentialcommands/commands/TeleportAskCommand.java

@@ -49,7 +49,7 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
             senderPlayer.getDisplayName().copy().fillStyle(targetPlayerProfile.getStyle(TextFormatType.Accent))
         );
 
-        String senderName = senderPlayer.getGameProfile().getName();
+        String senderName = senderPlayer.getGameProfile().name();
         new ChatConfirmationPrompt(
             targetPlayer,
             "/tpaccept " + senderName,