1.1.5

1 files changed, 29 insertions, 0 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/HypixelApi.java b/src/main/java/io/github/moulberry/notenoughupdates/util/HypixelApi.java
index ca6c30af..b925f6da 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/HypixelApi.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/HypixelApi.java
@@ -23,6 +23,9 @@ public class HypixelApi {
     private Gson gson = new Gson();
     private ExecutorService es = Executors.newFixedThreadPool(3);
 
+    private int myApiErrors = 0;
+    private String[] myApiURLs = {"https://moulberry.codes/", "https://51.89.22.3/", "http://moulberry.codes/", "http://51.89.22.3/"};
+
     public void getHypixelApiAsync(String apiKey, String method, HashMap<String, String> args, Consumer<JsonObject> consumer) {
         getHypixelApiAsync(apiKey, method, args, consumer, () -> {});
     }
@@ -31,6 +34,10 @@ public class HypixelApi {
         getApiAsync(generateApiUrl(apiKey.trim(), method, args), consumer, error);
     }
 
+    private String getMyApiURL() {
+        return myApiURLs[myApiErrors%myApiURLs.length];
+    }
+
     public void getApiAsync(String urlS, Consumer<JsonObject> consumer, Runnable error) {
         es.submit(() -> {
             try {
@@ -41,6 +48,28 @@ public class HypixelApi {
         });
     }
 
+    public void getMyApiAsync(String urlS, Consumer<JsonObject> consumer, Runnable error) {
+        es.submit(() -> {
+            try {
+                consumer.accept(getApiSync(getMyApiURL()+urlS));
+            } catch(IOException e) {
+                myApiErrors++;
+                error.run();
+            }
+        });
+    }
+
+    public void getMyApiGZIPAsync(String urlS, Consumer<JsonObject> consumer, Runnable error) {
+        es.submit(() -> {
+            try {
+                consumer.accept(getApiGZIPSync(getMyApiURL()+urlS));
+            } catch(IOException e) {
+                myApiErrors++;
+                error.run();
+            }
+        });
+    }
+
     public void getApiGZIPAsync(String urlS, Consumer<JsonObject> consumer, Runnable error) {
         es.submit(() -> {
             try {