Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2025-02-16 01:41:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
creeper123123321 2021-02-12 17:53:02 -03:00
parent 428d47a9b9
commit d3325612a8
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/com/github/creeper123123321/viaaas/handler/BackEndInit.kt
View File

@ -19,6 +19,6 @@ class BackEndInit(val connectionData: ConnectionData) : ChannelInitializer<Chann
// compress // compress
.addLast("via-codec", ViaCodec(user)) .addLast("via-codec", ViaCodec(user))
.addLast("mc", MinecraftCodec()) .addLast("mc", MinecraftCodec())
.addLast("handler", MinecraftHandler(connectionData, connectionData.frontChannel, frontEnd = false)) .addLast("handler", MinecraftHandler(connectionData, frontEnd = false))
} }
} }

2
src/main/kotlin/com/github/creeper123123321/viaaas/handler/FrontEndInit.kt
View File

@ -19,7 +19,7 @@ object FrontEndInit : ChannelInitializer<Channel>() {
.addLast("mc", MinecraftCodec()) .addLast("mc", MinecraftCodec())
.addLast( .addLast(
"handler", MinecraftHandler( "handler", MinecraftHandler(
ConnectionData(frontChannel = ch), other = null, frontEnd = true ConnectionData(frontChannel = ch), frontEnd = true
) )
) )
} }

2
src/main/kotlin/com/github/creeper123123321/viaaas/handler/MinecraftHandler.kt
View File

@ -11,10 +11,10 @@ import java.net.SocketAddress
class MinecraftHandler( class MinecraftHandler(
val data: ConnectionData, val data: ConnectionData,
var other: Channel?,
val frontEnd: Boolean val frontEnd: Boolean
) : SimpleChannelInboundHandler<Packet>() { ) : SimpleChannelInboundHandler<Packet>() {
var remoteAddress: SocketAddress? = null var remoteAddress: SocketAddress? = null
val other: Channel? get() = if (frontEnd) data.backChannel else data.frontChannel
override fun channelRead0(ctx: ChannelHandlerContext, packet: Packet) { override fun channelRead0(ctx: ChannelHandlerContext, packet: Packet) {
if (ctx.channel().isActive) { if (ctx.channel().isActive) {

4
src/main/kotlin/com/github/creeper123123321/viaaas/handler/state/HandshakeState.kt
View File

@ -89,9 +89,7 @@ class HandshakeState : MinecraftConnectionState {
if (it.isSuccess) { if (it.isSuccess) {
mcLogger.info("Connected ${handler.remoteAddress} -> $socketAddr") mcLogger.info("Connected ${handler.remoteAddress} -> $socketAddr")
val backChan = future.channel() as SocketChannel handler.data.backChannel = future.channel() as SocketChannel
handler.data.backChannel = backChan
handler.other = backChan
forward(handler, packet, true) forward(handler, packet, true)