Add Minecraft 26.3 support

.editorconfig

@@ -27,7 +27,7 @@ ij_continuation_indent_size = 8
 ij_java_doc_align_param_comments = false
 ij_java_doc_align_exception_comments = false
 ij_java_doc_add_blank_line_after_description = true
-ij_java_imports_layout = *,|,$*
+ij_java_imports_layout = *,|,javax.**,java.**,|,$*
 
 # noinspection all
 [{*.kt,*.kts}]

.github/workflows/build.yml

@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Setup Java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 25
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
       - 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@v6
+        uses: actions/upload-artifact@v7
         with:
           name: communityradar-${{ env.VERSION }}
           path: build/libs/*-${{ env.VERSION }}.jar

build.gradle.kts

@@ -13,18 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 plugins {
-    id("java")
+    java
     alias(libs.plugins.fabricLoom)
     alias(libs.plugins.spotless)
 }
 
-version = project.extra["mod_version"] as String
-group = project.extra["maven_group"] as String
+val projectGroupId = providers.gradleProperty("group-id")
+val projectVersion = providers.gradleProperty("version")
+val archivesBaseName = providers.gradleProperty("archives-base-name")
+
+group = projectGroupId.get()
+version = projectVersion.get()
 
 base {
-    archivesName.set(project.extra["archives_base_name"] as String)
+    archivesName = archivesBaseName
 }
 
 repositories {
@@ -39,78 +42,77 @@ dependencies {
         "fabric-api-base",
         "fabric-command-api-v2"
     ).forEach {
-        // Add each module as a dependency
         implementation(fabricApi.module(it, libs.versions.fabricApi.get()))
     }
-
 }
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(25))
+        languageVersion = JavaLanguageVersion.of(25)
+    }
+}
+
+spotless {
+    java {
+        endWithNewline()
+        licenseHeaderFile(rootProject.projectDir.resolve("HEADER"))
+        importOrder("", "javax.|java.", "\\#")
+        trimTrailingWhitespace()
+        removeUnusedImports()
+        forbidWildcardImports()
+        forbidModuleImports()
+        shortenFullyQualifiedTypes()
+    }
+
+    kotlinGradle {
+        endWithNewline()
+        licenseHeaderFile(rootProject.projectDir.resolve("HEADER"), "(import|plugins|buildscript|pluginManagement|base|root)")
+        trimTrailingWhitespace()
+    }
+
+    kotlin {
+        endWithNewline()
+        licenseHeaderFile(rootProject.projectDir.resolve("HEADER"))
+        trimTrailingWhitespace()
     }
-    // withSourcesJar()
-    // withJavadocJar()
 }
 
 tasks {
-    var archivesName = project.base.archivesName.get()
-    val filterExpandProps = mapOf(
-        "version" to project.version,
-        "loader_version" to libs.versions.fabricLoader.get(),
+    val filterExpandProperties = mapOf(
+        "version" to projectVersion.get(),
         "minecraft_version" to libs.versions.minecraft.get()
             .replace("-pre-", "-beta.")
             .replace("-rc-", "-rc."),
-        "website" to project.extra.get("website") as String,
-        "source" to project.extra.get("source") as String,
-        "discord" to project.extra.get("discord") as String
+        "website" to providers.gradleProperty("website").get(),
+        "source" to providers.gradleProperty("source").get(),
+        "discord" to providers.gradleProperty("discord").get()
     )
 
-    withType<ProcessResources> {
+    withType<ProcessResources>().configureEach {
         // https://github.com/gradle/gradle/issues/861
-        outputs.upToDateWhen { false }
+        inputs.properties(filterExpandProperties)
 
-        filteringCharset = Charsets.UTF_8.name()
         filesMatching("fabric.mod.json") {
-            expand(filterExpandProps)
+            expand(filterExpandProperties)
         }
     }
 
-    withType<JavaCompile> {
+    withType<JavaCompile>().configureEach {
         options.encoding = Charsets.UTF_8.name()
-        options.release.set(25)
     }
 
-    withType<Javadoc> {
+    withType<Javadoc>().configureEach {
         with(options as StandardJavadocDocletOptions) {
             encoding(Charsets.UTF_8.name())
-            addStringOption("Xdoclint:reference,syntax,html,missing", "-quiet")
             keyWords()
             linkSource()
             use()
         }
 
         named<Jar>("jar") {
             from("LICENSE") {
-                rename { "${it}_${archivesName}" }
+                rename { "${it}_${archivesBaseName.get()}" }
             }
         }
     }
 }
-
-spotless {
-    java {
-        licenseHeaderFile(rootProject.file("HEADER"))
-        endWithNewline()
-        trimTrailingWhitespace()
-        removeUnusedImports()
-        forbidWildcardImports()
-        forbidModuleImports()
-    }
-
-    kotlin {
-        licenseHeaderFile(rootProject.file("HEADER"))
-        endWithNewline()
-        trimTrailingWhitespace()
-    }
-}

gradle.properties

@@ -3,9 +3,9 @@ org.gradle.parallel=true
 org.gradle.configuration-cache=true
 
 # Mod Properties
-mod_version=1.1.0-SNAPSHOT+26.2
-maven_group=io.github.communityradargg.fabric
-archives_base_name=communityradar-fabric
+version=1.0.0-SNAPSHOT+26.3
+group-id=io.github.communityradargg.fabric
+archives-base-name=communityradar-fabric
 
 website=https://community-radar.de/
 source=https://github.com/CommunityRadarGG/Mod_Fabric/

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
 # Plugins
 fabricLoom = "1.17-SNAPSHOT"
-spotless = "8.6.0"
+spotless = "8.10.2"
 
 # Libraries
-minecraft = "26.2"
-fabricLoader = "0.19.3" # on change - check if fabric.mod.json needs to be increased
-fabricApi = "0.152.1+26.2"
+minecraft = "26.3-rc-3"
+fabricLoader = "0.19.5" # on change - check if fabric.mod.json needs to be increased
+fabricApi = "0.160.4+26.3"
 
 [libraries]
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

src/main/java/io/github/communityradargg/fabric/CommunityRadarMod.java

@@ -18,13 +18,13 @@
 import io.github.communityradargg.fabric.commands.RadarCommand;
 import io.github.communityradargg.fabric.radarlistmanager.RadarListManager;
 import net.fabricmc.api.ModInitializer;
-
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
+
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Optional;

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

@@ -35,6 +35,7 @@
 import net.minecraft.server.permissions.Permission;
 import net.minecraft.server.permissions.PermissionLevel;
 import org.jetbrains.annotations.NotNull;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

src/main/java/io/github/communityradargg/fabric/mixin/AvatarRenderStateMixin.java

@@ -19,6 +19,7 @@
 import net.minecraft.client.renderer.entity.state.AvatarRenderState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
+
 import java.util.UUID;
 
 /**

src/main/java/io/github/communityradargg/fabric/mixin/ChatComponentMixin.java

@@ -25,6 +25,7 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;

src/main/java/io/github/communityradargg/fabric/mixin/EntityRendererMixin.java

@@ -27,6 +27,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
 import java.util.UUID;
 
 /**

src/main/java/io/github/communityradargg/fabric/radarlistmanager/RadarList.java

@@ -23,6 +23,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

src/main/java/io/github/communityradargg/fabric/radarlistmanager/RadarListEntry.java

@@ -17,6 +17,7 @@
 
 import com.google.gson.annotations.SerializedName;
 import org.jetbrains.annotations.NotNull;
+
 import java.time.LocalDateTime;
 import java.util.UUID;
 

src/main/java/io/github/communityradargg/fabric/radarlistmanager/RadarListManager.java

@@ -26,6 +26,7 @@
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;

src/main/java/io/github/communityradargg/fabric/radarlistmanager/adapters/GsonLocalDateTimeAdapter.java

@@ -22,6 +22,7 @@
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+
 import java.lang.reflect.Type;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

src/main/java/io/github/communityradargg/fabric/radarlistmanager/adapters/GsonRadarListPlayerMapAdapter.java

@@ -23,6 +23,7 @@
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import io.github.communityradargg.fabric.radarlistmanager.RadarListEntry;
+
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/io/github/communityradargg/fabric/utils/Utils.java

@@ -26,6 +26,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
+
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.http.HttpClient;

src/main/resources/fabric.mod.json

@@ -25,7 +25,7 @@
         "communityradar.mixins.json"
     ],
     "depends": {
-        "fabricloader": ">=0.19.3",
+        "fabricloader": ">=0.19.5",
         "minecraft": ">=${minecraft_version}",
         "java": ">=25",
         "fabric-command-api-v2": "*"