More platform cleanup

build.gradle.kts

@@ -68,7 +68,7 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation(kotlin("reflect"))
 
-    val vvVer = "5.7.1"
+    val vvVer = "5.7.2-SNAPSHOT"
     val vbVer = "5.7.1"
     val vrVer = "4.0.14"
     val vafVer = "4.0.8"

src/main/java/com/viaversion/aas/platform/AspirinInjector.java

@@ -1,16 +1,18 @@
 package com.viaversion.aas.platform;
 
 import com.viaversion.viaversion.platform.NoopInjector;
+import com.viaversion.viaversion.platform.ViaCodecHandler;
 
 public class AspirinInjector extends NoopInjector {
-	@Override
-	public String getEncoderName() {
-		return getDecoderName();
-	}
 
-	@Override
-	public String getDecoderName() {
-		return "via-codec";
-	}
+    @Override
+    public String getEncoderName() {
+        return ViaCodecHandler.NAME;
+    }
+
+    @Override
+    public String getDecoderName() {
+        return ViaCodecHandler.NAME;
+    }
 
 }

src/main/java/com/viaversion/aas/platform/AspirinLoader.java → src/main/java/com/viaversion/aas/platform/AspirinPlatformLoader.java

@@ -9,7 +9,8 @@
 import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.provider.EncryptionProvider;
 import net.raphimc.vialegacy.protocol.release.r1_7_6_10tor1_8.provider.GameProfileFetcher;
 
-public class AspirinLoader implements ViaPlatformLoader {
+public class AspirinPlatformLoader implements ViaPlatformLoader {
+
 	@Override
 	public void load() {
 		Via.getManager().getProviders().use(VersionProvider.class, new AspirinVersionProvider());
@@ -26,4 +27,5 @@ public void load() {
 	@Override
 	public void unload() {
 	}
+
 }

src/main/kotlin/com/viaversion/aas/VIAaaS.kt

@@ -3,17 +3,16 @@ package com.viaversion.aas
 import com.viaversion.aas.command.CommandManager
 import com.viaversion.aas.command.VIAaaSConsole
 import com.viaversion.aas.config.VIAaaSConfig
-import com.viaversion.aas.platform.AspirinAprilFools
-import com.viaversion.aas.platform.AspirinBackwards
-import com.viaversion.aas.platform.AspirinLegacy
 import com.viaversion.aas.platform.AspirinPlatform
-import com.viaversion.aas.platform.AspirinRewind
-import com.viaversion.aas.protocol.registerAspirinProtocols
 import com.viaversion.aas.web.ViaWebApp
+import com.viaversion.viaaprilfools.ViaAprilFoolsPlatformImpl
+import com.viaversion.viabackwards.ViaBackwardsPlatformImpl
+import com.viaversion.viarewind.ViaRewindPlatformImpl
 import com.viaversion.viaversion.api.Via
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion
 import com.viaversion.viaversion.api.protocol.version.VersionType
 import io.ktor.server.application.*
+import net.raphimc.vialegacy.ViaLegacyPlatformImpl
 import org.apache.logging.log4j.Level
 import org.apache.logging.log4j.io.IoBuilder
 
@@ -64,15 +63,14 @@ private fun initVia(cmdManager: CommandManager) {
     val platform = AspirinPlatform(cmdManager)
 
     platform.initVia {
-        AspirinBackwards().init()
-        AspirinRewind().init()
-        AspirinAprilFools().init()
-        AspirinLegacy().init()
+        ViaBackwardsPlatformImpl()
+        ViaRewindPlatformImpl()
+        ViaAprilFoolsPlatformImpl()
+        ViaLegacyPlatformImpl()
         Via.getManager().configurationProvider.register(VIAaaSConfig)
     }
 
     ProtocolVersion.register(AUTO)
-    registerAspirinProtocols()
 }
 
 fun Application.mainWeb() {

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

@@ -3,6 +3,7 @@ package com.viaversion.aas.handler
 import com.viaversion.aas.codec.FrameCodec
 import com.viaversion.aas.codec.MinecraftCodec
 import com.viaversion.viaversion.connection.UserConnectionImpl
+import com.viaversion.viaversion.platform.ViaCodecHandler
 import com.viaversion.viaversion.protocol.ProtocolPipelineImpl
 import io.netty.channel.Channel
 import io.netty.channel.ChannelInitializer
@@ -27,7 +28,7 @@ class BackEndInit(private val connectionData: ConnectionData, private val proxyU
             // "crypto"
             .addLast("frame", FrameCodec())
             // compress
-            .addLast("via-codec", ViaCodec(user))
+            .addLast(ViaCodecHandler.NAME, ViaCodecHandler(user))
             .addLast("timeout", ReadTimeoutHandler(30, TimeUnit.SECONDS))
             .addLast("mc", MinecraftCodec())
             .addLast("handler", MinecraftHandler(connectionData, frontEnd = false))

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

@@ -3,7 +3,6 @@ package com.viaversion.aas.handler
 import com.viaversion.aas.codec.packet.Packet
 import com.viaversion.aas.mcLogger
 import com.viaversion.aas.setAutoRead
-import com.viaversion.viaversion.exception.CancelCodecException
 import io.netty.channel.Channel
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.SimpleChannelInboundHandler
@@ -63,7 +62,6 @@ class MinecraftHandler(
 
     override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) {
         if (cause is ProxyConnectException && failedProxy(ctx)) return
-        if (cause is CancelCodecException) return
         if (cause is ClosedChannelException) return
         val exceptionId = ThreadLocalRandom.current().nextInt().toUInt().toString(36)
         mcLogger.debug("Exception {}: ", exceptionId, cause)

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

@@ -3,43 +3,31 @@ package com.viaversion.aas.platform
 import com.viaversion.aas.AspirinServer
 import com.viaversion.aas.command.CommandManager
 import com.viaversion.aas.command.ViaAspirinCommand
-import com.viaversion.aas.config.AspirinViaConfig
 import com.viaversion.viaversion.ViaManagerImpl
-import com.viaversion.viaversion.api.Via
-import com.viaversion.viaversion.configuration.AbstractViaConfig
 import com.viaversion.viaversion.libs.gson.JsonObject
 import com.viaversion.viaversion.platform.UserConnectionViaVersionPlatform
 import io.ktor.server.application.*
 import java.io.File
 import java.util.logging.Logger
 
 class AspirinPlatform(val cmdManager: CommandManager) : UserConnectionViaVersionPlatform(File("config/viaversion")) {
-    private val logger = Logger.getLogger("ViaVersion")
-
-    override fun createConfig(): AbstractViaConfig {
-        return AspirinViaConfig(this.dataFolder.resolve("viaversion.yml"), logger)
-    }
 
     fun initVia(enableListener: Runnable) {
         val viaCommand = ViaAspirinCommand()
         cmdManager.registerCommand(viaCommand, "viaversion", "viaver", "vvcloud", "vvaas", "vvaspirin", "viaaas")
 
-        Via.init(
-            ViaManagerImpl.builder()
-                .injector(AspirinInjector())
-                .loader(AspirinLoader())
-                .commandHandler(viaCommand)
-                .platform(this).build()
+        ViaManagerImpl.initAndLoad(
+            this,
+            AspirinInjector(),
+            viaCommand,
+            AspirinPlatformLoader(),
+            enableListener
         )
-
-        Via.getManager().addEnableListener(enableListener)
-        (Via.getManager() as ViaManagerImpl).init()
-        (Via.getManager() as ViaManagerImpl).onServerLoaded()
     }
 
     override fun getDump(): JsonObject {
         return JsonObject().also {
-            it.add("versions", JsonObject().also{
+            it.add("versions", JsonObject().also {
                 it.addProperty("jvm", System.getProperty("java.version"))
                 it.addProperty("ktor", Application::class.java.`package`.implementationVersion)
             })
@@ -53,5 +41,4 @@ class AspirinPlatform(val cmdManager: CommandManager) : UserConnectionViaVersion
     override fun getPlatformName() = "VIAaaS"
     override fun getPlatformVersion(): String = AspirinServer.version
 
-    override fun isProxy() = true
 }