From 3c41fb721d9aad7add115f0d4cdc7dabd162528c Mon Sep 17 00:00:00 2001
From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com>
Date: Sat, 17 Jul 2021 11:57:12 +0200
Subject: [PATCH] Improved MojangApiUtils

---
 .../studiocode/invui/util/MojangApiUtils.java | 14 +++++------
 .../de/studiocode/invui/util/WebUtils.java    | 23 -------------------
 2 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 InvUI/src/main/java/de/studiocode/invui/util/WebUtils.java

diff --git a/InvUI/src/main/java/de/studiocode/invui/util/MojangApiUtils.java b/InvUI/src/main/java/de/studiocode/invui/util/MojangApiUtils.java
index 704fef0..2b54760 100644
--- a/InvUI/src/main/java/de/studiocode/invui/util/MojangApiUtils.java
+++ b/InvUI/src/main/java/de/studiocode/invui/util/MojangApiUtils.java
@@ -6,6 +6,8 @@ import com.google.gson.JsonParser;
 import com.mojang.util.UUIDTypeAdapter;
 
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.net.URL;
 import java.util.UUID;
 
@@ -15,10 +17,9 @@ public class MojangApiUtils {
     private static final String NAME_AT_TIME_URL = "https://api.mojang.com/users/profiles/minecraft/%s?at=%s";
     
     public static String[] getSkinData(UUID uuid, boolean requestSignature) throws IOException {
-        String url = String.format(SKIN_DATA_URL, uuid, requestSignature);
-        String content = WebUtils.readWebsiteContent(new URL(url));
-        
-        JsonObject jsonObject = new JsonParser().parse(content).getAsJsonObject();
+        String url = String.format(SKIN_DATA_URL, uuid, !requestSignature);
+        Reader reader = new InputStreamReader(new URL(url).openConnection().getInputStream());
+        JsonObject jsonObject = new JsonParser().parse(reader).getAsJsonObject();
         
         checkForError(jsonObject);
         if (jsonObject.has("properties")) {
@@ -38,9 +39,8 @@ public class MojangApiUtils {
     
     public static UUID getUuidAtTime(String name, long timestamp) throws IOException {
         String url = String.format(NAME_AT_TIME_URL, name, timestamp);
-        String content = WebUtils.readWebsiteContent(new URL(url));
-        
-        JsonObject jsonObject = new JsonParser().parse(content).getAsJsonObject();
+        Reader reader = new InputStreamReader(new URL(url).openConnection().getInputStream());
+        JsonObject jsonObject = new JsonParser().parse(reader).getAsJsonObject();
         
         checkForError(jsonObject);
         if (jsonObject.has("id")) {
diff --git a/InvUI/src/main/java/de/studiocode/invui/util/WebUtils.java b/InvUI/src/main/java/de/studiocode/invui/util/WebUtils.java
deleted file mode 100644
index 92e35c9..0000000
--- a/InvUI/src/main/java/de/studiocode/invui/util/WebUtils.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package de.studiocode.invui.util;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-public class WebUtils {
-    
-    public static String readWebsiteContent(@NotNull URL url) throws IOException {
-        StringBuilder content = new StringBuilder();
-        BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
-        String line;
-        while ((line = reader.readLine()) != null) {
-            content.append(line).append("\n");
-        }
-        
-        return content.substring(0, content.length() - 1);
-    }
-    
-}