Hopefully fix mineskin api stuff

libraryaddict · Feb 24, 2025 · 9a2ae0a · 9a2ae0a
1 parent 1032a2c
commit 9a2ae0a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinAPI.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinAPI.java
@@ -104,7 +104,7 @@ static void write(ByteArrayOutputStream output, PrintWriter writer, String bound
     private final ReentrantLock lock = new ReentrantLock();
     @Getter
     @Setter
-    private boolean debugging;
+    private boolean debugging = LibsDisguises.getInstance() == null;
     @Getter
     @Setter
     private String apiKey;
@@ -128,7 +128,9 @@ public MineSkinAPI(String extraInfo) {
             }
         }
 
-        userAgent = "LibsDisguises/" + LibsDisguises.getInstance().getDescription().getVersion() + extraInfo;
+        String version = LibsDisguises.getInstance() == null ? "Not-LD-Itself" : LibsDisguises.getInstance().getDescription().getVersion();
+
+        userAgent = "LibsDisguises/" + version + extraInfo;
     }
 
     public boolean hasApiKey() {
@@ -287,7 +289,7 @@ private MineSkinQueueResponse readResponse(HttpURLConnection connection, SkinUti
     }
 
     private MineSkinQueueResponse getJobStatus(String jobId, SkinUtils.SkinCallback callback) throws IOException {
-        URL url = new URL("https://api.mineskin.org/v2/queue/:" + jobId);
+        URL url = new URL("https://api.mineskin.org/v2/queue/" + jobId);
         // Creating a connection
         HttpURLConnection con = (HttpURLConnection) url.openConnection();
         addConnectionHeaders(con);
@@ -414,7 +416,7 @@ private MineSkinQueueResponse doPost(SkinUtils.SkinCallback callback, MineSkinSu
                 ex2.printStackTrace();
             }
 
-            if (LibsDisguises.getInstance().getLogger() != null) {
+            if (LibsDisguises.getInstance() != null && LibsDisguises.getInstance().getLogger() != null) {
                 LibsDisguises.getInstance().getLogger().warning("Failed to access MineSkin.org");
             }
 

diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/LibsMsg.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/LibsMsg.java
@@ -417,6 +417,10 @@ public String get(Object... strings) {
     }
 
     public String toString() {
+        if (LibsDisguises.getInstance() == null) {
+            return name();
+        }
+
         throw new IllegalStateException("Dont call this");
     }
 }