diff --git a/pom.xml b/pom.xml index bcd47e5a..8463a12c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,9 +10,9 @@ net.md-5 - bungeecord + bungeecord-parent 1.0-SNAPSHOT - jar + pom BungeeCord Proxy component of the Elastic Portal Suite @@ -36,6 +36,10 @@ + + proxy + + scm:git:git@github.com:ElasticPortalSuite/BungeeCord.git scm:git:git@github.com:ElasticPortalSuite/BungeeCord.git @@ -57,31 +61,6 @@ - - com.google.code.findbugs - jsr305 - 2.0.1 - - - com.google.guava - guava - 13.0.1 - - - net.md-5 - mendax - 1.4.6-SNAPSHOT - - - org.bouncycastle - bcprov-ext-jdk15on - 1.47 - - - org.yaml - snakeyaml - 1.11 - org.projectlombok lombok @@ -119,45 +98,6 @@ 1.7 - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - ${main.class} - ${describe} - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.0 - - - package - - shade - - - - - - - *:* - - **/*.java - **/*.properties - **/*.SF - **/*.DSA - - - - - com.github.wvengen proguard-maven-plugin diff --git a/proxy/nb-configuration.xml b/proxy/nb-configuration.xml new file mode 100644 index 00000000..c2decf16 --- /dev/null +++ b/proxy/nb-configuration.xml @@ -0,0 +1,18 @@ + + + + + + JDK_1.7 + + diff --git a/proxy/pom.xml b/proxy/pom.xml new file mode 100644 index 00000000..d36cbbb3 --- /dev/null +++ b/proxy/pom.xml @@ -0,0 +1,98 @@ + + + 4.0.0 + + + net.md-5 + bungeecord-parent + 1.0-SNAPSHOT + ../pom.xml + + + net.md-5 + bungeecord-proxy + 1.0-SNAPSHOT + jar + + BungeeCord + Proxy component of the Elastic Portal Suite + + + + com.google.code.findbugs + jsr305 + 2.0.1 + + + com.google.guava + guava + 13.0.1 + + + net.md-5 + mendax + 1.4.6-SNAPSHOT + + + org.bouncycastle + bcprov-ext-jdk15on + 1.47 + + + org.yaml + snakeyaml + 1.11 + + + org.projectlombok + lombok + 0.11.6 + provided + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + net.md_5.bungee.BungeeCord + ${describe} + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.0 + + + package + + shade + + + + + + + *:* + + **/*.java + **/*.properties + **/*.SF + **/*.DSA + + + + + + + + diff --git a/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java similarity index 100% rename from src/main/java/net/md_5/bungee/BungeeCord.java rename to proxy/src/main/java/net/md_5/bungee/BungeeCord.java diff --git a/src/main/java/net/md_5/bungee/ChatColor.java b/proxy/src/main/java/net/md_5/bungee/ChatColor.java similarity index 100% rename from src/main/java/net/md_5/bungee/ChatColor.java rename to proxy/src/main/java/net/md_5/bungee/ChatColor.java diff --git a/src/main/java/net/md_5/bungee/Configuration.java b/proxy/src/main/java/net/md_5/bungee/Configuration.java similarity index 100% rename from src/main/java/net/md_5/bungee/Configuration.java rename to proxy/src/main/java/net/md_5/bungee/Configuration.java diff --git a/src/main/java/net/md_5/bungee/EncryptionUtil.java b/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java similarity index 100% rename from src/main/java/net/md_5/bungee/EncryptionUtil.java rename to proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java diff --git a/src/main/java/net/md_5/bungee/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/EntityMap.java similarity index 100% rename from src/main/java/net/md_5/bungee/EntityMap.java rename to proxy/src/main/java/net/md_5/bungee/EntityMap.java diff --git a/src/main/java/net/md_5/bungee/GenericConnection.java b/proxy/src/main/java/net/md_5/bungee/GenericConnection.java similarity index 100% rename from src/main/java/net/md_5/bungee/GenericConnection.java rename to proxy/src/main/java/net/md_5/bungee/GenericConnection.java diff --git a/src/main/java/net/md_5/bungee/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/InitialHandler.java similarity index 100% rename from src/main/java/net/md_5/bungee/InitialHandler.java rename to proxy/src/main/java/net/md_5/bungee/InitialHandler.java diff --git a/src/main/java/net/md_5/bungee/KickException.java b/proxy/src/main/java/net/md_5/bungee/KickException.java similarity index 100% rename from src/main/java/net/md_5/bungee/KickException.java rename to proxy/src/main/java/net/md_5/bungee/KickException.java diff --git a/src/main/java/net/md_5/bungee/ListenThread.java b/proxy/src/main/java/net/md_5/bungee/ListenThread.java similarity index 100% rename from src/main/java/net/md_5/bungee/ListenThread.java rename to proxy/src/main/java/net/md_5/bungee/ListenThread.java diff --git a/src/main/java/net/md_5/bungee/Logger.java b/proxy/src/main/java/net/md_5/bungee/Logger.java similarity index 100% rename from src/main/java/net/md_5/bungee/Logger.java rename to proxy/src/main/java/net/md_5/bungee/Logger.java diff --git a/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java similarity index 100% rename from src/main/java/net/md_5/bungee/Metrics.java rename to proxy/src/main/java/net/md_5/bungee/Metrics.java diff --git a/src/main/java/net/md_5/bungee/Permission.java b/proxy/src/main/java/net/md_5/bungee/Permission.java similarity index 100% rename from src/main/java/net/md_5/bungee/Permission.java rename to proxy/src/main/java/net/md_5/bungee/Permission.java diff --git a/src/main/java/net/md_5/bungee/ReconnectSaveThread.java b/proxy/src/main/java/net/md_5/bungee/ReconnectSaveThread.java similarity index 100% rename from src/main/java/net/md_5/bungee/ReconnectSaveThread.java rename to proxy/src/main/java/net/md_5/bungee/ReconnectSaveThread.java diff --git a/src/main/java/net/md_5/bungee/ServerConnection.java b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java similarity index 100% rename from src/main/java/net/md_5/bungee/ServerConnection.java rename to proxy/src/main/java/net/md_5/bungee/ServerConnection.java diff --git a/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java similarity index 100% rename from src/main/java/net/md_5/bungee/UserConnection.java rename to proxy/src/main/java/net/md_5/bungee/UserConnection.java diff --git a/src/main/java/net/md_5/bungee/Util.java b/proxy/src/main/java/net/md_5/bungee/Util.java similarity index 100% rename from src/main/java/net/md_5/bungee/Util.java rename to proxy/src/main/java/net/md_5/bungee/Util.java diff --git a/src/main/java/net/md_5/bungee/command/Command.java b/proxy/src/main/java/net/md_5/bungee/command/Command.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/Command.java rename to proxy/src/main/java/net/md_5/bungee/command/Command.java diff --git a/src/main/java/net/md_5/bungee/command/CommandAlert.java b/proxy/src/main/java/net/md_5/bungee/command/CommandAlert.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/CommandAlert.java rename to proxy/src/main/java/net/md_5/bungee/command/CommandAlert.java diff --git a/src/main/java/net/md_5/bungee/command/CommandBungee.java b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/CommandBungee.java rename to proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java diff --git a/src/main/java/net/md_5/bungee/command/CommandEnd.java b/proxy/src/main/java/net/md_5/bungee/command/CommandEnd.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/CommandEnd.java rename to proxy/src/main/java/net/md_5/bungee/command/CommandEnd.java diff --git a/src/main/java/net/md_5/bungee/command/CommandIP.java b/proxy/src/main/java/net/md_5/bungee/command/CommandIP.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/CommandIP.java rename to proxy/src/main/java/net/md_5/bungee/command/CommandIP.java diff --git a/src/main/java/net/md_5/bungee/command/CommandList.java b/proxy/src/main/java/net/md_5/bungee/command/CommandList.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/CommandList.java rename to proxy/src/main/java/net/md_5/bungee/command/CommandList.java diff --git a/src/main/java/net/md_5/bungee/command/CommandMotd.java b/proxy/src/main/java/net/md_5/bungee/command/CommandMotd.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/CommandMotd.java rename to proxy/src/main/java/net/md_5/bungee/command/CommandMotd.java diff --git a/src/main/java/net/md_5/bungee/command/CommandReload.java b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/CommandReload.java rename to proxy/src/main/java/net/md_5/bungee/command/CommandReload.java diff --git a/src/main/java/net/md_5/bungee/command/CommandSender.java b/proxy/src/main/java/net/md_5/bungee/command/CommandSender.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/CommandSender.java rename to proxy/src/main/java/net/md_5/bungee/command/CommandSender.java diff --git a/src/main/java/net/md_5/bungee/command/CommandServer.java b/proxy/src/main/java/net/md_5/bungee/command/CommandServer.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/CommandServer.java rename to proxy/src/main/java/net/md_5/bungee/command/CommandServer.java diff --git a/src/main/java/net/md_5/bungee/command/ConsoleCommandSender.java b/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandSender.java similarity index 100% rename from src/main/java/net/md_5/bungee/command/ConsoleCommandSender.java rename to proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandSender.java diff --git a/src/main/java/net/md_5/bungee/packet/DefinedPacket.java b/proxy/src/main/java/net/md_5/bungee/packet/DefinedPacket.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/DefinedPacket.java rename to proxy/src/main/java/net/md_5/bungee/packet/DefinedPacket.java diff --git a/src/main/java/net/md_5/bungee/packet/Packet0KeepAlive.java b/proxy/src/main/java/net/md_5/bungee/packet/Packet0KeepAlive.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/Packet0KeepAlive.java rename to proxy/src/main/java/net/md_5/bungee/packet/Packet0KeepAlive.java diff --git a/src/main/java/net/md_5/bungee/packet/Packet1Login.java b/proxy/src/main/java/net/md_5/bungee/packet/Packet1Login.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/Packet1Login.java rename to proxy/src/main/java/net/md_5/bungee/packet/Packet1Login.java diff --git a/src/main/java/net/md_5/bungee/packet/Packet2Handshake.java b/proxy/src/main/java/net/md_5/bungee/packet/Packet2Handshake.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/Packet2Handshake.java rename to proxy/src/main/java/net/md_5/bungee/packet/Packet2Handshake.java diff --git a/src/main/java/net/md_5/bungee/packet/Packet3Chat.java b/proxy/src/main/java/net/md_5/bungee/packet/Packet3Chat.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/Packet3Chat.java rename to proxy/src/main/java/net/md_5/bungee/packet/Packet3Chat.java diff --git a/src/main/java/net/md_5/bungee/packet/Packet9Respawn.java b/proxy/src/main/java/net/md_5/bungee/packet/Packet9Respawn.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/Packet9Respawn.java rename to proxy/src/main/java/net/md_5/bungee/packet/Packet9Respawn.java diff --git a/src/main/java/net/md_5/bungee/packet/PacketC9PlayerListItem.java b/proxy/src/main/java/net/md_5/bungee/packet/PacketC9PlayerListItem.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/PacketC9PlayerListItem.java rename to proxy/src/main/java/net/md_5/bungee/packet/PacketC9PlayerListItem.java diff --git a/src/main/java/net/md_5/bungee/packet/PacketCDClientStatus.java b/proxy/src/main/java/net/md_5/bungee/packet/PacketCDClientStatus.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/PacketCDClientStatus.java rename to proxy/src/main/java/net/md_5/bungee/packet/PacketCDClientStatus.java diff --git a/src/main/java/net/md_5/bungee/packet/PacketFAPluginMessage.java b/proxy/src/main/java/net/md_5/bungee/packet/PacketFAPluginMessage.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/PacketFAPluginMessage.java rename to proxy/src/main/java/net/md_5/bungee/packet/PacketFAPluginMessage.java diff --git a/src/main/java/net/md_5/bungee/packet/PacketFCEncryptionResponse.java b/proxy/src/main/java/net/md_5/bungee/packet/PacketFCEncryptionResponse.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/PacketFCEncryptionResponse.java rename to proxy/src/main/java/net/md_5/bungee/packet/PacketFCEncryptionResponse.java diff --git a/src/main/java/net/md_5/bungee/packet/PacketFDEncryptionRequest.java b/proxy/src/main/java/net/md_5/bungee/packet/PacketFDEncryptionRequest.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/PacketFDEncryptionRequest.java rename to proxy/src/main/java/net/md_5/bungee/packet/PacketFDEncryptionRequest.java diff --git a/src/main/java/net/md_5/bungee/packet/PacketFFKick.java b/proxy/src/main/java/net/md_5/bungee/packet/PacketFFKick.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/PacketFFKick.java rename to proxy/src/main/java/net/md_5/bungee/packet/PacketFFKick.java diff --git a/src/main/java/net/md_5/bungee/packet/PacketInputStream.java b/proxy/src/main/java/net/md_5/bungee/packet/PacketInputStream.java similarity index 100% rename from src/main/java/net/md_5/bungee/packet/PacketInputStream.java rename to proxy/src/main/java/net/md_5/bungee/packet/PacketInputStream.java diff --git a/src/main/java/net/md_5/bungee/plugin/Cancellable.java b/proxy/src/main/java/net/md_5/bungee/plugin/Cancellable.java similarity index 100% rename from src/main/java/net/md_5/bungee/plugin/Cancellable.java rename to proxy/src/main/java/net/md_5/bungee/plugin/Cancellable.java diff --git a/src/main/java/net/md_5/bungee/plugin/ChatEvent.java b/proxy/src/main/java/net/md_5/bungee/plugin/ChatEvent.java similarity index 100% rename from src/main/java/net/md_5/bungee/plugin/ChatEvent.java rename to proxy/src/main/java/net/md_5/bungee/plugin/ChatEvent.java diff --git a/src/main/java/net/md_5/bungee/plugin/InvalidPluginException.java b/proxy/src/main/java/net/md_5/bungee/plugin/InvalidPluginException.java similarity index 100% rename from src/main/java/net/md_5/bungee/plugin/InvalidPluginException.java rename to proxy/src/main/java/net/md_5/bungee/plugin/InvalidPluginException.java diff --git a/src/main/java/net/md_5/bungee/plugin/JavaPlugin.java b/proxy/src/main/java/net/md_5/bungee/plugin/JavaPlugin.java similarity index 100% rename from src/main/java/net/md_5/bungee/plugin/JavaPlugin.java rename to proxy/src/main/java/net/md_5/bungee/plugin/JavaPlugin.java diff --git a/src/main/java/net/md_5/bungee/plugin/JavaPluginManager.java b/proxy/src/main/java/net/md_5/bungee/plugin/JavaPluginManager.java similarity index 100% rename from src/main/java/net/md_5/bungee/plugin/JavaPluginManager.java rename to proxy/src/main/java/net/md_5/bungee/plugin/JavaPluginManager.java diff --git a/src/main/java/net/md_5/bungee/plugin/LoginEvent.java b/proxy/src/main/java/net/md_5/bungee/plugin/LoginEvent.java similarity index 100% rename from src/main/java/net/md_5/bungee/plugin/LoginEvent.java rename to proxy/src/main/java/net/md_5/bungee/plugin/LoginEvent.java diff --git a/src/main/java/net/md_5/bungee/plugin/PluginDescription.java b/proxy/src/main/java/net/md_5/bungee/plugin/PluginDescription.java similarity index 100% rename from src/main/java/net/md_5/bungee/plugin/PluginDescription.java rename to proxy/src/main/java/net/md_5/bungee/plugin/PluginDescription.java diff --git a/src/main/java/net/md_5/bungee/plugin/PluginMessageEvent.java b/proxy/src/main/java/net/md_5/bungee/plugin/PluginMessageEvent.java similarity index 100% rename from src/main/java/net/md_5/bungee/plugin/PluginMessageEvent.java rename to proxy/src/main/java/net/md_5/bungee/plugin/PluginMessageEvent.java diff --git a/src/main/java/net/md_5/bungee/plugin/ServerConnectEvent.java b/proxy/src/main/java/net/md_5/bungee/plugin/ServerConnectEvent.java similarity index 100% rename from src/main/java/net/md_5/bungee/plugin/ServerConnectEvent.java rename to proxy/src/main/java/net/md_5/bungee/plugin/ServerConnectEvent.java diff --git a/src/main/java/net/md_5/bungee/tablist/GlobalPingTabList.java b/proxy/src/main/java/net/md_5/bungee/tablist/GlobalPingTabList.java similarity index 100% rename from src/main/java/net/md_5/bungee/tablist/GlobalPingTabList.java rename to proxy/src/main/java/net/md_5/bungee/tablist/GlobalPingTabList.java diff --git a/src/main/java/net/md_5/bungee/tablist/GlobalTabList.java b/proxy/src/main/java/net/md_5/bungee/tablist/GlobalTabList.java similarity index 100% rename from src/main/java/net/md_5/bungee/tablist/GlobalTabList.java rename to proxy/src/main/java/net/md_5/bungee/tablist/GlobalTabList.java diff --git a/src/main/java/net/md_5/bungee/tablist/ServerUniqueTabList.java b/proxy/src/main/java/net/md_5/bungee/tablist/ServerUniqueTabList.java similarity index 100% rename from src/main/java/net/md_5/bungee/tablist/ServerUniqueTabList.java rename to proxy/src/main/java/net/md_5/bungee/tablist/ServerUniqueTabList.java diff --git a/src/main/java/net/md_5/bungee/tablist/TabListHandler.java b/proxy/src/main/java/net/md_5/bungee/tablist/TabListHandler.java similarity index 100% rename from src/main/java/net/md_5/bungee/tablist/TabListHandler.java rename to proxy/src/main/java/net/md_5/bungee/tablist/TabListHandler.java