diff --git a/.idea/misc.xml b/.idea/misc.xml index 18ad7e3..8bddb52 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/eaglerbungee/nb-configuration.xml b/eaglerbungee/nb-configuration.xml deleted file mode 100644 index 7e46592..0000000 --- a/eaglerbungee/nb-configuration.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - project - NEW_LINE - NEW_LINE - NEW_LINE - true - true - true - true - true - true - true - true - true - true - - diff --git a/eaglerbungee/pom.xml b/eaglerbungee/pom.xml deleted file mode 100644 index 768bda2..0000000 --- a/eaglerbungee/pom.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - 4.0.0 - - - org.sonatype.oss - oss-parent - 7 - - - net.md-5 - bungeecord-parent - 1.6.4-SNAPSHOT - pom - - BungeeCord - Parent project for all BungeeCord modules. - https://github.com/SpigotMC/BungeeCord - 2012 - - Elastic Portal Suite - https://github.com/SpigotMC - - - - The BSD 3-Clause License - http://opensource.org/licenses/BSD-3-Clause - repo - - - - - - md_5 - - - - - api - bootstrap - config - event - protocol - proxy - query - - - - scm:git:git@github.com:SpigotMC/BungeeCord.git - scm:git:git@github.com:SpigotMC/BungeeCord.git - git@github.com:SpigotMC/BungeeCord.git - - - GitHub - https://github.com/SpigotMC/BungeeCord/issues - - - jenkins - http://ci.md-5.net/job/BungeeCord - - - - unknown - 4.0.9.Final - UTF-8 - - - - - junit - junit - 4.11 - test - - - org.projectlombok - lombok - 1.12.2 - provided - - - - - - - com.lukegb.mojo - gitdescribe-maven-plugin - 1.3 - - git-${project.name}-${project.version}- - -${build.number} - - - - compile - - gitdescribe - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.7 - 1.7 - - - - - diff --git a/eaglerbungee/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/eaglerbungee/src/main/java/net/md_5/bungee/connection/InitialHandler.java index 4431883..327529a 100644 --- a/eaglerbungee/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/eaglerbungee/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -84,6 +84,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection { @Override public void handle(final PacketFEPing ping) throws Exception { + System.out.println("[InitialHandler - Server pinged]"); ServerPing response = new ServerPing(this.bungee.getProtocolVersion(), this.bungee.getGameVersion(), this.listener.getMotd(), this.bungee.getOnlineCount(), this.listener.getMaxPlayers()); response = this.bungee.getPluginManager().callEvent(new ProxyPingEvent(this, response)).getResponse(); final String kickMessage = ChatColor.DARK_BLUE + "\u0000" + response.getProtocolVersion() + "\u0000" + response.getGameVersion() + "\u0000" + response.getMotd() + "\u0000" + response.getCurrentPlayers() + "\u0000" @@ -93,6 +94,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection { @Override public void handle(final Packet1Login login) throws Exception { + System.out.println("Login"); Preconditions.checkState(this.thisState == State.LOGIN, (Object) "Not expecting FORGE LOGIN"); Preconditions.checkState(this.forgeLogin == null, (Object) "Already received FORGE LOGIN"); this.forgeLogin = login; diff --git a/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketProxy.java b/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketProxy.java index 2bd1be1..3e9f59c 100644 --- a/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketProxy.java +++ b/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketProxy.java @@ -61,6 +61,7 @@ public class WebSocketProxy extends SimpleChannelInboundHandler { } public boolean connect() { + System.out.println("[WebsocketProxy] - connecting (?)"); try { if(tcpChannel == null) { Bootstrap clientBootstrap = new Bootstrap(); diff --git a/lwjgl-rundir/_eagstorage.g.dat b/lwjgl-rundir/_eagstorage.g.dat index cec3867..272024d 100644 Binary files a/lwjgl-rundir/_eagstorage.g.dat and b/lwjgl-rundir/_eagstorage.g.dat differ diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index 27efbae..ae7d658 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java b/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java index 03c7541..0a90913 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java @@ -1136,6 +1136,7 @@ public class EaglerAdapterImpl2 { public static final boolean connectionOpen() { return clientSocket != null && clientSocket.isOpen(); } + public static final void writePacket(byte[] packet) { if(clientSocket != null && clientSocket.isOpen()) { System.out.println("[EaglerAdapterImpl2] - Writing packet"); @@ -1147,6 +1148,9 @@ public class EaglerAdapterImpl2 { if(!readPackets.isEmpty()) { return readPackets.remove(0); } + else { + System.err.println("[EaglerAdapterImpl2] - Cannot read packet!"); + } } return null; } diff --git a/src/main/java/net/lax1dude/eaglercraft/WebsocketNetworkManager.java b/src/main/java/net/lax1dude/eaglercraft/WebsocketNetworkManager.java index 116c4ad..8f23e03 100644 --- a/src/main/java/net/lax1dude/eaglercraft/WebsocketNetworkManager.java +++ b/src/main/java/net/lax1dude/eaglercraft/WebsocketNetworkManager.java @@ -68,7 +68,6 @@ public class WebsocketNetworkManager implements INetworkManager { private LinkedList readChunks = new LinkedList<>(); public void processReadPackets() { - System.out.println("[WebsocketNetworkManager] - processReadPackets called"); readChunks.clear(); if(oldChunkBuffer != null) { diff --git a/src/main/java/net/minecraft/src/GuiConnecting.java b/src/main/java/net/minecraft/src/GuiConnecting.java index 9ef7b4b..174b10b 100644 --- a/src/main/java/net/minecraft/src/GuiConnecting.java +++ b/src/main/java/net/minecraft/src/GuiConnecting.java @@ -75,7 +75,7 @@ public class GuiConnecting extends GuiScreen { } this.clientHandler = new NetClientHandler(this.mc, uri, 0); - System.out.println("Sending packets"); + System.out.println("[GuiConnecting] - Sending packets"); this.clientHandler.addToSendQueue(new Packet2ClientProtocol(78, EaglerProfile.username, uria, port)); this.clientHandler.addToSendQueue(new Packet250CustomPayload("EAG|MySkin", EaglerProfile.getSkinPacket())); this.clientHandler.addToSendQueue(new Packet250CustomPayload("EAG|MyCape", EaglerProfile.getCapePacket())); @@ -89,7 +89,6 @@ public class GuiConnecting extends GuiScreen { } } if(this.clientHandler != null) { - System.out.println("[GuiConnecting] - Processing packets"); this.clientHandler.processReadPackets(); } else { diff --git a/src/main/java/net/minecraft/src/NetClientHandler.java b/src/main/java/net/minecraft/src/NetClientHandler.java index 2747fa8..58da4ce 100644 --- a/src/main/java/net/minecraft/src/NetClientHandler.java +++ b/src/main/java/net/minecraft/src/NetClientHandler.java @@ -93,9 +93,6 @@ public class NetClientHandler extends NetHandler { if (this.netManager != null) { this.netManager.processReadPackets(); } - else { - System.err.println("[NetClientHandler] - netManager is null!"); - } if(!EaglerAdapter.connectionOpen()) { if(!this.disconnected) {