diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml index 3e88466..215e81c 100644 --- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml @@ -1,6 +1,6 @@ name: Bug report description: Report problems/issues here -labels: bug +labels: [bug] body: - type: checkboxes attributes: diff --git a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml index 3f33432..6a5897c 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml +++ b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml @@ -1,6 +1,6 @@ name: Feature request description: Use this to request new features and/or changes -labels: enhancement +labels: [enhancement] body: - type: checkboxes attributes: diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3ba13e0..fb07900 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1 +1,3 @@ +#file: noinspection YAMLSchemaValidation +#IntelliJ IDEA interprets this as another issue template so the above line is required blank_issues_enabled: false diff --git a/build.gradle b/build.gradle index 769265c..bab8927 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,19 @@ dependencies { } shadowJar { - relocate('org.bstats', 'io.github.jack1424.realtimeweather') + relocate('org.bstats', 'io.github.jack1424.realTimeWeather') +} + +tasks.jar { + manifest { + attributes["paperweight-mappings-namespace"] = "mojang" + } +} + +tasks.shadowJar { + manifest { + attributes["paperweight-mappings-namespace"] = "mojang" + } } def targetJavaVersion = 21 diff --git a/src/main/java/io/github/jack1424/realtimeweather/requests/RequestFunctions.java b/src/main/java/io/github/jack1424/realtimeweather/requests/RequestFunctions.java index d869ebc..e45c7c0 100644 --- a/src/main/java/io/github/jack1424/realtimeweather/requests/RequestFunctions.java +++ b/src/main/java/io/github/jack1424/realtimeweather/requests/RequestFunctions.java @@ -7,16 +7,18 @@ import org.json.simple.parser.ParseException; import java.io.IOException; import java.net.HttpURLConnection; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.util.Scanner; public class RequestFunctions { - public static Object makeRequest(String URLString) throws IOException, HTTPResponseException, ParseException { + public static Object makeRequest(String URLString) throws IOException, HTTPResponseException, ParseException, URISyntaxException { int responseCode = getResponseCode(URLString); if (responseCode > 399) throw new HTTPResponseException(responseCode); - Scanner scanner = new Scanner(new URL(URLString).openStream()); + Scanner scanner = new Scanner(new URI(URLString).toURL().openStream()); StringBuilder response = new StringBuilder(); while (scanner.hasNextLine()) response.append(scanner.nextLine()); @@ -25,8 +27,8 @@ public class RequestFunctions { return new JSONParser().parse(response.toString()); } - public static int getResponseCode(String URLString) throws IOException { - URL url = new URL(URLString); + public static int getResponseCode(String URLString) throws IOException, URISyntaxException { + URL url = new URI(URLString).toURL(); HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.setRequestMethod("GET"); con.connect(); @@ -34,7 +36,7 @@ public class RequestFunctions { } public static String getLatestVersion() throws Exception { - return ((JSONObject) ((JSONArray) makeRequest("https://api.modrinth.com/v2/project/WRA6ODcm/version")).get(0)).get("version_number").toString(); + return ((JSONObject) ((JSONArray) makeRequest("https://api.modrinth.com/v2/project/WRA6ODcm/version")).getFirst()).get("version_number").toString(); } public static class HTTPResponseException extends Exception {