From b7b42539084062443a0a06a939fd0d76328cb325 Mon Sep 17 00:00:00 2001
From: EasyOn <aala.aj@hotmail.com>
Date: Sun, 23 Feb 2025 13:13:32 +0100
Subject: [PATCH] Changing GSON version to 2.11 and editing some JSonParser
 issues

---
 pom.xml                                       | 44 ++++++++++++++++---
 .../managers/UpdateCheckManager.java          | 10 ++---
 .../subcommands/ChangelogSubCmd.java          |  4 +-
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index e125547..d0db0ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.release>8</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -127,11 +126,6 @@
             <artifactId>adventure-platform-bukkit</artifactId>
             <version>4.3.4</version>
         </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.4</version>
-        </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
@@ -142,5 +136,41 @@
             <artifactId>adventure-text-serializer-json</artifactId>
             <version>4.17.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-shade-plugin</artifactId>
+            <version>3.6.0</version>
+        </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>com.google.gson</pattern>
+                                    <shadedPattern>com.pixesoj.deluxeteleport.shaded.gson</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/src/main/java/com/pixesoj/deluxeteleport/managers/UpdateCheckManager.java b/src/main/java/com/pixesoj/deluxeteleport/managers/UpdateCheckManager.java
index e5b6b5f..d9c1a7a 100644
--- a/src/main/java/com/pixesoj/deluxeteleport/managers/UpdateCheckManager.java
+++ b/src/main/java/com/pixesoj/deluxeteleport/managers/UpdateCheckManager.java
@@ -32,12 +32,12 @@ public UpdateCheckResult check() {
                 try (InputStream inputStream = connection.getInputStream();
                      InputStreamReader reader = new InputStreamReader(inputStream)) {
 
-                    JsonObject json = JsonParser.parseReader(reader).getAsJsonObject();
+                    JsonObject json = new JsonParser().parse(reader).getAsJsonObject();
                     String latestVersion = json.get("name").getAsString();
                     if (latestVersion.contains("-")) latestVersion = latestVersion.split("-")[0];
-
                     String downloadUrl = null;
-                    if (json.has("assets") && !json.getAsJsonArray("assets").isEmpty()) {
+
+                    if (json.has("assets") && json.getAsJsonArray("assets").size() > 0) {
                         JsonArray assets = json.getAsJsonArray("assets");
                         downloadUrl = assets.get(0).getAsJsonObject().get("browser_download_url").getAsString();
                     }
@@ -78,8 +78,8 @@ public List<String> getAvailableVersions() {
                     response.append(inputLine);
                 }
                 in.close();
-
-                JsonArray releases = JsonParser.parseString(response.toString()).getAsJsonArray();
+                JsonObject json = new JsonParser().parse(response.toString()).getAsJsonObject();
+                JsonArray releases = json.getAsJsonArray("releases");
 
                 for (int i = 0; i < releases.size(); i++) {
                     JsonObject release = releases.get(i).getAsJsonObject();
diff --git a/src/main/java/com/pixesoj/deluxeteleport/subcommands/ChangelogSubCmd.java b/src/main/java/com/pixesoj/deluxeteleport/subcommands/ChangelogSubCmd.java
index 69cc8e0..47e2bf7 100644
--- a/src/main/java/com/pixesoj/deluxeteleport/subcommands/ChangelogSubCmd.java
+++ b/src/main/java/com/pixesoj/deluxeteleport/subcommands/ChangelogSubCmd.java
@@ -1,5 +1,6 @@
 package com.pixesoj.deluxeteleport.subcommands;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.pixesoj.deluxeteleport.DeluxeTeleport;
@@ -104,8 +105,7 @@ public void mainSubCommand(CommandSender sender, String[] args, boolean isNotify
                 response.append(inputLine);
             }
             in.close();
-
-            JsonObject jsonResponse = JsonParser.parseString(response.toString()).getAsJsonObject();
+            JsonObject jsonResponse = new JsonParser().parse(response.toString()).getAsJsonObject();
             String changelogBody = jsonResponse.get("body").getAsString();
 
             String version = jsonResponse.get("name").getAsString();