Prepare for the 26.1 release series

.github/workflows/build.yml

@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Setup Java
         uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 21
+          java-version: 25
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build
@@ -33,7 +33,7 @@ jobs:
           echo $version
       - name: Upload Artifact
         if: startsWith(github.event.head_commit.message || '', 'Release')
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: communityradar-${{ env.VERSION }}
           path: build/libs/*-${{ env.VERSION }}.jar

README.md

@@ -1,4 +1,4 @@
-CommunityRadar - Official - Fabric Mod 1.20.4
+CommunityRadar - Official - Fabric Mod
 ==========================
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4.svg)](#code-of-conduct)

build.gradle.kts

@@ -32,25 +32,22 @@ repositories {
 }
 
 dependencies {
-    // To change the versions see the gradle.properties file
     minecraft(libs.minecraft)
-    mappings(loom.officialMojangMappings())
-    modImplementation(libs.fabricLoader)
+    implementation(libs.fabricLoader)
 
-    // Make a set of all api modules we wish to use
     setOf(
         "fabric-api-base",
         "fabric-command-api-v2"
     ).forEach {
         // Add each module as a dependency
-        modImplementation(fabricApi.module(it, libs.versions.fabricApi.get()))
+        implementation(fabricApi.module(it, libs.versions.fabricApi.get()))
     }
 
 }
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
     // withSourcesJar()
     // withJavadocJar()
@@ -81,7 +78,7 @@ tasks {
 
     withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
-        options.release.set(21)
+        options.release.set(25)
     }
 
     withType<Javadoc> {
@@ -93,7 +90,7 @@ tasks {
             use()
         }
 
-        jar {
+        named<Jar>("jar") {
             from("LICENSE") {
                 rename { "${it}_${archivesName}" }
             }

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.parallel=true
 org.gradle.configuration-cache=true
 
 # Mod Properties
-mod_version=1.1.0-SNAPSHOT+1.21.11
+mod_version=1.0.0-SNAPSHOT+26.1
 maven_group=io.github.communityradargg.fabric
 archives_base_name=communityradar-fabric
 

gradle/libs.versions.toml

@@ -4,16 +4,16 @@ fabricLoom = "1.14-SNAPSHOT"
 spotless = "8.1.0"
 
 # Libraries
-minecraft = "1.21.11"
-fabricLoader = "0.18.2"
-fabricApi = "0.139.4+1.21.11"
+minecraft = "26.1-snapshot-1"
+fabricLoader = "0.18.4"
+fabricApi = "0.140.3+26.1"
 
 [libraries]
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
 fabricLoader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabricLoader" }
 
 [plugins]
-fabricLoom = { id = "fabric-loom", version.ref = "fabricLoom" }
+fabricLoom = { id = "net.fabricmc.fabric-loom", version.ref = "fabricLoom" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 
 [bundles]

src/main/java/io/github/communityradargg/fabric/commands/RadarCommand.java

@@ -27,7 +27,7 @@
 import io.github.communityradargg.fabric.utils.Messages;
 import io.github.communityradargg.fabric.utils.RadarMessage;
 import io.github.communityradargg.fabric.utils.Utils;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommands;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientPacketListener;
@@ -45,30 +45,30 @@ public class RadarCommand {
     private static final PermissionLevel REQUIRED_PERMISSION_LEVEL = PermissionLevel.ALL;
 
     public static void register(final @NotNull CommandDispatcher<FabricClientCommandSource> dispatcher) {
-        final LiteralCommandNode<FabricClientCommandSource> mainCommand = dispatcher.register(ClientCommandManager.literal(COMMAND_NAME)
+        final LiteralCommandNode<FabricClientCommandSource> mainCommand = dispatcher.register(ClientCommands.literal(COMMAND_NAME)
                 .requires(source -> source.getPlayer().permissions().hasPermission(new Permission.HasCommandLevel(REQUIRED_PERMISSION_LEVEL)))
-                .then(ClientCommandManager.literal("help")
+                .then(ClientCommands.literal("help")
                         .executes(context -> handleHelpSubcommand(context.getSource()))
                 )
-                .then(ClientCommandManager.literal("lists")
+                .then(ClientCommands.literal("lists")
                         .executes(context -> {
                             handleListsSubcommand(context.getSource());
                             return Command.SINGLE_SUCCESS;
                         })
                 )
-                .then(ClientCommandManager.literal("check")
-                        .then(ClientCommandManager.argument("player", StringArgumentType.string())
+                .then(ClientCommands.literal("check")
+                        .then(ClientCommands.argument("player", StringArgumentType.string())
                                 .executes(context -> {
                                     final String player = StringArgumentType.getString(context, "player");
                                     return handleCheckSubcommand(context.getSource(), player);
                                 }))
                         .executes(context -> handleMissingArgs(context.getSource()))
                 )
-                .then(ClientCommandManager.literal("player")
-                        .then(ClientCommandManager.literal("add")
-                                .then(ClientCommandManager.argument("namespace", StringArgumentType.string())
-                                        .then(ClientCommandManager.argument("player", StringArgumentType.string())
-                                                .then(ClientCommandManager.argument("cause", StringArgumentType.greedyString())
+                .then(ClientCommands.literal("player")
+                        .then(ClientCommands.literal("add")
+                                .then(ClientCommands.argument("namespace", StringArgumentType.string())
+                                        .then(ClientCommands.argument("player", StringArgumentType.string())
+                                                .then(ClientCommands.argument("cause", StringArgumentType.greedyString())
                                                         .executes(context -> {
                                                             final String namespace = StringArgumentType.getString(context, "namespace");
                                                             final String player = StringArgumentType.getString(context, "player");
@@ -83,9 +83,9 @@ public static void register(final @NotNull CommandDispatcher<FabricClientCommand
                                 )
                                 .executes(context -> handleMissingArgs(context.getSource()))
                         )
-                        .then(ClientCommandManager.literal("remove")
-                                .then(ClientCommandManager.argument("namespace", StringArgumentType.string())
-                                        .then(ClientCommandManager.argument("player", StringArgumentType.string())
+                        .then(ClientCommands.literal("remove")
+                                .then(ClientCommands.argument("namespace", StringArgumentType.string())
+                                        .then(ClientCommands.argument("player", StringArgumentType.string())
                                                 .executes(context -> {
                                                     final String namespace = StringArgumentType.getString(context, "namespace");
                                                     final String player = StringArgumentType.getString(context, "player");
@@ -99,10 +99,10 @@ public static void register(final @NotNull CommandDispatcher<FabricClientCommand
                         )
                         .executes(context -> handleHelpSubcommand(context.getSource()))
                 )
-                .then(ClientCommandManager.literal("list")
-                        .then(ClientCommandManager.literal("add")
-                                .then(ClientCommandManager.argument("namespace", StringArgumentType.string())
-                                        .then(ClientCommandManager.argument("prefix", StringArgumentType.greedyString())
+                .then(ClientCommands.literal("list")
+                        .then(ClientCommands.literal("add")
+                                .then(ClientCommands.argument("namespace", StringArgumentType.string())
+                                        .then(ClientCommands.argument("prefix", StringArgumentType.greedyString())
                                                 .executes(context -> {
                                                     final String namespace = StringArgumentType.getString(context, "namespace");
                                                     final String prefix = StringArgumentType.getString(context, "prefix");
@@ -114,8 +114,8 @@ public static void register(final @NotNull CommandDispatcher<FabricClientCommand
                                 )
                                 .executes(context -> handleMissingArgs(context.getSource()))
                         )
-                        .then(ClientCommandManager.literal("delete")
-                                .then(ClientCommandManager.argument("namespace", StringArgumentType.string())
+                        .then(ClientCommands.literal("delete")
+                                .then(ClientCommands.argument("namespace", StringArgumentType.string())
                                         .executes(context -> {
                                             final String namespace = StringArgumentType.getString(context, "namespace");
                                             handleListDeleteSubcommand(context.getSource(), namespace);
@@ -124,8 +124,8 @@ public static void register(final @NotNull CommandDispatcher<FabricClientCommand
                                 )
                                 .executes(context -> handleMissingArgs(context.getSource()))
                         )
-                        .then(ClientCommandManager.literal("show")
-                                .then(ClientCommandManager.argument("namespace", StringArgumentType.string())
+                        .then(ClientCommands.literal("show")
+                                .then(ClientCommands.argument("namespace", StringArgumentType.string())
                                         .executes(context -> {
                                             final String namespace = StringArgumentType.getString(context, "namespace");
                                             handleListShowSubcommand(context.getSource(), namespace);
@@ -134,9 +134,9 @@ public static void register(final @NotNull CommandDispatcher<FabricClientCommand
                                 )
                                 .executes(context -> handleMissingArgs(context.getSource()))
                         )
-                        .then(ClientCommandManager.literal("prefix")
-                                .then(ClientCommandManager.argument("namespace", StringArgumentType.string())
-                                        .then(ClientCommandManager.argument("prefix", StringArgumentType.greedyString())
+                        .then(ClientCommands.literal("prefix")
+                                .then(ClientCommands.argument("namespace", StringArgumentType.string())
+                                        .then(ClientCommands.argument("prefix", StringArgumentType.greedyString())
                                                 .executes(context -> {
                                                     final String namespace = StringArgumentType.getString(context, "namespace");
                                                     final String prefix = StringArgumentType.getString(context, "prefix");
@@ -151,7 +151,7 @@ public static void register(final @NotNull CommandDispatcher<FabricClientCommand
                         .executes(context -> handleHelpSubcommand(context.getSource()))
                 )
                 .executes(context -> handleHelpSubcommand(context.getSource())));
-        COMMAND_ALIASES.forEach(alias -> dispatcher.register(ClientCommandManager.literal(alias).redirect(mainCommand)));
+        COMMAND_ALIASES.forEach(alias -> dispatcher.register(ClientCommands.literal(alias).redirect(mainCommand)));
     }
 
     /**

src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
     "depends": {
         "fabricloader": ">=${loader_version}",
         "minecraft": "~${minecraft_version}",
-        "java": ">=21",
+        "java": ">=25",
         "fabric-command-api-v2": "*"
     },
     "custom": {