Fixed server IP in Discord integration

Author: FabiPunktExe

changelog.md

@@ -1,2 +1,2 @@
 ## SimpleClient %version%
-- Added TNT Timer
+- Fixed server IP in Discord integration

gradle.properties

@@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # SimpleClient
-simpleclient_version=0.3.2
+simpleclient_version=0.3.3
 discord_game_sdk_version=v0.5.5

simpleclient-1.19.4/src/main/java/simpleclient/SimpleClient.java

@@ -54,8 +54,7 @@ public void onInitializeClient() {
             if (mc.player != null && mc.level != null) {
                 if (DiscordRPC.INSTANCE.getIngameTimestamp() == null) DiscordRPC.INSTANCE.setIngameTimestamp(Instant.now());
                 if (mc.getSingleplayerServer() == null) {
-                    InetSocketAddress address = (InetSocketAddress) mc.getConnection().getConnection().getRemoteAddress();
-                    return DiscordRPC.activity("Multiplayer", address.getHostString(), DiscordRPC.INSTANCE.getIngameTimestamp());
+                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServer().ip, DiscordRPC.INSTANCE.getIngameTimestamp());
                 } else {
                     String gamemode = mc.player.isCreative() ? "Creative Mode" : mc.player.isSpectator() ? "Spectator Mode" : "Survival Mode";
                     return DiscordRPC.activity("Singleplayer", gamemode, DiscordRPC.INSTANCE.getIngameTimestamp());

simpleclient-1.20.1/src/main/java/simpleclient/SimpleClient.java

@@ -47,8 +47,7 @@ public void onInitializeClient() {
             if (mc.player != null && mc.level != null) {
                 if (DiscordRPC.INSTANCE.getIngameTimestamp() == null) DiscordRPC.INSTANCE.setIngameTimestamp(Instant.now());
                 if (mc.getSingleplayerServer() == null) {
-                    InetSocketAddress address = (InetSocketAddress) mc.getConnection().getConnection().getRemoteAddress();
-                    return DiscordRPC.activity("Multiplayer", address.getHostString(), DiscordRPC.INSTANCE.getIngameTimestamp());
+                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServer().ip, DiscordRPC.INSTANCE.getIngameTimestamp());
                 } else {
                     String gamemode = mc.player.isCreative() ? "Creative Mode" : mc.player.isSpectator() ? "Spectator Mode" : "Survival Mode";
                     return DiscordRPC.activity("Singleplayer", gamemode, DiscordRPC.INSTANCE.getIngameTimestamp());

simpleclient-1.20/src/main/java/simpleclient/SimpleClient.java

@@ -47,8 +47,7 @@ public void onInitializeClient() {
             if (mc.player != null && mc.level != null) {
                 if (DiscordRPC.INSTANCE.getIngameTimestamp() == null) DiscordRPC.INSTANCE.setIngameTimestamp(Instant.now());
                 if (mc.getSingleplayerServer() == null) {
-                    InetSocketAddress address = (InetSocketAddress) mc.getConnection().getConnection().getRemoteAddress();
-                    return DiscordRPC.activity("Multiplayer", address.getHostString(), DiscordRPC.INSTANCE.getIngameTimestamp());
+                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServer().ip, DiscordRPC.INSTANCE.getIngameTimestamp());
                 } else {
                     String gamemode = mc.player.isCreative() ? "Creative Mode" : mc.player.isSpectator() ? "Spectator Mode" : "Survival Mode";
                     return DiscordRPC.activity("Singleplayer", gamemode, DiscordRPC.INSTANCE.getIngameTimestamp());

simpleclient-1.8.9/src/main/java/simpleclient/SimpleClient.java

@@ -47,9 +47,8 @@ public void onInitializeClient() {
             MinecraftClient mc = MinecraftClient.getInstance();
             if (mc.player != null && mc.world != null) {
                 if (DiscordRPC.INSTANCE.getIngameTimestamp() == null) DiscordRPC.INSTANCE.setIngameTimestamp(Instant.now());
-                if (mc.getServer() == null) {
-                    InetSocketAddress address = (InetSocketAddress) mc.getNetworkHandler().getClientConnection().getAddress();
-                    return DiscordRPC.activity("Multiplayer", address.getHostString(), DiscordRPC.INSTANCE.getIngameTimestamp());
+                if (mc.getServer() == null) {;
+                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServerEntry().address, DiscordRPC.INSTANCE.getIngameTimestamp());
                 } else {
                     PlayerListEntry entry = mc.getNetworkHandler().getPlayerListEntry(mc.player.getGameProfile().getId());
                     LevelInfo.GameMode mode = entry.getGameMode();