From 470ac0e97e43eccfd723cd08f50448bcdfaa0e6b Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 29 Apr 2017 13:29:13 +0300 Subject: [PATCH] =?UTF-8?q?Bridge:=20=D1=84=D0=B0=D0=B9=D0=BB=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bridge/build.gradle | 2 +- bridge/src/main/java/asys/bridge/bukkit/BridgePlugin.java | 5 +++-- .../main/java/asys/bridge/client/ClientPacketHandler.java | 4 +++- bridge/src/main/resources/config.yml | 4 ++++ 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 bridge/src/main/resources/config.yml diff --git a/bridge/build.gradle b/bridge/build.gradle index 9abe9b7..ad90035 100644 --- a/bridge/build.gradle +++ b/bridge/build.gradle @@ -1,5 +1,5 @@ group = 'asys' -version = '0.3-SNAPSHOT' +version = '0.4-SNAPSHOT' repositories { maven { url 'https://hub.spigotmc.org/nexus/content/groups/public/' } diff --git a/bridge/src/main/java/asys/bridge/bukkit/BridgePlugin.java b/bridge/src/main/java/asys/bridge/bukkit/BridgePlugin.java index c448dc8..f4d4734 100644 --- a/bridge/src/main/java/asys/bridge/bukkit/BridgePlugin.java +++ b/bridge/src/main/java/asys/bridge/bukkit/BridgePlugin.java @@ -20,12 +20,13 @@ public class BridgePlugin extends JavaPlugin { @Override public void onEnable() { INSTANCE = this; - client = new Client(); + saveDefaultConfig(); + client = new Client(); ScheduledExecutorService ses = Executors.newScheduledThreadPool(1); sesFuture = ses.scheduleAtFixedRate(() -> { getLogger().info(String.format("Connect(%d) to ASys...", ++tryConnect)); - client.connect("127.0.0.1", 8779); + client.connect(getConfig().getString("host"), getConfig().getInt("port")); if (client.isConnected()) { getLogger().info(String.format("Connect(%d) OK", tryConnect)); sesFuture.cancel(false); diff --git a/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java b/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java index 7cad1e1..bcf3c74 100644 --- a/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java +++ b/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java @@ -40,7 +40,9 @@ public class ClientPacketHandler extends ChannelInboundHandlerAdapter implements context.channel().attr(KNOWN_PACKETS).set(handshakePackets); context.channel().attr(KNOWN_HANDLERS).set(handshakeHandlers); - CS_Handshake packet = new CS_Handshake("SpigotServer0", "testpassphrase"); + CS_Handshake packet = new CS_Handshake( + BridgePlugin.INSTANCE.getConfig().getString("clientId"), + BridgePlugin.INSTANCE.getConfig().getString("passcode")); context.channel().writeAndFlush(packet); } diff --git a/bridge/src/main/resources/config.yml b/bridge/src/main/resources/config.yml new file mode 100644 index 0000000..5d80f21 --- /dev/null +++ b/bridge/src/main/resources/config.yml @@ -0,0 +1,4 @@ +clientId: SpigotServer0 +host: 127.0.0.1 +port: 8779 +passcode: testpassphrase \ No newline at end of file