Update to Minecraft 1.21.9

Author: lucko

spark-fabric/build.gradle

@@ -28,9 +28,9 @@ configurations {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft 'com.mojang:minecraft:1.21.8'
-    mappings 'net.fabricmc:yarn:1.21.8+build.1:v2'
-    modImplementation 'net.fabricmc:fabric-loader:0.16.14'
+    minecraft 'com.mojang:minecraft:1.21.9'
+    mappings 'net.fabricmc:yarn:1.21.9+build.1:v2'
+    modImplementation 'net.fabricmc:fabric-loader:0.17.2'
 
     Set<String> apiModules = [
             "fabric-api-base",
@@ -40,12 +40,12 @@ dependencies {
 
     // Add each module as a dependency
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.129.0+1.21.8'))
+        modImplementation(fabricApi.module(it, '0.133.14+1.21.9'))
     }
 
-    include(modImplementation('me.lucko:fabric-permissions-api:0.4.1'))
+    include(modImplementation('me.lucko:fabric-permissions-api:0.5.0'))
 
-    modImplementation('eu.pb4:placeholder-api:2.7.0+1.21.6')
+    modImplementation('eu.pb4:placeholder-api:2.8.0+1.21.9')
 
     shade project(':spark-common')
 }

spark-fabric/src/main/java/me/lucko/spark/fabric/FabricClientCommandSender.java

@@ -44,7 +44,7 @@ public FabricClientCommandSender(ClientCommandSource commandSource) {
 
     @Override
     public String getName() {
-        return this.delegate.getPlayer().getGameProfile().getName();
+        return this.delegate.getPlayer().getGameProfile().name();
     }
 
     @Override

spark-fabric/src/main/java/me/lucko/spark/fabric/FabricPlayerPingProvider.java

@@ -38,7 +38,7 @@ public FabricPlayerPingProvider(MinecraftServer server) {
     public Map<String, Integer> poll() {
         ImmutableMap.Builder<String, Integer> builder = ImmutableMap.builder();
         for (ServerPlayerEntity player : this.server.getPlayerManager().getPlayerList()) {
-            builder.put(player.getGameProfile().getName(), player.networkHandler.getLatency());
+            builder.put(player.getGameProfile().name(), player.networkHandler.getLatency());
         }
         return builder.build();
     }

spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerCommandSender.java

@@ -71,7 +71,7 @@ public boolean hasPermission(String permission) {
             ServerPlayerEntity player = this.delegate.getPlayer();
             MinecraftServer server = this.delegate.getServer();
             if (player != null) {
-                if (server != null && server.isHost(player.getGameProfile())) {
+                if (server != null && server.isHost(player.getPlayerConfigEntry())) {
                     return true;
                 }
                 return player.hasPermissionLevel(4);

spark-neoforge/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'com.gradleup.shadow' version '8.3.8'
-    id 'net.neoforged.moddev' version '2.0.78'
+    id 'net.neoforged.moddev' version '2.0.110'
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -15,7 +15,7 @@ java {
 }
 
 neoForge {
-    version = "21.8.4-beta"
+    version = "21.9.2-beta"
     validateAccessTransformers = true
 
     runs {

spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgePlatformInfo.java

@@ -53,11 +53,11 @@ public String getBrand() {
 
     @Override
     public String getVersion() {
-        return FMLLoader.versionInfo().neoForgeVersion();
+        return FMLLoader.getCurrent().getVersionInfo().neoForgeVersion();
     }
 
     @Override
     public String getMinecraftVersion() {
-        return FMLLoader.versionInfo().mcVersion();
+        return FMLLoader.getCurrent().getVersionInfo().mcVersion();
     }
 }

spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgePlayerPingProvider.java

@@ -38,7 +38,7 @@ public NeoForgePlayerPingProvider(MinecraftServer server) {
     public Map<String, Integer> poll() {
         ImmutableMap.Builder<String, Integer> builder = ImmutableMap.builder();
         for (ServerPlayer player : this.server.getPlayerList().getPlayers()) {
-            builder.put(player.getGameProfile().getName(), player.connection.latency());
+            builder.put(player.getGameProfile().name(), player.connection.latency());
         }
         return builder.build();
     }

spark-neoforge/src/main/java/me/lucko/spark/neoforge/plugin/NeoForgeServerSparkPlugin.java

@@ -76,8 +76,8 @@ public static void register(NeoForgeSparkMod mod, ServerAboutToStartEvent event)
             return false;
         }
 
-        MinecraftServer server = player.getServer();
-        if (server != null && server.isSingleplayerOwner(player.getGameProfile())) {
+        MinecraftServer server = player.level().getServer();
+        if (server != null && server.isSingleplayerOwner(player.nameAndId())) {
             return true;
         }