diff --git a/build.gradle.kts b/build.gradle.kts
index 21682da..e2bd073 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.googlecode.htmlcompressor.compressor.HtmlCompressor
import org.gradlewebtools.minify.minifier.js.JSMinifierOptions
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.nio.file.Files as JFiles
@@ -7,8 +8,6 @@ buildscript {
dependencies { classpath("com.github.hazendaz:htmlcompressor:1.7.1") }
}
-import com.googlecode.htmlcompressor.compressor.HtmlCompressor
-
plugins {
`java-library`
application
@@ -58,8 +57,8 @@ repositories {
dependencies {
implementation(kotlin("stdlib-jdk8"))
- implementation("com.viaversion:viaversion:4.0.0-21w19a") { isTransitive = false }
- implementation("com.viaversion:viabackwards:4.0.0-21w19a") { isTransitive = false }
+ implementation("com.viaversion:viaversion:4.0.0-21w19a-SNAPSHOT") { isTransitive = false }
+ implementation("com.viaversion:viabackwards:4.0.0-21w19a-SNAPSHOT") { isTransitive = false }
implementation("com.github.ViaVersion.ViaRewind:viarewind-all:dev-SNAPSHOT") { isTransitive = false }
implementation("com.google.guava:guava:30.1.1-jre")
implementation("io.netty:netty-all:4.1.63.Final")
diff --git a/src/main/kotlin/com/viaversion/aas/VIAaaSAddress.kt b/src/main/kotlin/com/viaversion/aas/VIAaaSAddress.kt
index 9fd28e7..c198b9a 100644
--- a/src/main/kotlin/com/viaversion/aas/VIAaaSAddress.kt
+++ b/src/main/kotlin/com/viaversion/aas/VIAaaSAddress.kt
@@ -2,7 +2,6 @@ package com.viaversion.aas
import com.viaversion.aas.util.StacklessException
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
-import java.util.*
class VIAaaSAddress {
var serverAddress: String? = null
diff --git a/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/chunks/ChunkPacketTransformer.kt b/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/chunks/ChunkPacketTransformer.kt
index aca0dc9..08e67f0 100644
--- a/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/chunks/ChunkPacketTransformer.kt
+++ b/src/main/kotlin/com/viaversion/aas/protocol/id47toid5/chunks/ChunkPacketTransformer.kt
@@ -4,7 +4,7 @@ import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_8
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper
import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.type.types.CustomByteType
-import io.netty.buffer.ByteBuf
+import com.viaversion.viaversion.protocol.packet.PacketWrapperImpl
import java.io.IOException
import java.util.stream.IntStream
import java.util.zip.DataFormatException
@@ -44,9 +44,7 @@ object ChunkPacketTransformer {
val chunk = Chunk1_8to1_7_6_10(uncompressedData, primaryBitMask, addBitMask, true, groundUp)
packetWrapper.clearPacket()
- val field = PacketWrapper::class.java.getDeclaredField("inputBuffer")
- field.isAccessible = true
- val buffer = field[packetWrapper] as ByteBuf
+ val buffer = (packetWrapper as PacketWrapperImpl).inputBuffer
buffer.clear()
buffer.writeInt(chunkX)
diff --git a/src/main/resources/viaaas.yml b/src/main/resources/viaaas.yml
index 92c19b5..5dd9c07 100644
--- a/src/main/resources/viaaas.yml
+++ b/src/main/resources/viaaas.yml
@@ -36,9 +36,9 @@ use-strong-random: false
require-host-name: true
# Host names of this instance, that will be used in the virtual host as a suffix.
host-name:
-- viaaas.localhost
-- via.localhost
-- via-127-0-0-1.nip.io
+ - viaaas.localhost
+ - via.localhost
+ - via-127-0-0-1.nip.io
# Requires online mode for front-end connections. May be useful for stopping bots.
force-online-mode: false
# Default port to be used when connecting to the backend server.
@@ -51,11 +51,11 @@ default-backend-port: 25565
# Blocks backend connection to local addresses (localhost, 0.0.0.0, ::1, 127.(...), 10.(...), etc).
block-local-address: true
# If some server is in this list, it will be blocked. This has priority over allowed-back-addresses.
-blocked-back-addresses:
-- "*.hypixel.net"
+blocked-back-addresses:
+ - "*.hypixel.net"
# Only allows the backend address if it matches an address in this list.
allowed-back-addresses:
-- "*"
+ - "*"
#
######
# Info
diff --git a/src/main/resources/web/index.html b/src/main/resources/web/index.html
index 9a6b1d6..fbd8bc0 100644
--- a/src/main/resources/web/index.html
+++ b/src/main/resources/web/index.html
@@ -17,13 +17,21 @@
style-src https://cdnjs.cloudflare.com/ 'self';
img-src data: https://cdn.discordapp.com/ https://crafthead.net/ https://crafatar.com/;
connect-src 'self' http://localhost:*/ https: wss:;
- script-src 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' 'self' https://ajax.cloudflare.com/ https://cdnjs.cloudflare.com/ https://alcdn.msauth.net/" http-equiv="Content-Security-Policy">
+ script-src 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' 'self' https://ajax.cloudflare.com/ https://cdnjs.cloudflare.com/ https://alcdn.msauth.net/"
+ http-equiv="Content-Security-Policy">
-
-
-
+
+
+
@@ -39,22 +47,26 @@