diff --git a/build.gradle b/build.gradle index 78d632f..7108ed0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -allprojects { +subprojects { apply plugin: 'java' compileJava { @@ -40,23 +40,3 @@ allprojects { from configurations.compile + configurations.runtime - configurations.compile_excludeCopy } } - -group 'mc' -version '1.0-SNAPSHOT' - -apply plugin: 'application' - -mainClassName = "mc.core.Main" - -ext { - log4j_version = '2.5' -} - -dependencies { - /* Logger */ - runtime (group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j_version) - runtime (group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4j_version) - - /* Components */ - compile (group: 'commons-io', name: 'commons-io', version: '2.6') -} diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 0000000..67be58f --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,19 @@ +group 'mc' +version '1.0-SNAPSHOT' + +apply plugin: 'application' + +mainClassName = "mc.core.Main" + +ext { + log4j_version = '2.5' +} + +dependencies { + /* Logger */ + runtime (group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j_version) + runtime (group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4j_version) + + /* Components */ + compile (group: 'commons-io', name: 'commons-io', version: '2.6') +} diff --git a/src/main/java/mc/core/Config.java b/core/src/main/java/mc/core/Config.java similarity index 100% rename from src/main/java/mc/core/Config.java rename to core/src/main/java/mc/core/Config.java diff --git a/src/main/java/mc/core/GameLoop.java b/core/src/main/java/mc/core/GameLoop.java similarity index 100% rename from src/main/java/mc/core/GameLoop.java rename to core/src/main/java/mc/core/GameLoop.java diff --git a/src/main/java/mc/core/Location.java b/core/src/main/java/mc/core/Location.java similarity index 100% rename from src/main/java/mc/core/Location.java rename to core/src/main/java/mc/core/Location.java diff --git a/src/main/java/mc/core/Look.java b/core/src/main/java/mc/core/Look.java similarity index 100% rename from src/main/java/mc/core/Look.java rename to core/src/main/java/mc/core/Look.java diff --git a/src/main/java/mc/core/Main.java b/core/src/main/java/mc/core/Main.java similarity index 100% rename from src/main/java/mc/core/Main.java rename to core/src/main/java/mc/core/Main.java diff --git a/src/main/java/mc/core/Player.java b/core/src/main/java/mc/core/Player.java similarity index 100% rename from src/main/java/mc/core/Player.java rename to core/src/main/java/mc/core/Player.java diff --git a/src/main/java/mc/core/PlayerManager.java b/core/src/main/java/mc/core/PlayerManager.java similarity index 100% rename from src/main/java/mc/core/PlayerManager.java rename to core/src/main/java/mc/core/PlayerManager.java diff --git a/src/main/java/mc/core/embedded/ConfigFromSpring.java b/core/src/main/java/mc/core/embedded/ConfigFromSpring.java similarity index 100% rename from src/main/java/mc/core/embedded/ConfigFromSpring.java rename to core/src/main/java/mc/core/embedded/ConfigFromSpring.java diff --git a/src/main/java/mc/core/embedded/InMemoryPlayerManager.java b/core/src/main/java/mc/core/embedded/InMemoryPlayerManager.java similarity index 100% rename from src/main/java/mc/core/embedded/InMemoryPlayerManager.java rename to core/src/main/java/mc/core/embedded/InMemoryPlayerManager.java diff --git a/src/main/java/mc/core/network/BroadcastNetChannel.java b/core/src/main/java/mc/core/network/BroadcastNetChannel.java similarity index 100% rename from src/main/java/mc/core/network/BroadcastNetChannel.java rename to core/src/main/java/mc/core/network/BroadcastNetChannel.java diff --git a/src/main/java/mc/core/network/CSPacket.java b/core/src/main/java/mc/core/network/CSPacket.java similarity index 100% rename from src/main/java/mc/core/network/CSPacket.java rename to core/src/main/java/mc/core/network/CSPacket.java diff --git a/src/main/java/mc/core/network/NetChannel.java b/core/src/main/java/mc/core/network/NetChannel.java similarity index 100% rename from src/main/java/mc/core/network/NetChannel.java rename to core/src/main/java/mc/core/network/NetChannel.java diff --git a/src/main/java/mc/core/network/NetStream.java b/core/src/main/java/mc/core/network/NetStream.java similarity index 100% rename from src/main/java/mc/core/network/NetStream.java rename to core/src/main/java/mc/core/network/NetStream.java diff --git a/src/main/java/mc/core/network/SCPacket.java b/core/src/main/java/mc/core/network/SCPacket.java similarity index 100% rename from src/main/java/mc/core/network/SCPacket.java rename to core/src/main/java/mc/core/network/SCPacket.java diff --git a/src/main/java/mc/core/network/Server.java b/core/src/main/java/mc/core/network/Server.java similarity index 100% rename from src/main/java/mc/core/network/Server.java rename to core/src/main/java/mc/core/network/Server.java diff --git a/src/main/java/mc/core/network/StartServerException.java b/core/src/main/java/mc/core/network/StartServerException.java similarity index 100% rename from src/main/java/mc/core/network/StartServerException.java rename to core/src/main/java/mc/core/network/StartServerException.java diff --git a/src/main/java/mc/core/world/Block.java b/core/src/main/java/mc/core/world/Block.java similarity index 100% rename from src/main/java/mc/core/world/Block.java rename to core/src/main/java/mc/core/world/Block.java diff --git a/src/main/java/mc/core/world/Chunk.java b/core/src/main/java/mc/core/world/Chunk.java similarity index 100% rename from src/main/java/mc/core/world/Chunk.java rename to core/src/main/java/mc/core/world/Chunk.java diff --git a/src/main/java/mc/core/world/World.java b/core/src/main/java/mc/core/world/World.java similarity index 100% rename from src/main/java/mc/core/world/World.java rename to core/src/main/java/mc/core/world/World.java diff --git a/src/main/resources/icon.png b/core/src/main/resources/icon.png similarity index 100% rename from src/main/resources/icon.png rename to core/src/main/resources/icon.png diff --git a/src/main/resources/log4j2.xml b/core/src/main/resources/log4j2.xml similarity index 100% rename from src/main/resources/log4j2.xml rename to core/src/main/resources/log4j2.xml diff --git a/src/main/resources/spring.xml b/core/src/main/resources/spring.xml similarity index 100% rename from src/main/resources/spring.xml rename to core/src/main/resources/spring.xml diff --git a/proto125/build.gradle b/proto125/build.gradle index f39d9a6..f83cfb0 100644 --- a/proto125/build.gradle +++ b/proto125/build.gradle @@ -7,7 +7,7 @@ ext { dependencies { /* Core */ - compile_excludeCopy rootProject + compile_excludeCopy project(':core') /* Netty */ compile (group: 'io.netty', name: 'netty-all', version: netty_version) diff --git a/settings.gradle b/settings.gradle index 0992588..d9a2454 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ -rootProject.name = 'core' +rootProject.name = 'server' -include('proto125') +include('core') // Core +include('proto125') // Protocol 1.2.5