From eb23580bc4b4a9f194eecb207690b036d9be68c3 Mon Sep 17 00:00:00 2001
From: ineanto <ineanto@ineanto.xyz>
Date: Thu, 16 May 2024 21:09:56 +0200
Subject: [PATCH] feat: bump required version to Java 21

---
 CHANGELOG.log                                 |  6 +++
 build.gradle.kts                              | 45 +++++++++----------
 .../xyz/ineanto/nicko/mojang/MojangAPI.java   |  3 +-
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.log b/CHANGELOG.log
index 7afcbd8..30044c1 100644
--- a/CHANGELOG.log
+++ b/CHANGELOG.log
@@ -1,3 +1,9 @@
+1.1.8: Update n°12 (XX/XX/24)
+    [FEATURES]
+
+    [OTHER]
+        - Dropped the release candidate status as Nicko is now considered stable.
+
 1.1.7-RC1: Hotfix n°5 (04/05/24)
     [OTHER]
         - Restored download link again on spigotmc.org
diff --git a/build.gradle.kts b/build.gradle.kts
index f902dbc..692026c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,21 +1,17 @@
 plugins {
     id("java")
-    id("io.github.goooler.shadow") version "8.1.2"
+    id("io.github.goooler.shadow") version "8.1.7"
     id("xyz.jpenilla.run-paper") version "2.2.2"
 }
 
 group = "xyz.ineanto"
-version = "1.1.7-RC1"
-
-val shadowImplementation: Configuration by configurations.creating
-configurations["implementation"].extendsFrom(shadowImplementation)
-configurations["testImplementation"].extendsFrom(shadowImplementation)
+version = "1.1.8"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
@@ -45,21 +41,22 @@ repositories {
 }
 
 dependencies {
-    implementation("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
-    implementation("com.comphenix.protocol:ProtocolLib:5.2.0-SNAPSHOT")
+    // Nicko
+    compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("com.comphenix.protocol:ProtocolLib:5.2.0-SNAPSHOT")
+    compileOnly("me.clip:placeholderapi:2.11.5")
+    compileOnly("net.kyori:adventure-api:4.14.0")
 
-    shadowImplementation("me.clip:placeholderapi:2.11.5")
-    shadowImplementation("net.kyori:adventure-api:4.14.0")
-    shadowImplementation("xyz.xenondevs.invui:invui:1.30")
-    shadowImplementation("net.wesjd:anvilgui:1.9.3-SNAPSHOT")
-    shadowImplementation("com.github.jsixface:yamlconfig:1.2")
-    shadowImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2")
-    shadowImplementation("com.fasterxml.jackson.core:jackson-core:2.15.2")
-    shadowImplementation("com.mysql:mysql-connector-j:8.2.0")
-    shadowImplementation("org.mariadb.jdbc:mariadb-java-client:3.3.1")
-    shadowImplementation("redis.clients:jedis:5.1.2")
-    shadowImplementation("com.google.code.gson:gson:2.10.1")
-    shadowImplementation("org.bstats:bstats-bukkit:3.0.2")
+    implementation("xyz.xenondevs.invui:invui:1.30")
+    implementation("net.wesjd:anvilgui:1.9.4-SNAPSHOT")
+    implementation("com.github.jsixface:yamlconfig:1.2")
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2")
+    implementation("com.fasterxml.jackson.core:jackson-core:2.15.2")
+    implementation("com.mysql:mysql-connector-j:8.2.0")
+    implementation("org.mariadb.jdbc:mariadb-java-client:3.3.1")
+    implementation("redis.clients:jedis:5.1.2")
+    implementation("com.google.code.gson:gson:2.10.1")
+    implementation("org.bstats:bstats-bukkit:3.0.2")
 
     testImplementation("com.github.seeseemelk:MockBukkit-v1.20:3.86.0")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
@@ -77,8 +74,6 @@ tasks {
     }
 
     shadowJar {
-        configurations = listOf(shadowImplementation)
-
         // NAMING
         archiveBaseName.set("nicko")
         archiveVersion.set(version.toString())
diff --git a/src/main/java/xyz/ineanto/nicko/mojang/MojangAPI.java b/src/main/java/xyz/ineanto/nicko/mojang/MojangAPI.java
index a0abeba..0f6ac9a 100644
--- a/src/main/java/xyz/ineanto/nicko/mojang/MojangAPI.java
+++ b/src/main/java/xyz/ineanto/nicko/mojang/MojangAPI.java
@@ -13,6 +13,7 @@ import javax.net.ssl.HttpsURLConnection;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.URI;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Optional;
@@ -103,7 +104,7 @@ public class MojangAPI {
 
     private JsonObject getRequestToUrl(String parametrizedUrl) throws ExecutionException, InterruptedException {
         return worker.submit(() -> {
-            final URL url = new URL(parametrizedUrl);
+            final URL url = URI.create(parametrizedUrl).toURL();
             final HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
             con.setDoInput(true);
             con.setRequestMethod("GET");