Merge pull request #3 from hestia-rsps/release/package

Package change
hestia-rsps · Nov 10, 2018 · 684e1e4 · 684e1e4
2 parents 3e0168e + 0162bf7
commit 684e1e4
Show file tree

Hide file tree

Showing 35 changed files with 87 additions and 83 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 apply plugin: 'maven'
 
-group 'world.gregs'
+group 'world.gregs.hestia'
 version '0.1.0'
 
 repositories {

diff --git a/...ain/kotlin/world/gregs/hestia/Settings.kt → ...otlin/world/gregs/hestia/core/Settings.kt b/...ain/kotlin/world/gregs/hestia/Settings.kt → ...otlin/world/gregs/hestia/core/Settings.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia
+package world.gregs.hestia.core
 
 import org.yaml.snakeyaml.Yaml
 import java.io.File

diff --git a/...kotlin/world/gregs/hestia/WorldDetails.kt → ...n/world/gregs/hestia/core/WorldDetails.kt b/...kotlin/world/gregs/hestia/WorldDetails.kt → ...n/world/gregs/hestia/core/WorldDetails.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia
+package world.gregs.hestia.core
 
 class WorldDetails(val activity: String, val ip: String, val region: String, val country: Int, val location: Int = 0, val flag: Int) {
     var size = 0

diff --git a/.../gregs/hestia/network/NetworkConstants.kt → ...s/hestia/core/network/NetworkConstants.kt b/.../gregs/hestia/network/NetworkConstants.kt → ...s/hestia/core/network/NetworkConstants.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia.network
+package world.gregs.hestia.core.network
 
 import io.netty.util.AttributeKey
 import java.math.BigInteger

diff --git a/...lin/world/gregs/hestia/network/Session.kt → ...orld/gregs/hestia/core/network/Session.kt b/...lin/world/gregs/hestia/network/Session.kt → ...orld/gregs/hestia/core/network/Session.kt
@@ -1,8 +1,8 @@
-package world.gregs.hestia.network
+package world.gregs.hestia.core.network
 
-import world.gregs.hestia.network.packets.Packet
-import world.gregs.hestia.network.packets.out.ClientResponse
-import world.gregs.hestia.network.packets.out.Response
+import world.gregs.hestia.core.network.packets.Packet
+import world.gregs.hestia.core.network.packets.out.ClientResponse
+import world.gregs.hestia.core.network.packets.out.Response
 import io.netty.channel.Channel
 import io.netty.channel.ChannelFutureListener
 import java.net.InetSocketAddress

diff --git a/...s/hestia/network/client/AutoConnection.kt → ...tia/core/network/client/AutoConnection.kt b/...s/hestia/network/client/AutoConnection.kt → ...tia/core/network/client/AutoConnection.kt
@@ -1,6 +1,6 @@
-package world.gregs.hestia.network.client
+package world.gregs.hestia.core.network.client
 
-import world.gregs.hestia.network.codec.Pipeline
+import world.gregs.hestia.core.network.codec.Pipeline
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 

diff --git a/...gregs/hestia/network/client/Connection.kt → .../hestia/core/network/client/Connection.kt b/...gregs/hestia/network/client/Connection.kt → .../hestia/core/network/client/Connection.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia.network.client
+package world.gregs.hestia.core.network.client
 
 import io.netty.bootstrap.Bootstrap
 import io.netty.channel.ChannelFuture

diff --git a/...hestia/network/client/ConnectionChange.kt → ...a/core/network/client/ConnectionChange.kt b/...hestia/network/client/ConnectionChange.kt → ...a/core/network/client/ConnectionChange.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia.network.client
+package world.gregs.hestia.core.network.client
 
 interface ConnectionChange {
     fun connect()

diff --git a/...rld/gregs/hestia/network/codec/Encoder.kt → ...regs/hestia/core/network/codec/Encoder.kt b/...rld/gregs/hestia/network/codec/Encoder.kt → ...regs/hestia/core/network/codec/Encoder.kt
@@ -1,6 +1,6 @@
-package world.gregs.hestia.network.codec
+package world.gregs.hestia.core.network.codec
 
-import world.gregs.hestia.network.packets.Packet
+import world.gregs.hestia.core.network.packets.Packet
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelHandler
 import io.netty.channel.ChannelHandlerContext

diff --git a/...ld/gregs/hestia/network/codec/Pipeline.kt → ...egs/hestia/core/network/codec/Pipeline.kt b/...ld/gregs/hestia/network/codec/Pipeline.kt → ...egs/hestia/core/network/codec/Pipeline.kt
@@ -1,7 +1,7 @@
-package world.gregs.hestia.network.codec
+package world.gregs.hestia.core.network.codec
 
-import world.gregs.hestia.network.NetworkConstants.SESSION_KEY
-import world.gregs.hestia.network.Session
+import world.gregs.hestia.core.network.NetworkConstants.SESSION_KEY
+import world.gregs.hestia.core.network.Session
 import io.netty.channel.ChannelHandler
 import io.netty.channel.ChannelInitializer
 import io.netty.channel.socket.SocketChannel

diff --git a/...network/codec/inbound/HandshakeHandler.kt → ...network/codec/inbound/HandshakeHandler.kt b/...network/codec/inbound/HandshakeHandler.kt → ...network/codec/inbound/HandshakeHandler.kt
@@ -1,6 +1,6 @@
-package world.gregs.hestia.network.codec.inbound
+package world.gregs.hestia.core.network.codec.inbound
 
-import world.gregs.hestia.network.Session
+import world.gregs.hestia.core.network.Session
 import io.netty.buffer.ByteBuf
 
 abstract class HandshakeHandler : SessionInboundHandler() {

diff --git a/...a/network/codec/inbound/InboundHandler.kt → ...e/network/codec/inbound/InboundHandler.kt b/...a/network/codec/inbound/InboundHandler.kt → ...e/network/codec/inbound/InboundHandler.kt
@@ -1,7 +1,7 @@
-package world.gregs.hestia.network.codec.inbound
+package world.gregs.hestia.core.network.codec.inbound
 
-import world.gregs.hestia.network.NetworkConstants
-import world.gregs.hestia.network.Session
+import world.gregs.hestia.core.network.NetworkConstants
+import world.gregs.hestia.core.network.Session
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelHandler

diff --git a/...ork/codec/inbound/PacketInboundHandler.kt → ...ork/codec/inbound/PacketInboundHandler.kt b/...ork/codec/inbound/PacketInboundHandler.kt → ...ork/codec/inbound/PacketInboundHandler.kt
@@ -1,9 +1,9 @@
-package world.gregs.hestia.network.codec.inbound
+package world.gregs.hestia.core.network.codec.inbound
 
-import world.gregs.hestia.network.Session
-import world.gregs.hestia.network.packets.InboundPacket
-import world.gregs.hestia.network.packets.Packet
-import world.gregs.hestia.network.packets.PacketMap
+import world.gregs.hestia.core.network.Session
+import world.gregs.hestia.core.network.packets.InboundPacket
+import world.gregs.hestia.core.network.packets.Packet
+import world.gregs.hestia.core.services.load.PacketMap
 import io.netty.buffer.ByteBuf
 import io.netty.channel.ChannelHandler
 import io.netty.channel.group.ChannelGroup

diff --git a/...rk/codec/inbound/SessionInboundHandler.kt → ...rk/codec/inbound/SessionInboundHandler.kt b/...rk/codec/inbound/SessionInboundHandler.kt → ...rk/codec/inbound/SessionInboundHandler.kt
@@ -1,7 +1,7 @@
-package world.gregs.hestia.network.codec.inbound
+package world.gregs.hestia.core.network.codec.inbound
 
-import world.gregs.hestia.network.NetworkConstants
-import world.gregs.hestia.network.Session
+import world.gregs.hestia.core.network.NetworkConstants
+import world.gregs.hestia.core.network.Session
 import io.netty.buffer.ByteBuf
 import io.netty.channel.ChannelHandlerContext
 

diff --git a/...regs/hestia/network/login/LoginDecoder.kt → ...hestia/core/network/login/LoginDecoder.kt b/...regs/hestia/network/login/LoginDecoder.kt → ...hestia/core/network/login/LoginDecoder.kt
@@ -1,14 +1,14 @@
-package world.gregs.hestia.network.login
+package world.gregs.hestia.core.network.login
 
 import io.netty.buffer.ByteBuf
 import org.slf4j.LoggerFactory
-import world.gregs.hestia.network.NetworkConstants
-import world.gregs.hestia.network.Session
-import world.gregs.hestia.network.packets.InboundPacket
-import world.gregs.hestia.network.packets.Packet
-import world.gregs.hestia.network.packets.PacketMap
-import world.gregs.hestia.network.packets.out.Response
-import world.gregs.hestia.services.Decryption
+import world.gregs.hestia.core.network.NetworkConstants
+import world.gregs.hestia.core.network.Session
+import world.gregs.hestia.core.network.packets.InboundPacket
+import world.gregs.hestia.core.network.packets.Packet
+import world.gregs.hestia.core.services.load.PacketMap
+import world.gregs.hestia.core.network.packets.out.Response
+import world.gregs.hestia.core.services.Decryption
 
 interface LoginDecoder {
 

diff --git a/...gs/hestia/network/login/LoginHandshake.kt → ...stia/core/network/login/LoginHandshake.kt b/...gs/hestia/network/login/LoginHandshake.kt → ...stia/core/network/login/LoginHandshake.kt
@@ -1,13 +1,13 @@
-package world.gregs.hestia.network.login
+package world.gregs.hestia.core.network.login
 
 import io.netty.buffer.ByteBuf
-import world.gregs.hestia.network.Session
-import world.gregs.hestia.network.codec.inbound.HandshakeHandler
-import world.gregs.hestia.network.packets.InboundPacket
-import world.gregs.hestia.network.packets.Packet
-import world.gregs.hestia.network.packets.PacketMap
-import world.gregs.hestia.network.packets.out.Response
-import world.gregs.hestia.services.Decryption
+import world.gregs.hestia.core.network.Session
+import world.gregs.hestia.core.network.codec.inbound.HandshakeHandler
+import world.gregs.hestia.core.network.packets.InboundPacket
+import world.gregs.hestia.core.network.packets.Packet
+import world.gregs.hestia.core.services.load.PacketMap
+import world.gregs.hestia.core.network.packets.out.Response
+import world.gregs.hestia.core.services.Decryption
 
 class LoginHandshake(private val packets: PacketMap, private val listener: LoginRequestListener) : HandshakeHandler(), LoginDecoder {
 

diff --git a/src/main/kotlin/world/gregs/hestia/core/network/login/LoginRequestListener.kt b/src/main/kotlin/world/gregs/hestia/core/network/login/LoginRequestListener.kt
@@ -0,0 +1,9 @@
+package world.gregs.hestia.core.network.login
+
+import world.gregs.hestia.core.network.Session
+import world.gregs.hestia.core.network.packets.InboundPacket
+import world.gregs.hestia.core.network.packets.Packet
+
+interface LoginRequestListener {
+    fun login(session: Session, handler: InboundPacket, packet: Packet, password: String, serverSeed: Long, clientSeed: Long)
+}
diff --git a/...s/hestia/network/packets/InboundPacket.kt → ...tia/core/network/packets/InboundPacket.kt b/...s/hestia/network/packets/InboundPacket.kt → ...tia/core/network/packets/InboundPacket.kt
@@ -1,6 +1,6 @@
-package world.gregs.hestia.network.packets
+package world.gregs.hestia.core.network.packets
 
-import world.gregs.hestia.network.Session
+import world.gregs.hestia.core.network.Session
 
 /**
  * Annotation for packet opcode(s)

diff --git a/...ld/gregs/hestia/network/packets/Packet.kt → ...egs/hestia/core/network/packets/Packet.kt b/...ld/gregs/hestia/network/packets/Packet.kt → ...egs/hestia/core/network/packets/Packet.kt
@@ -1,9 +1,9 @@
-package world.gregs.hestia.network.packets
+package world.gregs.hestia.core.network.packets
 
 
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
-import world.gregs.hestia.network.packets.Packet.Type
+import world.gregs.hestia.core.network.packets.Packet.Type
 
 /**
  * A unit of byte data

diff --git a/...tia/network/packets/out/ClientResponse.kt → ...ore/network/packets/out/ClientResponse.kt b/...tia/network/packets/out/ClientResponse.kt → ...ore/network/packets/out/ClientResponse.kt
@@ -1,6 +1,6 @@
-package world.gregs.hestia.network.packets.out
+package world.gregs.hestia.core.network.packets.out
 
-import world.gregs.hestia.network.packets.Packet
+import world.gregs.hestia.core.network.packets.Packet
 
 class ClientResponse(response: Response): Packet.Builder() {
 

diff --git a/...gs/hestia/network/packets/out/Response.kt → ...stia/core/network/packets/out/Response.kt b/...gs/hestia/network/packets/out/Response.kt → ...stia/core/network/packets/out/Response.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia.network.packets.out
+package world.gregs.hestia.core.network.packets.out
 
 enum class Response(val opcode: Int) {
     DATA_CHANGE(0),

diff --git a/...ld/gregs/hestia/network/server/Network.kt → ...egs/hestia/core/network/server/Network.kt b/...ld/gregs/hestia/network/server/Network.kt → ...egs/hestia/core/network/server/Network.kt
@@ -1,6 +1,6 @@
-package world.gregs.hestia.network.server
+package world.gregs.hestia.core.network.server
 
-import world.gregs.hestia.network.server.threads.DecoderThreadFactory
+import world.gregs.hestia.core.network.server.threads.DecoderThreadFactory
 import io.netty.bootstrap.ServerBootstrap
 import io.netty.channel.ChannelFuture
 import io.netty.channel.ChannelInitializer

diff --git a/...twork/server/threads/CoreThreadFactory.kt → ...twork/server/threads/CoreThreadFactory.kt b/...twork/server/threads/CoreThreadFactory.kt → ...twork/server/threads/CoreThreadFactory.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia.network.server.threads
+package world.gregs.hestia.core.network.server.threads
 
 import java.util.concurrent.ThreadFactory
 import java.util.concurrent.atomic.AtomicInteger

diff --git a/...rk/server/threads/DecoderThreadFactory.kt → ...rk/server/threads/DecoderThreadFactory.kt b/...rk/server/threads/DecoderThreadFactory.kt → ...rk/server/threads/DecoderThreadFactory.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia.network.server.threads
+package world.gregs.hestia.core.network.server.threads
 
 import java.util.concurrent.atomic.AtomicInteger
 

diff --git a/...ork/server/threads/LoaderThreadFactory.kt → ...ork/server/threads/LoaderThreadFactory.kt b/...ork/server/threads/LoaderThreadFactory.kt → ...ork/server/threads/LoaderThreadFactory.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia.network.server.threads
+package world.gregs.hestia.core.network.server.threads
 
 import java.util.concurrent.atomic.AtomicInteger
 

diff --git a/...tlin/world/gregs/hestia/services/Cache.kt → ...world/gregs/hestia/core/services/Cache.kt b/...tlin/world/gregs/hestia/services/Cache.kt → ...world/gregs/hestia/core/services/Cache.kt
@@ -1,10 +1,10 @@
-package world.gregs.hestia.services
+package world.gregs.hestia.core.services
 
 import com.alex.store.Index
 import com.alex.store.Store
 import com.alex.util.whirlpool.Whirlpool
 import io.netty.buffer.Unpooled
-import world.gregs.hestia.Settings
+import world.gregs.hestia.core.Settings
 import java.io.IOException
 
 object Cache {
@@ -14,7 +14,8 @@ object Cache {
 
     @Throws(IOException::class)
     fun init(path: String? = null) {
-        STORE = Store(path ?: Settings.get("cachePath", null) ?: throw NullPointerException())
+        STORE = Store(path ?: Settings.get("cachePath", null)
+        ?: throw NullPointerException())
         versionTable = createVersionTable()
     }
 

diff --git a/...world/gregs/hestia/services/Decryption.kt → .../gregs/hestia/core/services/Decryption.kt b/...world/gregs/hestia/services/Decryption.kt → .../gregs/hestia/core/services/Decryption.kt
@@ -1,6 +1,6 @@
-package world.gregs.hestia.services
+package world.gregs.hestia.core.services
 
-import world.gregs.hestia.network.packets.Packet
+import world.gregs.hestia.core.network.packets.Packet
 import java.math.BigInteger
 
 object Decryption {

diff --git a/...world/gregs/hestia/services/Encryption.kt → .../gregs/hestia/core/services/Encryption.kt b/...world/gregs/hestia/services/Encryption.kt → .../gregs/hestia/core/services/Encryption.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia.services
+package world.gregs.hestia.core.services
 
 import org.slf4j.LoggerFactory
 import java.security.MessageDigest

diff --git a/...regs/hestia/services/GenericExtensions.kt → ...hestia/core/services/GenericExtensions.kt b/...regs/hestia/services/GenericExtensions.kt → ...hestia/core/services/GenericExtensions.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia.services
+package world.gregs.hestia.core.services
 
 
 /*

diff --git a/...lin/world/gregs/hestia/services/Loader.kt → ...gregs/hestia/core/services/load/Loader.kt b/...lin/world/gregs/hestia/services/Loader.kt → ...gregs/hestia/core/services/load/Loader.kt
@@ -1,4 +1,4 @@
-package world.gregs.hestia.services
+package world.gregs.hestia.core.services.load
 
 import org.slf4j.LoggerFactory
 import java.io.File

diff --git a/...gs/hestia/network/packets/PacketLoader.kt → ...hestia/core/services/load/PacketLoader.kt b/...gs/hestia/network/packets/PacketLoader.kt → ...hestia/core/services/load/PacketLoader.kt
@@ -1,8 +1,10 @@
-package world.gregs.hestia.network.packets
+package world.gregs.hestia.core.services.load
 
-import world.gregs.hestia.services.Loader
-import world.gregs.hestia.services.plural
 import org.slf4j.LoggerFactory
+import world.gregs.hestia.core.network.packets.InboundPacket
+import world.gregs.hestia.core.network.packets.PacketOpcode
+import world.gregs.hestia.core.network.packets.PacketSize
+import world.gregs.hestia.core.services.plural
 import kotlin.system.measureNanoTime
 
 class PacketLoader(path: String) {

diff --git a/...gregs/hestia/network/packets/PacketMap.kt → ...gs/hestia/core/services/load/PacketMap.kt b/...gregs/hestia/network/packets/PacketMap.kt → ...gs/hestia/core/services/load/PacketMap.kt
@@ -1,5 +1,6 @@
-package world.gregs.hestia.network.packets
+package world.gregs.hestia.core.services.load
 
+import world.gregs.hestia.core.network.packets.InboundPacket
 import java.util.*
 
 class PacketMap : HashMap<Int, Pair<InboundPacket, Int>>() {

diff --git a/src/main/kotlin/world/gregs/hestia/network/login/LoginRequestListener.kt b/src/main/kotlin/world/gregs/hestia/network/login/LoginRequestListener.kt
diff --git a/...gregs/hestia/network/PacketBuilderTest.kt → .../hestia/core/network/PacketBuilderTest.kt b/...gregs/hestia/network/PacketBuilderTest.kt → .../hestia/core/network/PacketBuilderTest.kt
@@ -1,9 +1,9 @@
-package world.gregs.hestia.network
+package world.gregs.hestia.core.network
 
 import io.netty.buffer.Unpooled
 import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Test
-import world.gregs.hestia.network.packets.Packet
+import world.gregs.hestia.core.network.packets.Packet
 
 internal class PacketBuilderTest {
 

diff --git a/.../world/gregs/hestia/network/PacketTest.kt → ...d/gregs/hestia/core/network/PacketTest.kt b/.../world/gregs/hestia/network/PacketTest.kt → ...d/gregs/hestia/core/network/PacketTest.kt
@@ -1,9 +1,9 @@
-package world.gregs.hestia.network
+package world.gregs.hestia.core.network
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import world.gregs.hestia.network.packets.Packet
+import world.gregs.hestia.core.network.packets.Packet
 
 internal class PacketTest {