mirror of
https://github.com/ViaVersion/VIAaaS.git
synced 2024-09-30 04:57:50 +02:00
Update VV dependency to 4.0.0 repackage (#136)
* Update VV dependency to 4.0.0 repackage * dev viarewind Co-authored-by: KennyTV <jahnke.nassim@gmail.com>
This commit is contained in:
parent
400f6e410c
commit
7527c9fb5a
@ -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")
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 {
|
||||
|
@ -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,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>) {
|
||||
|
@ -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>) {
|
||||
|
@ -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
|
||||
|
@ -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'"
|
||||
|
@ -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"
|
||||
|
@ -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'"
|
||||
|
@ -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'"
|
||||
|
@ -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,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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
||||
|
@ -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.*
|
||||
|
@ -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())
|
||||
|
@ -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
|
||||
|
||||
|
@ -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) {
|
||||
|
@ -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>) {
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 {
|
||||
|
@ -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
|
||||
|
@ -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 {
|
||||
|
@ -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 {
|
||||
|
@ -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
|
||||
|
@ -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,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,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
|
||||
|
@ -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 {
|
||||
|
@ -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 {
|
||||
|
@ -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,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,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,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,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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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)
|
@ -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"
|
||||
|
@ -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() {
|
||||
|
@ -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,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 {
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
@ -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>() {
|
||||
|
@ -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
|
||||
|
@ -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 {
|
||||
|
@ -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 {
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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 {
|
||||
|
@ -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() {
|
||||
|
@ -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() {
|
||||
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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() {
|
||||
|
@ -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]!!)
|
||||
|
@ -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) {
|
||||
|
@ -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) {
|
||||
|
@ -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) {
|
||||
|
@ -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>()
|
||||
|
@ -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 {
|
||||
|
@ -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() {
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user