From 8f4e3fbc0e9d55618fd2c07c2f6cb27f9ad4abde Mon Sep 17 00:00:00 2001 From: Brady Date: Wed, 4 Mar 2020 11:35:11 -0600 Subject: [PATCH] Might as well populate the server name --- .../java/baritone/launch/mixins/MixinThreadLanServerPing.java | 4 ++++ src/main/java/baritone/bot/UserManager.java | 2 +- .../java/baritone/utils/accessor/IThreadLanServerPing.java | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/launch/java/baritone/launch/mixins/MixinThreadLanServerPing.java b/src/launch/java/baritone/launch/mixins/MixinThreadLanServerPing.java index e12669106..b2249611e 100644 --- a/src/launch/java/baritone/launch/mixins/MixinThreadLanServerPing.java +++ b/src/launch/java/baritone/launch/mixins/MixinThreadLanServerPing.java @@ -29,6 +29,10 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(ThreadLanServerPing.class) public abstract class MixinThreadLanServerPing implements IThreadLanServerPing { + @Accessor + @Override + public abstract String getMotd(); + @Accessor @Override public abstract String getAddress(); diff --git a/src/main/java/baritone/bot/UserManager.java b/src/main/java/baritone/bot/UserManager.java index 24ccf5237..22b72f096 100644 --- a/src/main/java/baritone/bot/UserManager.java +++ b/src/main/java/baritone/bot/UserManager.java @@ -96,7 +96,7 @@ public final class UserManager implements IUserManager, Helper { IThreadLanServerPing lanServerPing = (IThreadLanServerPing) integratedServer.getLanServerPing(); int port = Integer.parseInt(lanServerPing.getAddress()); - return connect0(session, new ServerData("", "localhost:" + port, true)); + return connect0(session, new ServerData(lanServerPing.getMotd(), "localhost:" + port, true)); } catch (Exception e) { e.printStackTrace(); return ConnectionResult.failed(CANT_RESOLVE_LAN); diff --git a/src/main/java/baritone/utils/accessor/IThreadLanServerPing.java b/src/main/java/baritone/utils/accessor/IThreadLanServerPing.java index 6211ab08a..107cdd126 100644 --- a/src/main/java/baritone/utils/accessor/IThreadLanServerPing.java +++ b/src/main/java/baritone/utils/accessor/IThreadLanServerPing.java @@ -23,5 +23,7 @@ package baritone.utils.accessor; */ public interface IThreadLanServerPing { + String getMotd(); + String getAddress(); }