Improve gradle build setup and remove use of deprecated java

Author: TBlueF

build.gradle.kts

@@ -0,0 +1,4 @@
+// adding this helps intellij with resolving repositories to be able to download library docs and sources
+plugins {
+    bluemap.base
+}

buildSrc/src/main/kotlin/bluemap.base.gradle.kts

@@ -1,8 +1,5 @@
 plugins {
-    java
-    `java-library`
     `maven-publish`
-    id ( "com.diffplug.spotless" )
 }
 
 group = "de.bluecolored"
@@ -33,47 +30,6 @@ repositories {
     maven ( "https://maven.minecraftforge.net" )
 }
 
-tasks.withType(JavaCompile::class).configureEach {
-    options.encoding = "utf-8"
-}
-
-tasks.withType(AbstractArchiveTask::class).configureEach {
-    isReproducibleFileOrder = true
-    isPreserveFileTimestamps = false
-}
-
-java {
-    toolchain.languageVersion = JavaLanguageVersion.of(21)
-    withSourcesJar()
-    withJavadocJar()
-}
-
-tasks.javadoc {
-    (options as StandardJavadocDocletOptions).apply {
-        links(
-            "https://docs.oracle.com/en/java/javase/21/docs/api/",
-            "https://javadoc.io/doc/com.flowpowered/flow-math/1.0.3/",
-            "https://javadoc.io/doc/com.google.code.gson/gson/2.8.9/",
-        )
-        addStringOption("Xdoclint:none", "-quiet")
-        addBooleanOption("html5", true)
-    }
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-spotless {
-    java {
-        target ("src/*/java/**/*.java")
-
-        licenseHeaderFile(rootProject.file("LICENSE_HEADER"))
-        indentWithSpaces()
-        trimTrailingWhitespace()
-    }
-}
-
 publishing {
     repositories {
         maven {

buildSrc/src/main/kotlin/bluemap.implementation.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id ( "bluemap.base" )
+    id ( "bluemap.java" )
     id ( "com.gradleup.shadow" )
 }
 

buildSrc/src/main/kotlin/bluemap.java.gradle.kts

@@ -0,0 +1,47 @@
+plugins {
+    id ( "bluemap.base" )
+    java
+    `java-library`
+    id ( "com.diffplug.spotless" )
+}
+
+tasks.withType(JavaCompile::class).configureEach {
+    options.encoding = "utf-8"
+}
+
+tasks.withType(AbstractArchiveTask::class).configureEach {
+    isReproducibleFileOrder = true
+    isPreserveFileTimestamps = false
+}
+
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(21)
+    withSourcesJar()
+    withJavadocJar()
+}
+
+tasks.javadoc {
+    (options as StandardJavadocDocletOptions).apply {
+        links(
+            "https://docs.oracle.com/en/java/javase/21/docs/api/",
+            "https://javadoc.io/doc/com.flowpowered/flow-math/1.0.3/",
+            "https://javadoc.io/doc/com.google.code.gson/gson/2.8.9/",
+        )
+        addStringOption("Xdoclint:none", "-quiet")
+        addBooleanOption("html5", true)
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
+
+spotless {
+    java {
+        target ("src/*/java/**/*.java")
+
+        licenseHeaderFile(rootProject.file("LICENSE_HEADER"))
+        indentWithSpaces()
+        trimTrailingWhitespace()
+    }
+}

buildSrc/src/main/kotlin/curseforge.kt

@@ -1,10 +1,12 @@
 import com.matthewprenger.cursegradle.CurseProject
-import gradle.kotlin.dsl.accessors._94345610689fa610403700b47edcf23c.curseforge
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.closureOf
 
 fun Project.curseforgeBlueMap (configuration: Action<CurseProject>) {
+    val curseforge = extensions.getByName("curseforge")
+            as com.matthewprenger.cursegradle.CurseExtension
+
     curseforge.project(closureOf<CurseProject> {
         id = "406463"
         changelogType = "markdown"

common/build.gradle.kts

@@ -2,7 +2,7 @@ import com.github.gradle.node.npm.task.NpmTask
 import java.io.IOException
 
 plugins {
-    bluemap.base
+    bluemap.java
     alias ( libs.plugins.node.gradle )
 }
 

common/src/main/java/de/bluecolored/bluemap/common/debug/StateDumper.java

@@ -185,7 +185,7 @@ private void dumpInstance(Object instance, JsonWriter writer, Set<Object> alread
                 writer.name("state").value(thread.getState().toString());
                 writer.name("priority").value(thread.getPriority());
                 writer.name("alive").value(thread.isAlive());
-                writer.name("id").value(thread.getId());
+                writer.name("id").value(thread.threadId());
                 writer.name("deamon").value(thread.isDaemon());
                 writer.name("interrupted").value(thread.isInterrupted());
 

common/src/main/java/de/bluecolored/bluemap/common/metrics/Metrics.java

@@ -34,7 +34,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.net.URL;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 
 public class Metrics {
@@ -61,10 +61,11 @@ public static void sendReport(String implementation, String mcVersion) {
         }
     }
 
+    @SuppressWarnings("UnusedReturnValue")
     private static String sendData(String data) throws IOException {
         byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
 
-        HttpsURLConnection connection = (HttpsURLConnection) new URL(METRICS_REPORT_URL).openConnection();
+        HttpsURLConnection connection = (HttpsURLConnection) URI.create(METRICS_REPORT_URL).toURL().openConnection();
         connection.setRequestMethod("POST");
         connection.addRequestProperty("Content-Length", String.valueOf(bytes.length));
         connection.setRequestProperty("Content-Type", "application/json");

common/src/main/java/de/bluecolored/bluemap/common/plugin/skins/MojangSkinProvider.java

@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.net.URI;
 import java.net.URL;
 import java.util.Base64;
 import java.util.Optional;
@@ -45,18 +46,17 @@ public class MojangSkinProvider implements SkinProvider {
     @Override
     public Optional<BufferedImage> load(UUID playerUUID) throws IOException {
         try (Reader reader = requestProfileJson(playerUUID)) {
-            JsonParser parser = new JsonParser();
-            String textureInfoJson = readTextureInfoJson(parser.parse(reader));
-            String textureUrl = readTextureUrl(parser.parse(textureInfoJson));
-            return Optional.of(ImageIO.read(new URL(textureUrl)));
+            String textureInfoJson = readTextureInfoJson(JsonParser.parseReader(reader));
+            String textureUrl = readTextureUrl(JsonParser.parseString(textureInfoJson));
+            return Optional.of(ImageIO.read(URI.create(textureUrl).toURL()));
         } catch (IOException ex) {
             Logger.global.logDebug("Failed to load skin from mojang for player: '" + playerUUID + "' - " + ex);
             return Optional.empty();
         }
     }
 
     private Reader requestProfileJson(UUID playerUUID) throws IOException {
-        URL url = new URL("https://sessionserver.mojang.com/session/minecraft/profile/" + playerUUID);
+        URL url = URI.create("https://sessionserver.mojang.com/session/minecraft/profile/" + playerUUID).toURL();
         return new InputStreamReader(url.openStream());
     }
 

core/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    bluemap.base
+    bluemap.java
 }
 
 dependencies {