Performance improvement

Author: Calboot

build.gradle

@@ -99,18 +99,34 @@ tasks.register("sendDiscord") {
     mustRunAfter(tasks.buildAndGather, tasks.publishAll)
     doLast {
         Map<String, String> env = System.getenv()
-        String msg =
-                "# Announcement\nNew version of project [${env.REPO}](${env.REPO_URL}) has been released, check it on [Github Release](${env.REPO_URL}releases/tag/${env.TAG})\n## What's new:\n${file("changelog.md").text}\n"
-        msg = msg.replace("\n", "\\n")
-        println("Sending message to " + env.DISCORD_WEBHOOK + "...")
+        StringBuilder msgBuilder = new StringBuilder(
+                "# Announcement\nNew version of project [${env.REPO}](${env.REPO_URL}) has been released, check it on [Github Release](${env.REPO_URL}/releases/tag/${env.TAG})\n## What's new:\n${file("changelog.md").text}\n"
+        )
+        Map<String, Object> properties = rootProject.getProperties()
+        boolean bl1 = properties.containsKey("modrinth_id"), bl2 = properties.containsKey("curseforge_id")
+        if (bl1 || bl2) {
+            msgBuilder.append("\nTry out on ")
+        }
+        if (bl1) {
+            msgBuilder.append("[Modrinth](https://www.modrinth.com/mod/${properties.get("modrinth_id")})")
+            if (bl2) {
+                msgBuilder.append(" and [CurseForge](https://cflookup.com/${properties.get("curseforge_id")})")
+            }
+        } else if (bl2) {
+            msgBuilder.append("[CurseForge](https://cflookup.com/${properties.get("curseforge_id")})")
+        }
+        String msg = msgBuilder.toString().replace("\n", "\\n")
+        println("Sending json content to " + env.DISCORD_WEBHOOK + "...")
+        String content = "{\"content\" : \"${msg}\"}"
+        println(content)
 
         HttpURLConnection connection = (HttpURLConnection) new URI(env.DISCORD_WEBHOOK).toURL().openConnection()
         connection.setRequestMethod("POST")
         connection.setRequestProperty("Content-Type", "application/json")
         connection.setDoInput(true)
         connection.setDoOutput(true)
         OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream())
-        writer.write("{\"content\" : \"${msg}\"}")
+        writer.write(content)
         writer.flush()
         writer.close()
         connection.connect()

changelog.md

@@ -1,7 +1,3 @@
 ### General
 
-- Support for Minecraft 1.21.8
-
-### Bugfix
-
-- Incorrect average ping when some but not all packages are lost
+- Performance improvement

common.gradle

@@ -96,7 +96,9 @@ loom {
     runConfigs.configureEach {
         runDir "../../run"
         vmArgs commonVmArgs
-        ideConfigGenerated true
+    }
+    runConfigs.server {
+        ideConfigGenerated = true
     }
 
     runs {
@@ -106,11 +108,8 @@ loom {
             vmArgs auditVmArgs
             ideConfigGenerated false
         }
-        clientMixinAudit {
-            client()
-            vmArgs auditVmArgs
-            ideConfigGenerated false
-        }
+
+        remove client
     }
 }
 

gradle.properties

@@ -6,7 +6,7 @@ loader_version=0.16.14
 # Mod Properties
 mod_id=authlib-proxy-for-server
 mod_name=AuthlibProxyForServer
-mod_version=0.2.1
+mod_version=0.2.2
 mod_version_type=release
 group=com.ayakacraft
 archives_base_name=authlib-proxy-for-server

src/main/java/com/ayakacraft/authlibproxyforserver/commands/AuthProxyCommand.java

@@ -22,9 +22,10 @@
 
 import com.ayakacraft.authlibproxyforserver.AuthlibProxyForServer;
 import com.ayakacraft.authlibproxyforserver.ProxyConfig;
-import com.ayakacraft.authlibproxyforserver.mixin.YggdrasilAuthenticationServiceAccessor;
 import com.ayakacraft.authlibproxyforserver.utils.NetworkUtils;
 import com.ayakacraft.authlibproxyforserver.utils.preprocess.PreprocessPattern;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
@@ -36,8 +37,8 @@
 
 import java.io.IOException;
 import java.net.URI;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import static com.ayakacraft.authlibproxyforserver.AuthlibProxyForServer.LOGGER;
 import static com.ayakacraft.authlibproxyforserver.AuthlibProxyForServer.config;
@@ -163,13 +164,13 @@ private static int type(CommandContext<ServerCommandSource> context, String type
     }
 
     private static int ping(CommandContext<ServerCommandSource> context) {
-        List<String> hosts = new LinkedList<>();
+        Set<String> hosts = Sets.newHashSet();
         //#if MC>=12006
-        com.mojang.authlib.Environment env = YggdrasilAuthenticationServiceAccessor.determineEnvironment();
+        com.mojang.authlib.Environment env = com.ayakacraft.authlibproxyforserver.mixin.YggdrasilAuthenticationServiceAccessor.determineEnvironment();
         hosts.add(env.sessionHost());
         hosts.add(env.servicesHost());
         //#elseif MC>=11600
-        //$$ com.mojang.authlib.Environment env = YggdrasilAuthenticationServiceAccessor.determineEnvironment();
+        //$$ com.mojang.authlib.Environment env = com.ayakacraft.authlibproxyforserver.mixin.YggdrasilAuthenticationServiceAccessor.determineEnvironment();
         //$$ hosts.add(env.getAuthHost());
         //$$ hosts.add(env.getAccountsHost());
         //$$ hosts.add(env.getSessionHost());
@@ -248,11 +249,11 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
     private static class TcpingThread extends Thread {
 
         private static Text packetLossStatusText(int packetsReceived) {
-            double     packetLoss = 1d - (double) packetsReceived / AuthProxyCommand.TCPING_TIMES;
+            double     packetLoss = 1D - (double) packetsReceived / AuthProxyCommand.TCPING_TIMES;
             Formatting colour;
-            if (packetLoss >= 0.8d) {
+            if (packetLoss > 0.8D) {
                 colour = Formatting.RED;
-            } else if (packetLoss >= 0.3d) {
+            } else if (packetLoss > 0.2D) {
                 colour = Formatting.YELLOW;
             } else {
                 colour = Formatting.GREEN;
@@ -264,9 +265,11 @@ private static Text packetLossStatusText(int packetsReceived) {
 
         private static Text averagePingText(long ping) {
             Formatting colour;
-            if (ping >= 800) {
+            if (ping > 1000) {
+                colour = Formatting.LIGHT_PURPLE;
+            } else if (ping >= 800) {
                 colour = Formatting.RED;
-            } else if (ping >= 400) {
+            } else if (ping >= 300) {
                 colour = Formatting.YELLOW;
             } else {
                 colour = Formatting.GREEN;
@@ -275,40 +278,56 @@ private static Text averagePingText(long ping) {
                     .append(Text.literal(ping + "ms").formatted(colour));
         }
 
-        private final List<String> hosts;
+        private final Set<String> hosts;
 
         private final ServerCommandSource source;
 
-        public TcpingThread(List<String> hosts, ServerCommandSource source) {
+        private final Map<String, Pair<Long, Integer>> results;
+
+        private long startTimeMillis;
+
+        public TcpingThread(Set<String> hosts, ServerCommandSource source) {
+            super("TCPing Thread");
             this.hosts = hosts;
             this.source = source;
+            this.results = Maps.newHashMap();
+        }
+
+        private synchronized void saveResult(String host, Pair<Long, Integer> res) {
+            results.put(host, res);
+            if (results.size() >= hosts.size()) {
+                results.forEach(this::sendResult);
+                sendFeedback(source, Text.literal("Ping finished after " + (System.currentTimeMillis() - startTimeMillis) + "ms"), false);
+            }
         }
 
-        private void tcping(String host) {
-            Pair<Long, Integer> res = NetworkUtils.tcpingMultiple(URI.create(host), proxy, TCPING_TIMES);
+        private void sendResult(String h, Pair<Long, Integer> r) {
             sendFeedback(
                     source,
-                    Text.literal(String.format("Ping for '%s':", host)),
+                    Text.literal(String.format("Ping for '%s':", h)),
                     false
             );
             sendFeedback(
                     source,
-                    packetLossStatusText(res.getRight()),
+                    packetLossStatusText(r.getRight()),
                     false
             );
-            if (res.getRight() > 0) {
+            if (r.getRight() > 0) {
                 sendFeedback(
                         source,
-                        averagePingText(res.getLeft() / res.getRight()),
+                        averagePingText(r.getLeft() / r.getRight()),
                         false
                 );
             }
         }
 
+        @Override
         public void run() {
             sendFeedback(source, Text.literal("Ping started"), false);
-            hosts.forEach(this::tcping);
-            sendFeedback(source, Text.literal("Ping finished"), false);
+            startTimeMillis = System.currentTimeMillis();
+            hosts.forEach(host -> new Thread(() ->
+                    saveResult(host, NetworkUtils.tcpingMultiple(URI.create(host), proxy, TCPING_TIMES))).start()
+            );
         }
 
     }

src/main/java/com/ayakacraft/authlibproxyforserver/utils/NetworkUtils.java

@@ -44,10 +44,10 @@ public static long tcping(URI uri, Proxy proxy) {
 
     public static Pair<Long, Integer> tcpingMultiple(URI uri, Proxy proxy, int times) {
         if (times <= 0) {
-            throw new IllegalArgumentException("Not positive as expected: " + times);
+            throw new IllegalArgumentException("TCPing times not positive as expected: " + times);
         }
         long sum = 0L;
-        int i = 0;
+        int  i   = 0;
         for (int j = 0; j < times; j++) {
             long l = tcping(uri, proxy);
             if (l >= 0) {

versions/1.21.8/gradle.properties

@@ -8,6 +8,6 @@ minecraft_dependency=1.21.8
 # The target mc versions for the mod during mod publishing, separated with \n
 game_versions=1.21.8
 # Dependencies
-# fabric_api_version=0.129.0+1.21.8
+# fabric_api_version=0.130.0+1.21.8
 # Mod Dependency
 # check available versions on maven for the given minecraft version you are using