feat: fabric 26.1, resource versions expansions, version bumps

Author: Chicken

.github/workflows/ci.yml

@@ -18,11 +18,11 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v6
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
           cache: gradle
 
       - name: Build with Gradle
@@ -43,11 +43,11 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v6
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
           cache: gradle
 
       - name: Initialize CodeQL

Authentication/AuthCore/build.gradle.kts

@@ -4,10 +4,9 @@ plugins {
 }
 
 group = "codes.antti.auth.authentication"
-version = "0.4.0"
+version = "0.5.0"
 
 dependencies {
-    compileOnly(libs.jetbrains.annotations)
     implementation(project(":Common:Http"))
     implementation(project(":Common:Database"))
 }

Authentication/AuthFabric/src/main/java/codes/antti/auth/authentication/fabric/FabricMod.java

@@ -9,10 +9,10 @@
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.server.command.CommandManager;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
@@ -38,30 +38,30 @@ public void onInitializeServer() {
         core.init(this);
 
         CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) ->
-            dispatcher.register(CommandManager.literal("auth")
-                .then(CommandManager.argument("token", StringArgumentType.string())
+            dispatcher.register(Commands.literal("auth")
+                .then(Commands.argument("token", StringArgumentType.string())
                     .executes(ctx -> {
-                        ServerCommandSource source = ctx.getSource();
-                        ServerPlayerEntity player;
+                        CommandSourceStack source = ctx.getSource();
+                        ServerPlayer player;
                         try {
-                            player = source.getPlayerOrThrow();
+                            player = source.getPlayerOrException();
                         } catch (Exception e) {
-                            source.sendFeedback(() -> Text.literal("This command can only be used by players"), false);
+                            source.sendSuccess(() -> Component.literal("This command can only be used by players"), false);
                             return 0;
                         }
                         String token = StringArgumentType.getString(ctx, "token");
                         try {
-                            String msg = core.handleAuthCommand(player.getUuid(), player.getName().getString(), token);
+                            String msg = core.handleAuthCommand(player.getUUID(), player.getName().getString(), token);
                             if (msg != null) {
-                                source.sendFeedback(() -> Text.literal(msg), false);
+                                source.sendSuccess(() -> Component.literal(msg), false);
                                 return 1;
                             } else {
-                                source.sendFeedback(() -> Text.literal("Verification failed, check that you typed the authentication token correctly"), false);
+                                source.sendSuccess(() -> Component.literal("Verification failed, check that you typed the authentication token correctly"), false);
                                 return 0;
                             }
                         } catch (SQLException e) {
                             getLogger().severe("Failed to verify player session: " + e.getMessage());
-                            source.sendFeedback(() -> Text.literal("Something went wrong"), false);
+                            source.sendSuccess(() -> Component.literal("Something went wrong"), false);
                             return 0;
                         }
                     })

Authentication/AuthFabric/src/main/resources/fabric.mod.json

@@ -1,16 +1,16 @@
 {
   "schemaVersion": 1,
   "id": "authentication",
-  "version": "0.4.0",
+  "version": "${version}",
   "name": "Authentication",
   "description": "Authentication of Minecraft players in web applications",
   "authors": ["Antti"],
   "entrypoints": {
     "server": ["codes.antti.auth.authentication.fabric.FabricMod"]
   },
   "depends": {
-    "fabricloader": ">=0.16.0",
-    "fabric-api": "*",
-    "minecraft": "~1.21"
+    "fabricloader": ">=${fabric_loader_version}",
+    "fabric-api": ">=${fabric_api_version}",
+    "minecraft": "*"
   }
 }

Authentication/AuthSpigot/build.gradle.kts

@@ -8,8 +8,6 @@ group = "codes.antti.auth"
 version = project(":Authentication:AuthCore").version
 
 dependencies {
-    compileOnly(libs.spigot.api)
-    compileOnly(libs.jetbrains.annotations)
     implementation(project(":Authentication:AuthCore"))
 }
 

Authentication/AuthSpigot/src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: Authentication
 version: "${version}"
 main: codes.antti.auth.authentication.spigot.AuthenticationPlugin
-api-version: "1.16"
+api-version: "${api_version}"
 author: Antti
 description: Authentication of Minecraft players in web applications
 

Authorization/build.gradle.kts

@@ -3,12 +3,10 @@ plugins {
 }
 
 group = "codes.antti.auth"
-version = "0.3.0"
+version = "0.4.0"
 
 dependencies {
-    compileOnly(libs.spigot.api)
     compileOnly(libs.luckperms)
-    compileOnly(libs.jetbrains.annotations)
     implementation(project(":Common:Http"))
 }
 

Authorization/src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: Authorization
 version: "${version}"
 main: codes.antti.auth.authorization.AuthorizationPlugin
-api-version: "1.16"
+api-version: "${api_version}"
 depend: [LuckPerms]
 author: Antti
 description: Authorization of authenticated Minecraft players in web applications

BlueMap/Chat/ChatCore/build.gradle.kts

@@ -4,10 +4,9 @@ plugins {
 }
 
 group = "codes.antti.auth.bluemap.chat"
-version = "0.3.0"
+version = "0.4.0"
 
 dependencies {
-    compileOnly(libs.jetbrains.annotations)
     compileOnly(libs.bluemap.api)
     compileOnly(libs.lombok)
     annotationProcessor(libs.lombok)

BlueMap/Chat/ChatFabric/build.gradle.kts

@@ -10,7 +10,7 @@ group = "codes.antti.auth.bluemap"
 version = project(":BlueMap:Chat:ChatCore").version
 
 dependencies {
-    "modCompileOnly"(libs.bluemap.api)
+    compileOnly(libs.bluemap.api)
     shadowImpl(project(":BlueMap:Chat:ChatCore"))
     shadowImpl(project(":Common:Fabric"))
 }