Minecraft/asys
Archived
0
Fork 0
Code Activity

Bridge: убран лишний код

Browse Source
This commit is contained in:
DmitriyMX
2017-07-24 23:06:55 +03:00
parent 1a36b70e5d
commit 819cb372ba
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bridge/src/main/java/asys/bridge/bukkit/BridgeBukkitImpl.java
View File

@@ -17,7 +17,7 @@ public class BridgeBukkitImpl extends AbstractBridge implements IBridge {
private int scheduleId; private int scheduleId;
private int second; private int second;
public BridgeBukkitImpl(BridgePlugin plugin) { BridgeBukkitImpl(BridgePlugin plugin) {
this.plugin = plugin; this.plugin = plugin;
this.logger = new LoggerBukkitImpl(plugin.getLogger()); this.logger = new LoggerBukkitImpl(plugin.getLogger());
this.configBukkit = new ConfigBukkitImpl(plugin.getConfig()); this.configBukkit = new ConfigBukkitImpl(plugin.getConfig());
@@ -51,7 +51,6 @@ public class BridgeBukkitImpl extends AbstractBridge implements IBridge {
@Override @Override
public void startPing() { public void startPing() {
scheduleId = plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin,() -> { scheduleId = plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin,() -> {
plugin.getLogger().info("[D] send ping...");
this.client.sendPacket(new CS_Ping( this.client.sendPacket(new CS_Ping(
System.currentTimeMillis(), System.currentTimeMillis(),
20.0D, //FIXME fake tps 20.0D, //FIXME fake tps

2
bridge/src/main/java/asys/bridge/bukkit/ConfigBukkitImpl.java
View File

@@ -10,7 +10,7 @@ import org.bukkit.configuration.file.FileConfiguration;
public class ConfigBukkitImpl implements IConfig { public class ConfigBukkitImpl implements IConfig {
private FileConfiguration fileConfiguration; private FileConfiguration fileConfiguration;
public ConfigBukkitImpl(FileConfiguration fileConfiguration) { ConfigBukkitImpl(FileConfiguration fileConfiguration) {
this.fileConfiguration = fileConfiguration; this.fileConfiguration = fileConfiguration;
} }

2
bridge/src/main/java/asys/bridge/client/AbstractBridge.java
View File

@@ -20,7 +20,7 @@ public abstract class AbstractBridge implements IBridge {
connectTicker = new TaskTicker().setStepTimeMs(5000L); connectTicker = new TaskTicker().setStepTimeMs(5000L);
connectTicker.setTask(() -> { connectTicker.setTask(() -> {
getLogger().info(String.format("Connect(%d) to Zond...", ++tryConnect)); 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()) { if (client.isConnected()) {
stopReconnect(); stopReconnect();
} else { } else {

10
bridge/src/main/java/asys/bridge/client/Client.java
View File

@@ -22,25 +22,25 @@ public class Client {
private ChannelFuture channelFuture; private ChannelFuture channelFuture;
private IBridge bridge; private IBridge bridge;
public Client(IBridge bridge) { Client(IBridge bridge) {
this.bridge = bridge; this.bridge = bridge;
} }
public void connect(String host, int port) { void connect(int port) {
if (group == null || bootstrap == null) { if (group == null || bootstrap == null) {
group = new NioEventLoopGroup(); group = new NioEventLoopGroup();
bootstrap = createBootstrap(); bootstrap = createBootstrap();
} }
channelFuture = bootstrap.connect(host, port); channelFuture = bootstrap.connect("127.0.0.1", port);
channelFuture.awaitUninterruptibly(5000); channelFuture.awaitUninterruptibly(5000);
} }
public boolean isConnected() { boolean isConnected() {
return (channelFuture != null && channelFuture.isSuccess()); return (channelFuture != null && channelFuture.isSuccess());
} }
public void disconnect() { void disconnect() {
group.shutdownGracefully(); group.shutdownGracefully();
} }