Fix incorrect init logic in tpsbar

Added config command
Add basement things of config file hot reloading
2024-03-08 22:17:09 +08:00 · 2024-03-03 13:01:24 +00:00 · 2024-03-03 12:13:18 +00:00 · 2024-03-03 11:52:27 +00:00 · 2024-03-03 11:52:17 +00:00 · 2024-03-03 13:54:25 +08:00
19 changed files with 229 additions and 49 deletions
--- a/.github/workflows/build_1_20_4.yml
+++ b/.github/workflows/build_1_20_4.yml
@@ -49,7 +49,7 @@ jobs:
        export GITHUB_USERNAME=LuminolCI
        echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
        export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-        ./gradlew publish
+        ./gradlew :luminol-api:publish
    - name: Rename jar file
      run: mv build/libs/Luminol-paperclip-1.20.4-R0.1-SNAPSHOT-reobf.jar build/libs/luminol-1.20.4-paperclip.jar
    - name: Release Artifacts
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ For maven
 ## Contact
 > If you are interested in this project or have any issue, feel free to ask us.

-QQ Group: `368632360` | QQ Channel: [Click To Join](https://pd.qq.com/s/eq9krf9j)
+QQ Group: `368632360` | QQ Channel: [Click To Join](https://pd.qq.com/s/eq9krf9j) | Telegram: [Click To Join](https://t.me/LuminolMC)

 ## Notice
 **This project is not related to Leaves.Do not report any bugs about protocol support to leaves because the protocol supports are already refactored.**
--- a/README_CN.md
+++ b/README_CN.md
@@ -50,7 +50,7 @@ dependencies {
 ## 联系方式
 > 如果您对这个项目感兴趣或有任何问题，请随时向我们提问。

-QQ群：`368632360` | QQ频道：[点击加入](https://pd.qq.com/s/eq9krf9j)
+QQ群：`368632360` | QQ频道：[点击加入](https://pd.qq.com/s/eq9krf9j) | Telegram:[点击加入](https://t.me/LuminolMC)

 ## 关于 Issue
 当您遇到任何问题时，请向我们提问，我们将尽力解决，但请记得清楚地描述您的问题并提供足够的日志等信息。
@@ -70,4 +70,4 @@ QQ群：`368632360` | QQ频道：[点击加入](https://pd.qq.com/s/eq9krf9j)
    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol&type=Date" />
    <img alt="Star历史表" src="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol&type=Date" />
  </picture>
-</a>
+</a>
--- a/T.txt
+++ b/T.txt
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -98,3 +98,34 @@ paperweight {
        }
    }
 }
+
+allprojects {
+    publishing {
+        repositories {
+            maven {
+                name = "githubPackage"
+                url = uri("https://maven.pkg.github.com/LuminolMC/Luminol")
+
+                credentials.username = System.getenv("GITHUB_USERNAME")
+                credentials.password = System.getenv("GITHUB_TOKEN")
+            }
+
+            publications {
+                register<MavenPublication>("gpr") {
+                    from(components["java"])
+                }
+            }
+        }
+    }
+ }
+
+publishing {
+    if (project.hasProperty("publishDevBundle")) {
+        publications.create<MavenPublication>("devBundle") {
+            artifact(tasks.generateDevelopmentBundle) {
+                artifactId = "dev-bundle"
+            }
+        }
+    }
+}
+
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = me.earthme.luminol
 version = 1.20.4-R0.1-SNAPSHOT

-foliaCommit = e22501a8e39b8f234bfbedbe0560b6f8f425a818
+foliaCommit = e97b1eee63b802568447d344bac5a66bf90c6c71

 org.gradle.caching = true
 org.gradle.parallel = true
--- a/patches/api/0001-Threaded-region-start-tick-and-finished-tick-event.patch
+++ b/patches/api/0001-Threaded-region-start-tick-and-finished-tick-event.patch
--- a/patches/server/0001-Fix-build.patch
+++ b/patches/server/0001-Fix-build.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix build


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 959e62d800de05b2dd77a252f442c3daf8438490..b9c5ef4d15aa97a380419912e3ee09d094ae752e 100644
+index 08d434023226af0d2c469055a3b2188fe8a4ed38..48e9f6ff317bfc7077563e9c651d2a90da6bb37a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
@@ -17,7 +17,7 @@ index 959e62d800de05b2dd77a252f442c3daf8438490..b9c5ef4d15aa97a380419912e3ee09d0
     implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
         exclude("io.papermc.paper", "paper-api")
     }
-@@ -73,7 +73,7 @@ tasks.jar {
+@@ -74,7 +74,7 @@ tasks.jar {
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
             "Implementation-Title" to "CraftBukkit",
--- a/patches/server/0002-Rebrand-to-Luminol.patch
+++ b/patches/server/0002-Rebrand-to-Luminol.patch
@@ -51,10 +51,10 @@ index e2f704c115fd6e00960bb56bb0779f1100c89c17..72b9343979de5aa8bb399cbe7cb8a795
 
         return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b73699a08a368e6305759438c00066b0d5e7b39a..22aff010859dded150b6e3dd0644fe3c38dbaea9 100644
+index 3ec07e77748ee9bb21f9d09230f935bca2217e4d..94ac1715a3c8f8d84911d758dd26a45394f87872 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1954,7 +1954,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1953,7 +1953,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     @DontObfuscate
     public String getServerModName() {
--- a/patches/server/0003-Empty-config-file-base.patch
+++ b/patches/server/0003-Empty-config-file-base.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Empty config file base


 diff --git a/build.gradle.kts b/build.gradle.kts
-index b9c5ef4d15aa97a380419912e3ee09d094ae752e..e837f1f9b444318cbee8719b9dd0eb669478742e 100644
+index 48e9f6ff317bfc7077563e9c651d2a90da6bb37a..d4baa7a193eba22be23921029ca4808a73de063d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
@@ -16,6 +16,82 @@ index b9c5ef4d15aa97a380419912e3ee09d094ae752e..e837f1f9b444318cbee8719b9dd0eb66
     // Paper start
     implementation("org.jline:jline-terminal-jansi:3.21.0")
     implementation("net.minecrell:terminalconsoleappender:1.3.0")
+diff --git a/src/main/java/me/earthme/luminol/commands/LuminolConfigCommand.java b/src/main/java/me/earthme/luminol/commands/LuminolConfigCommand.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..5c8745dffa80cf47e856d04d283937bda86881f8
+--- /dev/null
+++ b/src/main/java/me/earthme/luminol/commands/LuminolConfigCommand.java
+@@ -0,0 +1,70 @@
+package me.earthme.luminol.commands;
+
+import me.earthme.luminol.config.LuminolConfig;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.TextColor;
+import org.bukkit.Location;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LuminolConfigCommand extends Command {
+    public LuminolConfigCommand(){
+        super("luminolconfig");
+        this.setPermission("luminol.commands.luminolconfig");
+        this.setDescription("Manage config file");
+        this.setUsage("/luminolconfig");
+    }
+
+    @Override
+    public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args, @Nullable Location location) throws IllegalArgumentException {
+        final List<String> result = new ArrayList<>();
+
+        if (args.length == 1){
+            result.add("reload");
+        }
+
+        return result;
+    }
+
+    @Override
+    public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
+        if (!this.testPermission(sender)){
+            sender.sendMessage(Component
+                    .text("No permission to execute this command!")
+                    .color(TextColor.color(255,0,0))
+            );
+        }
+
+        if (args.length < 1){
+            sender.sendMessage(
+                    Component
+                            .text("Wrong use!\n")
+                            .color(TextColor.color(255,0,0))
+            );
+            return true;
+        }
+
+        switch (args[0]){
+            case "reload" -> {
+                LuminolConfig.reloadAsync().thenAccept(nullValue -> sender.sendMessage(
+                        Component
+                                .text("Reloaded config file!")
+                                .color(TextColor.color(0,255,0))
+                ));
+            }
+
+            default -> sender.sendMessage(
+                    Component
+                            .text("Unknown action!\n")
+                            .color(TextColor.color(255,0,0))
+            );
+        }
+
+        return true;
+    }
+}
 diff --git a/src/main/java/me/earthme/luminol/config/ConfigInfo.java b/src/main/java/me/earthme/luminol/config/ConfigInfo.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..01b64c2cf6b437114337626c242e1da3fbdb8ead
@@ -71,6 +147,20 @@ index 0000000000000000000000000000000000000000..ac2a92fe0ddbebb71ea4dd8c96f461d0
 +        return this.baseKeyName;
 +    }
 +}
+diff --git a/src/main/java/me/earthme/luminol/config/HotReloadUnsupported.java b/src/main/java/me/earthme/luminol/config/HotReloadUnsupported.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..559c11cb523c7cade34a0abfad15c988f5ad87fe
+--- /dev/null
+++ b/src/main/java/me/earthme/luminol/config/HotReloadUnsupported.java
+@@ -0,0 +1,8 @@
+package me.earthme.luminol.config;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HotReloadUnsupported {
+}
 diff --git a/src/main/java/me/earthme/luminol/config/IConfigModule.java b/src/main/java/me/earthme/luminol/config/IConfigModule.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..9f6896711907ac30fe0c00130207b970007e4bb4
@@ -101,13 +191,18 @@ index 0000000000000000000000000000000000000000..9f6896711907ac30fe0c00130207b970
 +}
 diff --git a/src/main/java/me/earthme/luminol/config/LuminolConfig.java b/src/main/java/me/earthme/luminol/config/LuminolConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..63d1de1cebe2700010191560ea8b80dfdac2f9bc
+index 0000000000000000000000000000000000000000..2b4e64796bf01b0a5fcb306850cd60837ed4d36b
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/LuminolConfig.java
-@@ -0,0 +1,185 @@
+@@ -0,0 +1,218 @@
 +package me.earthme.luminol.config;
 +
 +import com.electronwill.nightconfig.core.file.CommentedFileConfig;
+import io.papermc.paper.threadedregions.RegionizedServer;
+import me.earthme.luminol.commands.LuminolConfigCommand;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.scheduler.MinecraftInternalPlugin;
+import org.jetbrains.annotations.Contract;
 +import org.jetbrains.annotations.NotNull;
 +
 +import java.io.File;
@@ -120,6 +215,7 @@ index 0000000000000000000000000000000000000000..63d1de1cebe2700010191560ea8b80df
 +import java.net.URLDecoder;
 +import java.nio.charset.StandardCharsets;
 +import java.util.*;
+import java.util.concurrent.CompletableFuture;
 +import java.util.jar.JarEntry;
 +import java.util.jar.JarFile;
 +
@@ -132,7 +228,34 @@ index 0000000000000000000000000000000000000000..63d1de1cebe2700010191560ea8b80df
 +    private static final File baseConfigFile = new File(baseConfigFolder,"luminol_global_config.toml");
 +    private static final Set<IConfigModule> allInstanced = new HashSet<>();
 +    private static CommentedFileConfig configFileInstance;
-+    
+    public static boolean alreadyInited = false;
+    private static MinecraftInternalPlugin NULL_PLUGIN = new MinecraftInternalPlugin();
+
+    public static void setupLatch(){
+        Bukkit.getCommandMap().register("luminolconfig","luminol",new LuminolConfigCommand());
+        alreadyInited = true;
+    }
+
+    public static void reload(){
+        RegionizedServer.ensureGlobalTickThread("Reload luminol config off global region thread!");
+
+        dropAllInstanced();
+        try {
+            loadConfig();
+        }catch (Exception e){
+            logger.error(e);
+        }
+    }
+
+    @Contract(" -> new")
+    public static @NotNull CompletableFuture<Void> reloadAsync(){
+        return CompletableFuture.runAsync(LuminolConfig::reload,task -> Bukkit.getGlobalRegionScheduler().run(NULL_PLUGIN,scheduled -> task.run()));
+    }
+
+    public static void dropAllInstanced(){
+        allInstanced.clear();
+    }
+
 +    public static void loadConfig() throws IOException {
 +        baseConfigFolder.mkdirs();
 +
@@ -176,7 +299,7 @@ index 0000000000000000000000000000000000000000..63d1de1cebe2700010191560ea8b80df
 +        for (Field field : fields) {
 +            int modifiers = field.getModifiers();
 +            if (Modifier.isStatic(modifiers) && !Modifier.isFinal(modifiers)) {
-+                boolean skipLoad = field.getAnnotation(DoNotLoad.class) != null;
+                boolean skipLoad = field.getAnnotation(DoNotLoad.class) != null || (alreadyInited && field.getAnnotation(HotReloadUnsupported.class) != null);
 +                ConfigInfo configInfo = field.getAnnotation(ConfigInfo.class);
 +
 +                if (skipLoad || configInfo == null){
@@ -291,7 +414,7 @@ index 0000000000000000000000000000000000000000..63d1de1cebe2700010191560ea8b80df
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6b3242117d62175de462d04e4d178b49ae2521e9..d6b480565340f5edbf81d7b57c3199292b020615 100644
+index 6b3242117d62175de462d04e4d178b49ae2521e9..4744ace98d1741db80ac2aea198f332d95c0ba33 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -19,6 +19,8 @@ import java.util.Locale;
@@ -303,11 +426,12 @@ index 6b3242117d62175de462d04e4d178b49ae2521e9..d6b480565340f5edbf81d7b57c319929
 import net.minecraft.DefaultUncaughtExceptionHandler;
 import net.minecraft.DefaultUncaughtExceptionHandlerWithName;
 import net.minecraft.SharedConstants;
-@@ -209,6 +211,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -209,6 +211,8 @@ 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
 +        LuminolConfig.loadConfig(); //Luminol - load config file
+        LuminolConfig.setupLatch(); //Luminol - load config file
         // 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
--- a/patches/server/0004-Add-config-for-server-mod-name.patch
+++ b/patches/server/0004-Add-config-for-server-mod-name.patch
@@ -47,10 +47,10 @@ index 0000000000000000000000000000000000000000..94e7c8910e3623163528a844fd7a08b3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 22aff010859dded150b6e3dd0644fe3c38dbaea9..4468e6fdbbe527111f4410188f2f2df7f592f81e 100644
+index 94ac1715a3c8f8d84911d758dd26a45394f87872..dd4fbe5a51e05560343d2ee919d4bc50963e3d70 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1954,7 +1954,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1953,7 +1953,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     @DontObfuscate
     public String getServerModName() {
--- a/patches/server/0011-Add-a-simple-tpsbar.patch
+++ b/patches/server/0011-Add-a-simple-tpsbar.patch
@@ -52,10 +52,10 @@ index 0000000000000000000000000000000000000000..ac8f0e3bf130ba6dfd7202e2f4803522
 +}
 diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/TpsBarConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/TpsBarConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b370787c3f525b9b978ad14b3e7056d7c92fcae5
+index 0000000000000000000000000000000000000000..0179a5c8006d2dae3c61303f42f59a685efbd2c4
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/TpsBarConfig.java
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,44 @@
 +package me.earthme.luminol.config.modules.misc;
 +
 +import com.electronwill.nightconfig.core.file.CommentedFileConfig;
@@ -63,6 +63,7 @@ index 0000000000000000000000000000000000000000..b370787c3f525b9b978ad14b3e7056d7
 +import me.earthme.luminol.config.ConfigInfo;
 +import me.earthme.luminol.config.EnumConfigCategory;
 +import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.LuminolConfig;
 +import me.earthme.luminol.functions.GlobalServerTpsBar;
 +import org.bukkit.Bukkit;
 +
@@ -92,16 +93,19 @@ index 0000000000000000000000000000000000000000..b370787c3f525b9b978ad14b3e7056d7
 +    public void onLoaded(CommentedFileConfig configInstance){
 +        if (tpsbarEnabled){
 +            GlobalServerTpsBar.init();
-+            Bukkit.getCommandMap().register("tpsbar","luminol",new TpsBarCommand("tpsbar"));
+
+            if (!LuminolConfig.alreadyInited){
+                Bukkit.getCommandMap().register("tpsbar","luminol",new TpsBarCommand("tpsbar"));
+            }
 +        }
 +    }
 +}
 diff --git a/src/main/java/me/earthme/luminol/functions/GlobalServerTpsBar.java b/src/main/java/me/earthme/luminol/functions/GlobalServerTpsBar.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7511bc3f6828ab712f644cf4292a5f831e8c8653
+index 0000000000000000000000000000000000000000..a346af48f5b57ecac2484e799c8bbe525a9c0c05
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/functions/GlobalServerTpsBar.java
-@@ -0,0 +1,206 @@
+@@ -0,0 +1,210 @@
 +package me.earthme.luminol.functions;
 +
 +import io.papermc.paper.threadedregions.ThreadedRegionizer;
@@ -133,6 +137,10 @@ index 0000000000000000000000000000000000000000..7511bc3f6828ab712f644cf4292a5f83
 +    private static final Logger logger = LogManager.getLogger();
 +
 +    public static void init(){
+        if (tpsbarTask != null && !tpsbarTask.isCancelled()){
+            tpsbarTask.cancel();
+        }
+
 +        Bukkit.getAsyncScheduler().runAtFixedRate(NULL_PLUGIN,c -> {
 +            tpsbarTask = c;
 +            try {
@@ -144,7 +152,7 @@ index 0000000000000000000000000000000000000000..7511bc3f6828ab712f644cf4292a5f83
 +    }
 +
 +    public static void cancelBarUpdateTask(){
-+        if (tpsbarTask == null){
+        if (tpsbarTask == null || tpsbarTask.isCancelled()){
 +            return;
 +        }
 +
@@ -309,10 +317,10 @@ index 0000000000000000000000000000000000000000..7511bc3f6828ab712f644cf4292a5f83
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index d6b480565340f5edbf81d7b57c3199292b020615..ea3b3f8b2318b8a1e8975e89c90cab05c6ab2835 100644
+index 4744ace98d1741db80ac2aea198f332d95c0ba33..550fb11c64e3adb35bb7f78c53f0b5ae5ce9ff58 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -831,6 +831,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -832,6 +832,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
 
     @Override
     public void stopServer() {
--- a/patches/server/0013-Add-config-for-offline-mode-warning.patch
+++ b/patches/server/0013-Add-config-for-offline-mode-warning.patch
@@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..502b93c7bda9e8577a1901a8777b7cf9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index ea3b3f8b2318b8a1e8975e89c90cab05c6ab2835..dd0d8ba5087532770358416be72bb0215b265180 100644
+index 550fb11c64e3adb35bb7f78c53f0b5ae5ce9ff58..71151811c36c75ace1e41837123b320ae48a4b53 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -283,7 +283,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -284,7 +284,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
         String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
         // Paper end - Add Velocity IP Forwarding Support
--- a/patches/server/0015-Io_uring-channel-type-support.patch
+++ b/patches/server/0015-Io_uring-channel-type-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Io_uring channel type support


 diff --git a/build.gradle.kts b/build.gradle.kts
-index e837f1f9b444318cbee8719b9dd0eb669478742e..3a787b0afa3a34f23f1c18fb5250a5ff4bcd2f96 100644
+index d4baa7a193eba22be23921029ca4808a73de063d..32c93c1349b8dbf6017f4e926e697c1c40627d36 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -35,6 +35,7 @@ dependencies {
@@ -18,17 +18,19 @@ index e837f1f9b444318cbee8719b9dd0eb669478742e..3a787b0afa3a34f23f1c18fb5250a5ff
     implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
 diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/IOUringSupportConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/IOUringSupportConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..313c3908ea406119da4f49db2e4fac6572727c80
+index 0000000000000000000000000000000000000000..f3090b6e11d82d02528c7afd358ef4db61707092
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/IOUringSupportConfig.java
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,22 @@
 +package me.earthme.luminol.config.modules.misc;
 +
 +import me.earthme.luminol.config.ConfigInfo;
 +import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.HotReloadUnsupported;
 +import me.earthme.luminol.config.IConfigModule;
 +
 +public class IOUringSupportConfig implements IConfigModule {
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "enabled")
 +    public static boolean enabled = false;
 +
--- a/patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch
+++ b/patches/server/0018-Prevent-teleportAsync-calling-during-moving-event-be.patch
@@ -48,7 +48,7 @@ index 9cbf17436b4cf52aae374767aafe79ea4f60c3ce..f2068e7608ed765e35759eb981db6c95
         super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
         this.chatVisibility = ChatVisiblity.FULL;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bcd5d0a274960ccd02a18f754c7ccfdaea698ecc..3ab8e0b0744eaa94cab1f81bc561e420cb151adf 100644
+index 9555ae82d68cf217bc17e3bd9af2462702a2506b..51053d90f1bbad0b6453c13e06010cd7193ae7b7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -675,7 +675,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -61,7 +61,7 @@ index bcd5d0a274960ccd02a18f754c7ccfdaea698ecc..3ab8e0b0744eaa94cab1f81bc561e420
 
                     // If the event is cancelled we move the player back to their old location.
                     if (event.isCancelled()) {
-@@ -1625,7 +1627,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1621,7 +1623,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
                                     Location oldTo = to.clone();
                                     PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
--- a/patches/server/0020-Kaiiju-linear-region-format-and-settings.patch
+++ b/patches/server/0020-Kaiiju-linear-region-format-and-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Kaiiju linear region format and settings


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3a787b0afa3a34f23f1c18fb5250a5ff4bcd2f96..18326989bfccea2c6d292b0020aab711438031c8 100644
+index 32c93c1349b8dbf6017f4e926e697c1c40627d36..d104fb1b29bc103736fcd19a8f12ca095b6b4960 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -20,6 +20,10 @@ dependencies {
@@ -573,10 +573,10 @@ index 9017907c0ec67a37a506f09b7e4499cef7885279..8b9ffcaab5d71660291d1c0454d2abd9
 
 diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/RegionFormatConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/RegionFormatConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..5219ef799585db502a19e79145b971365a736277
+index 0000000000000000000000000000000000000000..7c034f65bac5aab4c46a8506efa5befe7891bc99
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/RegionFormatConfig.java
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,58 @@
 +package me.earthme.luminol.config.modules.misc;
 +
 +import com.electronwill.nightconfig.core.file.CommentedFileConfig;
@@ -587,12 +587,16 @@ index 0000000000000000000000000000000000000000..5219ef799585db502a19e79145b97136
 +    @DoNotLoad
 +    public static RegionFileFormat regionFormatName = RegionFileFormat.ANVIL;
 +
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "formatName")
 +    private static String formatName = "ANVIL";
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "linear_compression_level")
 +    public static int regionFormatLinearCompressionLevel = 1;
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "linear_flusher_thread_count")
 +    public static int linearFlushThreads = 1;
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "linear_flush_frequency")
 +    public static int linearFlushFrequency = 10;
 +
@@ -608,6 +612,10 @@ index 0000000000000000000000000000000000000000..5219ef799585db502a19e79145b97136
 +
 +    @Override
 +    public void onLoaded(CommentedFileConfig configInstance){
+        if (LuminolConfig.alreadyInited){
+            return;
+        }
+
 +        regionFormatName = RegionFileFormat.fromString(formatName);
 +        if (regionFormatName.equals(RegionFileFormat.INVALID)) {
 +            LuminolConfig.logger.error("Unknown region format in luminol global config: {}", formatName);
@@ -628,7 +636,7 @@ index 0000000000000000000000000000000000000000..5219ef799585db502a19e79145b97136
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4468e6fdbbe527111f4410188f2f2df7f592f81e..13ad20b3d43cc22ad1046220b24272dd274de997 100644
+index dd4fbe5a51e05560343d2ee919d4bc50963e3d70..df7e9b02c24053b02ef05b38474ec1862ddff30c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -923,7 +923,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -650,7 +658,7 @@ index 4468e6fdbbe527111f4410188f2f2df7f592f81e..13ad20b3d43cc22ad1046220b24272dd
 
         return flag3;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 21ec49acb3c1241d9286959c42a7f8363f637e4f..c212030a24174115a975604b91d03cf8ad4043de 100644
+index 79e507c1463dbb9039b1fed8bdf41c0ee5f4fec3..8f642259ab8aa94eb5739ecbe72211c248c1114d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -211,7 +211,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
--- a/patches/server/0054-Leaves-Bladeren-Protocol.patch
+++ b/patches/server/0054-Leaves-Bladeren-Protocol.patch
@@ -6,21 +6,25 @@ Subject: [PATCH] Leaves Bladeren Protocol

 diff --git a/src/main/java/me/earthme/luminol/config/modules/gameplay/LeavesBladerenProtocolConfig.java b/src/main/java/me/earthme/luminol/config/modules/gameplay/LeavesBladerenProtocolConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b882549a3c3bc8c192014fd6e1ac7b4f0feddafc
+index 0000000000000000000000000000000000000000..4950d33288d6bc3c4ce90ae12bbf4797e3989500
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/gameplay/LeavesBladerenProtocolConfig.java
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,28 @@
 +package me.earthme.luminol.config.modules.gameplay;
 +
 +import me.earthme.luminol.config.ConfigInfo;
 +import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.HotReloadUnsupported;
 +import me.earthme.luminol.config.IConfigModule;
 +
 +public class LeavesBladerenProtocolConfig implements IConfigModule {
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "enable_base_protocol")
 +    public static boolean enableBaseProtocol = false;
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "enable_mspt_sync_protocol")
 +    public static boolean msptSyncProtocol = false;
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "mspt_sync_interval")
 +    public static int msptSyncTickInterval = 20;
 +
--- a/patches/server/0056-Leaves-carpet-protocol-support.patch
+++ b/patches/server/0056-Leaves-carpet-protocol-support.patch
@@ -4,19 +4,21 @@ Date: Thu, 8 Feb 2024 11:57:18 +0000
 Subject: [PATCH] Leaves carpet protocol support


-diff --git a/src/main/java/me/earthme/luminol/config/modules/gameplay/LeavesProtocolSupportConfig.java b/src/main/java/me/earthme/luminol/config/modules/gameplay/LeavesProtocolSupportConfig.java
+diff --git a/src/main/java/me/earthme/luminol/config/modules/gameplay/LeavesCarpetProtocolSupportConfig.java b/src/main/java/me/earthme/luminol/config/modules/gameplay/LeavesCarpetProtocolSupportConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..80d57d6262510cf7c6446e46cdd16d05461e9484
+index 0000000000000000000000000000000000000000..0ef77515b213b74bdcf7dac70a02bfaa1c8804f5
 --- /dev/null
-+++ b/src/main/java/me/earthme/luminol/config/modules/gameplay/LeavesProtocolSupportConfig.java
-@@ -0,0 +1,20 @@
+++ b/src/main/java/me/earthme/luminol/config/modules/gameplay/LeavesCarpetProtocolSupportConfig.java
+@@ -0,0 +1,22 @@
 +package me.earthme.luminol.config.modules.gameplay;
 +
 +import me.earthme.luminol.config.ConfigInfo;
 +import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.HotReloadUnsupported;
 +import me.earthme.luminol.config.IConfigModule;
 +
-+public class LeavesProtocolSupportConfig implements IConfigModule {
+public class LeavesCarpetProtocolSupportConfig implements IConfigModule {
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "enabled")
 +    public static boolean enabled = false;
 +
@@ -32,12 +34,13 @@ index 0000000000000000000000000000000000000000..80d57d6262510cf7c6446e46cdd16d05
 +}
 diff --git a/src/main/java/top/leavesmc/leaves/protocol/CarpetServerProtocol.java b/src/main/java/top/leavesmc/leaves/protocol/CarpetServerProtocol.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..2af49a86bf2a8bb65073c8ce088e875224916fd8
+index 0000000000000000000000000000000000000000..0542d66a3dfae2aa3ccb6ca3dced6b34024017ad
 --- /dev/null
 +++ b/src/main/java/top/leavesmc/leaves/protocol/CarpetServerProtocol.java
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,113 @@
 +package top.leavesmc.leaves.protocol;
 +
+import me.earthme.luminol.config.modules.gameplay.LeavesCarpetProtocolSupportConfig;
 +import net.minecraft.nbt.CompoundTag;
 +import net.minecraft.network.FriendlyByteBuf;
 +import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -72,7 +75,7 @@ index 0000000000000000000000000000000000000000..2af49a86bf2a8bb65073c8ce088e8752
 +
 +    @ProtocolHandler.PlayerJoin
 +    public static void onPlayerJoin(ServerPlayer player) {
-+        if (me.earthme.luminol.config.modules.gameplay.LeavesProtocolSupportConfig.enabled) {
+        if (LeavesCarpetProtocolSupportConfig.enabled) {
 +            CompoundTag data = new CompoundTag();
 +            data.putString(HI, VERSION);
 +            ProtocolUtils.sendPayloadPacket(player, new CarpetPayload(data));
@@ -81,7 +84,7 @@ index 0000000000000000000000000000000000000000..2af49a86bf2a8bb65073c8ce088e8752
 +
 +    @ProtocolHandler.PayloadReceiver(payload = CarpetPayload.class, payloadId = "hello")
 +    private static void handleHello(@NotNull ServerPlayer player, @NotNull CarpetServerProtocol.CarpetPayload payload) {
-+        if (me.earthme.luminol.config.modules.gameplay.LeavesProtocolSupportConfig.enabled) {
+        if (LeavesCarpetProtocolSupportConfig.enabled) {
 +            if (payload.nbt.contains(HELLO)) {
 +                MinecraftServer.LOGGER.info("Player " + player.getScoreboardName() + " joined with carpet " + payload.nbt.getString(HELLO));
 +                CompoundTag data = new CompoundTag();
--- a/patches/unapplied/0001-Added-maven-publish.patch
+++ b/patches/unapplied/0001-Added-maven-publish.patch
Author	SHA1	Message	Date
M2ke4U	483e958c58	Fix incorrect init logic in tpsbar	2024-03-08 22:17:09 +08:00
MrHua269	01abc6c424	Added config command	2024-03-03 13:01:24 +00:00
MrHua269	6d26556182	Add basement things of config file hot reloading	2024-03-03 12:13:18 +00:00
MrHua269	78e463d201	Merge remote-tracking branch 'origin/ver/1.20.4' into ver/1.20.4	2024-03-03 11:52:27 +00:00
MrHua269	f67b792dd6	Only publish API module	2024-03-03 11:52:17 +00:00
NatJerry	38eb77a049	[ci skip]Update README_CN.md	2024-03-03 13:54:25 +08:00
NatJerry	624825f76b	[ci skip]Update README.md	2024-03-03 13:53:30 +08:00
MrHua269	4dcf8fb6ff	Merge remote-tracking branch 'origin/ver/1.20.4' into ver/1.20.4	2024-03-03 00:55:02 +00:00
MrHua269	a06ae51240	Adjust gradle config in main module and added option for dev bundle publishing	2024-03-03 00:54:21 +00:00
Klop233	3c80338a24	test	2024-03-02 14:37:19 +08:00
MrHua269	59a428e597	Updated Upstream(Folia)	2024-02-22 00:53:47 +00:00
MrHua269	f65089a3bc	Updated Upstream(Folia)	2024-02-21 07:22:46 +00:00