diff --git a/build.gradle b/build.gradle index cd40b3d..78d632f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,43 +1,62 @@ +allprojects { + apply plugin: 'java' + + compileJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + options.encoding = 'UTF-8' + } + + repositories { + mavenCentral() + } + + ext { + slf4j_version = '1.7.21' + spring_version = '4.2.5.RELEASE' + } + + configurations { + compile_excludeCopy + compile.extendsFrom compile_excludeCopy + } + + dependencies { + /* Logger */ + compile (group: 'org.slf4j', name: 'slf4j-api', version: slf4j_version) + compile (group: 'org.slf4j', name: 'jcl-over-slf4j', version: slf4j_version) + + /* Spring */ + compile (group: 'org.springframework', name: 'spring-context', version: spring_version) { + exclude group: 'commons-logging' + } + + /* Components */ + compile (group: 'org.projectlombok', name: 'lombok', version: '1.16.16') + } + + task copyDep(type: Copy) { + into 'libs' + from configurations.compile + configurations.runtime - configurations.compile_excludeCopy + } +} + group 'mc' version '1.0-SNAPSHOT' -apply plugin: 'java' +apply plugin: 'application' -compileJava { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - options.encoding = 'UTF-8' -} - -repositories { - mavenCentral() -} +mainClassName = "mc.core.Main" ext { - slf4j_version = '1.7.21' log4j_version = '2.5' - spring_version = '4.2.5.RELEASE' - netty_version = '4.1.22.Final' } dependencies { /* Logger */ - compile (group: 'org.slf4j', name: 'slf4j-api', version: slf4j_version) - compile (group: 'org.slf4j', name: 'jcl-over-slf4j', version: slf4j_version) - compile (group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j_version) - compile (group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4j_version) - - /* Spring */ - compile (group: 'org.springframework', name: 'spring-context', version: spring_version) { - exclude group: 'commons-logging' - } - - /* Netty */ - compile (group: 'io.netty', name: 'netty-all', version: netty_version) + 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: 'org.projectlombok', name: 'lombok', version: '1.16.16') compile (group: 'commons-io', name: 'commons-io', version: '2.6') - compile (group: 'com.google.guava', name: 'guava', version: '24.1-jre') - compile (group: 'com.google.code.gson', name: 'gson', version: '2.8.2') } diff --git a/proto125/build.gradle b/proto125/build.gradle new file mode 100644 index 0000000..f39d9a6 --- /dev/null +++ b/proto125/build.gradle @@ -0,0 +1,18 @@ +group 'mc' +version '1.0-SNAPSHOT' + +ext { + netty_version = '4.1.22.Final' +} + +dependencies { + /* Core */ + compile_excludeCopy rootProject + + /* Netty */ + compile (group: 'io.netty', name: 'netty-all', version: netty_version) + + /* Components */ + compile (group: 'com.google.guava', name: 'guava', version: '24.1-jre') + compile (group: 'com.google.code.gson', name: 'gson', version: '2.8.2') +} diff --git a/src/main/java/mc/core/network/proto_125/ByteArrayOutputNetStream.java b/proto125/src/main/java/mc/core/network/proto_125/ByteArrayOutputNetStream.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/ByteArrayOutputNetStream.java rename to proto125/src/main/java/mc/core/network/proto_125/ByteArrayOutputNetStream.java diff --git a/src/main/java/mc/core/network/proto_125/NetStream_p125.java b/proto125/src/main/java/mc/core/network/proto_125/NetStream_p125.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/NetStream_p125.java rename to proto125/src/main/java/mc/core/network/proto_125/NetStream_p125.java diff --git a/src/main/java/mc/core/network/proto_125/netty/NettyPlayer.java b/proto125/src/main/java/mc/core/network/proto_125/netty/NettyPlayer.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/netty/NettyPlayer.java rename to proto125/src/main/java/mc/core/network/proto_125/netty/NettyPlayer.java diff --git a/src/main/java/mc/core/network/proto_125/netty/NettyServer.java b/proto125/src/main/java/mc/core/network/proto_125/netty/NettyServer.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/netty/NettyServer.java rename to proto125/src/main/java/mc/core/network/proto_125/netty/NettyServer.java diff --git a/src/main/java/mc/core/network/proto_125/netty/PacketDecoder.java b/proto125/src/main/java/mc/core/network/proto_125/netty/PacketDecoder.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/netty/PacketDecoder.java rename to proto125/src/main/java/mc/core/network/proto_125/netty/PacketDecoder.java diff --git a/src/main/java/mc/core/network/proto_125/netty/PacketEncoder.java b/proto125/src/main/java/mc/core/network/proto_125/netty/PacketEncoder.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/netty/PacketEncoder.java rename to proto125/src/main/java/mc/core/network/proto_125/netty/PacketEncoder.java diff --git a/src/main/java/mc/core/network/proto_125/netty/PacketHandler.java b/proto125/src/main/java/mc/core/network/proto_125/netty/PacketHandler.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/netty/PacketHandler.java rename to proto125/src/main/java/mc/core/network/proto_125/netty/PacketHandler.java diff --git a/src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetChannel.java b/proto125/src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetChannel.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetChannel.java rename to proto125/src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetChannel.java diff --git a/src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetStream.java b/proto125/src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetStream.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetStream.java rename to proto125/src/main/java/mc/core/network/proto_125/netty/wrappers/WrapperNetStream.java diff --git a/src/main/java/mc/core/network/proto_125/packets/ChunkAllocationPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/ChunkAllocationPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/ChunkAllocationPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/ChunkAllocationPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/ChunkDataPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/ChunkDataPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/ChunkDataPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/ChunkDataPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/KeepAlivePacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/KeepAlivePacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/KeepAlivePacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/KeepAlivePacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/KickPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/KickPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/KickPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/KickPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/LoginPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/LoginPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/LoginPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/LoginPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/PacketManager.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PacketManager.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/PacketManager.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/PacketManager.java diff --git a/src/main/java/mc/core/network/proto_125/packets/PingPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PingPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/PingPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/PingPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/PlayerAbilitiesPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerAbilitiesPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/PlayerAbilitiesPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/PlayerAbilitiesPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/PlayerInfoPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerInfoPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/PlayerInfoPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/PlayerInfoPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/PlayerLookPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerLookPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/PlayerLookPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/PlayerLookPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/PlayerPositionPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerPositionPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/PlayerPositionPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/PlayerPositionPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/SpawnPositionPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnPositionPacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/SpawnPositionPacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/SpawnPositionPacket.java diff --git a/src/main/java/mc/core/network/proto_125/packets/TimeUpdatePacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/TimeUpdatePacket.java similarity index 100% rename from src/main/java/mc/core/network/proto_125/packets/TimeUpdatePacket.java rename to proto125/src/main/java/mc/core/network/proto_125/packets/TimeUpdatePacket.java diff --git a/settings.gradle b/settings.gradle index 17bdad4..0992588 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,3 @@ rootProject.name = 'core' +include('proto125') diff --git a/src/main/java/mc/core/GameLoop.java b/src/main/java/mc/core/GameLoop.java index b091a65..d0e0c94 100644 --- a/src/main/java/mc/core/GameLoop.java +++ b/src/main/java/mc/core/GameLoop.java @@ -6,7 +6,6 @@ package mc.core; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import mc.core.network.proto_125.packets.PositionAndLookPacket; import org.springframework.beans.factory.annotation.Autowired; import java.util.Calendar;