Update Curse remote mod handling

TerraFirmaCraft-The-Final-Frontier · Aug 10, 2024 · 37d30e6 · 37d30e6
1 parent 5946ef3
commit 37d30e6
Showing 1 changed file with 21 additions and 25 deletions.
diff --git a/...rector-core/src/main/java/net/jan/moddirector/core/configuration/type/CurseRemoteMod.java b/...rector-core/src/main/java/net/jan/moddirector/core/configuration/type/CurseRemoteMod.java
@@ -1,23 +1,12 @@
 package net.jan.moddirector.core.configuration.type;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import net.jan.moddirector.core.ModDirector;
 import net.jan.moddirector.core.configuration.*;
 import net.jan.moddirector.core.exception.ModDirectorException;
@@ -26,6 +15,16 @@
 import net.jan.moddirector.core.util.WebClient;
 import net.jan.moddirector.core.util.WebGetResponse;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+
 public class CurseRemoteMod extends ModDirectorRemoteMod {
     private final int addonId;
     private final int fileId;
@@ -80,17 +79,17 @@ public RemoteModInformation queryInformation() throws ModDirectorException {
             WebGetResponse response = WebClient.get(apiUrl);
             JsonObject jsonObject;
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(response.getInputStream(), StandardCharsets.UTF_8))) {
-                jsonObject = new JsonParser().parse(reader).getAsJsonObject().getAsJsonObject("data");
+                jsonObject = JsonParser.parseReader(reader).getAsJsonObject().getAsJsonObject("data");
             }
             information = ConfigurationController.OBJECT_MAPPER.readValue(jsonObject.toString(), CurseAddonFileInformation.class);
-        } catch(MalformedURLException e) {
-            throw new ModDirectorException("Failed to create curse.tools api url", e);
-        } catch(JsonParseException e) {
-            throw new ModDirectorException("Failed to parse Json response from curse", e);
-        } catch(JsonMappingException e) {
-            throw new ModDirectorException("Failed to map Json response from curse, did they change their api?", e);
-        } catch(IOException e) {
-            throw new ModDirectorException("Failed to open connection to curse", e);
+        } catch (MalformedURLException e) {
+            throw new ModDirectorException("Failed to create Curse API URL", e);
+        } catch (JsonParseException e) {
+            throw new ModDirectorException("Failed to parse JSON response from Curse", e);
+        } catch (JsonMappingException e) {
+            throw new ModDirectorException("Failed to map JSON response from Curse, did they change their API?", e);
+        } catch (IOException e) {
+            throw new ModDirectorException("Failed to open connection to Curse", e);
         }
 
         if(fileName != null) {
@@ -110,8 +109,5 @@ private static class CurseAddonFileInformation {
 
         @JsonProperty
         private URL downloadUrl;
-
-        @JsonProperty
-        private String[] gameVersions;
     }
 }