From a8ae5ce73d37e1a0a238399a288ed1249a6261b6 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Tue, 30 Apr 2024 23:33:55 +0200 Subject: [PATCH] 1.20.3->1.20.5 implementations --- .../com/viaversion/aas/platform/AspirinLoader.java | 9 +++++---- .../aas/provider/AspirinTransferProvider.java | 11 +++++++++++ src/main/kotlin/com/viaversion/aas/VIAaaS.kt | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/viaversion/aas/provider/AspirinTransferProvider.java diff --git a/src/main/java/com/viaversion/aas/platform/AspirinLoader.java b/src/main/java/com/viaversion/aas/platform/AspirinLoader.java index a61189e..63b6e19 100644 --- a/src/main/java/com/viaversion/aas/platform/AspirinLoader.java +++ b/src/main/java/com/viaversion/aas/platform/AspirinLoader.java @@ -1,9 +1,7 @@ package com.viaversion.aas.platform; -import com.viaversion.aas.provider.AspirinCompressionProvider; -import com.viaversion.aas.provider.AspirinEncryptionProvider; -import com.viaversion.aas.provider.AspirinProfileProvider; -import com.viaversion.aas.provider.AspirinVersionProvider; +import com.viaversion.aas.provider.*; +import com.viaversion.viabackwards.protocol.protocol1_20_3to1_20_5.provider.TransferProvider; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.platform.ViaPlatformLoader; import com.viaversion.viaversion.api.protocol.version.VersionProvider; @@ -17,6 +15,9 @@ public class AspirinLoader implements ViaPlatformLoader { Via.getManager().getProviders().use(VersionProvider.class, new AspirinVersionProvider()); Via.getManager().getProviders().use(CompressionProvider.class, new AspirinCompressionProvider()); + //ViaBackwards + Via.getManager().getProviders().use(TransferProvider.class, new AspirinTransferProvider()); + //ViaLegacy Via.getManager().getProviders().use(GameProfileFetcher.class, new AspirinProfileProvider()); Via.getManager().getProviders().use(EncryptionProvider.class, new AspirinEncryptionProvider()); diff --git a/src/main/java/com/viaversion/aas/provider/AspirinTransferProvider.java b/src/main/java/com/viaversion/aas/provider/AspirinTransferProvider.java new file mode 100644 index 0000000..e10a999 --- /dev/null +++ b/src/main/java/com/viaversion/aas/provider/AspirinTransferProvider.java @@ -0,0 +1,11 @@ +package com.viaversion.aas.provider; + +import com.viaversion.viabackwards.protocol.protocol1_20_3to1_20_5.provider.TransferProvider; +import com.viaversion.viaversion.api.connection.UserConnection; + +public class AspirinTransferProvider implements TransferProvider { + + @Override + public void connectToServer(UserConnection userConnection, String s, int i) { + } +} diff --git a/src/main/kotlin/com/viaversion/aas/VIAaaS.kt b/src/main/kotlin/com/viaversion/aas/VIAaaS.kt index cabb297..f4463b2 100644 --- a/src/main/kotlin/com/viaversion/aas/VIAaaS.kt +++ b/src/main/kotlin/com/viaversion/aas/VIAaaS.kt @@ -12,6 +12,7 @@ import com.viaversion.aas.web.ViaWebApp import com.viaversion.viaversion.api.Via import com.viaversion.viaversion.api.protocol.version.ProtocolVersion import com.viaversion.viaversion.api.protocol.version.VersionType +import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3 import io.ktor.server.application.* import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job @@ -67,6 +68,7 @@ private fun initVia() { Via.getManager().configurationProvider.register(VIAaaSConfig) } + Protocol1_20_5To1_20_3.strictErrorHandling = false ProtocolVersion.register(AUTO) registerAspirinProtocols() }