diff --git a/bridge/build.gradle b/bridge/build.gradle index 84e84cb..071d568 100644 --- a/bridge/build.gradle +++ b/bridge/build.gradle @@ -17,11 +17,10 @@ configurations { } compileJava { - dependsOn ':bridge-protocol:compileJava' + dependsOn ':libprotocol:compileJava' } jar { - dependsOn ':bridge-protocol:jar' dependsOn configurations.include from { configurations.include.collect { it.isDirectory() ? it : zipTree(it) } } } @@ -31,7 +30,7 @@ ext { } dependencies { - include files(project(':bridge-protocol').sourceSets.main.output.classesDir) + include files(project(':libprotocol').sourceSets.main.output.classesDir) compile (group: 'org.bukkit', name: 'bukkit', version: '1.8.8-R0.1-SNAPSHOT') { exclude group: 'junit' exclude group: 'commons-lang' diff --git a/build.gradle b/build.gradle index 1e22a8f..9d0cf9b 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ subprojects { } subprojects { - if (!it.name.startsWith('bridge') && !it.name.startsWith('zond')) { + if (it.name != 'bridge' && it.name != 'zond' && !it.name.startsWith('lib')) { ext { slf4jVersion = '1.7.21' } diff --git a/bridge-protocol/build.gradle b/libprotocol/build.gradle similarity index 100% rename from bridge-protocol/build.gradle rename to libprotocol/build.gradle diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/CS_ConsoleMessage.java b/libprotocol/src/main/java/asys/mcsmanager/packets/CS_ConsoleMessage.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/CS_ConsoleMessage.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/CS_ConsoleMessage.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/CS_Handshake.java b/libprotocol/src/main/java/asys/mcsmanager/packets/CS_Handshake.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/CS_Handshake.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/CS_Handshake.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/CS_Ping.java b/libprotocol/src/main/java/asys/mcsmanager/packets/CS_Ping.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/CS_Ping.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/CS_Ping.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/IPacketHandler.java b/libprotocol/src/main/java/asys/mcsmanager/packets/IPacketHandler.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/IPacketHandler.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/IPacketHandler.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/Packet.java b/libprotocol/src/main/java/asys/mcsmanager/packets/Packet.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/Packet.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/Packet.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/SC_Command.java b/libprotocol/src/main/java/asys/mcsmanager/packets/SC_Command.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/SC_Command.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/SC_Command.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java b/libprotocol/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/SC_ToggleSendMessages.java b/libprotocol/src/main/java/asys/mcsmanager/packets/SC_ToggleSendMessages.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/SC_ToggleSendMessages.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/SC_ToggleSendMessages.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java b/libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java b/libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java b/libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java diff --git a/bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/Params.java b/libprotocol/src/main/java/asys/mcsmanager/packets/codec/Params.java similarity index 100% rename from bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/Params.java rename to libprotocol/src/main/java/asys/mcsmanager/packets/codec/Params.java diff --git a/mcserver-manager/build.gradle b/mcserver-manager/build.gradle index 1c6657f..2d7d636 100644 --- a/mcserver-manager/build.gradle +++ b/mcserver-manager/build.gradle @@ -9,7 +9,7 @@ configurations { } compileJava { - dependsOn ':bridge-protocol:compileJava' + dependsOn ':libprotocol:compileJava' } jar { @@ -35,7 +35,7 @@ ext { dependencies { compile project(':core') compile project(':webinterface') - include files(project(':bridge-protocol').sourceSets.main.output.classesDir) + include files(project(':libprotocol').sourceSets.main.output.classesDir) compile group: 'io.netty', name: 'netty-codec', version: nettyVersion compile group: 'io.netty', name: 'netty-codec-http', version: nettyVersion } diff --git a/settings.gradle b/settings.gradle index 02de200..d2df509 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,6 @@ rootProject.name = 'asys' include 'core' include 'webinterface' include 'mcserver-manager' -include 'bridge-protocol' +include 'libprotocol' include 'bridge' include 'zond'