From 4c309a0f509a23a75f3d0f5df5a94c5d83f95fbb Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 24 Jul 2022 16:54:54 +0100 Subject: [PATCH] Split protocol packages into upstream/downstream packages --- .../archive/cache/NxtJs5ChannelHandler.kt | 2 +- .../archive/cache/OsrsJs5ChannelHandler.kt | 14 +++++----- .../cache/OsrsJs5ChannelInitializer.kt | 6 ++-- .../org/openrs2/game/cluster/Cluster.kt | 2 +- .../org/openrs2/game/cluster/CountryList.kt | 2 +- .../game/cluster/SingleWorldCluster.kt | 2 +- .../openrs2/game/net/Rs2ChannelInitializer.kt | 4 +-- .../game/net/jaggrab/JaggrabChannelHandler.kt | 2 +- .../openrs2/game/net/js5/Js5ChannelHandler.kt | 4 +-- .../org/openrs2/game/net/js5/Js5Client.kt | 2 +- .../org/openrs2/game/net/js5/Js5Service.kt | 4 +-- .../game/net/login/LoginChannelHandler.kt | 18 ++++++------ .../org/openrs2/protocol/ProtocolModule.kt | 28 +++++++++---------- .../jaggrab/{ => upstream}/JaggrabRequest.kt | 2 +- .../{ => upstream}/JaggrabRequestDecoder.kt | 2 +- .../{ => upstream}/JaggrabRequestEncoder.kt | 2 +- .../{ => downstream}/Js5RemoteDownstream.kt | 2 +- .../js5/{ => downstream}/Js5Response.kt | 2 +- .../{ => downstream}/Js5ResponseDecoder.kt | 2 +- .../{ => downstream}/Js5ResponseEncoder.kt | 2 +- .../js5/{ => downstream}/XorDecoder.kt | 2 +- .../js5/{ => downstream}/XorEncoder.kt | 2 +- .../js5/{ => downstream}/XorExtensions.kt | 2 +- .../protocol/js5/{ => upstream}/Js5Request.kt | 2 +- .../js5/{ => upstream}/Js5RequestDecoder.kt | 2 +- .../js5/{ => upstream}/Js5RequestEncoder.kt | 2 +- .../{ => downstream}/ClientOutOfDateCodec.kt | 2 +- .../login/{ => downstream}/IpLimitCodec.kt | 2 +- .../login/{ => downstream}/Js5OkCodec.kt | 2 +- .../login/{ => downstream}/LoginDownstream.kt | 2 +- .../login/{ => downstream}/LoginResponse.kt | 2 +- .../login/{ => downstream}/ServerFullCodec.kt | 2 +- .../InitCrossDomainConnectionCodec.kt | 2 +- .../{ => upstream}/InitGameConnectionCodec.kt | 2 +- .../InitJaggrabConnectionCodec.kt | 2 +- .../InitJs5RemoteConnectionCodec.kt | 2 +- .../login/{ => upstream}/LoginRequest.kt | 2 +- .../login/{ => upstream}/LoginUpstream.kt | 2 +- .../{ => upstream}/RequestWorldListCodec.kt | 2 +- .../{ => downstream}/WorldListDownstream.kt | 2 +- .../{ => downstream}/WorldListResponse.kt | 2 +- .../WorldListResponseCodec.kt | 2 +- .../jaggrab/JaggrabRequestDecoderTest.kt | 2 ++ .../jaggrab/JaggrabRequestEncoderTest.kt | 2 ++ .../protocol/js5/Js5RequestDecoderTest.kt | 2 ++ .../protocol/js5/Js5RequestEncoderTest.kt | 2 ++ .../protocol/js5/Js5ResponseDecoderTest.kt | 2 ++ .../protocol/js5/Js5ResponseEncoderTest.kt | 2 ++ .../openrs2/protocol/js5/XorDecoderTest.kt | 1 + .../openrs2/protocol/js5/XorEncoderTest.kt | 1 + 50 files changed, 88 insertions(+), 74 deletions(-) rename protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/{ => upstream}/JaggrabRequest.kt (56%) rename protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/{ => upstream}/JaggrabRequestDecoder.kt (92%) rename protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/{ => upstream}/JaggrabRequestEncoder.kt (89%) rename protocol/src/main/kotlin/org/openrs2/protocol/js5/{ => downstream}/Js5RemoteDownstream.kt (83%) rename protocol/src/main/kotlin/org/openrs2/protocol/js5/{ => downstream}/Js5Response.kt (85%) rename protocol/src/main/kotlin/org/openrs2/protocol/js5/{ => downstream}/Js5ResponseDecoder.kt (98%) rename protocol/src/main/kotlin/org/openrs2/protocol/js5/{ => downstream}/Js5ResponseEncoder.kt (98%) rename protocol/src/main/kotlin/org/openrs2/protocol/js5/{ => downstream}/XorDecoder.kt (89%) rename protocol/src/main/kotlin/org/openrs2/protocol/js5/{ => downstream}/XorEncoder.kt (89%) rename protocol/src/main/kotlin/org/openrs2/protocol/js5/{ => downstream}/XorExtensions.kt (94%) rename protocol/src/main/kotlin/org/openrs2/protocol/js5/{ => upstream}/Js5Request.kt (90%) rename protocol/src/main/kotlin/org/openrs2/protocol/js5/{ => upstream}/Js5RequestDecoder.kt (96%) rename protocol/src/main/kotlin/org/openrs2/protocol/js5/{ => upstream}/Js5RequestEncoder.kt (97%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => downstream}/ClientOutOfDateCodec.kt (83%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => downstream}/IpLimitCodec.kt (82%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => downstream}/Js5OkCodec.kt (81%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => downstream}/LoginDownstream.kt (82%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => downstream}/LoginResponse.kt (85%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => downstream}/ServerFullCodec.kt (82%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => upstream}/InitCrossDomainConnectionCodec.kt (85%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => upstream}/InitGameConnectionCodec.kt (94%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => upstream}/InitJaggrabConnectionCodec.kt (85%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => upstream}/InitJs5RemoteConnectionCodec.kt (94%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => upstream}/LoginRequest.kt (91%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => upstream}/LoginUpstream.kt (82%) rename protocol/src/main/kotlin/org/openrs2/protocol/login/{ => upstream}/RequestWorldListCodec.kt (93%) rename protocol/src/main/kotlin/org/openrs2/protocol/world/{ => downstream}/WorldListDownstream.kt (82%) rename protocol/src/main/kotlin/org/openrs2/protocol/world/{ => downstream}/WorldListResponse.kt (95%) rename protocol/src/main/kotlin/org/openrs2/protocol/world/{ => downstream}/WorldListResponseCodec.kt (99%) diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/NxtJs5ChannelHandler.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/NxtJs5ChannelHandler.kt index ef15a644..5239c0e8 100644 --- a/archive/src/main/kotlin/org/openrs2/archive/cache/NxtJs5ChannelHandler.kt +++ b/archive/src/main/kotlin/org/openrs2/archive/cache/NxtJs5ChannelHandler.kt @@ -19,7 +19,7 @@ import org.openrs2.buffer.use import org.openrs2.cache.MasterIndexFormat import org.openrs2.protocol.Rs2Decoder import org.openrs2.protocol.Rs2Encoder -import org.openrs2.protocol.js5.XorDecoder +import org.openrs2.protocol.js5.downstream.XorDecoder import kotlin.coroutines.Continuation public class NxtJs5ChannelHandler( diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/OsrsJs5ChannelHandler.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/OsrsJs5ChannelHandler.kt index cdf80b72..f5581efa 100644 --- a/archive/src/main/kotlin/org/openrs2/archive/cache/OsrsJs5ChannelHandler.kt +++ b/archive/src/main/kotlin/org/openrs2/archive/cache/OsrsJs5ChannelHandler.kt @@ -6,13 +6,13 @@ import io.netty.channel.ChannelPipeline import org.openrs2.cache.MasterIndexFormat import org.openrs2.protocol.Rs2Decoder import org.openrs2.protocol.Rs2Encoder -import org.openrs2.protocol.js5.Js5Request -import org.openrs2.protocol.js5.Js5RequestEncoder -import org.openrs2.protocol.js5.Js5Response -import org.openrs2.protocol.js5.Js5ResponseDecoder -import org.openrs2.protocol.js5.XorDecoder -import org.openrs2.protocol.login.LoginRequest -import org.openrs2.protocol.login.LoginResponse +import org.openrs2.protocol.js5.downstream.Js5Response +import org.openrs2.protocol.js5.downstream.Js5ResponseDecoder +import org.openrs2.protocol.js5.downstream.XorDecoder +import org.openrs2.protocol.js5.upstream.Js5Request +import org.openrs2.protocol.js5.upstream.Js5RequestEncoder +import org.openrs2.protocol.login.downstream.LoginResponse +import org.openrs2.protocol.login.upstream.LoginRequest import kotlin.coroutines.Continuation public class OsrsJs5ChannelHandler( diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/OsrsJs5ChannelInitializer.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/OsrsJs5ChannelInitializer.kt index e146c4ef..64f046fc 100644 --- a/archive/src/main/kotlin/org/openrs2/archive/cache/OsrsJs5ChannelInitializer.kt +++ b/archive/src/main/kotlin/org/openrs2/archive/cache/OsrsJs5ChannelInitializer.kt @@ -6,9 +6,9 @@ import io.netty.handler.timeout.ReadTimeoutHandler import org.openrs2.protocol.Protocol import org.openrs2.protocol.Rs2Decoder import org.openrs2.protocol.Rs2Encoder -import org.openrs2.protocol.login.ClientOutOfDateCodec -import org.openrs2.protocol.login.InitJs5RemoteConnectionCodec -import org.openrs2.protocol.login.Js5OkCodec +import org.openrs2.protocol.login.downstream.ClientOutOfDateCodec +import org.openrs2.protocol.login.downstream.Js5OkCodec +import org.openrs2.protocol.login.upstream.InitJs5RemoteConnectionCodec public class OsrsJs5ChannelInitializer(private val handler: OsrsJs5ChannelHandler) : ChannelInitializer() { override fun initChannel(ch: Channel) { diff --git a/game/src/main/kotlin/org/openrs2/game/cluster/Cluster.kt b/game/src/main/kotlin/org/openrs2/game/cluster/Cluster.kt index c3e69669..d2930d43 100644 --- a/game/src/main/kotlin/org/openrs2/game/cluster/Cluster.kt +++ b/game/src/main/kotlin/org/openrs2/game/cluster/Cluster.kt @@ -1,6 +1,6 @@ package org.openrs2.game.cluster -import org.openrs2.protocol.world.WorldListResponse +import org.openrs2.protocol.world.downstream.WorldListResponse import java.util.SortedMap public interface Cluster { diff --git a/game/src/main/kotlin/org/openrs2/game/cluster/CountryList.kt b/game/src/main/kotlin/org/openrs2/game/cluster/CountryList.kt index e8693266..b1a47999 100644 --- a/game/src/main/kotlin/org/openrs2/game/cluster/CountryList.kt +++ b/game/src/main/kotlin/org/openrs2/game/cluster/CountryList.kt @@ -2,7 +2,7 @@ package org.openrs2.game.cluster import org.openrs2.cache.config.enum.EnumTypeList import org.openrs2.conf.CountryCode -import org.openrs2.protocol.world.WorldListResponse +import org.openrs2.protocol.world.downstream.WorldListResponse import javax.inject.Inject import javax.inject.Singleton diff --git a/game/src/main/kotlin/org/openrs2/game/cluster/SingleWorldCluster.kt b/game/src/main/kotlin/org/openrs2/game/cluster/SingleWorldCluster.kt index 8d313b34..5bd6e182 100644 --- a/game/src/main/kotlin/org/openrs2/game/cluster/SingleWorldCluster.kt +++ b/game/src/main/kotlin/org/openrs2/game/cluster/SingleWorldCluster.kt @@ -1,7 +1,7 @@ package org.openrs2.game.cluster import org.openrs2.conf.Config -import org.openrs2.protocol.world.WorldListResponse +import org.openrs2.protocol.world.downstream.WorldListResponse import java.util.SortedMap import javax.inject.Inject import javax.inject.Singleton diff --git a/game/src/main/kotlin/org/openrs2/game/net/Rs2ChannelInitializer.kt b/game/src/main/kotlin/org/openrs2/game/net/Rs2ChannelInitializer.kt index 0e1c7e8e..2f4edd36 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/Rs2ChannelInitializer.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/Rs2ChannelInitializer.kt @@ -7,8 +7,8 @@ import org.openrs2.game.net.login.LoginChannelHandler import org.openrs2.protocol.Protocol import org.openrs2.protocol.Rs2Decoder import org.openrs2.protocol.Rs2Encoder -import org.openrs2.protocol.login.LoginDownstream -import org.openrs2.protocol.login.LoginUpstream +import org.openrs2.protocol.login.downstream.LoginDownstream +import org.openrs2.protocol.login.upstream.LoginUpstream import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.inject.Provider diff --git a/game/src/main/kotlin/org/openrs2/game/net/jaggrab/JaggrabChannelHandler.kt b/game/src/main/kotlin/org/openrs2/game/net/jaggrab/JaggrabChannelHandler.kt index b9c7f9b1..dedd6ae2 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/jaggrab/JaggrabChannelHandler.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/jaggrab/JaggrabChannelHandler.kt @@ -7,7 +7,7 @@ import io.netty.channel.SimpleChannelInboundHandler import io.netty.handler.timeout.IdleStateEvent import org.openrs2.buffer.use import org.openrs2.game.net.FileProvider -import org.openrs2.protocol.jaggrab.JaggrabRequest +import org.openrs2.protocol.jaggrab.upstream.JaggrabRequest import javax.inject.Inject import javax.inject.Singleton diff --git a/game/src/main/kotlin/org/openrs2/game/net/js5/Js5ChannelHandler.kt b/game/src/main/kotlin/org/openrs2/game/net/js5/Js5ChannelHandler.kt index 4569162c..cd056460 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/js5/Js5ChannelHandler.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/js5/Js5ChannelHandler.kt @@ -3,8 +3,8 @@ package org.openrs2.game.net.js5 import io.netty.channel.ChannelHandlerContext import io.netty.channel.SimpleChannelInboundHandler import io.netty.handler.timeout.IdleStateEvent -import org.openrs2.protocol.js5.Js5Request -import org.openrs2.protocol.js5.XorEncoder +import org.openrs2.protocol.js5.downstream.XorEncoder +import org.openrs2.protocol.js5.upstream.Js5Request import javax.inject.Inject public class Js5ChannelHandler @Inject constructor( diff --git a/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Client.kt b/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Client.kt index 2f8bdd99..93daca1d 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Client.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Client.kt @@ -1,7 +1,7 @@ package org.openrs2.game.net.js5 import io.netty.channel.ChannelHandlerContext -import org.openrs2.protocol.js5.Js5Request +import org.openrs2.protocol.js5.upstream.Js5Request public class Js5Client( public val ctx: ChannelHandlerContext diff --git a/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Service.kt b/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Service.kt index c44e442b..19faab1b 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Service.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Service.kt @@ -9,8 +9,8 @@ import org.openrs2.cache.Js5CompressionType import org.openrs2.cache.Js5MasterIndex import org.openrs2.cache.Store import org.openrs2.cache.VersionTrailer -import org.openrs2.protocol.js5.Js5Request -import org.openrs2.protocol.js5.Js5Response +import org.openrs2.protocol.js5.downstream.Js5Response +import org.openrs2.protocol.js5.upstream.Js5Request import org.openrs2.util.collect.UniqueQueue import java.io.FileNotFoundException import javax.inject.Inject diff --git a/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt b/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt index 99b66873..c7b745f3 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt @@ -19,15 +19,15 @@ import org.openrs2.game.net.js5.Js5ChannelHandler import org.openrs2.protocol.Protocol import org.openrs2.protocol.Rs2Decoder import org.openrs2.protocol.Rs2Encoder -import org.openrs2.protocol.jaggrab.JaggrabRequestDecoder -import org.openrs2.protocol.js5.Js5RemoteDownstream -import org.openrs2.protocol.js5.Js5RequestDecoder -import org.openrs2.protocol.js5.Js5ResponseEncoder -import org.openrs2.protocol.js5.XorDecoder -import org.openrs2.protocol.login.LoginRequest -import org.openrs2.protocol.login.LoginResponse -import org.openrs2.protocol.world.WorldListDownstream -import org.openrs2.protocol.world.WorldListResponse +import org.openrs2.protocol.jaggrab.upstream.JaggrabRequestDecoder +import org.openrs2.protocol.js5.downstream.Js5RemoteDownstream +import org.openrs2.protocol.js5.downstream.Js5ResponseEncoder +import org.openrs2.protocol.js5.downstream.XorDecoder +import org.openrs2.protocol.js5.upstream.Js5RequestDecoder +import org.openrs2.protocol.login.downstream.LoginResponse +import org.openrs2.protocol.login.upstream.LoginRequest +import org.openrs2.protocol.world.downstream.WorldListDownstream +import org.openrs2.protocol.world.downstream.WorldListResponse import javax.inject.Inject import javax.inject.Provider diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/ProtocolModule.kt b/protocol/src/main/kotlin/org/openrs2/protocol/ProtocolModule.kt index b82c084f..8af99593 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/ProtocolModule.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/ProtocolModule.kt @@ -6,20 +6,20 @@ import com.google.inject.TypeLiteral import com.google.inject.multibindings.Multibinder import org.openrs2.buffer.BufferModule import org.openrs2.crypto.CryptoModule -import org.openrs2.protocol.js5.Js5RemoteDownstream -import org.openrs2.protocol.login.ClientOutOfDateCodec -import org.openrs2.protocol.login.InitCrossDomainConnectionCodec -import org.openrs2.protocol.login.InitGameConnectionCodec -import org.openrs2.protocol.login.InitJaggrabConnectionCodec -import org.openrs2.protocol.login.InitJs5RemoteConnectionCodec -import org.openrs2.protocol.login.IpLimitCodec -import org.openrs2.protocol.login.Js5OkCodec -import org.openrs2.protocol.login.LoginDownstream -import org.openrs2.protocol.login.LoginUpstream -import org.openrs2.protocol.login.RequestWorldListCodec -import org.openrs2.protocol.login.ServerFullCodec -import org.openrs2.protocol.world.WorldListDownstream -import org.openrs2.protocol.world.WorldListResponseCodec +import org.openrs2.protocol.js5.downstream.Js5RemoteDownstream +import org.openrs2.protocol.login.downstream.ClientOutOfDateCodec +import org.openrs2.protocol.login.downstream.IpLimitCodec +import org.openrs2.protocol.login.downstream.Js5OkCodec +import org.openrs2.protocol.login.downstream.LoginDownstream +import org.openrs2.protocol.login.downstream.ServerFullCodec +import org.openrs2.protocol.login.upstream.InitCrossDomainConnectionCodec +import org.openrs2.protocol.login.upstream.InitGameConnectionCodec +import org.openrs2.protocol.login.upstream.InitJaggrabConnectionCodec +import org.openrs2.protocol.login.upstream.InitJs5RemoteConnectionCodec +import org.openrs2.protocol.login.upstream.LoginUpstream +import org.openrs2.protocol.login.upstream.RequestWorldListCodec +import org.openrs2.protocol.world.downstream.WorldListDownstream +import org.openrs2.protocol.world.downstream.WorldListResponseCodec public object ProtocolModule : AbstractModule() { public override fun configure() { diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequest.kt b/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/upstream/JaggrabRequest.kt similarity index 56% rename from protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequest.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/upstream/JaggrabRequest.kt index 02027d6a..e4c36c7f 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequest.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/upstream/JaggrabRequest.kt @@ -1,3 +1,3 @@ -package org.openrs2.protocol.jaggrab +package org.openrs2.protocol.jaggrab.upstream public data class JaggrabRequest(public val path: String) diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestDecoder.kt b/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/upstream/JaggrabRequestDecoder.kt similarity index 92% rename from protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestDecoder.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/upstream/JaggrabRequestDecoder.kt index 23f5ec04..3a4baf3a 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestDecoder.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/upstream/JaggrabRequestDecoder.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.jaggrab +package org.openrs2.protocol.jaggrab.upstream import io.netty.channel.ChannelHandler import io.netty.channel.ChannelHandlerContext diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestEncoder.kt b/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/upstream/JaggrabRequestEncoder.kt similarity index 89% rename from protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestEncoder.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/upstream/JaggrabRequestEncoder.kt index 0cfe4db2..256bccf6 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestEncoder.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/jaggrab/upstream/JaggrabRequestEncoder.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.jaggrab +package org.openrs2.protocol.jaggrab.upstream import io.netty.channel.ChannelHandler import io.netty.channel.ChannelHandlerContext diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5RemoteDownstream.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5RemoteDownstream.kt similarity index 83% rename from protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5RemoteDownstream.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5RemoteDownstream.kt index e6afeee6..8bbf2a16 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5RemoteDownstream.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5RemoteDownstream.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.js5 +package org.openrs2.protocol.js5.downstream import javax.inject.Qualifier diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5Response.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5Response.kt similarity index 85% rename from protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5Response.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5Response.kt index e9f75e22..ca3eb0d5 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5Response.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5Response.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.js5 +package org.openrs2.protocol.js5.downstream import io.netty.buffer.ByteBuf import io.netty.buffer.DefaultByteBufHolder diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5ResponseDecoder.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ResponseDecoder.kt similarity index 98% rename from protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5ResponseDecoder.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ResponseDecoder.kt index 19b06c40..9f798bb5 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5ResponseDecoder.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ResponseDecoder.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.js5 +package org.openrs2.protocol.js5.downstream import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5ResponseEncoder.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ResponseEncoder.kt similarity index 98% rename from protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5ResponseEncoder.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ResponseEncoder.kt index 82306c8f..f3c2fe11 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5ResponseEncoder.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ResponseEncoder.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.js5 +package org.openrs2.protocol.js5.downstream import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandler diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/XorDecoder.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/XorDecoder.kt similarity index 89% rename from protocol/src/main/kotlin/org/openrs2/protocol/js5/XorDecoder.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/XorDecoder.kt index 7a9a4584..d90bfbb6 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/XorDecoder.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/XorDecoder.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.js5 +package org.openrs2.protocol.js5.downstream import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/XorEncoder.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/XorEncoder.kt similarity index 89% rename from protocol/src/main/kotlin/org/openrs2/protocol/js5/XorEncoder.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/XorEncoder.kt index a67f05f8..d46e2cdf 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/XorEncoder.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/XorEncoder.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.js5 +package org.openrs2.protocol.js5.downstream import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/XorExtensions.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/XorExtensions.kt similarity index 94% rename from protocol/src/main/kotlin/org/openrs2/protocol/js5/XorExtensions.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/XorExtensions.kt index 82f561ce..d90622f0 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/XorExtensions.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/XorExtensions.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.js5 +package org.openrs2.protocol.js5.downstream import io.netty.buffer.ByteBuf diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5Request.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/upstream/Js5Request.kt similarity index 90% rename from protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5Request.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/js5/upstream/Js5Request.kt index 99ac827e..93126f56 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5Request.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/upstream/Js5Request.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.js5 +package org.openrs2.protocol.js5.upstream public sealed class Js5Request { public data class Group( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5RequestDecoder.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/upstream/Js5RequestDecoder.kt similarity index 96% rename from protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5RequestDecoder.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/js5/upstream/Js5RequestDecoder.kt index 13e5bfdb..848b8878 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5RequestDecoder.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/upstream/Js5RequestDecoder.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.js5 +package org.openrs2.protocol.js5.upstream import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5RequestEncoder.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/upstream/Js5RequestEncoder.kt similarity index 97% rename from protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5RequestEncoder.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/js5/upstream/Js5RequestEncoder.kt index 27a6acfd..ec18916f 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/Js5RequestEncoder.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/upstream/Js5RequestEncoder.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.js5 +package org.openrs2.protocol.js5.upstream import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandler diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/ClientOutOfDateCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientOutOfDateCodec.kt similarity index 83% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/ClientOutOfDateCodec.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientOutOfDateCodec.kt index 200c7ddf..c7391f3e 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/ClientOutOfDateCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientOutOfDateCodec.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.downstream import org.openrs2.protocol.EmptyPacketCodec import javax.inject.Singleton diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/IpLimitCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpLimitCodec.kt similarity index 82% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/IpLimitCodec.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpLimitCodec.kt index abcc584c..07b53e25 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/IpLimitCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpLimitCodec.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.downstream import org.openrs2.protocol.EmptyPacketCodec import javax.inject.Singleton diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/Js5OkCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/Js5OkCodec.kt similarity index 81% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/Js5OkCodec.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/Js5OkCodec.kt index 254752b4..0d2f02f4 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/Js5OkCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/Js5OkCodec.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.downstream import org.openrs2.protocol.EmptyPacketCodec import javax.inject.Singleton diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginDownstream.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginDownstream.kt similarity index 82% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/LoginDownstream.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginDownstream.kt index e9ba385a..13f2e6f6 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginDownstream.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginDownstream.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.downstream import javax.inject.Qualifier diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginResponse.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginResponse.kt similarity index 85% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/LoginResponse.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginResponse.kt index 2c03f481..f45c07b4 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginResponse.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginResponse.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.downstream import org.openrs2.protocol.Packet diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/ServerFullCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServerFullCodec.kt similarity index 82% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/ServerFullCodec.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServerFullCodec.kt index 483b7ba8..b94ee6cc 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/ServerFullCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServerFullCodec.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.downstream import org.openrs2.protocol.EmptyPacketCodec import javax.inject.Singleton diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/InitCrossDomainConnectionCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitCrossDomainConnectionCodec.kt similarity index 85% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/InitCrossDomainConnectionCodec.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitCrossDomainConnectionCodec.kt index fda56965..ab9d5093 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/InitCrossDomainConnectionCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitCrossDomainConnectionCodec.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.upstream import org.openrs2.protocol.EmptyPacketCodec import javax.inject.Singleton diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/InitGameConnectionCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitGameConnectionCodec.kt similarity index 94% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/InitGameConnectionCodec.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitGameConnectionCodec.kt index 3021a953..28a00c23 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/InitGameConnectionCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitGameConnectionCodec.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.upstream import io.netty.buffer.ByteBuf import org.openrs2.crypto.StreamCipher diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/InitJaggrabConnectionCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJaggrabConnectionCodec.kt similarity index 85% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/InitJaggrabConnectionCodec.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJaggrabConnectionCodec.kt index 58d03a94..1db742c5 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/InitJaggrabConnectionCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJaggrabConnectionCodec.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.upstream import org.openrs2.protocol.EmptyPacketCodec import javax.inject.Singleton diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/InitJs5RemoteConnectionCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJs5RemoteConnectionCodec.kt similarity index 94% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/InitJs5RemoteConnectionCodec.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJs5RemoteConnectionCodec.kt index 31ced1da..17d063fa 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/InitJs5RemoteConnectionCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJs5RemoteConnectionCodec.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.upstream import io.netty.buffer.ByteBuf import org.openrs2.crypto.StreamCipher diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginRequest.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/LoginRequest.kt similarity index 91% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/LoginRequest.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/LoginRequest.kt index 82214ce9..577670e6 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginRequest.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/LoginRequest.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.upstream import org.openrs2.protocol.Packet diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginUpstream.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/LoginUpstream.kt similarity index 82% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/LoginUpstream.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/LoginUpstream.kt index 6089e8b3..0c303831 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/LoginUpstream.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/LoginUpstream.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.upstream import javax.inject.Qualifier diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/RequestWorldListCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/RequestWorldListCodec.kt similarity index 93% rename from protocol/src/main/kotlin/org/openrs2/protocol/login/RequestWorldListCodec.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/RequestWorldListCodec.kt index aab88c2e..b8e32b28 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/RequestWorldListCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/RequestWorldListCodec.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.login +package org.openrs2.protocol.login.upstream import io.netty.buffer.ByteBuf import org.openrs2.crypto.StreamCipher diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/world/WorldListDownstream.kt b/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListDownstream.kt similarity index 82% rename from protocol/src/main/kotlin/org/openrs2/protocol/world/WorldListDownstream.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListDownstream.kt index b092d627..8c152941 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/world/WorldListDownstream.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListDownstream.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.world +package org.openrs2.protocol.world.downstream import javax.inject.Qualifier diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/world/WorldListResponse.kt b/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListResponse.kt similarity index 95% rename from protocol/src/main/kotlin/org/openrs2/protocol/world/WorldListResponse.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListResponse.kt index 936ef5f5..abc9ceaf 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/world/WorldListResponse.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListResponse.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.world +package org.openrs2.protocol.world.downstream import org.openrs2.protocol.Packet import java.util.SortedMap diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/world/WorldListResponseCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListResponseCodec.kt similarity index 99% rename from protocol/src/main/kotlin/org/openrs2/protocol/world/WorldListResponseCodec.kt rename to protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListResponseCodec.kt index edd96999..a0dba381 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/world/WorldListResponseCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListResponseCodec.kt @@ -1,4 +1,4 @@ -package org.openrs2.protocol.world +package org.openrs2.protocol.world.downstream import io.netty.buffer.ByteBuf import org.openrs2.buffer.readUnsignedShortSmart diff --git a/protocol/src/test/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestDecoderTest.kt b/protocol/src/test/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestDecoderTest.kt index 5ec562df..ad1842b6 100644 --- a/protocol/src/test/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestDecoderTest.kt +++ b/protocol/src/test/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestDecoderTest.kt @@ -2,6 +2,8 @@ package org.openrs2.protocol.jaggrab import io.netty.channel.embedded.EmbeddedChannel import io.netty.handler.codec.DecoderException +import org.openrs2.protocol.jaggrab.upstream.JaggrabRequest +import org.openrs2.protocol.jaggrab.upstream.JaggrabRequestDecoder import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/protocol/src/test/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestEncoderTest.kt b/protocol/src/test/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestEncoderTest.kt index 2d698058..6a578c76 100644 --- a/protocol/src/test/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestEncoderTest.kt +++ b/protocol/src/test/kotlin/org/openrs2/protocol/jaggrab/JaggrabRequestEncoderTest.kt @@ -1,6 +1,8 @@ package org.openrs2.protocol.jaggrab import io.netty.channel.embedded.EmbeddedChannel +import org.openrs2.protocol.jaggrab.upstream.JaggrabRequest +import org.openrs2.protocol.jaggrab.upstream.JaggrabRequestEncoder import kotlin.test.Test import kotlin.test.assertEquals diff --git a/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5RequestDecoderTest.kt b/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5RequestDecoderTest.kt index 030cb2cb..89774e5f 100644 --- a/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5RequestDecoderTest.kt +++ b/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5RequestDecoderTest.kt @@ -4,6 +4,8 @@ import io.netty.buffer.Unpooled import io.netty.channel.embedded.EmbeddedChannel import io.netty.handler.codec.DecoderException import org.openrs2.buffer.wrappedBuffer +import org.openrs2.protocol.js5.upstream.Js5Request +import org.openrs2.protocol.js5.upstream.Js5RequestDecoder import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5RequestEncoderTest.kt b/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5RequestEncoderTest.kt index 5f330b0c..8aac4788 100644 --- a/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5RequestEncoderTest.kt +++ b/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5RequestEncoderTest.kt @@ -4,6 +4,8 @@ import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled import io.netty.channel.embedded.EmbeddedChannel import org.openrs2.buffer.use +import org.openrs2.protocol.js5.upstream.Js5Request +import org.openrs2.protocol.js5.upstream.Js5RequestEncoder import kotlin.test.Test import kotlin.test.assertEquals diff --git a/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5ResponseDecoderTest.kt b/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5ResponseDecoderTest.kt index 377c7a36..6e0f4352 100644 --- a/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5ResponseDecoderTest.kt +++ b/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5ResponseDecoderTest.kt @@ -7,6 +7,8 @@ import io.netty.channel.embedded.EmbeddedChannel import io.netty.handler.codec.DecoderException import org.openrs2.buffer.use import org.openrs2.buffer.wrappedBuffer +import org.openrs2.protocol.js5.downstream.Js5Response +import org.openrs2.protocol.js5.downstream.Js5ResponseDecoder import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5ResponseEncoderTest.kt b/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5ResponseEncoderTest.kt index 5141546a..6884077c 100644 --- a/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5ResponseEncoderTest.kt +++ b/protocol/src/test/kotlin/org/openrs2/protocol/js5/Js5ResponseEncoderTest.kt @@ -6,6 +6,8 @@ import io.netty.buffer.Unpooled import io.netty.channel.embedded.EmbeddedChannel import io.netty.handler.codec.EncoderException import org.openrs2.buffer.use +import org.openrs2.protocol.js5.downstream.Js5Response +import org.openrs2.protocol.js5.downstream.Js5ResponseEncoder import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/protocol/src/test/kotlin/org/openrs2/protocol/js5/XorDecoderTest.kt b/protocol/src/test/kotlin/org/openrs2/protocol/js5/XorDecoderTest.kt index c68d4a5e..7b6d7a4c 100644 --- a/protocol/src/test/kotlin/org/openrs2/protocol/js5/XorDecoderTest.kt +++ b/protocol/src/test/kotlin/org/openrs2/protocol/js5/XorDecoderTest.kt @@ -5,6 +5,7 @@ import io.netty.buffer.PooledByteBufAllocator import io.netty.channel.embedded.EmbeddedChannel import org.openrs2.buffer.copiedBuffer import org.openrs2.buffer.use +import org.openrs2.protocol.js5.downstream.XorDecoder import kotlin.test.Test import kotlin.test.assertEquals diff --git a/protocol/src/test/kotlin/org/openrs2/protocol/js5/XorEncoderTest.kt b/protocol/src/test/kotlin/org/openrs2/protocol/js5/XorEncoderTest.kt index 0a6ed56b..f7aedcbb 100644 --- a/protocol/src/test/kotlin/org/openrs2/protocol/js5/XorEncoderTest.kt +++ b/protocol/src/test/kotlin/org/openrs2/protocol/js5/XorEncoderTest.kt @@ -5,6 +5,7 @@ import io.netty.buffer.PooledByteBufAllocator import io.netty.channel.embedded.EmbeddedChannel import org.openrs2.buffer.copiedBuffer import org.openrs2.buffer.use +import org.openrs2.protocol.js5.downstream.XorEncoder import kotlin.test.Test import kotlin.test.assertEquals