diff --git a/bridge/src/main/java/asys/bridge/bukkit/BridgeBukkitImpl.java b/bridge/src/main/java/asys/bridge/bukkit/BridgeBukkitImpl.java index 28effcc..cdfbbc8 100644 --- a/bridge/src/main/java/asys/bridge/bukkit/BridgeBukkitImpl.java +++ b/bridge/src/main/java/asys/bridge/bukkit/BridgeBukkitImpl.java @@ -17,7 +17,7 @@ public class BridgeBukkitImpl extends AbstractBridge implements IBridge { private int scheduleId; private int second; - public BridgeBukkitImpl(BridgePlugin plugin) { + BridgeBukkitImpl(BridgePlugin plugin) { this.plugin = plugin; this.logger = new LoggerBukkitImpl(plugin.getLogger()); this.configBukkit = new ConfigBukkitImpl(plugin.getConfig()); @@ -51,7 +51,6 @@ public class BridgeBukkitImpl extends AbstractBridge implements IBridge { @Override public void startPing() { scheduleId = plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin,() -> { - plugin.getLogger().info("[D] send ping..."); this.client.sendPacket(new CS_Ping( System.currentTimeMillis(), 20.0D, //FIXME fake tps diff --git a/bridge/src/main/java/asys/bridge/bukkit/ConfigBukkitImpl.java b/bridge/src/main/java/asys/bridge/bukkit/ConfigBukkitImpl.java index be56291..e85ad70 100644 --- a/bridge/src/main/java/asys/bridge/bukkit/ConfigBukkitImpl.java +++ b/bridge/src/main/java/asys/bridge/bukkit/ConfigBukkitImpl.java @@ -10,7 +10,7 @@ import org.bukkit.configuration.file.FileConfiguration; public class ConfigBukkitImpl implements IConfig { private FileConfiguration fileConfiguration; - public ConfigBukkitImpl(FileConfiguration fileConfiguration) { + ConfigBukkitImpl(FileConfiguration fileConfiguration) { this.fileConfiguration = fileConfiguration; } diff --git a/bridge/src/main/java/asys/bridge/client/AbstractBridge.java b/bridge/src/main/java/asys/bridge/client/AbstractBridge.java index ecbee7d..335f010 100644 --- a/bridge/src/main/java/asys/bridge/client/AbstractBridge.java +++ b/bridge/src/main/java/asys/bridge/client/AbstractBridge.java @@ -20,7 +20,7 @@ public abstract class AbstractBridge implements IBridge { connectTicker = new TaskTicker().setStepTimeMs(5000L); connectTicker.setTask(() -> { getLogger().info(String.format("Connect(%d) to Zond...", ++tryConnect)); - client.connect("127.0.0.1", getConfig().getInt("port")); + client.connect(getConfig().getInt("port")); if (client.isConnected()) { stopReconnect(); } else { diff --git a/bridge/src/main/java/asys/bridge/client/Client.java b/bridge/src/main/java/asys/bridge/client/Client.java index 7243997..084e816 100644 --- a/bridge/src/main/java/asys/bridge/client/Client.java +++ b/bridge/src/main/java/asys/bridge/client/Client.java @@ -22,25 +22,25 @@ public class Client { private ChannelFuture channelFuture; private IBridge bridge; - public Client(IBridge bridge) { + Client(IBridge bridge) { this.bridge = bridge; } - public void connect(String host, int port) { + void connect(int port) { if (group == null || bootstrap == null) { group = new NioEventLoopGroup(); bootstrap = createBootstrap(); } - channelFuture = bootstrap.connect(host, port); + channelFuture = bootstrap.connect("127.0.0.1", port); channelFuture.awaitUninterruptibly(5000); } - public boolean isConnected() { + boolean isConnected() { return (channelFuture != null && channelFuture.isSuccess()); } - public void disconnect() { + void disconnect() { group.shutdownGracefully(); }