diff --git a/src/main/java/net/krakatoa/proxy/config/ConfigHandler.java b/src/main/java/net/krakatoa/proxy/config/ConfigHandler.java index d880aa9..166402b 100644 --- a/src/main/java/net/krakatoa/proxy/config/ConfigHandler.java +++ b/src/main/java/net/krakatoa/proxy/config/ConfigHandler.java @@ -24,7 +24,6 @@ public class ConfigHandler { private String mongodbPassword; public void load() throws IOException { - // TODO change file to yaml Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class) .load(new File("/home/kra-minecraft/kraConfigs", "kraSettings.yaml")); diff --git a/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java b/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java index 2f9b7bf..52a4a24 100644 --- a/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java +++ b/src/main/java/net/krakatoa/proxy/listener/PostLoginListener.java @@ -3,11 +3,11 @@ package net.krakatoa.proxy.listener; import com.mongodb.client.model.Filters; import com.mongodb.client.model.UpdateOptions; import com.mongodb.client.model.Updates; +import earth.krakatao.protocol.KraSocketClientProtocolMessage; import java.security.SecureRandom; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import net.krakatoa.proxy.ProxySystem; -import net.krakatoa.proxy.protocol.KraProtocolMessage; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.HoverEvent; @@ -49,12 +49,14 @@ public class PostLoginListener implements Listener { sendVoiceWebCodeUrl(proxiedPlayer, voiceWebCode); } else { // check if both sockets connected - int cmdID = ProxySystem.getInstance().getKraProtocol().getCmdID(); + int cmdID = ProxySystem.getInstance().getKraSocketClientProtocol().getCmdID(); - ProxySystem.getInstance().getKraProtocol().SendMessage(11, cmdID, 1, uuid, 10, ""); + ProxySystem.getInstance().getKraSocketClient().getSocketClient() + .SendMessage(new KraSocketClientProtocolMessage((byte) 11, cmdID, 1, uuid, + (short) 10, "")); Document finalDocument = document; - Consumer consumer = value -> { + Consumer consumer = value -> { if (value.getArgs().equals("1")) { // connected! Send player to game server System.out.println( @@ -89,11 +91,10 @@ public class PostLoginListener implements Listener { System.out.println( "consumer response value " + value.getUuid() + " " + value.getCmdID()); }; - ProxySystem.getInstance().getKraProtocol().getConsumerHashMap().put(cmdID, consumer); + ProxySystem.getInstance().getKraSocketClientProtocol().getConsumerHashMap() + .put(cmdID, consumer); } }); - - } public void sendVoiceWebCodeUrl(ProxiedPlayer proxiedPlayer, String voiceWebCode) {