diff --git a/core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java index 85bfd583d..890290a01 100644 --- a/core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/connector/network/session/GeyserSession.java @@ -100,7 +100,7 @@ public class GeyserSession { } public void login() { - this.handle.login(); + throw new UnsupportedOperationException(); } public void authenticate(String username) { @@ -120,7 +120,7 @@ public class GeyserSession { } public void close() { - this.handle.close(); + throw new UnsupportedOperationException(); } public void executeInEventLoop(Runnable runnable) { diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java index 3cfe0e550..8a030c385 100644 --- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java @@ -625,17 +625,6 @@ public class GeyserSession implements GeyserConnection, CommandSender { upstream.sendPacket(gamerulePacket); } - public void login() { - if (this.remoteAuthType != AuthType.ONLINE) { - if (this.remoteAuthType == AuthType.OFFLINE) { - geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.auth.login.offline")); - } else { - geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.auth.login.floodgate")); - } - authenticate(authData.name()); - } - } - public void authenticate(String username) { authenticate(username, ""); } @@ -1046,10 +1035,6 @@ public class GeyserSession implements GeyserConnection, CommandSender { closed = true; } - public void close() { - disconnect(GeyserLocale.getPlayerLocaleString("geyser.network.close", getClientData().getLanguageCode())); - } - /** * Executes a task and prints a stack trace if an error occurs. */ diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginDisconnectTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginDisconnectTranslator.java index 2f6674727..981fa83bf 100644 --- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginDisconnectTranslator.java +++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginDisconnectTranslator.java @@ -26,7 +26,13 @@ package org.geysermc.geyser.translator.protocol.java; import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.TextComponent; +import net.kyori.adventure.text.TranslatableComponent; +import org.geysermc.common.PlatformType; +import org.geysermc.geyser.network.MinecraftProtocol; import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.text.GeyserLocale; import org.geysermc.geyser.translator.protocol.PacketTranslator; import org.geysermc.geyser.translator.protocol.Translator; import org.geysermc.geyser.translator.text.MessageTranslator; @@ -36,8 +42,37 @@ public class JavaLoginDisconnectTranslator extends PacketTranslator