fix: don't attempt to connect if apiKey is not set

Author: acrylic-style

fabric-1.16/src/main/java/net/azisaba/interchatmod/fabric/Mod.java

@@ -44,6 +44,7 @@ public void onInitialize() {
         TIMER.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (ModConfig.apiKey.isEmpty()) return;
                 try {
                     Gson gson = new Gson();
                     JsonArray arr = gson.fromJson(makeRequest("interchat/guilds/list"), JsonArray.class);
@@ -119,6 +120,7 @@ public static boolean isInAzisaba() {
     }
 
     public static void trySwitch() {
+        if (ModConfig.apiKey.isEmpty()) return;
         if (client == null) return;
         ServerInfo serverData = MinecraftClient.getInstance().getCurrentServerEntry();
         if (serverData != null) {

fabric-1.17/src/main/java/net/azisaba/interchatmod/fabric/Mod.java

@@ -47,6 +47,7 @@ public void onInitialize() {
         TIMER.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (ModConfig.apiKey.isEmpty()) return;
                 try {
                     Gson gson = new Gson();
                     JsonArray arr = gson.fromJson(makeRequest("interchat/guilds/list"), JsonArray.class);
@@ -118,6 +119,7 @@ public static boolean isInAzisaba() {
     }
 
     public static void trySwitch() {
+        if (ModConfig.apiKey.isEmpty()) return;
         if (client == null) return;
         ServerInfo serverData = MinecraftClient.getInstance().getCurrentServerEntry();
         if (serverData != null) {

fabric-1.18/src/main/java/net/azisaba/interchatmod/fabric/Mod.java

@@ -47,6 +47,7 @@ public void onInitialize() {
         TIMER.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (ModConfig.apiKey.isEmpty()) return;
                 try {
                     Gson gson = new Gson();
                     JsonArray arr = gson.fromJson(makeRequest("interchat/guilds/list"), JsonArray.class);
@@ -118,6 +119,7 @@ public static boolean isInAzisaba() {
     }
 
     public static void trySwitch() {
+        if (ModConfig.apiKey.isEmpty()) return;
         if (client == null) return;
         ServerInfo serverData = MinecraftClient.getInstance().getCurrentServerEntry();
         if (serverData != null) {

fabric-1.19/src/main/java/net/azisaba/interchatmod/fabric/Mod.java

@@ -16,8 +16,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
@@ -47,6 +45,7 @@ public void onInitialize() {
         TIMER.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (CONFIG.apiKey().isEmpty()) return;
                 try {
                     Gson gson = new Gson();
                     JsonArray arr = gson.fromJson(makeRequest("interchat/guilds/list"), JsonArray.class);
@@ -122,6 +121,7 @@ public static boolean isInAzisaba() {
     }
 
     public static void trySwitch() {
+        if (CONFIG.apiKey().isEmpty()) return;
         if (client == null) return;
         ServerInfo serverData = MinecraftClient.getInstance().getCurrentServerEntry();
         if (serverData != null) {

fabric-1.20/src/main/java/net/azisaba/interchatmod/fabric/Mod.java

@@ -16,8 +16,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
@@ -47,6 +45,7 @@ public void onInitialize() {
         TIMER.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (CONFIG.apiKey().isEmpty()) return;
                 try {
                     Gson gson = new Gson();
                     JsonArray arr = gson.fromJson(makeRequest("interchat/guilds/list"), JsonArray.class);
@@ -122,6 +121,7 @@ public static boolean isInAzisaba() {
     }
 
     public static void trySwitch() {
+        if (CONFIG.apiKey().isEmpty()) return;
         if (client == null) return;
         ServerInfo serverData = MinecraftClient.getInstance().getCurrentServerEntry();
         if (serverData != null) {

fabric-1.21.11/src/main/java/net/azisaba/interchatmod/fabric/Mod.java

@@ -18,8 +18,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
@@ -50,6 +48,7 @@ public void onInitialize() {
         TIMER.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (CONFIG.apiKey.isEmpty()) return;
                 try {
                     Gson gson = new Gson();
                     JsonArray arr = gson.fromJson(makeRequest("interchat/guilds/list"), JsonArray.class);
@@ -159,6 +158,7 @@ public static boolean isInAzisaba() {
     }
 
     public static void trySwitch() {
+        if (CONFIG.apiKey.isEmpty()) return;
         if (client == null) return;
         ServerInfo serverData = MinecraftClient.getInstance().getCurrentServerEntry();
         if (serverData != null) {

fabric-1.21.8/src/main/java/net/azisaba/interchatmod/fabric/Mod.java

@@ -19,8 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
@@ -50,6 +48,7 @@ public void onInitialize() {
         TIMER.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (CONFIG.apiKey().isEmpty()) return;
                 try {
                     Gson gson = new Gson();
                     JsonArray arr = gson.fromJson(makeRequest("interchat/guilds/list"), JsonArray.class);
@@ -163,6 +162,7 @@ public static boolean isInAzisaba() {
     }
 
     public static void trySwitch() {
+        if (CONFIG.apiKey().isEmpty()) return;
         if (client == null) return;
         ServerInfo serverData = MinecraftClient.getInstance().getCurrentServerEntry();
         if (serverData != null) {

fabric-1.21/src/main/java/net/azisaba/interchatmod/fabric/Mod.java

@@ -19,8 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
@@ -50,6 +48,7 @@ public void onInitialize() {
         TIMER.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (CONFIG.apiKey().isEmpty()) return;
                 try {
                     Gson gson = new Gson();
                     JsonArray arr = gson.fromJson(makeRequest("interchat/guilds/list"), JsonArray.class);
@@ -163,6 +162,7 @@ public static boolean isInAzisaba() {
     }
 
     public static void trySwitch() {
+        if (CONFIG.apiKey().isEmpty()) return;
         if (client == null) return;
         ServerInfo serverData = MinecraftClient.getInstance().getCurrentServerEntry();
         if (serverData != null) {

forge-1.15/src/main/java/net/azisaba/interchatmod/forge/Mod.java

@@ -44,6 +44,7 @@ public Mod() {
         TIMER.schedule(new TimerTask() {
             @Override
             public void run() {
+                if (ModConfig.apiKey.isEmpty()) return;
                 try {
                     Gson gson = new Gson();
                     JsonArray arr = gson.fromJson(makeRequest("interchat/guilds/list"), JsonArray.class);
@@ -119,6 +120,7 @@ public static boolean isInAzisaba() {
     }
 
     public static void trySwitch() {
+        if (ModConfig.apiKey.isEmpty()) return;
         if (client == null) return;
         ServerData serverData = Minecraft.getInstance().getCurrentServerData();
         if (serverData != null) {