Fabric 26.1 support by AnttiMK (#4550)

* Switch loom to non-obfuscated version

* Apply build changes

* Bump shadow

* Update sources for 26.1

* Use SNAPSHOT version for loom

* Bump dependencies, set sourceCompatibility to 25

* Bump VanillaGradle to fix build

Author: AnttiMK

Plan/build.gradle

@@ -10,8 +10,8 @@ buildscript {
 plugins {
     id("base")
     id "org.sonarqube" version "7.2.3.7755"
-    id "com.gradleup.shadow" version "9.0.0-beta6" apply false
-    id "fabric-loom" version "1.15.4" apply false
+    id "com.gradleup.shadow" version "9.4.0" apply false
+    id "net.fabricmc.fabric-loom" version "1.15-SNAPSHOT" apply false
 }
 
 apply plugin: "nebula-aggregate-javadocs"

Plan/fabric/build.gradle

@@ -1,7 +1,6 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import net.fabricmc.loom.task.RemapJarTask
 
-apply plugin: "fabric-loom"
+apply plugin: "net.fabricmc.fabric-loom"
 apply plugin: "com.gradleup.shadow"
 
 configurations {
@@ -17,11 +16,9 @@ dependencies {
 
     implementation "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
 
-    // https://wiki.fabricmc.net/tutorial:migratemappings
-    minecraft "com.mojang:minecraft:1.21.9"
-    mappings loom.officialMojangMappings()
-    modImplementation "net.fabricmc:fabric-loader:0.18.4"
-    modImplementation("me.lucko:fabric-permissions-api:0.4.1")
+    minecraft "com.mojang:minecraft:26.1"
+    implementation "net.fabricmc:fabric-loader:0.18.6"
+    implementation("me.lucko:fabric-permissions-api:0.7.0")
 
     // Fabric API
     Set<String> apiModules = [
@@ -34,15 +31,16 @@ dependencies {
     ]
 
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, "0.134.0+1.21.9"))
+        implementation(fabricApi.module(it, "0.145.1+26.1"))
     }
 
     testImplementation(testFixtures(project(":common")))
     testImplementation(project(":extensions:adventure"))
 }
 
 tasks.withType(JavaCompile).configureEach {
-    options.release.set(21)
+    options.release.set(25)
+    sourceCompatibility = "${JavaVersion.VERSION_25}"
 }
 
 processResources {
@@ -118,14 +116,9 @@ tasks.named("shadowJar", ShadowJar) {
     relocate "javax.servlet", "plan.javax.servlet"
 
     mergeServiceFiles()
-}
 
-tasks.register("remapShadowJar", RemapJarTask) {
-    dependsOn tasks.shadowJar
-    input = tasks.shadowJar.archiveFile
-    addNestedDependencies = true
     destinationDirectory.set(file("$rootDir/builds/"))
     archiveBaseName.set("PlanFabric")
 }
 
-tasks.assemble.dependsOn tasks.remapShadowJar
+tasks.assemble.dependsOn tasks.shadowJar

Plan/fabric/src/main/java/net/playeranalytics/plan/commands/FabricCommandManager.java

@@ -30,11 +30,11 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import me.lucko.fabric.api.permissions.v0.Permissions;
 import net.minecraft.commands.SharedSuggestionProvider;
 import net.minecraft.commands.Commands;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
+import net.minecraft.server.permissions.Permissions;
 import net.playeranalytics.plan.PlanFabric;
 import net.playeranalytics.plugin.scheduling.RunnableFactory;
 
@@ -56,8 +56,8 @@ public FabricCommandManager(CommandDispatcher<CommandSourceStack> dispatcher, Pl
 
     public static boolean checkPermission(CommandSourceStack src, String permission) {
         if (isPermissionsApiAvailable()) {
-            return Permissions.check(src, permission, 2);
-        } else if (src.hasPermission(2)) {
+            return me.lucko.fabric.api.permissions.v0.Permissions.check(src, permission, 2);
+        } else if (src.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER)) {
             return true;
         } else {
             return switch (permission) {

Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/domain/FabricPlayerData.java

@@ -51,7 +51,7 @@ public String getName() {
 
     @Override
     public Optional<String> getDisplayName() {
-        return Optional.ofNullable(player.getDisplayName()).map(Component::getString);
+        return Optional.of(player.getDisplayName()).map(Component::getString);
     }
 
     @Override
@@ -61,7 +61,7 @@ public Optional<Boolean> isOperator() {
 
     @Override
     public Optional<String> getCurrentWorld() {
-        return Optional.of(player.level().dimension().location().toString());
+        return Optional.of(player.level().dimension().identifier().toString());
     }
 
     @Override

Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/DeathEventListener.java

@@ -131,7 +131,7 @@ public String findWeapon(Entity killer) {
 
     private String getItemInHand(ServerPlayer killer) {
         ItemStack itemInHand = killer.getMainHandItem();
-        return itemInHand.getItem().getName().getString();
+        return itemInHand.getItemName().getString();
     }
 
     private Optional<ServerPlayer> getShooter(Projectile projectile) {

Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/GameModeChangeListener.java

@@ -75,7 +75,7 @@ private void actOnEvent(ServerPlayer player, GameType newGameMode) {
         UUID uuid = player.getUUID();
         long time = System.currentTimeMillis();
         String gameMode = newGameMode.name();
-        String worldName = player.level().dimension().location().toString();
+        String worldName = player.level().dimension().identifier().toString();
 
         dbSystem.getDatabase().executeTransaction(new StoreWorldNameTransaction(serverInfo.getServerUUID(), worldName));
         worldAliasSettings.addWorld(worldName);

Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/fabric/WorldChangeListener.java

@@ -24,7 +24,7 @@
 import com.djrapitops.plan.storage.database.transactions.events.StoreWorldNameTransaction;
 import com.djrapitops.plan.utilities.logging.ErrorContext;
 import com.djrapitops.plan.utilities.logging.ErrorLogger;
-import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
+import net.fabricmc.fabric.api.entity.event.v1.ServerEntityLevelChangeEvents;
 import net.minecraft.server.level.ServerPlayer;
 import net.playeranalytics.plan.gathering.listeners.FabricListener;
 
@@ -70,7 +70,7 @@ private void actOnEvent(ServerPlayer player) {
 
         UUID uuid = player.getUUID();
 
-        String worldName = player.level().dimension().location().toString();
+        String worldName = player.level().dimension().identifier().toString();
         String gameMode = player.gameMode.getGameModeForPlayer().name();
 
         dbSystem.getDatabase().executeTransaction(new StoreWorldNameTransaction(serverInfo.getServerUUID(), worldName));
@@ -86,7 +86,7 @@ public void register() {
             return;
         }
 
-        ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register((player, origin, destination) -> {
+        ServerEntityLevelChangeEvents.AFTER_PLAYER_CHANGE_LEVEL.register((player, _, _) -> {
             if (!this.isEnabled) {
                 return;
             }

Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/mixin/CommandSourceStackMixin.java

@@ -46,7 +46,7 @@ public boolean supportsChatEvents() {
     }
 
     @Shadow
-    public abstract void sendSuccess(Supplier<Component> supplier, boolean broadcastToOps);
+    public abstract void sendSuccess(Supplier<Component> messageSupplier, boolean broadcast);
 
     @Shadow
     @Nullable

Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/mixin/KickCommandMixin.java

@@ -32,8 +32,8 @@
 public class KickCommandMixin {
 
     @Inject(method = "kickPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;disconnect(Lnet/minecraft/network/chat/Component;)V"))
-    private static void onKickPlayer(CommandSourceStack source, Collection<ServerPlayer> targets, Component reason, CallbackInfoReturnable<Integer> cir) {
-        PlanFabricEvents.ON_KICKED.invoker().onKicked(source, targets, reason);
+    private static void onKickPlayer(CommandSourceStack source, Collection<ServerPlayer> players, Component reason, CallbackInfoReturnable<Integer> cir) {
+        PlanFabricEvents.ON_KICKED.invoker().onKicked(source, players, reason);
     }
 
 }

Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/mixin/PlayerListMixin.java

@@ -31,8 +31,8 @@
 public class PlayerListMixin {
 
     @Inject(method = "canPlayerLogin", at = @At(value = "TAIL"))
-    public void onLogin(SocketAddress address, NameAndId profile, CallbackInfoReturnable<Component> cir) {
-        PlanFabricEvents.ON_LOGIN.invoker().onLogin(address, profile, cir.getReturnValue());
+    public void onLogin(SocketAddress address, NameAndId nameAndId, CallbackInfoReturnable<Component> cir) {
+        PlanFabricEvents.ON_LOGIN.invoker().onLogin(address, nameAndId, cir.getReturnValue());
     }
 
 }