Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2024-06-28 10:44:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update VV dependency to 4.0.0 repackage (#136)

Browse Source 
* Update VV dependency to 4.0.0 repackage

* dev viarewind

Co-authored-by: KennyTV <jahnke.nassim@gmail.com>
This commit is contained in:
creeper123123321 2021-04-27 16:28:53 -03:00 committed by GitHub
parent 400f6e410c
commit 7527c9fb5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
72 changed files with 201 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -29,7 +29,7 @@ compileKotlin.kotlinOptions.jvmTarget = "11"
val gitVersion: groovy.lang.Closure<String> by extra
group = "com.github.creeper123123321.viaaas"
version = "0.3.0-SNAPSHOT+" + try {
version = "0.4.0-SNAPSHOT+" + try {
gitVersion()
} catch (e: Exception) {
"unknown"
@ -38,7 +38,7 @@ version = "0.3.0-SNAPSHOT+" + try {
extra.set("archivesBaseName", "VIAaaS")
repositories {
//mavenLocal()
mavenLocal()
mavenCentral()
maven("https://oss.sonatype.org/content/repositories/snapshots")
maven("https://repo.viaversion.com/")
@ -47,8 +47,8 @@ repositories {
}
dependencies {
implementation("us.myles:viaversion:4.0.0-21w16a") { isTransitive = false }
implementation("nl.matsv:viabackwards:4.0.0-21w16a") { isTransitive = false }
implementation("com.viaversion:viaversion:4.0.0-21w16a") { isTransitive = false }
implementation("com.viaversion:viabackwards:4.0.0-21w16a") { isTransitive = false }
implementation("com.github.ViaVersion.ViaRewind:viarewind-all:dev-SNAPSHOT") { isTransitive = false }
implementation("io.netty:netty-all:4.1.63.Final")
implementation("org.yaml:snakeyaml:1.28")

4
src/main/kotlin/com/viaversion/aas/Util.kt
View File

@ -13,8 +13,8 @@ import io.netty.channel.Channel
import io.netty.channel.ChannelFutureListener
import io.netty.handler.codec.DecoderException
import org.slf4j.LoggerFactory
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import com.viaversion.viaversion.api.type.Type
import java.math.BigInteger
import java.net.InetAddress
import java.net.InetSocketAddress

8
src/main/kotlin/com/viaversion/aas/VIAaaS.kt
View File

@ -37,10 +37,10 @@ import io.netty.channel.socket.nio.NioSocketChannel
import io.netty.util.concurrent.Future
import org.apache.logging.log4j.Level
import org.apache.logging.log4j.io.IoBuilder
import us.myles.ViaVersion.ViaManagerImpl
import us.myles.ViaVersion.api.Via
import us.myles.ViaVersion.api.data.MappingDataLoader
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import com.viaversion.viaversion.ViaManagerImpl
import com.viaversion.viaversion.api.Via
import com.viaversion.viaversion.api.data.MappingDataLoader
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import java.io.File
import java.net.InetAddress
import java.security.KeyPairGenerator

2
src/main/kotlin/com/viaversion/aas/VIAaaSAddress.kt
View File

@ -1,7 +1,7 @@
package com.viaversion.aas
import com.viaversion.aas.util.StacklessException
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import java.util.*
class VIAaaSAddress {

2
src/main/kotlin/com/viaversion/aas/codec/CompressionCodec.kt
View File

@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf
import io.netty.channel.ChannelHandlerContext
import io.netty.handler.codec.DecoderException
import io.netty.handler.codec.MessageToMessageCodec
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.type.Type
import java.util.zip.Deflater
import java.util.zip.Inflater

4
src/main/kotlin/com/viaversion/aas/codec/FrameCodec.kt
View File

@ -4,8 +4,8 @@ import com.viaversion.aas.badLength
import io.netty.buffer.ByteBuf
import io.netty.channel.ChannelHandlerContext
import io.netty.handler.codec.ByteToMessageCodec
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.exception.CancelDecoderException
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.exception.CancelDecoderException
class FrameCodec : ByteToMessageCodec<ByteBuf>() {
override fun decode(ctx: ChannelHandlerContext, input: ByteBuf, out: MutableList<Any>) {

2
src/main/kotlin/com/viaversion/aas/codec/MinecraftCodec.kt
View File

@ -8,7 +8,7 @@ import io.netty.buffer.ByteBuf
import io.netty.buffer.ByteBufAllocator
import io.netty.channel.ChannelHandlerContext
import io.netty.handler.codec.MessageToMessageCodec
import us.myles.ViaVersion.exception.CancelEncoderException
import com.viaversion.viaversion.exception.CancelEncoderException
class MinecraftCodec : MessageToMessageCodec<ByteBuf, Packet>() {
override fun encode(ctx: ChannelHandlerContext, msg: Packet, out: MutableList<Any>) {

2
src/main/kotlin/com/viaversion/aas/command/Command.kt
View File

@ -1,6 +1,6 @@
package com.viaversion.aas.command
import us.myles.ViaVersion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.command.ViaCommandSender
interface Command {
val info: String

2
src/main/kotlin/com/viaversion/aas/command/EndCommand.kt
View File

@ -1,6 +1,6 @@
package com.viaversion.aas.command
import us.myles.ViaVersion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.command.ViaCommandSender
object EndCommand : Command {
override val info = "Alias of 'viaaas stop'"

2
src/main/kotlin/com/viaversion/aas/command/HelpCommand.kt
View File

@ -1,6 +1,6 @@
package com.viaversion.aas.command
import us.myles.ViaVersion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.command.ViaCommandSender
object HelpCommand : Command {
override val info = "Lists the available commands"

2
src/main/kotlin/com/viaversion/aas/command/ListCommand.kt
View File

@ -1,6 +1,6 @@
package com.viaversion.aas.command
import us.myles.ViaVersion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.command.ViaCommandSender
object ListCommand : Command {
override val info = "Alias of 'viaaas connections'"

2
src/main/kotlin/com/viaversion/aas/command/ReloadCommand.kt
View File

@ -1,6 +1,6 @@
package com.viaversion.aas.command
import us.myles.ViaVersion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.command.ViaCommandSender
object ReloadCommand : Command {
override val info = "Alias for 'viaversion aasreload'"

2
src/main/kotlin/com/viaversion/aas/command/VIAaaSConsole.kt
View File

@ -7,7 +7,7 @@ import org.jline.reader.Candidate
import org.jline.reader.LineReader
import org.jline.reader.LineReaderBuilder
import org.slf4j.LoggerFactory
import us.myles.ViaVersion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.command.ViaCommandSender
import java.util.*
object VIAaaSConsole : SimpleTerminalConsole(), ViaCommandSender {

4
src/main/kotlin/com/viaversion/aas/command/ViaAspirinCommand.kt
View File

@ -4,8 +4,8 @@ import com.viaversion.aas.command.sub.AspirinReloadSubCommand
import com.viaversion.aas.command.sub.ConnectionsSubCommand
import com.viaversion.aas.command.sub.StopSubCommand
import com.viaversion.aas.command.sub.VIAaaSSubCommand
import us.myles.ViaVersion.api.command.ViaCommandSender
import us.myles.ViaVersion.commands.ViaCommandHandler
import com.viaversion.viaversion.api.command.ViaCommandSender
import com.viaversion.viaversion.commands.ViaCommandHandler
object ViaAspirinCommand : ViaCommandHandler(), Command {
override val info = "ViaVersion command"

4
src/main/kotlin/com/viaversion/aas/command/sub/AspirinReloadSubCommand.kt
View File

@ -1,8 +1,8 @@
package com.viaversion.aas.command.sub
import com.viaversion.aas.config.VIAaaSConfig
import us.myles.ViaVersion.api.command.ViaCommandSender
import us.myles.ViaVersion.api.command.ViaSubCommand
import com.viaversion.viaversion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.command.ViaSubCommand
object AspirinReloadSubCommand: ViaSubCommand() {
override fun name() = "aasreload"

6
src/main/kotlin/com/viaversion/aas/command/sub/ConnectionsSubCommand.kt
View File

@ -2,9 +2,9 @@ package com.viaversion.aas.command.sub
import com.viaversion.aas.handler.MinecraftHandler
import com.viaversion.aas.parseProtocol
import us.myles.ViaVersion.api.Via
import us.myles.ViaVersion.api.command.ViaCommandSender
import us.myles.ViaVersion.api.command.ViaSubCommand
import com.viaversion.viaversion.api.Via
import com.viaversion.viaversion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.command.ViaSubCommand
object ConnectionsSubCommand : ViaSubCommand() {
override fun name(): String = "connections"

4
src/main/kotlin/com/viaversion/aas/command/sub/StopSubCommand.kt
View File

@ -1,8 +1,8 @@
package com.viaversion.aas.command.sub
import com.viaversion.aas.serverFinishing
import us.myles.ViaVersion.api.command.ViaCommandSender
import us.myles.ViaVersion.api.command.ViaSubCommand
import com.viaversion.viaversion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.command.ViaSubCommand
object StopSubCommand : ViaSubCommand() {
override fun name() = "stop"

4
src/main/kotlin/com/viaversion/aas/command/sub/VIAaaSSubCommand.kt
View File

@ -1,8 +1,8 @@
package com.viaversion.aas.command.sub
import com.viaversion.aas.viaaasVer
import us.myles.ViaVersion.api.command.ViaCommandSender
import us.myles.ViaVersion.api.command.ViaSubCommand
import com.viaversion.viaversion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.command.ViaSubCommand
object VIAaaSSubCommand : ViaSubCommand() {
override fun name(): String = "viaaas"

2
src/main/kotlin/com/viaversion/aas/config/AspirinViaConfig.kt
View File

@ -1,6 +1,6 @@
package com.viaversion.aas.config
import us.myles.ViaVersion.AbstractViaConfig
import com.viaversion.viaversion.configuration.AbstractViaConfig
import java.io.File
import java.net.URL

2
src/main/kotlin/com/viaversion/aas/config/VIAaaSConfig.kt
View File

@ -1,6 +1,6 @@
package com.viaversion.aas.config
import us.myles.ViaVersion.util.Config
import com.viaversion.viaversion.util.Config
import java.io.File
import java.security.SecureRandom
import java.util.*

8
src/main/kotlin/com/viaversion/aas/handler/BackEndInit.kt
View File

@ -6,14 +6,14 @@ import com.viaversion.aas.handler.autoprotocol.ProtocolDetectorHandler
import io.netty.channel.Channel
import io.netty.channel.ChannelInitializer
import io.netty.handler.timeout.ReadTimeoutHandler
import us.myles.ViaVersion.api.data.UserConnection
import us.myles.ViaVersion.api.protocol.ProtocolPipeline
import com.viaversion.viaversion.connection.UserConnectionImpl
import com.viaversion.viaversion.protocol.ProtocolPipelineImpl
import java.util.concurrent.TimeUnit
class BackEndInit(val connectionData: ConnectionData) : ChannelInitializer<Channel>() {
override fun initChannel(ch: Channel) {
val user = UserConnection(ch, true)
ProtocolPipeline(user)
val user = UserConnectionImpl(ch, true)
ProtocolPipelineImpl(user)
ch.pipeline().also { addSocks5(it) }
// "crypto"
.addLast("frame", FrameCodec())

2
src/main/kotlin/com/viaversion/aas/handler/MinecraftHandler.kt
View File

@ -7,7 +7,7 @@ import io.netty.channel.Channel
import io.netty.channel.ChannelHandlerContext
import io.netty.channel.SimpleChannelInboundHandler
import io.netty.handler.proxy.Socks5ProxyHandler
import us.myles.ViaVersion.exception.CancelCodecException
import com.viaversion.viaversion.exception.CancelCodecException
import java.net.SocketAddress
import java.nio.channels.ClosedChannelException

2
src/main/kotlin/com/viaversion/aas/handler/Util.kt
View File

@ -5,7 +5,7 @@ import com.viaversion.aas.packet.Packet
import com.viaversion.aas.send
import io.netty.channel.ChannelPipeline
import io.netty.handler.proxy.Socks5ProxyHandler
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import java.net.InetSocketAddress
fun forward(handler: MinecraftHandler, packet: Packet, flush: Boolean = false) {

6
src/main/kotlin/com/viaversion/aas/handler/ViaCodec.kt
View File

@ -3,9 +3,9 @@ package com.viaversion.aas.handler
import io.netty.buffer.ByteBuf
import io.netty.channel.ChannelHandlerContext
import io.netty.handler.codec.MessageToMessageCodec
import us.myles.ViaVersion.api.data.UserConnection
import us.myles.ViaVersion.exception.CancelDecoderException
import us.myles.ViaVersion.exception.CancelEncoderException
import com.viaversion.viaversion.api.connection.UserConnection
import com.viaversion.viaversion.exception.CancelDecoderException
import com.viaversion.viaversion.exception.CancelEncoderException
class ViaCodec(val info: UserConnection) : MessageToMessageCodec<ByteBuf, ByteBuf>() {
override fun decode(ctx: ChannelHandlerContext, bytebuf: ByteBuf, out: MutableList<Any>) {

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

@ -9,8 +9,8 @@ import com.viaversion.aas.parseProtocol
import com.google.gson.JsonParser
import com.viaversion.aas.util.StacklessException
import io.netty.channel.ChannelHandlerContext
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import com.viaversion.viaversion.api.protocol.packet.State
import java.nio.channels.ClosedChannelException
import java.util.concurrent.CompletableFuture

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

@ -21,8 +21,8 @@ import io.netty.channel.ChannelOption
import io.netty.handler.timeout.ReadTimeoutHandler
import io.netty.resolver.NoopAddressResolverGroup
import io.netty.util.concurrent.Future
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import com.viaversion.viaversion.api.protocol.packet.State
import java.net.InetSocketAddress
import java.util.concurrent.CompletableFuture
import java.util.concurrent.ExecutionException

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

@ -12,7 +12,7 @@ import com.google.common.net.HostAndPort
import com.google.common.util.concurrent.RateLimiter
import com.viaversion.aas.util.StacklessException
import io.netty.channel.ChannelHandlerContext
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.protocol.packet.State
import java.net.InetAddress
import java.net.InetSocketAddress
import java.util.concurrent.TimeUnit

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

@ -16,7 +16,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.future.await
import kotlinx.coroutines.launch
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.protocol.packet.State
import java.util.*
import java.util.concurrent.CompletableFuture
import javax.crypto.Cipher

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

@ -4,7 +4,7 @@ import com.viaversion.aas.packet.Packet
import com.viaversion.aas.handler.MinecraftHandler
import com.viaversion.aas.mcLogger
import io.netty.channel.ChannelHandlerContext
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.protocol.packet.State
interface MinecraftConnectionState {
val state: State

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

@ -16,8 +16,8 @@ import com.viaversion.aas.util.StacklessException
import io.netty.buffer.ByteBufAllocator
import io.netty.buffer.Unpooled
import io.netty.channel.ChannelHandlerContext
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.protocol.packet.State
object PlayState : MinecraftConnectionState {
override val state: State

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

@ -13,8 +13,8 @@ import com.google.gson.JsonObject
import com.google.gson.JsonParser
import com.viaversion.aas.util.StacklessException
import io.netty.channel.ChannelHandlerContext
import us.myles.ViaVersion.api.Via
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.Via
import com.viaversion.viaversion.api.protocol.packet.State
import java.util.*
object StatusState : MinecraftConnectionState {

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

@ -17,7 +17,7 @@ import io.netty.resolver.NoopAddressResolverGroup
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.protocol.packet.State
import java.net.Inet4Address
import java.net.InetAddress
import java.net.InetSocketAddress

6
src/main/kotlin/com/viaversion/aas/packet/PacketRegistry.kt
View File

@ -11,9 +11,9 @@ import com.viaversion.aas.packet.status.StatusResponse
import com.google.common.collect.Range
import com.viaversion.aas.util.StacklessException
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.protocol.packet.State
import java.util.function.Supplier
object PacketRegistry {

4
src/main/kotlin/com/viaversion/aas/packet/handshake/Handshake.kt
View File

@ -2,8 +2,8 @@ package com.viaversion.aas.packet.handshake
import com.viaversion.aas.packet.Packet
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.protocol.packet.State
import kotlin.properties.Delegates
class Handshake : Packet {

4
src/main/kotlin/com/viaversion/aas/packet/login/CryptoRequest.kt
View File

@ -3,8 +3,8 @@ package com.viaversion.aas.packet.login
import com.viaversion.aas.packet.Packet
import com.viaversion.aas.readByteArray
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import com.viaversion.viaversion.api.type.Type
import java.security.KeyFactory
import java.security.PublicKey
import java.security.spec.X509EncodedKeySpec

4
src/main/kotlin/com/viaversion/aas/packet/login/CryptoResponse.kt
View File

@ -3,8 +3,8 @@ package com.viaversion.aas.packet.login
import com.viaversion.aas.packet.Packet
import com.viaversion.aas.readByteArray
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import com.viaversion.viaversion.api.type.Type
class CryptoResponse : Packet {
lateinit var encryptedKey: ByteArray

2
src/main/kotlin/com/viaversion/aas/packet/login/LoginDisconnect.kt
View File

@ -2,7 +2,7 @@ package com.viaversion.aas.packet.login
import com.viaversion.aas.packet.Packet
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.type.Type
class LoginDisconnect : Packet {
lateinit var msg: String

2
src/main/kotlin/com/viaversion/aas/packet/login/LoginStart.kt
View File

@ -2,7 +2,7 @@ package com.viaversion.aas.packet.login
import com.viaversion.aas.packet.Packet
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.type.Type
class LoginStart : Packet {
lateinit var username: String

4
src/main/kotlin/com/viaversion/aas/packet/login/LoginSuccess.kt
View File

@ -3,8 +3,8 @@ package com.viaversion.aas.packet.login
import com.viaversion.aas.packet.Packet
import com.viaversion.aas.parseUndashedId
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import com.viaversion.viaversion.api.type.Type
import java.util.*
class LoginSuccess : Packet {

2
src/main/kotlin/com/viaversion/aas/packet/login/PluginRequest.kt
View File

@ -3,7 +3,7 @@ package com.viaversion.aas.packet.login
import com.viaversion.aas.packet.Packet
import com.viaversion.aas.readRemainingBytes
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.type.Type
import kotlin.properties.Delegates
class PluginRequest : Packet {

2
src/main/kotlin/com/viaversion/aas/packet/login/PluginResponse.kt
View File

@ -3,7 +3,7 @@ package com.viaversion.aas.packet.login
import com.viaversion.aas.packet.Packet
import com.viaversion.aas.readRemainingBytes
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.type.Type
import kotlin.properties.Delegates
class PluginResponse : Packet {

2
src/main/kotlin/com/viaversion/aas/packet/login/SetCompression.kt
View File

@ -2,7 +2,7 @@ package com.viaversion.aas.packet.login
import com.viaversion.aas.packet.Packet
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.type.Type
import kotlin.properties.Delegates
class SetCompression : Packet {

2
src/main/kotlin/com/viaversion/aas/packet/play/Kick.kt
View File

@ -2,7 +2,7 @@ package com.viaversion.aas.packet.play
import com.viaversion.aas.packet.Packet
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.type.Type
class Kick : Packet {
lateinit var msg: String

4
src/main/kotlin/com/viaversion/aas/packet/play/PluginMessage.kt
View File

@ -4,8 +4,8 @@ import com.viaversion.aas.packet.Packet
import com.viaversion.aas.readByteArray
import com.viaversion.aas.readRemainingBytes
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import com.viaversion.viaversion.api.type.Type
class PluginMessage : Packet {
lateinit var channel: String

2
src/main/kotlin/com/viaversion/aas/packet/status/StatusResponse.kt
View File

@ -2,7 +2,7 @@ package com.viaversion.aas.packet.status
import com.viaversion.aas.packet.Packet
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.type.Type
class StatusResponse : Packet {
lateinit var json: String

4
src/main/kotlin/com/viaversion/aas/platform/AspirinBackwards.kt
View File

@ -1,8 +1,8 @@
package com.viaversion.aas.platform
import nl.matsv.viabackwards.api.ViaBackwardsPlatform
import com.viaversion.viabackwards.api.ViaBackwardsPlatform
import org.slf4j.LoggerFactory
import us.myles.ViaVersion.sponge.util.LoggerWrapper
import com.viaversion.viaversion.sponge.util.LoggerWrapper
import java.io.File
import java.util.logging.Logger

6
src/main/kotlin/com/viaversion/aas/platform/AspirinBossBar.kt
View File

@ -1,8 +1,8 @@
package com.viaversion.aas.platform
import us.myles.ViaVersion.api.boss.BossColor
import us.myles.ViaVersion.api.boss.BossStyle
import us.myles.ViaVersion.boss.CommonBoss
import com.viaversion.viaversion.api.boss.BossColor
import com.viaversion.viaversion.api.boss.BossStyle
import com.viaversion.viaversion.boss.CommonBoss
class AspirinBossBar(title: String, health: Float, style: BossStyle, color: BossColor) :
CommonBoss<Unit>(title, health, color, style)

10
src/main/kotlin/com/viaversion/aas/platform/AspirinInjector.kt
View File

@ -1,10 +1,10 @@
package com.viaversion.aas.platform
import us.myles.ViaVersion.api.platform.ViaInjector
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import us.myles.viaversion.libs.fastutil.ints.IntLinkedOpenHashSet
import us.myles.viaversion.libs.fastutil.ints.IntSortedSet
import us.myles.viaversion.libs.gson.JsonObject
import com.viaversion.viaversion.api.platform.ViaInjector
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
import com.viaversion.viaversion.libs.fastutil.ints.IntLinkedOpenHashSet
import com.viaversion.viaversion.libs.fastutil.ints.IntSortedSet
import com.viaversion.viaversion.libs.gson.JsonObject
object AspirinInjector : ViaInjector {
override fun getEncoderName(): String = "via-codec"

10
src/main/kotlin/com/viaversion/aas/platform/AspirinLoader.kt
View File

@ -1,11 +1,11 @@
package com.viaversion.aas.platform
import com.viaversion.aas.provider.AspirinVersionProvider
import us.myles.ViaVersion.api.Via
import us.myles.ViaVersion.api.platform.ViaPlatformLoader
import us.myles.ViaVersion.bungee.providers.BungeeMovementTransmitter
import us.myles.ViaVersion.protocols.base.VersionProvider
import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider
import com.viaversion.viaversion.api.Via
import com.viaversion.viaversion.api.platform.ViaPlatformLoader
import com.viaversion.viaversion.api.protocol.version.VersionProvider
import com.viaversion.viaversion.bungee.providers.BungeeMovementTransmitter
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider
object AspirinLoader : ViaPlatformLoader {
override fun unload() {

33
src/main/kotlin/com/viaversion/aas/platform/AspirinPlatform.kt
View File

@ -6,16 +6,15 @@ import com.viaversion.aas.viaaasVer
import com.google.common.util.concurrent.ThreadFactoryBuilder
import io.netty.channel.DefaultEventLoop
import org.slf4j.LoggerFactory
import us.myles.ViaVersion.api.ViaAPI
import us.myles.ViaVersion.api.ViaVersionConfig
import us.myles.ViaVersion.api.command.ViaCommandSender
import us.myles.ViaVersion.api.configuration.ConfigurationProvider
import us.myles.ViaVersion.api.platform.TaskId
import us.myles.ViaVersion.api.platform.ViaConnectionManager
import us.myles.ViaVersion.api.platform.ViaPlatform
import us.myles.ViaVersion.sponge.util.LoggerWrapper
import us.myles.ViaVersion.util.VersionInfo
import us.myles.viaversion.libs.gson.JsonObject
import com.viaversion.viaversion.api.ViaAPI
import com.viaversion.viaversion.api.configuration.ViaVersionConfig
import com.viaversion.viaversion.api.command.ViaCommandSender
import com.viaversion.viaversion.api.configuration.ConfigurationProvider
import com.viaversion.viaversion.api.platform.PlatformTask
import com.viaversion.viaversion.api.platform.ViaPlatform
import com.viaversion.viaversion.sponge.util.LoggerWrapper
import com.viaversion.viaversion.util.VersionInfo
import com.viaversion.viaversion.libs.gson.JsonObject
import java.io.File
import java.util.*
import java.util.concurrent.CompletableFuture
@ -24,7 +23,6 @@ import java.util.concurrent.TimeUnit
import java.util.logging.Logger
object AspirinPlatform : ViaPlatform<UUID> {
val connMan = ViaConnectionManager()
val executor = Executors.newCachedThreadPool(ThreadFactoryBuilder().setNameFormat("Via-%d").setDaemon(true).build())
val eventLoop = DefaultEventLoop(executor)
@ -39,25 +37,24 @@ object AspirinPlatform : ViaPlatform<UUID> {
override fun onReload() {
}
override fun runSync(runnable: Runnable): TaskId = AspirinTask(eventLoop.submit(runnable))
override fun runSync(p0: Runnable, p1: Long): TaskId =
override fun runSync(runnable: Runnable): AspirinTask = AspirinTask(eventLoop.submit(runnable))
override fun runSync(p0: Runnable, p1: Long): AspirinTask =
AspirinTask(eventLoop.schedule(p0, p1 * 50L, TimeUnit.MILLISECONDS))
override fun runRepeatingSync(p0: Runnable, p1: Long): TaskId =
override fun runRepeatingSync(p0: Runnable, p1: Long): AspirinTask =
AspirinTask(eventLoop.scheduleAtFixedRate(p0, 0, p1 * 50L, TimeUnit.MILLISECONDS))
override fun cancelTask(p0: TaskId?) {
override fun cancelTask(p0: PlatformTask<*>?) {
(p0 as AspirinTask).obj.cancel(false)
}
override fun getDump(): JsonObject = JsonObject()
override fun kickPlayer(p0: UUID, p1: String): Boolean = false
override fun getApi(): ViaAPI<UUID> = AspirinViaAPI
override fun getDataFolder(): File = File("viaversion")
override fun getDataFolder(): File = File("viaversion")
override fun getConf(): ViaVersionConfig = AspirinViaConfig
override fun runAsync(p0: Runnable): TaskId = AspirinTask(CompletableFuture.runAsync(p0, executor))
override fun runAsync(p0: Runnable): AspirinTask = AspirinTask(CompletableFuture.runAsync(p0, executor))
override fun getLogger(): Logger = LoggerWrapper(LoggerFactory.getLogger("ViaVersion"))
override fun getConnectionManager(): ViaConnectionManager = connMan
override fun getOnlinePlayers(): Array<ViaCommandSender> = arrayOf()
override fun isPluginEnabled(): Boolean = true
override fun getConfigurationProvider(): ConfigurationProvider = AspirinViaConfig

2
src/main/kotlin/com/viaversion/aas/platform/AspirinRewind.kt
View File

@ -2,7 +2,7 @@ package com.viaversion.aas.platform
import de.gerrygames.viarewind.api.ViaRewindPlatform
import org.slf4j.LoggerFactory
import us.myles.ViaVersion.sponge.util.LoggerWrapper
import com.viaversion.viaversion.sponge.util.LoggerWrapper
import java.util.logging.Logger
object AspirinRewind : ViaRewindPlatform {

8
src/main/kotlin/com/viaversion/aas/platform/AspirinTask.kt
View File

@ -1,8 +1,12 @@
package com.viaversion.aas.platform
import us.myles.ViaVersion.api.platform.TaskId
import com.viaversion.viaversion.api.platform.PlatformTask
import java.util.concurrent.Future
class AspirinTask(val obj: Future<*>) : TaskId {
class AspirinTask(val obj: Future<*>) : PlatformTask<Any> {
override fun getObject(): Any = obj
override fun cancel() {
obj.cancel(false);
}
}

8
src/main/kotlin/com/viaversion/aas/platform/AspirinViaAPI.kt
View File

@ -1,10 +1,10 @@
package com.viaversion.aas.platform
import com.viaversion.viaversion.ViaAPIBase
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.ViaAPIBase
import us.myles.ViaVersion.api.boss.BossBar
import us.myles.ViaVersion.api.boss.BossColor
import us.myles.ViaVersion.api.boss.BossStyle
import com.viaversion.viaversion.api.boss.BossBar
import com.viaversion.viaversion.api.boss.BossColor
import com.viaversion.viaversion.api.boss.BossStyle
import java.util.*
object AspirinViaAPI : ViaAPIBase<UUID>() {

4
src/main/kotlin/com/viaversion/aas/protocol/AspirinProtocols.kt
View File

@ -2,8 +2,8 @@ package com.viaversion.aas.protocol
import com.viaversion.aas.protocol.id47toid5.Protocol1_8To1_7_6
import com.viaversion.aas.protocol.id5toid4.Protocol1_7_6to1_7_2
import us.myles.ViaVersion.api.Via
import us.myles.ViaVersion.api.protocol.ProtocolVersion
import com.viaversion.viaversion.api.Via
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
// cursed 1.7 -> 1.8 from https://github.com/Gerrygames/ClientViaVersion
// + https://github.com/creeper123123321/ViaRewind/tree/17to18

12
src/main/kotlin/com/viaversion/aas/protocol/Util.kt
View File

@ -1,11 +1,11 @@
package com.viaversion.aas.protocol
import us.myles.ViaVersion.api.PacketWrapper
import us.myles.ViaVersion.api.minecraft.Position
import us.myles.ViaVersion.api.remapper.ValueReader
import us.myles.ViaVersion.api.remapper.ValueTransformer
import us.myles.ViaVersion.api.remapper.ValueWriter
import us.myles.ViaVersion.api.type.Type
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper
import com.viaversion.viaversion.api.minecraft.Position
import com.viaversion.viaversion.api.protocol.remapper.ValueReader
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer
import com.viaversion.viaversion.api.protocol.remapper.ValueWriter
import com.viaversion.viaversion.api.type.Type
val INSERT_DASHES: ValueTransformer<String, String> = object : ValueTransformer<String, String>(Type.STRING) {
override fun transform(packetWrapper: PacketWrapper, s: String?): String {

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

@ -2,12 +2,12 @@ package com.viaversion.aas.protocol.id47toid5
import com.viaversion.aas.protocol.id47toid5.packets.*
import com.viaversion.aas.protocol.id47toid5.storage.*
import us.myles.ViaVersion.api.data.UserConnection
import us.myles.ViaVersion.api.protocol.SimpleProtocol
import com.viaversion.viaversion.api.connection.UserConnection
import com.viaversion.viaversion.api.protocol.AbstractSimpleProtocol
import java.util.*
// Based on https://github.com/Gerrygames/ClientViaVersion
object Protocol1_8To1_7_6 : SimpleProtocol() {
object Protocol1_8To1_7_6 : AbstractSimpleProtocol() {
private val placeable = ArrayList<Int>()
init {

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

@ -1,10 +1,10 @@
package com.viaversion.aas.protocol.id47toid5.chunks
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.PacketWrapper
import us.myles.ViaVersion.api.minecraft.BlockChangeRecord1_8
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.api.type.types.CustomByteType
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_8
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.type.types.CustomByteType
import java.io.IOException
import java.util.stream.IntStream
import java.util.zip.DataFormatException

2
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/chunks/ExtendedBlockStorage.kt
View File

@ -1,6 +1,6 @@
package com.viaversion.aas.protocol.id47toid5.chunks
import us.myles.ViaVersion.api.minecraft.chunks.NibbleArray
import com.viaversion.viaversion.api.minecraft.chunks.NibbleArray
class ExtendedBlockStorage(val yLocation: Int, hasSkyLight: Boolean) {
var blockLSBArray: ByteArray = ByteArray(4096)

8
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/metadata/MetadataRewriter.kt
View File

@ -1,10 +1,10 @@
package com.viaversion.aas.protocol.id47toid5.metadata
import de.gerrygames.viarewind.protocol.protocol1_8to1_7_6_10.metadata.MetaIndex1_8to1_7_6_10
import us.myles.ViaVersion.api.Via
import us.myles.ViaVersion.api.entities.Entity1_10Types
import us.myles.ViaVersion.api.minecraft.metadata.Metadata
import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_8
import com.viaversion.viaversion.api.Via
import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types
import com.viaversion.viaversion.api.minecraft.metadata.Metadata
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8
import java.util.*
object MetadataRewriter {

12
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/EntityPackets.kt
View File

@ -6,12 +6,12 @@ import com.viaversion.aas.protocol.id47toid5.storage.EntityTracker
import com.viaversion.aas.protocol.id47toid5.type.CustomIntType
import com.viaversion.aas.protocol.xyzToPosition
import de.gerrygames.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10
import us.myles.ViaVersion.api.entities.Entity1_10Types
import us.myles.ViaVersion.api.remapper.PacketRemapper
import us.myles.ViaVersion.api.remapper.TypeRemapper
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.api.type.types.version.Types1_8
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper
import com.viaversion.viaversion.api.protocol.remapper.TypeRemapper
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.type.types.version.Types1_8
import com.viaversion.viaversion.api.protocol.packet.State
import kotlin.experimental.and
fun Protocol1_8To1_7_6.registerEntityPackets() {

14
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/InventoryPackets.kt
View File

@ -3,13 +3,13 @@ package com.viaversion.aas.protocol.id47toid5.packets
import com.viaversion.aas.protocol.id47toid5.Protocol1_8To1_7_6
import com.viaversion.aas.protocol.id47toid5.storage.Windows
import de.gerrygames.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10
import us.myles.ViaVersion.api.minecraft.item.Item
import us.myles.ViaVersion.api.remapper.PacketRemapper
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.packets.State
import us.myles.viaversion.libs.kyori.adventure.text.Component
import us.myles.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer
import us.myles.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
import com.viaversion.viaversion.api.minecraft.item.Item
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.protocol.packet.State
import com.viaversion.viaversion.libs.kyori.adventure.text.Component
import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer
import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
fun Protocol1_8To1_7_6.registerInventoryPackets() {

6
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/LoginPackets.kt
View File

@ -1,9 +1,9 @@
package com.viaversion.aas.protocol.id47toid5.packets
import com.viaversion.aas.protocol.id47toid5.Protocol1_8To1_7_6
import us.myles.ViaVersion.api.remapper.PacketRemapper
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.protocol.packet.State
fun Protocol1_8To1_7_6.registerLoginPackets() {
//Encryption Request

34
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/PlayerPackets.kt
View File

@ -14,19 +14,19 @@ import de.gerrygames.viarewind.protocol.protocol1_7_6_10to1_8.types.CustomString
import de.gerrygames.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10
import de.gerrygames.viarewind.utils.ChatUtil
import io.netty.buffer.Unpooled
import us.myles.ViaVersion.api.PacketWrapper
import us.myles.ViaVersion.api.Via
import us.myles.ViaVersion.api.entities.Entity1_10Types
import us.myles.ViaVersion.api.minecraft.item.Item
import us.myles.ViaVersion.api.remapper.PacketRemapper
import us.myles.ViaVersion.api.remapper.TypeRemapper
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.api.type.types.CustomByteType
import us.myles.ViaVersion.api.type.types.version.Types1_8
import us.myles.ViaVersion.packets.State
import us.myles.ViaVersion.util.ChatColorUtil
import us.myles.viaversion.libs.opennbt.tag.builtin.ListTag
import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper
import com.viaversion.viaversion.api.Via
import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types
import com.viaversion.viaversion.api.minecraft.item.Item
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper
import com.viaversion.viaversion.api.protocol.remapper.TypeRemapper
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.type.types.CustomByteType
import com.viaversion.viaversion.api.type.types.version.Types1_8
import com.viaversion.viaversion.api.protocol.packet.State
import com.viaversion.viaversion.util.ChatColorUtil
import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag
import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag
import java.nio.charset.StandardCharsets
import java.util.*
import kotlin.experimental.and
@ -138,14 +138,14 @@ fun Protocol1_8To1_7_6.registerPlayerPackets() {
val entryByUUID = tablist.getTabListEntry(uuid)
if (entryByName == null || entryByUUID == null) {
if (entryByName != null || entryByUUID != null) {
val remove = PacketWrapper(0x38, null, packetWrapper.user())
val remove = PacketWrapper.create(0x38, null, packetWrapper.user())
remove.write(Type.VAR_INT, 4)
remove.write(Type.VAR_INT, 1)
remove.write(Type.UUID, entryByName?.uuid ?: entryByUUID!!.uuid)
tablist.remove(entryByName ?: entryByUUID!!)
remove.send(Protocol1_8To1_7_6::class.java)
}
val packetPlayerListItem = PacketWrapper(0x38, null, packetWrapper.user())
val packetPlayerListItem = PacketWrapper.create(0x38, null, packetWrapper.user())
val newentry = Tablist.TabListEntry(name, uuid)
if (entryByName != null || entryByUUID != null) {
newentry.displayName =
@ -172,7 +172,7 @@ fun Protocol1_8To1_7_6.registerPlayerPackets() {
}
packetPlayerListItem.send(Protocol1_8To1_7_6::class.java)
packetWrapper.cancel()
val delayedPacket = PacketWrapper(0x0C, null, packetWrapper.user())
val delayedPacket = PacketWrapper.create(0x0C, null, packetWrapper.user())
delayedPacket.write(Type.VAR_INT, entityId)
delayedPacket.write(Type.UUID, uuid)
delayedPacket.write(Type.INT, x)
@ -425,7 +425,7 @@ fun Protocol1_8To1_7_6.registerPlayerPackets() {
packetWrapper.id = -1
val newPacketBuf = Unpooled.buffer()
packetWrapper.writeToBuffer(newPacketBuf)
val newWrapper = PacketWrapper(0x17, newPacketBuf, packetWrapper.user())
val newWrapper = PacketWrapper.create(0x17, newPacketBuf, packetWrapper.user())
newWrapper.passthrough(Type.STRING)
newWrapper.write(Type.SHORT, newPacketBuf.readableBytes().toShort())
newWrapper.sendToServer(Protocol1_8To1_7_6::class.java, true, true)

14
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/packets/WorldPackets.kt
View File

@ -6,13 +6,13 @@ import com.viaversion.aas.protocol.id47toid5.chunks.ChunkPacketTransformer
import com.viaversion.aas.protocol.id47toid5.data.Particle1_8to1_7
import com.viaversion.aas.protocol.id47toid5.storage.MapStorage
import de.gerrygames.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10
import us.myles.ViaVersion.api.remapper.PacketRemapper
import us.myles.ViaVersion.api.remapper.TypeRemapper
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.packets.State
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9To1_8
import us.myles.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer
import us.myles.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper
import com.viaversion.viaversion.api.protocol.remapper.TypeRemapper
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.protocol.packet.State
import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8
import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer
import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
import kotlin.experimental.and
fun Protocol1_8To1_7_6.registerWorldPackets() {

16
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/storage/EntityTracker.kt
View File

@ -2,13 +2,13 @@ package com.viaversion.aas.protocol.id47toid5.storage
import com.viaversion.aas.protocol.id47toid5.Protocol1_8To1_7_6
import com.viaversion.aas.protocol.id47toid5.metadata.MetadataRewriter
import us.myles.ViaVersion.api.PacketWrapper
import us.myles.ViaVersion.api.data.StoredObject
import us.myles.ViaVersion.api.data.UserConnection
import us.myles.ViaVersion.api.entities.Entity1_10Types
import us.myles.ViaVersion.api.minecraft.metadata.Metadata
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.api.type.types.version.Types1_8
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper
import com.viaversion.viaversion.api.connection.StoredObject
import com.viaversion.viaversion.api.connection.UserConnection
import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types
import com.viaversion.viaversion.api.minecraft.metadata.Metadata
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.type.types.version.Types1_8
import java.lang.Exception
import java.util.concurrent.ConcurrentHashMap
@ -29,7 +29,7 @@ class EntityTracker(user: UserConnection) : StoredObject(user) {
fun sendMetadataBuffer(entityId: Int) {
if (!metadataBuffer.containsKey(entityId)) return
val wrapper = PacketWrapper(0x1C, null, this.user)
val wrapper = PacketWrapper.create(0x1C, null, this.user)
wrapper.write(Type.VAR_INT, entityId)
wrapper.write(Types1_8.METADATA_LIST, metadataBuffer[entityId])
MetadataRewriter.transform(clientEntityTypes[entityId], metadataBuffer[entityId]!!)

4
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/storage/MapStorage.kt
View File

@ -1,7 +1,7 @@
package com.viaversion.aas.protocol.id47toid5.storage
import us.myles.ViaVersion.api.data.StoredObject
import us.myles.ViaVersion.api.data.UserConnection
import com.viaversion.viaversion.api.connection.StoredObject
import com.viaversion.viaversion.api.connection.UserConnection
import java.util.*
class MapStorage(user: UserConnection) : StoredObject(user) {

4
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/storage/Scoreboard.kt
View File

@ -1,7 +1,7 @@
package com.viaversion.aas.protocol.id47toid5.storage
import us.myles.ViaVersion.api.data.StoredObject
import us.myles.ViaVersion.api.data.UserConnection
import com.viaversion.viaversion.api.connection.StoredObject
import com.viaversion.viaversion.api.connection.UserConnection
import java.util.*
class Scoreboard(user: UserConnection) : StoredObject(user) {

4
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/storage/Tablist.kt
View File

@ -1,7 +1,7 @@
package com.viaversion.aas.protocol.id47toid5.storage
import us.myles.ViaVersion.api.data.StoredObject
import us.myles.ViaVersion.api.data.UserConnection
import com.viaversion.viaversion.api.connection.StoredObject
import com.viaversion.viaversion.api.connection.UserConnection
import java.util.*
class Tablist(user: UserConnection?) : StoredObject(user) {

4
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/storage/Windows.kt
View File

@ -1,7 +1,7 @@
package com.viaversion.aas.protocol.id47toid5.storage
import us.myles.ViaVersion.api.data.StoredObject
import us.myles.ViaVersion.api.data.UserConnection
import com.viaversion.viaversion.api.connection.StoredObject
import com.viaversion.viaversion.api.connection.UserConnection
class Windows(user: UserConnection?) : StoredObject(user) {
var types = mutableMapOf<Short, Short>()

2
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/type/CustomIntType.kt
View File

@ -1,7 +1,7 @@
package com.viaversion.aas.protocol.id47toid5.type
import io.netty.buffer.ByteBuf
import us.myles.ViaVersion.api.type.PartialType
import com.viaversion.viaversion.api.type.PartialType
class CustomIntType(amount: Int) : PartialType<IntArray, Int>(amount, IntArray::class.java) {
override fun read(p0: ByteBuf, p1: Int): IntArray {

12
src/main/kotlin/com/viaversion/aas/protocol/id5toid4/Protocol1_7_6to1_7_2.kt
View File

@ -1,14 +1,14 @@
package com.viaversion.aas.protocol.id5toid4
import com.viaversion.aas.protocol.INSERT_DASHES
import us.myles.ViaVersion.api.data.UserConnection
import us.myles.ViaVersion.api.protocol.SimpleProtocol
import us.myles.ViaVersion.api.remapper.PacketRemapper
import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.packets.State
import com.viaversion.viaversion.api.connection.UserConnection
import com.viaversion.viaversion.api.protocol.AbstractSimpleProtocol
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.protocol.packet.State
// Based on https://github.com/Gerrygames/ClientViaVersion
object Protocol1_7_6to1_7_2 : SimpleProtocol() {
object Protocol1_7_6to1_7_2 : AbstractSimpleProtocol() {
override fun registerPackets() {
//Login Success
this.registerOutgoing(State.LOGIN, 0x02, 0x02, object : PacketRemapper() {

4
src/main/kotlin/com/viaversion/aas/provider/AspirinVersionProvider.kt
View File

@ -1,8 +1,8 @@
package com.viaversion.aas.provider
import com.viaversion.aas.handler.MinecraftHandler
import us.myles.ViaVersion.api.data.UserConnection
import us.myles.ViaVersion.protocols.base.BaseVersionProvider
import com.viaversion.viaversion.api.connection.UserConnection
import com.viaversion.viaversion.protocols.base.BaseVersionProvider
object AspirinVersionProvider : BaseVersionProvider() {
override fun getClosestServerProtocol(connection: UserConnection): Int {