fix more bugs

moehreag · moehreag · commit 7ca3619ce1c5 · 2024-12-17T18:41:06.000+01:00
- update lwjgl for 1.8.9
- rate limit the user requests to 2/s
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/api/APIOptions.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/api/APIOptions.java
@@ -28,7 +28,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
 import io.github.axolotlclient.api.chat.ChannelInvitesScreen;
 import io.github.axolotlclient.api.chat.ChatListScreen;
-import io.github.axolotlclient.api.requests.UserRequest;
+import io.github.axolotlclient.api.requests.AccountSettingsRequest;
 import io.github.axolotlclient.util.options.GenericOption;
 import lombok.Getter;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
@@ -71,7 +71,7 @@ public void init() {
 			Screen previous = client.currentScreen;
 			client.openScreen(new ConfirmScreen(b -> {
 				if (b) {
-					UserRequest.delete().thenAccept(r -> {
+					AccountSettingsRequest.deleteAccount().thenAccept(r -> {
 						if (r) {
 							API.getInstance().getNotificationProvider().addStatus("api.account.deletion.success", "api.account.deletion.success.desc");
 						} else {
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/api/StatusUpdateProviderImpl.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/api/StatusUpdateProviderImpl.java
@@ -57,10 +57,15 @@ public Request getStatus() {
 					StatusUpdate.SupportedServer server = optional.get();
 					if (server.equals(StatusUpdate.SupportedServer.HYPIXEL)) {
 						JsonObject object = HypixelLocation.get().thenApply(GsonHelper::fromJson).join();
-						HypixelGameType gameType = HypixelGameType.valueOf(object.get("gametype").getAsString());
+						String gameType;
+						if (object.has("gametype")) {
+							gameType = HypixelGameType.valueOf(object.get("gametype").getAsString()).getName();
+						} else {
+							gameType = object.get("server").getAsString();
+						}
 						String gameMode = getOrEmpty(object, "mode");
 						String map = getOrEmpty(object, "map");
-						return StatusUpdate.inGame(server, gameType.getName(), gameMode, map);
+						return StatusUpdate.inGame(server, gameType, gameMode, map);
 					}
 				}
 			}
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java
@@ -30,6 +30,7 @@
 import io.github.axolotlclient.api.requests.ChannelRequest;
 import io.github.axolotlclient.api.requests.FriendRequest;
 import io.github.axolotlclient.api.types.Channel;
+import io.github.axolotlclient.api.types.Relation;
 import io.github.axolotlclient.api.types.User;
 import io.github.axolotlclient.api.util.AlphabeticalComparator;
 import io.github.axolotlclient.modules.auth.Auth;
@@ -131,7 +132,10 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
 								client.execute(() -> client.openScreen(new ChatScreen(screen.getParent(), channel)))));
 						}).spacer();
 					}
-					if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
+					if (user.getRelation() != Relation.BLOCKED) {
+						if (user.getRelation() != Relation.FRIEND) {
+							menu.entry(new TranslatableText("api.friends.add"), b -> FriendRequest.getInstance().addFriend(user.getUuid())).spacer();
+						}
 						menu.entry(new TranslatableText("api.users.block"), buttonWidget ->
 							FriendRequest.getInstance().blockUser(user));
 					} else {
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelLocation.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelLocation.java
@@ -37,7 +37,7 @@ public static CompletableFuture<String> get() {
 	}
 
 	public static boolean waitingForResponse(String message) {
-		boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("gametype");
+		boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("server");
 		if (consume) {
 			consumer.complete(message);
 			consumer = null;
diff --git a/1.20/src/main/java/io/github/axolotlclient/api/APIOptions.java b/1.20/src/main/java/io/github/axolotlclient/api/APIOptions.java
@@ -29,7 +29,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
 import io.github.axolotlclient.api.chat.ChannelInvitesScreen;
 import io.github.axolotlclient.api.chat.ChatListScreen;
-import io.github.axolotlclient.api.requests.UserRequest;
+import io.github.axolotlclient.api.requests.AccountSettingsRequest;
 import io.github.axolotlclient.util.keybinds.KeyBinds;
 import io.github.axolotlclient.util.options.GenericOption;
 import lombok.Getter;
@@ -70,7 +70,7 @@ public void init() {
 			Screen previous = client.currentScreen;
 			client.setScreen(new ConfirmScreen(b -> {
 				if (b) {
-					UserRequest.delete().thenAccept(r -> {
+					AccountSettingsRequest.deleteAccount().thenAccept(r -> {
 						if (r) {
 							API.getInstance().getNotificationProvider().addStatus("api.account.deletion.success", "api.account.deletion.success.desc");
 						} else {
diff --git a/1.20/src/main/java/io/github/axolotlclient/api/StatusUpdateProviderImpl.java b/1.20/src/main/java/io/github/axolotlclient/api/StatusUpdateProviderImpl.java
@@ -58,10 +58,15 @@ public Request getStatus() {
 					StatusUpdate.SupportedServer server = optional.get();
 					if (server.equals(StatusUpdate.SupportedServer.HYPIXEL)) {
 						JsonObject object = HypixelLocation.get().thenApply(GsonHelper::fromJson).join();
-						HypixelGameType gameType = HypixelGameType.valueOf(object.get("gametype").getAsString());
+						String gameType;
+						if (object.has("gametype")) {
+							gameType = HypixelGameType.valueOf(object.get("gametype").getAsString()).getName();
+						} else {
+							gameType = object.get("server").getAsString();
+						}
 						String gameMode = getOrEmpty(object, "mode");
 						String map = getOrEmpty(object, "map");
-						return StatusUpdate.inGame(server, gameType.getName(), gameMode, map);
+						return StatusUpdate.inGame(server, gameType, gameMode, map);
 					} else if (server.equals(StatusUpdate.SupportedServer.MCC_ISLAND)) {
 						return MccIslandMods.getInstance().getMccIStatus();
 					}
diff --git a/1.20/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java b/1.20/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java
@@ -30,6 +30,7 @@
 import io.github.axolotlclient.api.requests.ChannelRequest;
 import io.github.axolotlclient.api.requests.FriendRequest;
 import io.github.axolotlclient.api.types.Channel;
+import io.github.axolotlclient.api.types.Relation;
 import io.github.axolotlclient.api.types.User;
 import io.github.axolotlclient.api.util.AlphabeticalComparator;
 import io.github.axolotlclient.modules.auth.Auth;
@@ -154,7 +155,10 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
 								.whenCompleteAsync((channel, throwable) -> client.execute(() -> client.setScreen(new ChatScreen(screen.getParent(), channel))));
 						}).spacer();
 					}
-					if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
+					if (user.getRelation() != Relation.BLOCKED) {
+						if (user.getRelation() != Relation.FRIEND) {
+							menu.entry(Text.translatable("api.friends.add"), b -> FriendRequest.getInstance().addFriend(user.getUuid())).spacer();
+						}
 						menu.entry(Text.translatable("api.users.block"), buttonWidget ->
 							FriendRequest.getInstance().blockUser(user));
 					} else {
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelLocation.java b/1.20/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelLocation.java
@@ -37,7 +37,7 @@ public static CompletableFuture<String> get() {
 	}
 
 	public static boolean waitingForResponse(String message) {
-		boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("gametype");
+		boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("server");
 		if (consume) {
 			consumer.complete(message);
 			consumer = null;
diff --git a/1.21.4/src/main/java/io/github/axolotlclient/api/APIOptions.java b/1.21.4/src/main/java/io/github/axolotlclient/api/APIOptions.java
@@ -29,7 +29,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
 import io.github.axolotlclient.api.chat.ChannelInvitesScreen;
 import io.github.axolotlclient.api.chat.ChatListScreen;
-import io.github.axolotlclient.api.requests.UserRequest;
+import io.github.axolotlclient.api.requests.AccountSettingsRequest;
 import io.github.axolotlclient.util.keybinds.KeyBinds;
 import io.github.axolotlclient.util.options.GenericOption;
 import lombok.Getter;
@@ -67,7 +67,7 @@ public void init() {
 			Screen previous = client.screen;
 			client.setScreen(new ConfirmScreen(b -> {
 				if (b) {
-					UserRequest.delete().thenAccept(r -> {
+					AccountSettingsRequest.deleteAccount().thenAccept(r -> {
 						if (r) {
 							API.getInstance().getNotificationProvider()
 								.addStatus("api.account.deletion.success", "api.account.deletion.success.desc");
diff --git a/1.21.4/src/main/java/io/github/axolotlclient/api/StatusUpdateProviderImpl.java b/1.21.4/src/main/java/io/github/axolotlclient/api/StatusUpdateProviderImpl.java
@@ -61,11 +61,15 @@ public Request getStatus() {
 					StatusUpdate.SupportedServer server = optional.get();
 					if (server.equals(StatusUpdate.SupportedServer.HYPIXEL)) {
 						JsonObject object = HypixelLocation.get().thenApply(GsonHelper::fromJson).join();
-						HypixelGameType gameType =
-							HypixelGameType.valueOf(object.get("gametype").getAsString());
+						String gameType;
+						if (object.has("gametype")) {
+							gameType = HypixelGameType.valueOf(object.get("gametype").getAsString()).getName();
+						} else {
+							gameType = object.get("server").getAsString();
+						}
 						String gameMode = getOrEmpty(object, "mode");
 						String map = getOrEmpty(object, "map");
-						return StatusUpdate.inGame(server, gameType.getName(), gameMode, map);
+						return StatusUpdate.inGame(server, gameType, gameMode, map);
 					} else if (server.equals(StatusUpdate.SupportedServer.MCC_ISLAND)) {
 						return MccIslandMods.getInstance().getMccIStatus();
 					}
diff --git a/1.21.4/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java
@@ -30,6 +30,7 @@
 import io.github.axolotlclient.api.requests.ChannelRequest;
 import io.github.axolotlclient.api.requests.FriendRequest;
 import io.github.axolotlclient.api.types.Channel;
+import io.github.axolotlclient.api.types.Relation;
 import io.github.axolotlclient.api.types.User;
 import io.github.axolotlclient.api.util.AlphabeticalComparator;
 import io.github.axolotlclient.modules.auth.Auth;
@@ -160,7 +161,10 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
 								() -> client.setScreen(new ChatScreen(screen.getParent(), channel))));
 						}).spacer();
 					}
-					if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
+					if (user.getRelation() != Relation.BLOCKED) {
+						if (user.getRelation() != Relation.FRIEND) {
+							menu.entry(Component.translatable("api.friends.add"), b -> FriendRequest.getInstance().addFriend(user.getUuid())).spacer();
+						}
 						menu.entry(Component.translatable("api.users.block"),
 							buttonWidget -> FriendRequest.getInstance().blockUser(user)
 						);
diff --git a/1.21.4/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelLocation.java b/1.21.4/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelLocation.java
@@ -37,7 +37,7 @@ public static CompletableFuture<String> get() {
 	}
 
 	public static boolean waitingForResponse(String message) {
-		boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("gametype");
+		boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("server");
 		if (consume) {
 			consumer.complete(message);
 			consumer = null;
diff --git a/1.21/src/main/java/io/github/axolotlclient/api/APIOptions.java b/1.21/src/main/java/io/github/axolotlclient/api/APIOptions.java
@@ -29,7 +29,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
 import io.github.axolotlclient.api.chat.ChannelInvitesScreen;
 import io.github.axolotlclient.api.chat.ChatListScreen;
-import io.github.axolotlclient.api.requests.UserRequest;
+import io.github.axolotlclient.api.requests.AccountSettingsRequest;
 import io.github.axolotlclient.util.keybinds.KeyBinds;
 import io.github.axolotlclient.util.options.GenericOption;
 import lombok.Getter;
@@ -70,7 +70,7 @@ public void init() {
 			Screen previous = client.currentScreen;
 			client.setScreen(new ConfirmScreen(b -> {
 				if (b) {
-					UserRequest.delete().thenAccept(r -> {
+					AccountSettingsRequest.deleteAccount().thenAccept(r -> {
 						if (r) {
 							API.getInstance().getNotificationProvider().addStatus("api.account.deletion.success", "api.account.deletion.success.desc");
 						} else {
diff --git a/1.21/src/main/java/io/github/axolotlclient/api/StatusUpdateProviderImpl.java b/1.21/src/main/java/io/github/axolotlclient/api/StatusUpdateProviderImpl.java
@@ -59,10 +59,15 @@ public Request getStatus() {
 					StatusUpdate.SupportedServer server = optional.get();
 					if (server.equals(StatusUpdate.SupportedServer.HYPIXEL)) {
 						JsonObject object = HypixelLocation.get().thenApply(GsonHelper::fromJson).join();
-						HypixelGameType gameType = HypixelGameType.valueOf(object.get("gametype").getAsString());
+						String gameType;
+						if (object.has("gametype")) {
+							gameType = HypixelGameType.valueOf(object.get("gametype").getAsString()).getName();
+						} else {
+							gameType = object.get("server").getAsString();
+						}
 						String gameMode = getOrEmpty(object, "mode");
 						String map = getOrEmpty(object, "map");
-						return StatusUpdate.inGame(server, gameType.getName(), gameMode, map);
+						return StatusUpdate.inGame(server, gameType, gameMode, map);
 					} else if (server.equals(StatusUpdate.SupportedServer.MCC_ISLAND)) {
 						return MccIslandMods.getInstance().getMccIStatus();
 					}
diff --git a/1.21/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java b/1.21/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java
@@ -30,6 +30,7 @@
 import io.github.axolotlclient.api.requests.ChannelRequest;
 import io.github.axolotlclient.api.requests.FriendRequest;
 import io.github.axolotlclient.api.types.Channel;
+import io.github.axolotlclient.api.types.Relation;
 import io.github.axolotlclient.api.types.User;
 import io.github.axolotlclient.api.util.AlphabeticalComparator;
 import io.github.axolotlclient.modules.auth.Auth;
@@ -155,7 +156,10 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
 							ChannelRequest.getOrCreateDM(user).whenCompleteAsync((channel, throwable) -> client.execute(() -> client.setScreen(new ChatScreen(screen.getParent(), channel))));
 						}).spacer();
 					}
-					if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
+					if (user.getRelation() != Relation.BLOCKED) {
+						if (user.getRelation() != Relation.FRIEND) {
+							menu.entry(Text.translatable("api.friends.add"), b -> FriendRequest.getInstance().addFriend(user.getUuid())).spacer();
+						}
 						menu.entry(Text.translatable("api.users.block"), buttonWidget -> FriendRequest.getInstance().blockUser(user));
 					} else {
 						menu.entry(Text.translatable("api.users.unblock"), buttonWidget -> FriendRequest.getInstance().unblockUser(user));
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelLocation.java b/1.21/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelLocation.java
@@ -37,7 +37,7 @@ public static CompletableFuture<String> get() {
 	}
 
 	public static boolean waitingForResponse(String message) {
-		boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("gametype");
+		boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("server");
 		if (consume) {
 			consumer.complete(message);
 			consumer = null;
diff --git a/1.8.9/build.gradle.kts b/1.8.9/build.gradle.kts
@@ -42,7 +42,7 @@ dependencies {
 
 	modImplementation(include("io.github.moehreag:search-in-resources:1.0.6+1.8.9")!!)
 
-	val lwjglVersion = "3.3.4"
+	val lwjglVersion = "3.3.5"
 	api("org.lwjgl:lwjgl-nanovg:$lwjglVersion")
 	runtimeOnly("org.lwjgl:lwjgl-nanovg:${lwjglVersion}:natives-linux")
 	runtimeOnly("org.lwjgl:lwjgl-nanovg:${lwjglVersion}:natives-linux-arm64")
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/api/APIOptions.java b/1.8.9/src/main/java/io/github/axolotlclient/api/APIOptions.java
@@ -28,7 +28,7 @@
 import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
 import io.github.axolotlclient.api.chat.ChannelInvitesScreen;
 import io.github.axolotlclient.api.chat.ChatListScreen;
-import io.github.axolotlclient.api.requests.UserRequest;
+import io.github.axolotlclient.api.requests.AccountSettingsRequest;
 import io.github.axolotlclient.util.options.GenericOption;
 import lombok.Getter;
 import net.minecraft.client.Minecraft;
@@ -71,7 +71,7 @@ public void init() {
 			Screen previous = client.screen;
 			client.openScreen(new ConfirmScreen((b, i) -> {
 				if (b) {
-					UserRequest.delete().thenAccept(r -> {
+					AccountSettingsRequest.deleteAccount().thenAccept(r -> {
 						if (r) {
 							API.getInstance().getNotificationProvider().addStatus("api.account.deletion.success", "api.account.deletion.success.desc");
 						} else {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/api/StatusUpdateProviderImpl.java b/1.8.9/src/main/java/io/github/axolotlclient/api/StatusUpdateProviderImpl.java
@@ -59,10 +59,15 @@ public Request getStatus() {
 					StatusUpdate.SupportedServer server = optional.get();
 					if (server.equals(StatusUpdate.SupportedServer.HYPIXEL)) {
 						JsonObject object = HypixelLocation.get().thenApply(GsonHelper::fromJson).join();
-						HypixelGameType gameType = HypixelGameType.valueOf(object.get("gametype").getAsString());
+						String gameType;
+						if (object.has("gametype")) {
+							gameType = HypixelGameType.valueOf(object.get("gametype").getAsString()).getName();
+						} else {
+							gameType = object.get("server").getAsString();
+						}
 						String gameMode = getOrEmpty(object, "mode");
 						String map = getOrEmpty(object, "map");
-						return StatusUpdate.inGame(server, gameType.getName(), gameMode, map);
+						return StatusUpdate.inGame(server, gameType, gameMode, map);
 					}
 				}
 			}
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java b/1.8.9/src/main/java/io/github/axolotlclient/api/chat/ChatUserListWidget.java
@@ -31,6 +31,7 @@
 import io.github.axolotlclient.api.requests.ChannelRequest;
 import io.github.axolotlclient.api.requests.FriendRequest;
 import io.github.axolotlclient.api.types.Channel;
+import io.github.axolotlclient.api.types.Relation;
 import io.github.axolotlclient.api.types.User;
 import io.github.axolotlclient.api.util.AlphabeticalComparator;
 import io.github.axolotlclient.modules.auth.Auth;
@@ -153,7 +154,10 @@ public boolean mouseClicked(int index, int mouseX, int mouseY, int button, int x
 								.whenCompleteAsync((channel, throwable) -> client.submit(() -> client.openScreen(new ChatScreen(screen.getParent(), channel))));
 						}).spacer();
 					}
-					if (!FriendRequest.getInstance().isBlocked(user.getUuid())) {
+					if (user.getRelation() != Relation.BLOCKED) {
+						if (user.getRelation() != Relation.FRIEND) {
+							menu.entry("api.friends.add", b -> FriendRequest.getInstance().addFriend(user.getUuid())).spacer();
+						}
 						menu.entry("api.users.block", buttonWidget ->
 							FriendRequest.getInstance().blockUser(user));
 					} else {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelLocation.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelLocation.java
@@ -37,7 +37,7 @@ public static CompletableFuture<String> get() {
 	}
 
 	public static boolean waitingForResponse(String message) {
-		boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("gametype");
+		boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("server");
 		if (consume) {
 			consumer.complete(message);
 			consumer = null;
diff --git a/common/src/main/java/io/github/axolotlclient/api/API.java b/common/src/main/java/io/github/axolotlclient/api/API.java
@@ -290,8 +290,9 @@ public void shutdown() {
 			// We have to rely on the gc to collect previous client objects as close() was only implemented in java 21.
 			// However, we are currently compiling against java 17.
 			//client.close();
-			client = null;
+			token = null;
 		}
+		client = null;
 	}
 
 	public boolean isSocketConnected() {
diff --git a/common/src/main/java/io/github/axolotlclient/api/requests/AccountSettingsRequest.java b/common/src/main/java/io/github/axolotlclient/api/requests/AccountSettingsRequest.java
@@ -51,4 +51,8 @@ public static CompletableFuture<Void> update(AccountSettings settings) {
 
 			});
 	}
+
+	public static CompletableFuture<Boolean> deleteAccount() {
+		return API.getInstance().delete(Request.Route.ACCOUNT.create()).thenApply(res -> !res.isError());
+	}
 }
diff --git a/common/src/main/java/io/github/axolotlclient/api/requests/FriendRequest.java b/common/src/main/java/io/github/axolotlclient/api/requests/FriendRequest.java
diff --git a/common/src/main/java/io/github/axolotlclient/api/requests/UserRequest.java b/common/src/main/java/io/github/axolotlclient/api/requests/UserRequest.java
diff --git a/gradle.properties b/gradle.properties

Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,15 @@ public Request getStatus() {`
`57`	`57`	`StatusUpdate.SupportedServer server = optional.get();`
`58`	`58`	`if (server.equals(StatusUpdate.SupportedServer.HYPIXEL)) {`
`59`	`59`	`JsonObject object = HypixelLocation.get().thenApply(GsonHelper::fromJson).join();`
`60`		`- HypixelGameType gameType = HypixelGameType.valueOf(object.get("gametype").getAsString());`
	`60`	`+ String gameType;`
	`61`	`+ if (object.has("gametype")) {`
	`62`	`+ gameType = HypixelGameType.valueOf(object.get("gametype").getAsString()).getName();`
	`63`	`+ } else {`
	`64`	`+ gameType = object.get("server").getAsString();`
	`65`	`+ }`
`61`	`66`	`String gameMode = getOrEmpty(object, "mode");`
`62`	`67`	`String map = getOrEmpty(object, "map");`
`63`		`- return StatusUpdate.inGame(server, gameType.getName(), gameMode, map);`
	`68`	`+ return StatusUpdate.inGame(server, gameType, gameMode, map);`
`64`	`69`	`}`
`65`	`70`	`}`
`66`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public static CompletableFuture<String> get() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public static boolean waitingForResponse(String message) {`
`40`		`- boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("gametype");`
	`40`	`+ boolean consume = consumer != null && message.startsWith("{") && message.endsWith("}") && message.contains("server");`
`41`	`41`	`if (consume) {`
`42`	`42`	`consumer.complete(message);`
`43`	`43`	`consumer = null;`