fix ping bug

moehreag · moehreag · commit daa08fdbd5d6 · 2022-11-16T01:22:46.000+01:00
- and other issues found along the way
diff --git a/src/main/java/io/github/axolotlclient/mixin/EntityRendererMixin.java b/src/main/java/io/github/axolotlclient/mixin/EntityRendererMixin.java
@@ -4,6 +4,7 @@
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.modules.hypixel.HypixelAbstractionLayer;
 import io.github.axolotlclient.modules.hypixel.levelhead.LevelHead;
+import io.github.axolotlclient.util.Util;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
@@ -36,8 +37,7 @@ public int forceShadows(TextRenderer instance, String text, int x, int y, int co
     @Inject(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;draw(Ljava/lang/String;III)I", ordinal = 1))
     public void addLevel(T entity, String string, double d, double e, double f, int i, CallbackInfo ci){
         if(entity instanceof AbstractClientPlayerEntity){
-            if(MinecraftClient.getInstance().getCurrentServerEntry() != null &&
-                    MinecraftClient.getInstance().getCurrentServerEntry().address.contains("hypixel.net")){
+            if(Util.currentServerAddressContains("hypixel.net")){
                 if(HypixelAbstractionLayer.hasValidAPIKey() && LevelHead.getInstance().enabled.get() && string.contains(entity.getName().asFormattedString())){
                     TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
                     String text = "Level: "+ HypixelAbstractionLayer.getPlayerLevel(String.valueOf(entity.getUuid()));
diff --git a/src/main/java/io/github/axolotlclient/mixin/GameRendererMixin.java b/src/main/java/io/github/axolotlclient/mixin/GameRendererMixin.java
@@ -235,10 +235,4 @@ public void updateFreelook(ClientPlayerEntity entity, float yaw, float pitch) {
     public float freelook$prevPitch(Entity entity) {
         return Freelook.getInstance().pitch(entity.prevPitch);
     }
-
-    @Inject(method = "onResized", at = @At(value = "TAIL"))
-    public void onResize(int i, int j, CallbackInfo ci){
-        Util.window = new Window(MinecraftClient.getInstance());
-        HudManager.getInstance().refreshAllBounds();
-    }
 }
diff --git a/src/main/java/io/github/axolotlclient/mixin/MinecraftClientAccessor.java b/src/main/java/io/github/axolotlclient/mixin/MinecraftClientAccessor.java
@@ -11,4 +11,10 @@ public interface MinecraftClientAccessor {
 
     @Accessor
     ClientTickTracker getTicker();
+
+    @Accessor
+    String getServerAddress();
+
+    @Accessor
+    int getServerPort();
 }
diff --git a/src/main/java/io/github/axolotlclient/mixin/MinecraftClientMixin.java b/src/main/java/io/github/axolotlclient/mixin/MinecraftClientMixin.java
@@ -6,12 +6,14 @@
 import io.github.axolotlclient.modules.rpc.DiscordRPC;
 import io.github.axolotlclient.modules.zoom.Zoom;
 import io.github.axolotlclient.util.Hooks;
+import io.github.axolotlclient.util.Util;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.RunArgs;
 import net.minecraft.client.options.GameOptions;
 import net.minecraft.client.options.KeyBinding;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.texture.TextureManager;
+import net.minecraft.client.util.Window;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.player.ClientPlayerEntity;
 import net.minecraft.world.level.LevelInfo;
@@ -133,4 +135,10 @@ public void onMouseButton(CallbackInfo ci){
     public void login(ClientWorld world, String loadingMessage, CallbackInfo ci){
         NetworkHelper.setOnline();
     }
+
+    @Inject(method = "resizeFraembuffer", at = @At("TAIL"))
+    public void onResize(CallbackInfo ci){
+        Util.window = new Window(MinecraftClient.getInstance());
+        HudManager.getInstance().refreshAllBounds();
+    }
 }
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ChatHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ChatHud.java
@@ -68,7 +68,7 @@ public void render(float delta){
                             int chatOpacity = (int)(Opacity * f);
                             ++j;
                             if (chatOpacity > 3) {
-                                int y = pos.y+height - (m * (9 + lineSpacing.get()));
+                                int y = pos.y+getHeight() - (m * (9 + lineSpacing.get()));
                                 if(background.get()) {
                                     fill(pos.x, y - (9+lineSpacing.get()), pos.x + l + 4, y, bgColor.get().withAlpha(chatOpacity/2).getAsInt());
                                 }
@@ -155,8 +155,12 @@ public boolean tickable() {
 
     @Override
     public void tick() {
-        width = (int) (client.options.chatWidth*320);
-        height = (int) (client.options.chatHeightUnfocused*180)+11;
+        //setWidth((int) (client.options.chatWidth*320));
+        int lastHeight = height;
+        setHeight(this.getHeight());//int) (client.options.chatHeightUnfocused*180)+11);
+        if(lastHeight != getHeight()){
+            onBoundsUpdate();
+        }
     }
 
     @Override
@@ -166,12 +170,12 @@ public void renderPlaceholderComponent(float delta) {
         if(MinecraftClient.getInstance().player!=null) {
             client.textRenderer.drawWithShadow(
                     "<" + MinecraftClient.getInstance().player.getName().asFormattedString() + "> OOh! There's my Chat now!",
-                    pos.x + 1, pos.y + height - 9, -1
+                    pos.x + 1, pos.y + getHeight() - 9, -1
             );
         } else {
             client.textRenderer.drawWithShadow(
                     "This is where your new and fresh looking chat will be!",
-                    pos.x + 1, pos.y + height - 9, -1
+                    pos.x + 1, pos.y + getHeight() - 9, -1
             );
         }
     }
@@ -202,20 +206,10 @@ public boolean isChatFocused() {
         return this.client.currentScreen instanceof ChatScreen;
     }
 
-    public int getWidth() {
-        return getWidth(this.client.options.chatWidth);
-    }
-
     public int getHeight() {
         return getHeight(this.isChatFocused() ? this.client.options.chatHeightFocused : this.client.options.chatHeightUnfocused);
     }
 
-    public static int getWidth(float chatWidth) {
-        int i = 320;
-        int j = 40;
-        return MathHelper.floor(chatWidth * (float)(i - j) + (float)j);
-    }
-
     public static int getHeight(float chatHeight) {
         int i = 180;
         int j = 20;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/IPHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/IPHud.java
@@ -1,6 +1,7 @@
 package io.github.axolotlclient.modules.hud.gui.hud.simple;
 
 import io.github.axolotlclient.modules.hud.gui.entry.SimpleTextHudEntry;
+import io.github.axolotlclient.util.Util;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.Identifier;
 
@@ -29,10 +30,10 @@ public String getValue() {
         if (client.isInSingleplayer()) {
             return "Singleplayer";
         }
-        if (client.getCurrentServerEntry() == null) {
+        if (Util.getCurrentServerAddress() == null) {
             return "none";
         }
-        return client.getCurrentServerEntry().address;
+        return Util.getCurrentServerAddress();
     }
 
     @Override
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/PingHud.java
@@ -2,10 +2,10 @@
 
 import io.github.axolotlclient.AxolotlclientConfig.options.IntegerOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
+import io.github.axolotlclient.mixin.MinecraftClientAccessor;
 import io.github.axolotlclient.modules.hud.gui.entry.SimpleTextHudEntry;
 import io.github.axolotlclient.util.ThreadExecuter;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ServerInfo;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.ServerAddress;
@@ -62,10 +62,13 @@ public boolean tickable() {
     private void updatePing(){
         if (MinecraftClient.getInstance().getCurrentServerEntry() != null) {
             if (MinecraftClient.getInstance().getCurrentServerEntry().ping <= 1) {
-                getRealTimeServerPing(MinecraftClient.getInstance().getCurrentServerEntry());
+                ServerAddress address = ServerAddress.parse(MinecraftClient.getInstance().getCurrentServerEntry().address);
+                getRealTimeServerPing(address.getAddress(), address.getPort());
             } else {
                 currentServerPing = (int) MinecraftClient.getInstance().getCurrentServerEntry().ping;
             }
+        }else if (((MinecraftClientAccessor)MinecraftClient.getInstance()).getServerAddress() != null) {
+            getRealTimeServerPing(((MinecraftClientAccessor)MinecraftClient.getInstance()).getServerAddress(), ((MinecraftClientAccessor)MinecraftClient.getInstance()).getServerPort());
         } else if (MinecraftClient.getInstance().isIntegratedServerRunning()){
             currentServerPing = 1;
         }
@@ -89,11 +92,10 @@ public List<Option<?>> getConfigurationOptions() {
 
     //Indicatia removed this feature...
     //We still need it :(
-    private void getRealTimeServerPing(ServerInfo server) {
+    private void getRealTimeServerPing(String address, int port) {
         ThreadExecuter.scheduleTask(() -> {
             try {
-                ServerAddress address = ServerAddress.parse(server.address);
-                final ClientConnection manager = ClientConnection.connect(InetAddress.getByName(address.getAddress()), address.getPort(), false);
+                final ClientConnection manager = ClientConnection.connect(InetAddress.getByName(address), port, false);
 
                 manager.setPacketListener(new ClientQueryPacketListener() {
                     @Override
@@ -117,7 +119,7 @@ public void onDisconnected(Text reason) {
 
                     }
                 });
-                manager.send(new HandshakeC2SPacket(47, address.getAddress(), address.getPort(), NetworkState.STATUS));
+                manager.send(new HandshakeC2SPacket(47, address, port, NetworkState.STATUS));
                 manager.send(new QueryRequestC2SPacket());
             }
             catch (Exception ignored){}
diff --git a/src/main/java/io/github/axolotlclient/modules/hypixel/autogg/AutoGG.java b/src/main/java/io/github/axolotlclient/modules/hypixel/autogg/AutoGG.java
@@ -176,8 +176,8 @@ private void populateMinemenGLHFStrings() {
     }
 
     public void onMessage(Text message) {
-        if(client.getCurrentServerEntry() != null) {
-            if (onHypixel.get() && client.getCurrentServerEntry().address.contains("hypixel")) {
+        if(Util.getCurrentServerAddress() != null) {
+            if (onHypixel.get() && Util.getCurrentServerAddress().contains("hypixel")) {
                 if (gf.get()) {
                     processChat(message, hypixelGFStrings, gfString.get());
                 }
@@ -187,7 +187,7 @@ public void onMessage(Text message) {
                 if (glhf.get()) {
                     processChat(message, hypixelGLHFStrings, glhfString.get());
                 }
-            } else if (onBWP.get() && client.getCurrentServerEntry().address.contains("bedwarspractice.club")) {
+            } else if (onBWP.get() && Util.getCurrentServerAddress().contains("bedwarspractice.club")) {
                 if (gf.get()) {
                     processChat(message, bedwarsPracticeGFStrings, gfString.get());
                 }
@@ -197,7 +197,7 @@ public void onMessage(Text message) {
                 if (glhf.get()) {
                     processChat(message, bedwarsPracticeGLHFStrings, glhfString.get());
                 }
-            } else if (onPVPL.get() && client.getCurrentServerEntry().address.contains("pvp.land")) {
+            } else if (onPVPL.get() && Util.getCurrentServerAddress().contains("pvp.land")) {
                 if (gf.get()) {
                     processChat(message, pvpLandGFStrings, gfString.get());
                 }
@@ -207,7 +207,7 @@ public void onMessage(Text message) {
                 if (glhf.get()) {
                     processChat(message, pvpLandGLHFStrings, glhfString.get());
                 }
-            } else if (onMMC.get() && client.getCurrentServerEntry().address.contains("minemen.club")) {
+            } else if (onMMC.get() && Util.getCurrentServerAddress().contains("minemen.club")) {
                 if (gf.get()) {
                     if (minemenGFStrings.size() == 0) populateMinemenGFStrings();
                     processChat(message, minemenGFStrings, "gf");
diff --git a/src/main/java/io/github/axolotlclient/modules/hypixel/autotip/AutoTip.java b/src/main/java/io/github/axolotlclient/modules/hypixel/autotip/AutoTip.java
@@ -3,6 +3,7 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionCategory;
 import io.github.axolotlclient.modules.hypixel.AbstractHypixelMod;
+import io.github.axolotlclient.util.Util;
 import net.minecraft.client.MinecraftClient;
 
 public class AutoTip implements AbstractHypixelMod {
@@ -29,8 +30,8 @@ public OptionCategory getCategory() {
     @Override
     public void tick() {
         if(init) {
-            if (System.currentTimeMillis() - lastTime > 1200000 && MinecraftClient.getInstance().getCurrentServerEntry() != null &&
-                    MinecraftClient.getInstance().getCurrentServerEntry().address.contains("hypixel") &&
+            if (System.currentTimeMillis() - lastTime > 1200000 && Util.getCurrentServerAddress() != null &&
+                    Util.currentServerAddressContains("hypixel") &&
                     enabled.get()) {
 
                 if(MinecraftClient.getInstance().player!=null) {
diff --git a/src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java b/src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java
@@ -64,7 +64,7 @@ public void init() {
         AxolotlClient.CONFIG.addCategory(category);
 
         if(OSUtil.getOS()== OSUtil.OperatingSystem.OTHER){
-            enabled.setForceOff(true, "crash");
+            enabled.setForceOff(true, "axolotlclient.crash");
         }
 
         Optional<ModContainer> container = FabricLoader.getInstance().getModContainer("axolotlclient");
@@ -130,21 +130,22 @@ public void updateActivity() {
         switch (showServerNameMode.get()) {
             case "showIp":
                 state = MinecraftClient.getInstance().world == null ?
-                        "In the menu" : (MinecraftClient.getInstance().getCurrentServerEntry() == null ?
-                        "Singleplayer" : MinecraftClient.getInstance().getCurrentServerEntry().address);
+                        "In the menu" : (Util.getCurrentServerAddress() == null ?
+                        "Singleplayer" : Util.getCurrentServerAddress());
                 break;
             case "showName":
                 state = MinecraftClient.getInstance().world == null ?
                         "In the menu" : (MinecraftClient.getInstance().getCurrentServerEntry() == null ?
-                        "Singleplayer" : MinecraftClient.getInstance().getCurrentServerEntry().name);
+                        (Util.getCurrentServerAddress() == null ? "Singleplayer" : Util.getCurrentServerAddress()) :
+                        MinecraftClient.getInstance().getCurrentServerEntry().name);
                 break;
             case "off":
             default:
                 state = "";
                 break;
         }
 
-        if (showActivity.get() && MinecraftClient.getInstance().getCurrentServerEntry() != null) {
+        if (showActivity.get() && Util.getCurrentServerAddress() != null) {
             activity.setDetails(Util.getGame());
         } else if (showActivity.get() && currentActivity != null){
             activity.setDetails(currentActivity.getDetails());
diff --git a/src/main/java/io/github/axolotlclient/modules/rpc/gameSdk/GameSdkDownloader.java b/src/main/java/io/github/axolotlclient/modules/rpc/gameSdk/GameSdkDownloader.java
@@ -64,7 +64,7 @@ public static void downloadSdk() {
 
             if (!sdk.exists() || !jni.exists()) {
                 Logger.error("Could not download GameSDK, no copy is available. RPC will be disabled.");
-                DiscordRPC.getInstance().enabled.setForceOff(true, "crash");
+                DiscordRPC.getInstance().enabled.setForceOff(true, "axolotlclient.crash");
                 return;
             }
 
@@ -126,7 +126,7 @@ private static void extractJni(File jni) throws IOException {
             extractJni(jni);
         } else {
             Logger.error("Extracting Jni failed, restart your game to try again.");
-            DiscordRPC.getInstance().enabled.setForceOff(true, "crash");
+            DiscordRPC.getInstance().enabled.setForceOff(true, "axolotlclient.crash");
         }
     }
 
diff --git a/src/main/java/io/github/axolotlclient/util/FeatureDisabler.java b/src/main/java/io/github/axolotlclient/util/FeatureDisabler.java
@@ -3,7 +3,6 @@
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.modules.freelook.Freelook;
-import net.minecraft.client.network.ServerInfo;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -36,7 +35,7 @@ private static void disableOption(BooleanOption option, String[] servers, String
         }
 
         if(option.getForceDisabled() != ban) {
-            option.setForceOff(ban, "ban_reason");
+            option.setForceOff(ban, "axolotlclient.ban_reason");
         }
     }
 
diff --git a/src/main/java/io/github/axolotlclient/util/Util.java b/src/main/java/io/github/axolotlclient/util/Util.java
@@ -2,7 +2,7 @@
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import io.github.axolotlclient.modules.hud.util.Rectangle;
+import io.github.axolotlclient.mixin.MinecraftClientAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.util.Window;
 import net.minecraft.entity.Entity;
@@ -113,9 +113,9 @@ public static String getGame(){
         List<String> sidebar = getSidebar();
 
         if(sidebar.isEmpty()) game = "";
-        else if (MinecraftClient.getInstance().getCurrentServerEntry() != null && MinecraftClient.getInstance().getCurrentServerEntry().address.toLowerCase().contains(sidebar.get(0).toLowerCase())){
+        else if (Util.getCurrentServerAddress() != null && Util.getCurrentServerAddress().toLowerCase().contains(sidebar.get(0).toLowerCase())){
             if ( sidebar.get(sidebar.size() -1).toLowerCase(Locale.ROOT)
-                    .contains(MinecraftClient.getInstance().getCurrentServerEntry().address.toLowerCase(Locale.ROOT)) ||
+                    .contains(Util.getCurrentServerAddress().toLowerCase(Locale.ROOT)) ||
                     sidebar.get(sidebar.size()-1).contains("Playtime")){
                 game = "In Lobby";
             }  else {
@@ -202,6 +202,22 @@ public static <T> T make(T object, Consumer<T> initializer) {
         return object;
     }
 
+    public static boolean currentServerAddressContains(String address){
+        if(MinecraftClient.getInstance().getCurrentServerEntry() != null){
+            return MinecraftClient.getInstance().getCurrentServerEntry().address.contains(address);
+        }
+        return ((MinecraftClientAccessor) MinecraftClient.getInstance()).getServerAddress() != null &&
+                ((MinecraftClientAccessor) MinecraftClient.getInstance()).getServerAddress().contains(address);
+    }
+
+    public static String getCurrentServerAddress(){
+        if(MinecraftClient.getInstance().getCurrentServerEntry() != null){
+            return MinecraftClient.getInstance().getCurrentServerEntry().address;
+        }
+        return ((MinecraftClientAccessor) MinecraftClient.getInstance()).getServerAddress() != null ?
+                ((MinecraftClientAccessor) MinecraftClient.getInstance()).getServerAddress() : null;
+    }
+
     public static List<String> getSidebar() {
         List<String> lines = new ArrayList<>();
         MinecraftClient client = MinecraftClient.getInstance();
@@ -265,9 +281,6 @@ public static float lerp(float start, float end, float percent) {
         return start + ((end - start) * percent);
     }
 
-    public static float easeInOutSine(float start, float end, float percent){
-        return (float) (start + (-(Math.cos(Math.PI * percent) - end) / 2));
-    }
 
     // https://stackoverflow.com/questions/12967896/converting-integers-to-roman-numerals-java
     public static String toRoman(int number) {

Original file line number	Diff line number	Diff line change
`@@ -235,10 +235,4 @@ public void updateFreelook(ClientPlayerEntity entity, float yaw, float pitch) {`
`235`	`235`	`public float freelook$prevPitch(Entity entity) {`
`236`	`236`	`return Freelook.getInstance().pitch(entity.prevPitch);`
`237`	`237`	`}`
`238`		`-`
`239`		`- @Inject(method = "onResized", at = @At(value = "TAIL"))`
`240`		`- public void onResize(int i, int j, CallbackInfo ci){`
`241`		`- Util.window = new Window(MinecraftClient.getInstance());`
`242`		`- HudManager.getInstance().refreshAllBounds();`
`243`		`- }`
`244`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package io.github.axolotlclient.modules.hud.gui.hud.simple;`
`2`	`2`
`3`	`3`	`import io.github.axolotlclient.modules.hud.gui.entry.SimpleTextHudEntry;`
	`4`	`+import io.github.axolotlclient.util.Util;`
`4`	`5`	`import net.minecraft.client.MinecraftClient;`
`5`	`6`	`import net.minecraft.util.Identifier;`
`6`	`7`
`@@ -29,10 +30,10 @@ public String getValue() {`
`29`	`30`	`if (client.isInSingleplayer()) {`
`30`	`31`	`return "Singleplayer";`
`31`	`32`	`}`
`32`		`- if (client.getCurrentServerEntry() == null) {`
	`33`	`+ if (Util.getCurrentServerAddress() == null) {`
`33`	`34`	`return "none";`
`34`	`35`	`}`
`35`		`- return client.getCurrentServerEntry().address;`
	`36`	`+ return Util.getCurrentServerAddress();`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -176,8 +176,8 @@ private void populateMinemenGLHFStrings() {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`public void onMessage(Text message) {`
`179`		`- if(client.getCurrentServerEntry() != null) {`
`180`		`- if (onHypixel.get() && client.getCurrentServerEntry().address.contains("hypixel")) {`
	`179`	`+ if(Util.getCurrentServerAddress() != null) {`
	`180`	`+ if (onHypixel.get() && Util.getCurrentServerAddress().contains("hypixel")) {`
`181`	`181`	`if (gf.get()) {`
`182`	`182`	`processChat(message, hypixelGFStrings, gfString.get());`
`183`	`183`	`}`
`@@ -187,7 +187,7 @@ public void onMessage(Text message) {`
`187`	`187`	`if (glhf.get()) {`
`188`	`188`	`processChat(message, hypixelGLHFStrings, glhfString.get());`
`189`	`189`	`}`
`190`		`- } else if (onBWP.get() && client.getCurrentServerEntry().address.contains("bedwarspractice.club")) {`
	`190`	`+ } else if (onBWP.get() && Util.getCurrentServerAddress().contains("bedwarspractice.club")) {`
`191`	`191`	`if (gf.get()) {`
`192`	`192`	`processChat(message, bedwarsPracticeGFStrings, gfString.get());`
`193`	`193`	`}`
`@@ -197,7 +197,7 @@ public void onMessage(Text message) {`
`197`	`197`	`if (glhf.get()) {`
`198`	`198`	`processChat(message, bedwarsPracticeGLHFStrings, glhfString.get());`
`199`	`199`	`}`
`200`		`- } else if (onPVPL.get() && client.getCurrentServerEntry().address.contains("pvp.land")) {`
	`200`	`+ } else if (onPVPL.get() && Util.getCurrentServerAddress().contains("pvp.land")) {`
`201`	`201`	`if (gf.get()) {`
`202`	`202`	`processChat(message, pvpLandGFStrings, gfString.get());`
`203`	`203`	`}`
`@@ -207,7 +207,7 @@ public void onMessage(Text message) {`
`207`	`207`	`if (glhf.get()) {`
`208`	`208`	`processChat(message, pvpLandGLHFStrings, glhfString.get());`
`209`	`209`	`}`
`210`		`- } else if (onMMC.get() && client.getCurrentServerEntry().address.contains("minemen.club")) {`
	`210`	`+ } else if (onMMC.get() && Util.getCurrentServerAddress().contains("minemen.club")) {`
`211`	`211`	`if (gf.get()) {`
`212`	`212`	`if (minemenGFStrings.size() == 0) populateMinemenGFStrings();`
`213`	`213`	`processChat(message, minemenGFStrings, "gf");`