ViaVersion update, platform implementation changes

VIAaaS command system had some big changes

Author: creeper123123321

build.gradle.kts

@@ -68,11 +68,11 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation(kotlin("reflect"))
 
-    val vvVer = "5.7.0"
-    val vbVer = "5.7.0"
-    val vrVer = "4.0.13"
-    val vafVer = "4.0.6"
-    val vlVer = "3.0.12"
+    val vvVer = "5.7.1"
+    val vbVer = "5.7.1"
+    val vrVer = "4.0.14"
+    val vafVer = "4.0.8"
+    val vlVer = "3.0.13"
     implementation("com.viaversion:viaversion-common:$vvVer") { isTransitive = false }
     implementation("com.viaversion:viabackwards-common:$vbVer") { isTransitive = false }
     implementation("com.viaversion:viarewind-common:$vrVer") { isTransitive = false }

src/main/java/com/viaversion/aas/command/CommandManager.java

@@ -0,0 +1,44 @@
+package com.viaversion.aas.command;
+
+import com.google.common.collect.HashMultimap;
+import org.jspecify.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Set;
+
+public class CommandManager {
+	private final HashMap<String, Command> aliasToCommand = new HashMap<>();
+	private final HashMultimap<Command, String> commandToAlias = HashMultimap.create();
+
+	{
+		registerCommand(new HelpCommand(this), "help", "?");
+		registerCommand(new EndCommand(), "end", "stop");
+		registerCommand(new ReloadCommand(this), "reload");
+		registerCommand(new ListCommand(), "list");
+		registerCommand(new VersionCommand(), "version", "ver");
+	}
+
+	public void registerCommand(Command cmd, String... aliases) {
+		for (String alias : aliases) {
+			aliasToCommand.put(alias, cmd);
+			commandToAlias.put(cmd, alias);
+		}
+	}
+
+	@Nullable
+	public Command getCommand(String name) {
+		return aliasToCommand.get(name);
+	}
+
+	public Set<Command> getCommands() {
+		return Set.copyOf(commandToAlias.keySet());
+	}
+
+	public Set<String> getCommandNames() {
+		return Set.copyOf(aliasToCommand.keySet());
+	}
+
+	public Set<String> getAliases(Command cmd) {
+		return Set.copyOf(commandToAlias.get(cmd));
+	}
+}

src/main/java/com/viaversion/aas/command/VersionCommand.java

@@ -1,30 +1,23 @@
 package com.viaversion.aas.config;
 
-import com.viaversion.aas.platform.AspirinPlatform;
 import com.viaversion.viaversion.configuration.AbstractViaConfig;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import java.util.logging.Logger;
 
 public class AspirinViaConfig extends AbstractViaConfig {
-
 	protected final List<String> UNSUPPORTED = new ArrayList<>();
 
-	public AspirinViaConfig() {
-		super(new File("config/viaversion.yml"), AspirinPlatform.INSTANCE.getLogger());
+	public AspirinViaConfig(File file, Logger jLogger) {
+		super(file, jLogger);
 		UNSUPPORTED.addAll(BUKKIT_ONLY_OPTIONS);
 		UNSUPPORTED.addAll(VELOCITY_ONLY_OPTIONS);
 
 		reload();
 	}
 
-	@Override
-	protected void handleConfig(Map<String, Object> config) {
-
-	}
-
 	@Override
 	public List<String> getUnsupportedOptions() {
 		return UNSUPPORTED;

src/main/java/com/viaversion/aas/config/AspirinViaConfig.java

@@ -1,29 +1,8 @@
 package com.viaversion.aas.platform;
 
-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.fastutil.objects.ObjectLinkedOpenHashSet;
-import com.viaversion.viaversion.libs.gson.JsonObject;
-import it.unimi.dsi.fastutil.objects.ObjectSortedSet;
-
-import java.util.SortedSet;
-
-public class AspirinInjector implements ViaInjector {
-	@Override
-	public void inject() {
-	}
-
-	@Override
-	public void uninject() {
-	}
-
-	@Override
-	public ProtocolVersion getServerProtocolVersion() {
-		return getServerProtocolVersions().first();
-	}
+import com.viaversion.viaversion.platform.NoopInjector;
 
+public class AspirinInjector extends NoopInjector {
 	@Override
 	public String getEncoderName() {
 		return getDecoderName();
@@ -34,15 +13,4 @@ public String getDecoderName() {
 		return "via-codec";
 	}
 
-	@Override
-	public JsonObject getDump() {
-		return new JsonObject();
-	}
-
-	@Override
-	public SortedSet<ProtocolVersion> getServerProtocolVersions() {
-		var versions = new ObjectLinkedOpenHashSet<ProtocolVersion>();
-		versions.addAll(ProtocolVersion.getProtocols());
-		return versions;
-	}
 }

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

@@ -7,9 +7,10 @@
 import java.util.logging.Logger;
 
 public class AspirinLegacy implements ViaLegacyPlatform {
+    private final Logger logger = Logger.getLogger("ViaLegacy");
     @Override
     public Logger getLogger() {
-        return Via.getPlatform().getLogger();
+        return logger;
     }
 
     @Override

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

@@ -16,7 +16,7 @@ public void load() {
 		Via.getManager().getProviders().use(CompressionProvider.class, new AspirinCompressionProvider());
 
 		//ViaBackwards
-		Via.getManager().getProviders().use(TransferProvider.class, new AspirinTransferProvider());
+		Via.getManager().getProviders().use(TransferProvider.class, TransferProvider.NOOP);
 
 		//ViaLegacy
 		Via.getManager().getProviders().use(GameProfileFetcher.class, new AspirinProfileProvider());

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

@@ -30,6 +30,9 @@ import io.netty.channel.WriteBufferWaterMark
 import io.netty.resolver.dns.DnsNameResolver
 import io.netty.resolver.dns.DnsNameResolverBuilder
 import io.netty.util.concurrent.Future
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import java.io.File
 import java.lang.management.ManagementFactory
 import java.security.KeyPair
@@ -108,12 +111,10 @@ object AspirinServer {
     fun mainStartSignal() = initFuture.complete(Unit)
 
     fun listenPorts(args: Array<String>) {
-        viaaasLogger.info("Using transport type {}", NettyTransportTypes.getDefault())
-
         val serverBootstrap = ServerBootstrap()
             .group(parentLoop, childLoop)
             .channelFactory(channelServerSocketFactory())
-            .childHandler(FrontEndInit)
+            .childHandler(FrontEndInit())
             .childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, bufferWaterMark)
             .childOption(ChannelOption.IP_TOS, 0x18)
             .childOption(ChannelOption.TCP_NODELAY, true)
@@ -127,20 +128,30 @@ object AspirinServer {
             takeFrom(commandLineCfg.engineConfig)
         }.start(false)
 
-        viaaasLogger.info(
-            "Using compression: {}, crypto: {}",
-            Natives.compress.loadedVariant,
-            Natives.cipher.loadedVariant
-        )
         chFutures.forEach {
             viaaasLogger.info("Binded minecraft into {}", it.sync().channel().localAddress())
         }
+    }
+
+    fun logNativesInfo() {
+        viaaasLogger.info("Using transport: {}, compression: {}, crypto: {}",
+            NettyTransportTypes.getDefault(),
+            Natives.compress.loadedVariant,
+            Natives.cipher.loadedVariant
+        )
+    }
+
+    fun logStartupSeconds() {
         viaaasLogger.info(
             "Application started in " + ManagementFactory.getRuntimeMXBean().uptime
                 .milliseconds.toDouble(DurationUnit.SECONDS) + "s"
         )
     }
 
+    fun checkForUpdatesStart() {
+        CoroutineScope(Job()).launch { viaaasLogger.info("{}", updaterCheckMessage()) }
+    }
+
     fun generateCert() {
         File("config/https.jks").apply {
             parentFile.mkdirs()