minor cleanup

src/main/kotlin/com/viaversion/aas/codec/CompressionCodec.kt

@@ -1,23 +1,23 @@
 package com.viaversion.aas.codec
 
+import com.viaversion.aas.util.StacklessException
 import com.viaversion.viaversion.api.type.Type
 import io.netty.buffer.ByteBuf
 import io.netty.channel.ChannelHandlerContext
-import io.netty.handler.codec.DecoderException
 import io.netty.handler.codec.MessageToMessageCodec
 import java.util.zip.Deflater
 import java.util.zip.Inflater
 
 class CompressionCodec(val threshold: Int) : MessageToMessageCodec<ByteBuf, ByteBuf>() {
     // https://github.com/Gerrygames/ClientViaVersion/blob/master/src/main/java/de/gerrygames/the5zig/clientviaversion/netty/CompressionEncoder.java
-    private val inflater: Inflater =
-        Inflater()// https://github.com/Gerrygames/ClientViaVersion/blob/master/src/main/java/de/gerrygames/the5zig/clientviaversion/netty/CompressionEncoder.java
+    private val inflater: Inflater = Inflater()
     private val deflater: Deflater = Deflater()
 
     @Throws(Exception::class)
     override fun encode(ctx: ChannelHandlerContext, input: ByteBuf, out: MutableList<Any>) {
         val frameLength = input.readableBytes()
         val outBuf = ctx.alloc().buffer()
+        outBuf.skipBytes(5) // reserve varint
         try {
             if (frameLength < threshold) {
                 outBuf.writeByte(0)
@@ -50,19 +50,17 @@ class CompressionCodec(val threshold: Int) : MessageToMessageCodec<ByteBuf, Byte
         }
 
         if (outLength < threshold) {
-            throw DecoderException("Badly compressed packet - size of $outLength is below server threshold of $threshold")
+            throw StacklessException("Badly compressed packet - size of $outLength is below server threshold of $threshold")
         }
         if (outLength > 2097152) {
-            throw DecoderException("Badly compressed packet - size of $outLength is larger than protocol maximum of 2097152")
+            throw StacklessException("Badly compressed packet - size of $outLength is larger than protocol maximum of 2097152")
         }
 
         inflater.setInput(input.nioBuffer())
         val output = ctx.alloc().buffer(outLength, outLength)
         try {
             output.writerIndex(
-                output.writerIndex() + inflater.inflate(
-                    output.nioBuffer(output.writerIndex(), output.writableBytes())
-                )
+                output.writerIndex() + inflater.inflate(output.nioBuffer(output.writerIndex(), output.writableBytes()))
             )
             out.add(output.retain())
         } finally {

src/main/kotlin/com/viaversion/aas/codec/MinecraftCodec.kt

@@ -1,8 +1,8 @@
 package com.viaversion.aas.codec
 
 import com.viaversion.aas.handler.MinecraftHandler
-import com.viaversion.aas.packet.Packet
-import com.viaversion.aas.packet.PacketRegistry
+import com.viaversion.aas.codec.packet.Packet
+import com.viaversion.aas.codec.packet.PacketRegistry
 import com.viaversion.aas.util.StacklessException
 import com.viaversion.viaversion.api.protocol.packet.Direction
 import com.viaversion.viaversion.exception.CancelEncoderException

src/main/kotlin/com/viaversion/aas/codec/packet/Packet.kt

@@ -1,4 +1,4 @@
-package com.viaversion.aas.packet
+package com.viaversion.aas.codec.packet
 
 import io.netty.buffer.ByteBuf
 

src/main/kotlin/com/viaversion/aas/codec/packet/PacketRegistry.kt

@@ -1,14 +1,14 @@
-package com.viaversion.aas.packet
+package com.viaversion.aas.codec.packet
 
 import com.google.common.collect.Range
-import com.viaversion.aas.packet.handshake.Handshake
-import com.viaversion.aas.packet.login.*
-import com.viaversion.aas.packet.play.Kick
-import com.viaversion.aas.packet.play.PluginMessage
-import com.viaversion.aas.packet.status.StatusPing
-import com.viaversion.aas.packet.status.StatusPong
-import com.viaversion.aas.packet.status.StatusRequest
-import com.viaversion.aas.packet.status.StatusResponse
+import com.viaversion.aas.codec.packet.handshake.Handshake
+import com.viaversion.aas.codec.packet.login.*
+import com.viaversion.aas.codec.packet.play.Kick
+import com.viaversion.aas.codec.packet.play.PluginMessage
+import com.viaversion.aas.codec.packet.status.StatusPing
+import com.viaversion.aas.codec.packet.status.StatusPong
+import com.viaversion.aas.codec.packet.status.StatusRequest
+import com.viaversion.aas.codec.packet.status.StatusResponse
 import com.viaversion.aas.util.StacklessException
 import com.viaversion.viaversion.api.protocol.packet.Direction
 import com.viaversion.viaversion.api.protocol.packet.State

src/main/kotlin/com/viaversion/aas/codec/packet/UnknownPacket.kt

@@ -1,4 +1,4 @@
-package com.viaversion.aas.packet
+package com.viaversion.aas.codec.packet
 
 import com.viaversion.aas.readRemainingBytes
 import io.netty.buffer.ByteBuf

src/main/kotlin/com/viaversion/aas/codec/packet/handshake/Handshake.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.handshake
+package com.viaversion.aas.codec.packet.handshake
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.viaversion.api.protocol.packet.State
 import com.viaversion.viaversion.api.type.Type
 import io.netty.buffer.ByteBuf

src/main/kotlin/com/viaversion/aas/codec/packet/login/CryptoRequest.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.login
+package com.viaversion.aas.codec.packet.login
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.aas.readByteArray
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
 import com.viaversion.viaversion.api.type.Type

src/main/kotlin/com/viaversion/aas/codec/packet/login/CryptoResponse.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.login
+package com.viaversion.aas.codec.packet.login
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.aas.readByteArray
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
 import com.viaversion.viaversion.api.type.Type

src/main/kotlin/com/viaversion/aas/codec/packet/login/LoginDisconnect.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.login
+package com.viaversion.aas.codec.packet.login
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.viaversion.api.type.Type
 import io.netty.buffer.ByteBuf
 

src/main/kotlin/com/viaversion/aas/codec/packet/login/LoginStart.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.login
+package com.viaversion.aas.codec.packet.login
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.viaversion.api.type.Type
 import io.netty.buffer.ByteBuf
 

src/main/kotlin/com/viaversion/aas/codec/packet/login/LoginSuccess.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.login
+package com.viaversion.aas.codec.packet.login
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.aas.parseUndashedId
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
 import com.viaversion.viaversion.api.type.Type

src/main/kotlin/com/viaversion/aas/codec/packet/login/PluginRequest.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.login
+package com.viaversion.aas.codec.packet.login
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.aas.readRemainingBytes
 import com.viaversion.viaversion.api.type.Type
 import io.netty.buffer.ByteBuf

src/main/kotlin/com/viaversion/aas/codec/packet/login/PluginResponse.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.login
+package com.viaversion.aas.codec.packet.login
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.aas.readRemainingBytes
 import com.viaversion.viaversion.api.type.Type
 import io.netty.buffer.ByteBuf

src/main/kotlin/com/viaversion/aas/codec/packet/login/SetCompression.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.login
+package com.viaversion.aas.codec.packet.login
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.viaversion.api.type.Type
 import io.netty.buffer.ByteBuf
 import kotlin.properties.Delegates

src/main/kotlin/com/viaversion/aas/codec/packet/play/Kick.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.play
+package com.viaversion.aas.codec.packet.play
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.viaversion.api.type.Type
 import io.netty.buffer.ByteBuf
 

src/main/kotlin/com/viaversion/aas/codec/packet/play/PluginMessage.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.play
+package com.viaversion.aas.codec.packet.play
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.aas.readByteArray
 import com.viaversion.aas.readRemainingBytes
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion

src/main/kotlin/com/viaversion/aas/codec/packet/status/StatusPing.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.status
+package com.viaversion.aas.codec.packet.status
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import io.netty.buffer.ByteBuf
 import kotlin.properties.Delegates
 

src/main/kotlin/com/viaversion/aas/codec/packet/status/StatusPong.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.status
+package com.viaversion.aas.codec.packet.status
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import io.netty.buffer.ByteBuf
 import kotlin.properties.Delegates
 

src/main/kotlin/com/viaversion/aas/codec/packet/status/StatusRequest.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.status
+package com.viaversion.aas.codec.packet.status
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import io.netty.buffer.ByteBuf
 
 class StatusRequest : Packet {

src/main/kotlin/com/viaversion/aas/codec/packet/status/StatusResponse.kt

@@ -1,6 +1,6 @@
-package com.viaversion.aas.packet.status
+package com.viaversion.aas.codec.packet.status
 
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.viaversion.api.type.Type
 import io.netty.buffer.ByteBuf
 

src/main/kotlin/com/viaversion/aas/handler/MinecraftHandler.kt

@@ -1,7 +1,7 @@
 package com.viaversion.aas.handler
 
 import com.viaversion.aas.mcLogger
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.aas.setAutoRead
 import com.viaversion.viaversion.exception.CancelCodecException
 import io.netty.channel.Channel

src/main/kotlin/com/viaversion/aas/handler/Util.kt

@@ -1,7 +1,7 @@
 package com.viaversion.aas.handler
 
 import com.viaversion.aas.config.VIAaaSConfig
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.aas.send
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
 import io.netty.channel.ChannelPipeline

src/main/kotlin/com/viaversion/aas/handler/autoprotocol/ProtocolDetectionState.kt

@@ -4,8 +4,8 @@ import com.google.gson.JsonParser
 import com.viaversion.aas.handler.MinecraftHandler
 import com.viaversion.aas.handler.state.MinecraftConnectionState
 import com.viaversion.aas.mcLogger
-import com.viaversion.aas.packet.Packet
-import com.viaversion.aas.packet.status.StatusResponse
+import com.viaversion.aas.codec.packet.Packet
+import com.viaversion.aas.codec.packet.status.StatusResponse
 import com.viaversion.aas.parseProtocol
 import com.viaversion.aas.util.StacklessException
 import com.viaversion.viaversion.api.protocol.packet.State

src/main/kotlin/com/viaversion/aas/handler/autoprotocol/ProtocolDetector.kt

@@ -10,8 +10,8 @@ import com.viaversion.aas.handler.ConnectionData
 import com.viaversion.aas.handler.MinecraftHandler
 import com.viaversion.aas.handler.addSocks5
 import com.viaversion.aas.mcLogger
-import com.viaversion.aas.packet.handshake.Handshake
-import com.viaversion.aas.packet.status.StatusRequest
+import com.viaversion.aas.codec.packet.handshake.Handshake
+import com.viaversion.aas.codec.packet.status.StatusRequest
 import com.viaversion.aas.send
 import com.viaversion.viaversion.api.protocol.packet.State
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion

src/main/kotlin/com/viaversion/aas/handler/state/HandshakeState.kt

@@ -8,8 +8,8 @@ import com.viaversion.aas.VIAaaSAddress
 import com.viaversion.aas.config.VIAaaSConfig
 import com.viaversion.aas.handler.MinecraftHandler
 import com.viaversion.aas.mcLogger
-import com.viaversion.aas.packet.Packet
-import com.viaversion.aas.packet.handshake.Handshake
+import com.viaversion.aas.codec.packet.Packet
+import com.viaversion.aas.codec.packet.handshake.Handshake
 import com.viaversion.aas.util.StacklessException
 import com.viaversion.viaversion.api.protocol.packet.State
 import io.netty.channel.ChannelHandlerContext

src/main/kotlin/com/viaversion/aas/handler/state/LoginState.kt

@@ -7,8 +7,8 @@ import com.viaversion.aas.codec.CompressionCodec
 import com.viaversion.aas.codec.CryptoCodec
 import com.viaversion.aas.handler.MinecraftHandler
 import com.viaversion.aas.handler.forward
-import com.viaversion.aas.packet.Packet
-import com.viaversion.aas.packet.login.*
+import com.viaversion.aas.codec.packet.Packet
+import com.viaversion.aas.codec.packet.login.*
 import com.viaversion.aas.util.StacklessException
 import com.viaversion.viaversion.api.protocol.packet.State
 import io.netty.channel.Channel

src/main/kotlin/com/viaversion/aas/handler/state/MinecraftConnectionState.kt

@@ -2,7 +2,7 @@ package com.viaversion.aas.handler.state
 
 import com.viaversion.aas.handler.MinecraftHandler
 import com.viaversion.aas.mcLogger
-import com.viaversion.aas.packet.Packet
+import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.viaversion.api.protocol.packet.State
 import io.netty.channel.ChannelHandlerContext
 

src/main/kotlin/com/viaversion/aas/handler/state/PlayState.kt

@@ -5,10 +5,10 @@ import com.viaversion.aas.config.VIAaaSConfig
 import com.viaversion.aas.handler.MinecraftHandler
 import com.viaversion.aas.handler.forward
 import com.viaversion.aas.handler.is1_7
-import com.viaversion.aas.packet.Packet
-import com.viaversion.aas.packet.UnknownPacket
-import com.viaversion.aas.packet.play.Kick
-import com.viaversion.aas.packet.play.PluginMessage
+import com.viaversion.aas.codec.packet.Packet
+import com.viaversion.aas.codec.packet.UnknownPacket
+import com.viaversion.aas.codec.packet.play.Kick
+import com.viaversion.aas.codec.packet.play.PluginMessage
 import com.viaversion.aas.parseProtocol
 import com.viaversion.aas.readRemainingBytes
 import com.viaversion.aas.util.StacklessException

src/main/kotlin/com/viaversion/aas/handler/state/StatusState.kt

@@ -6,9 +6,9 @@ import com.google.gson.JsonParser
 import com.viaversion.aas.config.VIAaaSConfig
 import com.viaversion.aas.handler.MinecraftHandler
 import com.viaversion.aas.handler.forward
-import com.viaversion.aas.packet.Packet
-import com.viaversion.aas.packet.UnknownPacket
-import com.viaversion.aas.packet.status.StatusResponse
+import com.viaversion.aas.codec.packet.Packet
+import com.viaversion.aas.codec.packet.UnknownPacket
+import com.viaversion.aas.codec.packet.status.StatusResponse
 import com.viaversion.aas.parseProtocol
 import com.viaversion.aas.util.StacklessException
 import com.viaversion.aas.writeFlushClose

src/main/kotlin/com/viaversion/aas/handler/state/Util.kt

@@ -6,7 +6,7 @@ import com.viaversion.aas.config.VIAaaSConfig
 import com.viaversion.aas.handler.BackEndInit
 import com.viaversion.aas.handler.MinecraftHandler
 import com.viaversion.aas.handler.forward
-import com.viaversion.aas.packet.handshake.Handshake
+import com.viaversion.aas.codec.packet.handshake.Handshake
 import com.viaversion.aas.util.StacklessException
 import com.viaversion.viaversion.api.protocol.packet.State
 import io.netty.bootstrap.Bootstrap

src/main/kotlin/com/viaversion/aas/platform/AspirinViaAPI.kt

@@ -5,7 +5,6 @@ import io.netty.buffer.ByteBuf
 import java.util.*
 
 object AspirinViaAPI : ViaAPIBase<UUID>() {
-
+    override fun getPlayerVersion(p0: UUID): Int = super.getPlayerVersion(p0)
     override fun sendRawPacket(p0: UUID, p1: ByteBuf) = super.sendRawPacket(p0, p1)
-    override fun getPlayerVersion(p0: UUID?): Int = throw UnsupportedOperationException()
 }

src/main/kotlin/com/viaversion/aas/protocol/id47toid5/Protocol1_8To1_7_6.kt

@@ -7,7 +7,7 @@ import com.viaversion.viaversion.api.protocol.AbstractSimpleProtocol
 
 // Based on https://github.com/Gerrygames/ClientViaVersion
 object Protocol1_8To1_7_6 : AbstractSimpleProtocol() {
-    private val placeable = ArrayList<Int>()
+    private val placeable = hashSetOf<Int>()
 
     init {
         placeable.add(6)

src/main/kotlin/com/viaversion/aas/protocol/id47toid5/chunks/ChunkPacketTransformer.kt

@@ -5,9 +5,7 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper
 import com.viaversion.viaversion.api.type.Type
 import com.viaversion.viaversion.api.type.types.CustomByteType
 import com.viaversion.viaversion.protocol.packet.PacketWrapperImpl
-import java.io.IOException
 import java.util.stream.IntStream
-import java.util.zip.DataFormatException
 import java.util.zip.Inflater
 import kotlin.streams.toList
 
@@ -72,8 +70,6 @@ object ChunkPacketTransformer {
         inflater.setInput(buildBuffer, 0, compressedSize)
         try {
             inflater.inflate(data)
-        } catch (ex: DataFormatException) {
-            throw IOException("Bad compressed data format")
         } finally {
             inflater.end()
         }
@@ -138,7 +134,7 @@ object ChunkPacketTransformer {
                 val y = encodedPos.and(0xFF)
                 val z = encodedPos.ushr(8).and(0xF)
                 BlockChangeRecord1_8(x, y, z, blocks[it].toInt())
-            }
-            .toList().toTypedArray())
+            }.toList().toTypedArray()
+        )
     }
 }