Continue to split components

patches/server/0009-Remove-Timings.patch → patches/server/0003-Remove-Timings.patch

@@ -905,7 +905,7 @@ index f5154194df9e44f8bcf431029f4bbed68db49658..8f14ed215ff2eb1e6a1d5c117425c897
                          packet.handle(listener);
                      } catch (Exception exception) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 56a2cee4faca2f0ba33ebe0b57b8b206ccd370a2..ff13358678c420c5bc1504deb5b83384bf449794 100644
+index ccd25a26cfd3b4075279bb89657563fb7f2fbd21..88aa9cda084f2b68629ffd00532eb849a595763a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -189,7 +189,7 @@ import org.bukkit.craftbukkit.CraftRegistry;
@@ -927,10 +927,19 @@ index 56a2cee4faca2f0ba33ebe0b57b8b206ccd370a2..ff13358678c420c5bc1504deb5b83384
          // Purpur start
          if (upnp) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9863790cfea027a775fae3c26b0f4515216dc22b..7105802aee38f8f0b896e97e59c566dbee8964d2 100644
+index d281fe5f75f6f99f869fa3cc8da4f1ff9f96a7bf..f171106aadf061b7a420ceb4a79b6f9b285a29a0 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -832,7 +832,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -63,7 +63,7 @@ import org.apache.logging.log4j.Level;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.io.IoBuilder;
+ import org.bukkit.command.CommandSender;
+-import co.aikar.timings.MinecraftTimings; // Paper
++// import co.aikar.timings.MinecraftTimings; // Paper // Vine - Remove Timings
+ import org.bukkit.craftbukkit.util.TerminalCompletionHandler;
+ import org.bukkit.craftbukkit.util.TerminalConsoleWriterThread;
+ import org.bukkit.event.server.ServerCommandEvent;
+@@ -838,7 +838,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              }
              // Paper start
              command.set(event.getCommand());
@@ -940,7 +949,7 @@ index 9863790cfea027a775fae3c26b0f4515216dc22b..7105802aee38f8f0b896e97e59c566db
                  org.bukkit.command.BufferedCommandSender sender = new org.bukkit.command.BufferedCommandSender();
                  Waitable<String> waitable = new Waitable<>() {
                      @Override
-@@ -842,11 +843,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -848,11 +849,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  };
                  waitableArray[0] = waitable;
                  co.aikar.timings.Timings.generateReport(new co.aikar.timings.TimingsReportListener(sender, waitable));

patches/server/0003-Reflect-utils.patch → patches/server/0004-Reflect-utils.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Reflect utils
 
 diff --git a/src/main/kotlin/one/tranic/vine/util/Reflect.kt b/src/main/kotlin/one/tranic/vine/util/Reflect.kt
 new file mode 100644
-index 0000000000000000000000000000000000000000..c2a6add7b813e27b4f1ac00945ef8e5969a5ce15
+index 0000000000000000000000000000000000000000..1d727c617cadd3e06f4bd74df3a7ffa08c68bafe
 --- /dev/null
 +++ b/src/main/kotlin/one/tranic/vine/util/Reflect.kt
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,43 @@
 +package one.tranic.vine.util
 +
 +import com.google.common.reflect.ClassPath
@@ -40,17 +40,15 @@ index 0000000000000000000000000000000000000000..c2a6add7b813e27b4f1ac00945ef8e59
 +                if (!clazz.isSubclassOf(T::class)) return@runCatching
 +                val objInstance: T? = if (isObject && clazz.objectInstance != null) {
 +                    clazz.objectInstance as T
-+                } else if (!isObject && clazz.isAbstract) {
++                } else if (!clazz.isData && !clazz.isFun && !clazz.isValue) {
 +                    clazz.createInstance() as T
 +                } else {
 +                    null
 +                }
 +                if (objInstance != null) {
 +                    implSet.add(objInstance)
 +                }
-+            }.getOrElse {
-+                it.printStackTrace()
-+            }
++            }.getOrElse {}
 +        }
 +        return implSet
 +    }

patches/server/0005-Command-Utils.patch

@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: 404Setup <153366651+404Setup@users.noreply.github.com>
+Date: Tue, 3 Sep 2024 22:59:12 +0800
+Subject: [PATCH] Command Utils
+
+
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+index f171106aadf061b7a420ceb4a79b6f9b285a29a0..90728949052211a33e979fc7839f17f03bc0c523 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -224,6 +224,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
+         this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
+         // Paper end - initialize global and world-defaults configuration
++        one.tranic.vine.commands.Command.INSTANCE.register(); // Vine - register commands
+         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
+         if (this.convertOldUsers()) {
+             this.getProfileCache().save(false); // Paper
+diff --git a/src/main/kotlin/one/tranic/vine/commands/Command.kt b/src/main/kotlin/one/tranic/vine/commands/Command.kt
+new file mode 100644
+index 0000000000000000000000000000000000000000..f268cd373e670493b6b85a7d6fd31d4e3120b494
+--- /dev/null
++++ b/src/main/kotlin/one/tranic/vine/commands/Command.kt
+@@ -0,0 +1,10 @@
++package one.tranic.vine.commands
++
++import one.tranic.vine.util.Reflect
++import org.bukkit.Bukkit
++
++object Command {
++    fun register() {
++        Reflect.findClass<org.bukkit.command.Command>("one.tranic.vine.commands.module").forEach { Bukkit.getCommandMap().register(it.name, "vine", it) }
++    }
++}
+\ No newline at end of file

patches/server/0005-Vine-Config.patch → patches/server/0006-Vine-Config.patch

@@ -17,51 +17,6 @@ index a7ffbbfd2a9fdeae0953ec8753ce48e93ccce086..9e58bce64d46a1ac12bcc067a0788306
              ShreddedPaperConfigurationLoader.init((File) optionset.valueOf("shreddedpaper-settings")); // ShreddedPaper
 
              // Purpur start - load config files early
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index d281fe5f75f6f99f869fa3cc8da4f1ff9f96a7bf..9863790cfea027a775fae3c26b0f4515216dc22b 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -1,20 +1,14 @@
- package net.minecraft.server.dedicated;
-
--import com.google.common.collect.Lists;
- import com.mojang.authlib.GameProfile;
- import com.mojang.datafixers.DataFixer;
- import com.mojang.logging.LogUtils;
--import java.io.BufferedReader;
- import java.io.BufferedWriter;
- import java.io.IOException;
--import java.io.InputStreamReader;
- import java.net.InetAddress;
- import java.net.Proxy;
--import java.nio.charset.StandardCharsets;
- import java.nio.file.Files;
- import java.nio.file.Path;
--import java.util.Collections;
--import java.util.List;
- import java.util.Locale;
- import java.util.Optional;
- import java.util.function.BooleanSupplier;
-@@ -63,9 +57,6 @@ import org.apache.logging.log4j.Level;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.io.IoBuilder;
- import org.bukkit.command.CommandSender;
--import co.aikar.timings.MinecraftTimings; // Paper
--import org.bukkit.craftbukkit.util.TerminalCompletionHandler;
--import org.bukkit.craftbukkit.util.TerminalConsoleWriterThread;
- import org.bukkit.event.server.ServerCommandEvent;
- import org.bukkit.craftbukkit.util.Waitable; // Paper
- import org.bukkit.event.server.RemoteServerCommandEvent;
-@@ -224,6 +215,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
-         this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
-         // Paper end - initialize global and world-defaults configuration
-+
-+        one.tranic.vine.config.ConfigUtil.setCommand();
-+
-         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
-         if (this.convertOldUsers()) {
-             this.getProfileCache().save(false); // Paper
 diff --git a/src/main/java/one/tranic/vine/config/package-info.java b/src/main/java/one/tranic/vine/config/package-info.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..45f4c24cc689252513752e7b1cfa6736aa465f6b
@@ -79,58 +34,12 @@ index 0000000000000000000000000000000000000000..45f4c24cc689252513752e7b1cfa6736
 + * */
 +package one.tranic.vine.config;
 \ No newline at end of file
-diff --git a/src/main/kotlin/one/tranic/vine/commands/VineCfgCommand.kt b/src/main/kotlin/one/tranic/vine/commands/VineCfgCommand.kt
-new file mode 100644
-index 0000000000000000000000000000000000000000..819da2962087ce70c6b9b4ec758937ef1b27e34d
---- /dev/null
-+++ b/src/main/kotlin/one/tranic/vine/commands/VineCfgCommand.kt
-@@ -0,0 +1,39 @@
-+package one.tranic.vine.commands
-+
-+import org.bukkit.command.Command
-+import org.bukkit.command.CommandSender
-+import net.kyori.adventure.text.Component
-+import net.kyori.adventure.text.format.TextColor
-+import one.tranic.vine.config.ConfigUtil
-+
-+class VineCfgCommand : Command("vinecfg") {
-+    init {
-+        this.permission = "vine.commands.cfg"
-+        this.description = "Manage config file"
-+        this.usage = "/vinecfg"
-+    }
-+
-+    override fun execute(sender: CommandSender, commandLabel: String, args: Array<String>): Boolean {
-+        if (!this.testPermission(sender)) {
-+            sender.sendMessage(
-+                Component
-+                    .text("No permission to execute this command!")
-+                    .color(TextColor.color(255, 0, 0))
-+            )
-+            return true
-+        }
-+
-+        ConfigUtil.reload()
-+
-+        sender.sendMessage(
-+            Component
-+                .text("Reloaded Vine config file!")
-+                .color(TextColor.color(0, 255, 0))
-+        )
-+        return true
-+    }
-+
-+    override fun tabComplete(sender: CommandSender, alias: String, args: Array<String>): List<String> {
-+        return emptyList()
-+    }
-+}
-\ No newline at end of file
 diff --git a/src/main/kotlin/one/tranic/vine/config/ConfigUtil.kt b/src/main/kotlin/one/tranic/vine/config/ConfigUtil.kt
 new file mode 100644
-index 0000000000000000000000000000000000000000..655dcd125a58aec84ee93a90cf087b0b10052830
+index 0000000000000000000000000000000000000000..af2593d911938de5b5127b3e4e76f7ad1d4f5c70
 --- /dev/null
 +++ b/src/main/kotlin/one/tranic/vine/config/ConfigUtil.kt
-@@ -0,0 +1,148 @@
+@@ -0,0 +1,143 @@
 +package one.tranic.vine.config
 +
 +import com.aayushatharva.brotli4j.Brotli4jLoader
@@ -145,11 +54,6 @@ index 0000000000000000000000000000000000000000..655dcd125a58aec84ee93a90cf087b0b
 +object ConfigUtil {
 +    private lateinit var configuration: YamlConfiguration
 +
-+    @JvmStatic
-+    fun setCommand() {
-+        Bukkit.getCommandMap().register("vinecfg", "vine", VineCfgCommand())
-+    }
-+
 +    /**
 +     * Load the configuration file.
 +     *

patches/server/0007-Config-command.patch

@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: 404Setup <153366651+404Setup@users.noreply.github.com>
+Date: Wed, 4 Sep 2024 08:30:54 +0800
+Subject: [PATCH] Config command
+
+
+diff --git a/src/main/kotlin/one/tranic/vine/commands/module/ConfigCommand.kt b/src/main/kotlin/one/tranic/vine/commands/module/ConfigCommand.kt
+new file mode 100644
+index 0000000000000000000000000000000000000000..167d67efe14e31e3385339c4cab29ad5c403b17f
+--- /dev/null
++++ b/src/main/kotlin/one/tranic/vine/commands/module/ConfigCommand.kt
+@@ -0,0 +1,36 @@
++package one.tranic.vine.commands.module
++
++import net.kyori.adventure.text.Component
++import net.kyori.adventure.text.format.TextColor
++import one.tranic.vine.config.ConfigUtil
++import org.bukkit.command.Command
++import org.bukkit.command.CommandSender
++
++class ConfigCommand : Command("vinecfg") {
++    init {
++        this.permission = "vine.commands.cfg"
++        this.description = "Manage config file"
++    }
++
++    override fun execute(sender: CommandSender, commandLabel: String, args: Array<String>): Boolean {
++        if (!this.testPermission(sender)) {
++            sender.sendMessage(
++                Component
++                    .text("No permission to execute this command!")
++                    .color(TextColor.color(255, 0, 0))
++            )
++            return true
++        }
++        ConfigUtil.reload()
++        sender.sendMessage(
++            Component
++                .text("Reloaded Vine config file!")
++                .color(TextColor.color(0, 255, 0))
++        )
++        return true
++    }
++
++    override fun tabComplete(sender: CommandSender, alias: String, args: Array<String>): List<String> {
++        return emptyList()
++    }
++}
+\ No newline at end of file

patches/server/0006-Preload-Utils.patch → patches/server/0008-Preload-Utils.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Preload Utils
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ccd25a26cfd3b4075279bb89657563fb7f2fbd21..56a2cee4faca2f0ba33ebe0b57b8b206ccd370a2 100644
+index 88aa9cda084f2b68629ffd00532eb849a595763a..ff13358678c420c5bc1504deb5b83384bf449794 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1175,6 +1175,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0011-ThreadInfoCommand.patch → patches/server/0012-ThreadInfoCommand.patch

@@ -4,13 +4,13 @@ Date: Fri, 16 Aug 2024 21:02:50 +0800
 Subject: [PATCH] ThreadInfoCommand
 
 
-diff --git a/src/main/kotlin/one/tranic/vine/commands/ThreadInfoCommand.kt b/src/main/kotlin/one/tranic/vine/commands/ThreadInfoCommand.kt
+diff --git a/src/main/kotlin/one/tranic/vine/commands/module/ThreadInfoCommand.kt b/src/main/kotlin/one/tranic/vine/commands/module/ThreadInfoCommand.kt
 new file mode 100644
-index 0000000000000000000000000000000000000000..ecc2ed943f88454406bca71780678e41b495b9eb
+index 0000000000000000000000000000000000000000..bd34eba01844dd33f311bec6be57c894c943cf1f
 --- /dev/null
-+++ b/src/main/kotlin/one/tranic/vine/commands/ThreadInfoCommand.kt
-@@ -0,0 +1,67 @@
-+package one.tranic.vine.commands
++++ b/src/main/kotlin/one/tranic/vine/commands/module/ThreadInfoCommand.kt
+@@ -0,0 +1,66 @@
++package one.tranic.vine.commands.module
 +
 +import net.kyori.adventure.text.Component
 +import net.kyori.adventure.text.format.NamedTextColor
@@ -23,8 +23,7 @@ index 0000000000000000000000000000000000000000..ecc2ed943f88454406bca71780678e41
 +class ThreadInfoCommand : Command("threads") {
 +    init {
 +        this.permission = "vine.commands.threads"
-+        this.setDescription("Threads")
-+        this.setUsage("/threads")
++        this.description = "Threads"
 +    }
 +
 +    private val color = TextColor.color(0, 245, 255)
@@ -78,15 +77,3 @@ index 0000000000000000000000000000000000000000..ecc2ed943f88454406bca71780678e41
 +    }
 +}
 \ No newline at end of file
-diff --git a/src/main/kotlin/one/tranic/vine/config/ConfigUtil.kt b/src/main/kotlin/one/tranic/vine/config/ConfigUtil.kt
-index 655dcd125a58aec84ee93a90cf087b0b10052830..f2acb72254cf89ae62e87556430d456349e87310 100644
---- a/src/main/kotlin/one/tranic/vine/config/ConfigUtil.kt
-+++ b/src/main/kotlin/one/tranic/vine/config/ConfigUtil.kt
-@@ -15,6 +15,7 @@ object ConfigUtil {
-     @JvmStatic
-     fun setCommand() {
-         Bukkit.getCommandMap().register("vinecfg", "vine", VineCfgCommand())
-+        Bukkit.getCommandMap().register("threads", "vine", ThreadInfoCommand())
-     }
-
-     /**

patches/server/0013-Try-Virtual-threads.patch → patches/server/0014-Try-Virtual-threads.patch

@@ -172,10 +172,10 @@ index ff13358678c420c5bc1504deb5b83384bf449794..bdd6938b3102e7201cc6700ce1213209
      public final ChatDecorator improvedChatDecorator = new io.papermc.paper.adventure.ImprovedChatDecorator(this); // Paper - adventure
      public ChatDecorator getChatDecorator() {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 7105802aee38f8f0b896e97e59c566dbee8964d2..26450404dc8f1c06a19a925cedb3d53e435917d7 100644
+index 90728949052211a33e979fc7839f17f03bc0c523..54a67ef91a3b26f65173c98e4a02b357e642f9aa 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -95,60 +95,60 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -104,60 +104,60 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
 
      @Override
      public boolean initServer() throws IOException {
@@ -280,7 +280,7 @@ index 7105802aee38f8f0b896e97e59c566dbee8964d2..26450404dc8f1c06a19a925cedb3d53e
          // CraftBukkit start - TODO: handle command-line logging arguments
          java.util.logging.Logger global = java.util.logging.Logger.getLogger("");
          global.setUseParentHandlers(false);
-@@ -372,7 +372,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -379,7 +379,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              }
 
              if (false && this.getMaxTickLength() > 0L) {  // Spigot - disable
@@ -289,7 +289,7 @@ index 7105802aee38f8f0b896e97e59c566dbee8964d2..26450404dc8f1c06a19a925cedb3d53e
 
                  thread1.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandlerWithName(DedicatedServer.LOGGER));
                  thread1.setName("Server Watchdog");
-@@ -530,7 +530,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -537,7 +537,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                      sender.sendMessage(net.kyori.adventure.text.Component.text("Failed to dump chunk information, see console", net.kyori.adventure.text.format.NamedTextColor.RED));
                  }
              };