diff --git a/README.md b/README.md index 50d4776..b1d7fde 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # Blokk ## To Do -- Move packets to their own project - Stop Using Spek - Support packet compression diff --git a/blokk-packet-codecs/build.gradle.kts b/blokk-packet-codecs/build.gradle.kts index aa7ec09..2073a52 100644 --- a/blokk-packet-codecs/build.gradle.kts +++ b/blokk-packet-codecs/build.gradle.kts @@ -12,7 +12,7 @@ repositories { val nettyVersion = properties["version.netty"].toString() dependencies { - api(project(":blokk-api")) + api(project(":blokk-packets")) // Netty api("io.netty:netty-buffer:${nettyVersion}") diff --git a/blokk-packets/build.gradle.kts b/blokk-packets/build.gradle.kts new file mode 100644 index 0000000..4216a94 --- /dev/null +++ b/blokk-packets/build.gradle.kts @@ -0,0 +1,20 @@ +plugins { + kotlin("jvm") +} + +group = rootProject.group +version = rootProject.version + +repositories { + mavenCentral() +} + +dependencies { + api(project(":blokk-api")) +} + +tasks { + compileKotlin { + kotlinOptions.jvmTarget = "1.8" + } +} diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/handshaking/HandshakePacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/handshaking/HandshakePacket.kt similarity index 90% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/handshaking/HandshakePacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/handshaking/HandshakePacket.kt index 7493238..db2c196 100644 --- a/blokk-api/src/main/kotlin/space/blokk/net/packets/handshaking/HandshakePacket.kt +++ b/blokk-packets/src/main/kotlin/space/blokk/net/packets/handshaking/HandshakePacket.kt @@ -4,15 +4,13 @@ import space.blokk.net.packets.IncomingPacket /** * This is the first packet a client should send. Per default, the server immediately switches - * the [session's currentProtocol][space.blokk.net.Session.currentProtocol] to - * `STATUS` or `LOGIN`, + * the [session's currentProtocol][space.blokk.net.Session.currentProtocol] to `STATUS` or `LOGIN`, * depending on the value of [loginAttempt]. * * @param protocolVersion The number of the [protocol version](https://wiki.vg/Protocol_version_numbers) used by the client. * @param serverAddress Hostname or IP address that was used to connect. * @param serverPort Port that was used to connect. - * @param loginAttempt Whether the server should use the `STATUS` or - * the `LOGIN` protocol from now on. + * @param loginAttempt Whether the server should use the `STATUS` or the `LOGIN` protocol from now on. */ data class HandshakePacket( val protocolVersion: Int, diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/login/DisconnectPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/login/DisconnectPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/login/DisconnectPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/login/DisconnectPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/login/EncryptionRequestPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/login/EncryptionRequestPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/login/EncryptionRequestPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/login/EncryptionRequestPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/login/EncryptionResponsePacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/login/EncryptionResponsePacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/login/EncryptionResponsePacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/login/EncryptionResponsePacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/login/LoginPluginRequestPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/login/LoginPluginRequestPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/login/LoginPluginRequestPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/login/LoginPluginRequestPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/login/LoginPluginResponsePacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/login/LoginPluginResponsePacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/login/LoginPluginResponsePacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/login/LoginPluginResponsePacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/login/LoginStartPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/login/LoginStartPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/login/LoginStartPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/login/LoginStartPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/login/LoginSuccessPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/login/LoginSuccessPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/login/LoginSuccessPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/login/LoginSuccessPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/login/SetCompressionPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/login/SetCompressionPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/login/SetCompressionPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/login/SetCompressionPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/play/ClientSettingsPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/play/ClientSettingsPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/play/ClientSettingsPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/play/ClientSettingsPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/play/IncomingPluginMessagePacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/play/IncomingPluginMessagePacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/play/IncomingPluginMessagePacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/play/IncomingPluginMessagePacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/play/JoinGamePacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/play/JoinGamePacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/play/JoinGamePacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/play/JoinGamePacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/play/OutgoingPluginMessagePacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/play/OutgoingPluginMessagePacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/play/OutgoingPluginMessagePacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/play/OutgoingPluginMessagePacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/play/PlayerAbilitiesPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/play/PlayerAbilitiesPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/play/PlayerAbilitiesPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/play/PlayerAbilitiesPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/play/ServerDifficultyPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/play/ServerDifficultyPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/play/ServerDifficultyPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/play/ServerDifficultyPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/status/PingPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/status/PingPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/status/PingPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/status/PingPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/status/PongPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/status/PongPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/status/PongPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/status/PongPacket.kt diff --git a/blokk-api/src/main/kotlin/space/blokk/net/packets/status/RequestPacket.kt b/blokk-packets/src/main/kotlin/space/blokk/net/packets/status/RequestPacket.kt similarity index 100% rename from blokk-api/src/main/kotlin/space/blokk/net/packets/status/RequestPacket.kt rename to blokk-packets/src/main/kotlin/space/blokk/net/packets/status/RequestPacket.kt diff --git a/blokk-server/build.gradle.kts b/blokk-server/build.gradle.kts index 7a8029a..2941786 100644 --- a/blokk-server/build.gradle.kts +++ b/blokk-server/build.gradle.kts @@ -1,5 +1,6 @@ plugins { kotlin("jvm") + kotlin("kapt") id("com.github.johnrengelman.shadow") version "6.0.0" } @@ -23,6 +24,7 @@ dependencies { // Blokk implementation(project(":blokk-api")) + implementation(project(":blokk-packets")) implementation(project(":blokk-packet-codecs")) // Logging @@ -42,6 +44,7 @@ dependencies { implementation("com.squareup.okhttp3:okhttp:4.8.1") implementation("com.sksamuel.hoplite:hoplite-core:1.3.3") implementation("com.sksamuel.hoplite:hoplite-yaml:1.3.3") + kapt("com.squareup.moshi:moshi-kotlin-codegen:${moshiVersion}") } tasks { diff --git a/settings.gradle.kts b/settings.gradle.kts index a914d5d..8f37504 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,4 +9,5 @@ rootProject.name = "blokk" include(":blokk-api") include(":blokk-server") +include(":blokk-packets") include(":blokk-packet-codecs")