Update fabric to 1.21.9 (#4306)

DrexHD · web-flow · commit e461c7b8aee7 · 2025-10-20T05:07:48.000+03:00
* Update fabric to 1.21.9

* Revert shadow version update
diff --git a/Plan/build.gradle b/Plan/build.gradle
@@ -11,7 +11,7 @@ plugins {
     id("base")
     id "org.sonarqube" version "6.3.1.5724"
     id "com.gradleup.shadow" version "9.0.0-beta6" apply false
-    id "fabric-loom" version "1.9-SNAPSHOT" apply false
+    id "fabric-loom" version "1.11-SNAPSHOT" apply false
 }
 
 apply plugin: "nebula-aggregate-javadocs"
diff --git a/Plan/fabric/build.gradle b/Plan/fabric/build.gradle
@@ -18,10 +18,10 @@ dependencies {
     implementation "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
 
     // https://wiki.fabricmc.net/tutorial:migratemappings
-    minecraft "com.mojang:minecraft:1.21.3"
-    mappings "net.fabricmc:yarn:1.21.3+build.2:v2"
-    modImplementation "net.fabricmc:fabric-loader:0.16.9"
-    modImplementation("me.lucko:fabric-permissions-api:0.3.3")
+    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"
+    modImplementation("me.lucko:fabric-permissions-api:0.4.1")
 
     // Fabric API
     Set<String> apiModules = [
@@ -34,7 +34,7 @@ dependencies {
     ]
 
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, "0.114.0+1.21.3"))
+        modImplementation(fabricApi.module(it, "0.134.0+1.21.9"))
     }
 
     testImplementation(testFixtures(project(":common")))
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/commands/use/FabricMessageBuilder.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/commands/use/FabricMessageBuilder.java
@@ -25,6 +25,7 @@
 import net.minecraft.text.Text;
 import org.apache.commons.text.TextStringBuilder;
 
+import java.net.URI;
 import java.util.Collection;
 
 public class FabricMessageBuilder implements MessageBuilder {
@@ -58,31 +59,31 @@ public MessageBuilder newLine() {
 
     @Override
     public MessageBuilder link(String url) {
-        builder.styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url)));
+        builder.styled(style -> style.withClickEvent(new ClickEvent.OpenUrl(URI.create(url))));
         return this;
     }
 
     @Override
     public MessageBuilder command(String command) {
-        builder.styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command.charAt(0) == '/' ? command : '/' + command)));
+        builder.styled(style -> style.withClickEvent(new ClickEvent.RunCommand(command.charAt(0) == '/' ? command : '/' + command)));
         return this;
     }
 
     @Override
     public MessageBuilder hover(String message) {
-        builder.styled(style -> style.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal(message))));
+        builder.styled(style -> style.withHoverEvent(new HoverEvent.ShowText(Text.literal(message))));
         return this;
     }
 
     @Override
     public MessageBuilder hover(String... lines) {
-        builder.styled(style -> style.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal(new TextStringBuilder().appendWithSeparators(lines, "\n").toString()))));
+        builder.styled(style -> style.withHoverEvent(new HoverEvent.ShowText(Text.literal(new TextStringBuilder().appendWithSeparators(lines, "\n").toString()))));
         return this;
     }
 
     @Override
     public MessageBuilder hover(Collection<String> lines) {
-        builder.styled(style -> style.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal(new TextStringBuilder().appendWithSeparators(lines, "\n").toString()))));
+        builder.styled(style -> style.withHoverEvent(new HoverEvent.ShowText(Text.literal(new TextStringBuilder().appendWithSeparators(lines, "\n").toString()))));
         return this;
     }
 
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/domain/FabricPlayerData.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/domain/FabricPlayerData.java
@@ -46,7 +46,7 @@ public UUID getUUID() {
 
     @Override
     public String getName() {
-        return player.getGameProfile().getName();
+        return player.getGameProfile().name();
     }
 
     @Override
@@ -56,12 +56,12 @@ public Optional<String> getDisplayName() {
 
     @Override
     public Optional<Boolean> isOperator() {
-        return Optional.of(server.getPlayerManager().getOpList().get(player.getGameProfile()) != null);
+        return Optional.of(server.getPlayerManager().getOpList().get(player.getPlayerConfigEntry()) != null);
     }
 
     @Override
     public Optional<String> getCurrentWorld() {
-        return Optional.of(player.getWorld().getRegistryKey().getValue().toString());
+        return Optional.of(player.getEntityWorld().getRegistryKey().getValue().toString());
     }
 
     @Override
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/PlanFabricEvents.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/PlanFabricEvents.java
@@ -16,13 +16,13 @@
  */
 package net.playeranalytics.plan.gathering.listeners.events;
 
-import com.mojang.authlib.GameProfile;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
+import net.minecraft.server.PlayerConfigEntry;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -173,7 +173,7 @@ public interface OnLogin {
          * @param profile the profile of the player
          * @param reason  the provided kick reason (null if player is permitted to join)
          */
-        void onLogin(SocketAddress address, GameProfile profile, Text reason);
+        void onLogin(SocketAddress address, PlayerConfigEntry profile, Text reason);
     }
 
     @FunctionalInterface
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/DeathEventListener.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/DeathEventListener.java
@@ -66,7 +66,7 @@ public void register() {
             return;
         }
 
-        ServerEntityCombatEvents.AFTER_KILLED_OTHER_ENTITY.register((world, killer, killedEntity) ->
+        ServerEntityCombatEvents.AFTER_KILLED_OTHER_ENTITY.register((world, killer, killedEntity, damageSource) ->
                 {
                     if (!this.isEnabled) {
                         return;
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/GameModeChangeListener.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/GameModeChangeListener.java
@@ -75,7 +75,7 @@ private void actOnEvent(ServerPlayerEntity player, GameMode newGameMode) {
         UUID uuid = player.getUuid();
         long time = System.currentTimeMillis();
         String gameMode = newGameMode.name();
-        String worldName = player.getWorld().getRegistryKey().getValue().toString();
+        String worldName = player.getEntityWorld().getRegistryKey().getValue().toString();
 
         dbSystem.getDatabase().executeTransaction(new StoreWorldNameTransaction(serverInfo.getServerUUID(), worldName));
         worldAliasSettings.addWorld(worldName);
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/PlayerOnlineListener.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/PlayerOnlineListener.java
@@ -33,6 +33,7 @@
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.minecraft.network.packet.c2s.handshake.ConnectionIntent;
 import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
+import net.minecraft.server.PlayerConfigEntry;
 import net.minecraft.server.dedicated.MinecraftDedicatedServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.playeranalytics.plan.gathering.FabricPlayerPositionTracker;
@@ -140,9 +141,9 @@ private void onHandshake(HandshakeC2SPacket packet) {
         }
     }
 
-    public void onPlayerLogin(SocketAddress address, GameProfile profile, boolean banned) {
+    public void onPlayerLogin(SocketAddress address, PlayerConfigEntry profile, boolean banned) {
         try {
-            UUID playerUUID = profile.getId();
+            UUID playerUUID = profile.id();
             ServerUUID serverUUID = serverInfo.getServerUUID();
 
             String playerJoinAddress = joinAddress.get();
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/WorldChangeListener.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/WorldChangeListener.java
@@ -70,7 +70,7 @@ private void actOnEvent(ServerPlayerEntity player) {
 
         UUID uuid = player.getUuid();
 
-        String worldName = player.getWorld().getRegistryKey().getValue().toString();
+        String worldName = player.getEntityWorld().getRegistryKey().getValue().toString();
         String gameMode = player.interactionManager.getGameMode().name();
 
         dbSystem.getDatabase().executeTransaction(new StoreWorldNameTransaction(serverInfo.getServerUUID(), worldName));
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/mixin/PlayerManagerMixin.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/mixin/PlayerManagerMixin.java
@@ -16,7 +16,7 @@
  */
 package net.playeranalytics.plan.gathering.mixin;
 
-import com.mojang.authlib.GameProfile;
+import net.minecraft.server.PlayerConfigEntry;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.text.Text;
 import net.playeranalytics.plan.gathering.listeners.events.PlanFabricEvents;
@@ -31,7 +31,7 @@
 public class PlayerManagerMixin {
 
     @Inject(method = "checkCanJoin", at = @At(value = "TAIL"))
-    public void onLogin(SocketAddress address, GameProfile profile, CallbackInfoReturnable<Text> cir) {
+    public void onLogin(SocketAddress address, PlayerConfigEntry profile, CallbackInfoReturnable<Text> cir) {
         PlanFabricEvents.ON_LOGIN.invoker().onLogin(address, profile, cir.getReturnValue());
     }
 
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/mixin/ServerCommandSourceMixin.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/mixin/ServerCommandSourceMixin.java
@@ -59,7 +59,7 @@ public MessageBuilder buildMessage() {
 
     @Override
     public Optional<String> getPlayerName() {
-        return getPlayer().map(ServerPlayerEntity::getGameProfile).map(GameProfile::getName);
+        return getPlayer().map(ServerPlayerEntity::getGameProfile).map(GameProfile::name);
     }
 
     @Override
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/mixin/ServerPlayNetworkHandlerMixin.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/mixin/ServerPlayNetworkHandlerMixin.java
@@ -33,7 +33,14 @@ public void onCommand(CommandExecutionC2SPacket packet, CallbackInfo ci) {
         PlanFabricEvents.ON_COMMAND.invoker().onCommand((ServerPlayNetworkHandler) (Object) this, packet.command());
     }
 
-    @Inject(method = "onPlayerMove", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;getServerWorld()Lnet/minecraft/server/world/ServerWorld;"))
+    @Inject(
+        method = "onPlayerMove",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/server/network/ServerPlayerEntity;getEntityWorld()Lnet/minecraft/server/world/ServerWorld;",
+            ordinal = 1
+        )
+    )
     public void onPlayerMove(PlayerMoveC2SPacket packet, CallbackInfo ci) {
         PlanFabricEvents.ON_MOVE.invoker().onMove((ServerPlayNetworkHandler) (Object) this, packet);
     }
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/identification/properties/FabricServerProperties.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/identification/properties/FabricServerProperties.java
@@ -37,7 +37,7 @@ public FabricServerProperties(MinecraftDedicatedServer server) {
                         FabricLoader.getInstance().getModContainer("fabricloader").map(modContainer -> modContainer.getMetadata().getVersion().getFriendlyString()).orElse("Unknown") +
                         " (loader)",
                 () -> (server.getServerIp() == null) ? "" : server.getServerIp(),
-                server.getProperties().maxPlayers
+                server.getProperties().maxPlayers.get()
         );
     }
 }
diff --git a/Plan/gradle/wrapper/gradle-wrapper.properties b/Plan/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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ plugins {`
`11`	`11`	`id("base")`
`12`	`12`	`id "org.sonarqube" version "6.3.1.5724"`
`13`	`13`	`id "com.gradleup.shadow" version "9.0.0-beta6" apply false`
`14`		`- id "fabric-loom" version "1.9-SNAPSHOT" apply false`
	`14`	`+ id "fabric-loom" version "1.11-SNAPSHOT" apply false`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`apply plugin: "nebula-aggregate-javadocs"`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public UUID getUUID() {`
`46`	`46`
`47`	`47`	`@Override`
`48`	`48`	`public String getName() {`
`49`		`- return player.getGameProfile().getName();`
	`49`	`+ return player.getGameProfile().name();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`
`@@ -56,12 +56,12 @@ public Optional<String> getDisplayName() {`
`56`	`56`
`57`	`57`	`@Override`
`58`	`58`	`public Optional<Boolean> isOperator() {`
`59`		`- return Optional.of(server.getPlayerManager().getOpList().get(player.getGameProfile()) != null);`
	`59`	`+ return Optional.of(server.getPlayerManager().getOpList().get(player.getPlayerConfigEntry()) != null);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Override`
`63`	`63`	`public Optional<String> getCurrentWorld() {`
`64`		`- return Optional.of(player.getWorld().getRegistryKey().getValue().toString());`
	`64`	`+ return Optional.of(player.getEntityWorld().getRegistryKey().getValue().toString());`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void register() {`
`66`	`66`	`return;`
`67`	`67`	`}`
`68`	`68`
`69`		`- ServerEntityCombatEvents.AFTER_KILLED_OTHER_ENTITY.register((world, killer, killedEntity) ->`
	`69`	`+ ServerEntityCombatEvents.AFTER_KILLED_OTHER_ENTITY.register((world, killer, killedEntity, damageSource) ->`
`70`	`70`	`{`
`71`	`71`	`if (!this.isEnabled) {`
`72`	`72`	`return;`