Clean LuminolConfig

README.md

@@ -1,8 +1,7 @@
 <img src="./public/image/Luminol_5.png" alt="Logo" align="right" width="250">
 
 # Luminol
-
-<h4>Luminol is a folia fork with many useful optimizations, configurable vanilla features, and more API supports, and it was designed for survival and anarchy servers</h4>
+<h4>Luminol is a Folia fork with many useful optimizations, configurable vanilla features, and more API supports, and it was designed for survival and anarchy servers</h4>
 
 [![MIT License](https://img.shields.io/github/license/LuminolMC/Luminol?style=flat-square)](LICENSE)
 [![Issues](https://img.shields.io/github/issues/LuminolMC/Luminol?style=flat-square)](https://github.com/LuminolMC/Luminol/issues)
@@ -13,28 +12,33 @@
 **English** | [中文](./README_CN.md)
 
 ## Features
- - Configurable vanilla features
- - Tpsbar support
- - Linear region file format(from kaiiju)
- - Useful optimizations to improve the performance of single threaded region
- - More API support for plugin development (W.I.P)
+- Configurable vanilla features
+- Tpsbar support
+- Linear region file format(from kaiiju)
+- Useful optimizations to improve the performance of single threaded region
+- More API support for plugin development (W.I.P)
 
 ## Download
 Any versions are available in the [release](https://github.com/LuminolMC/Luminol/releases), also you can build it by yourself through [the following steps](https://github.com/LuminolMC/Luminol#build).
 
 ## Build
 To build a paperclip jar, you need to run the following command. You can find the jar in build/libs(Note: JDK17 is needed)
+
  ```shell
  ./gradlew applyPatches && ./gradlew createReobfPaperclipJar
 ```
+
 ## Using API
 For gradle:
+
 ```kotlin
 dependencies {
     compileOnly("me.earthme.luminol:luminol-api:1.20.4-R0.1-SNAPSHOT")
 }
  ```
+
 For maven
+
 ```xml
 <dependency>
   <groupId>me.earthme.luminol</groupId>
@@ -46,11 +50,10 @@ 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](https://pd.qq.com/s/eq9krf9j)
+QQ Group: `368632360` | QQ Channel: [Click To Join](https://pd.qq.com/s/eq9krf9j)
 
 ## 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**
+**This project is not related to Leaves.Do not report any bugs about protocol support to leaves because the protocol supports are already refactored.**
 
 ## About Issue
 When you meet any problems, just ask us, we will do our best to solve it, but remember to state your problem clear and provide enough logs etc.</br>
@@ -61,9 +64,11 @@ See [Contributing](./docs/CONTRIBUTING.md)
 ## BStats
 ![bStats](https://bstats.org/signatures/server-implementation/Luminol.svg "bStats")
 
-## Please star us
-<picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=LuminolMC/Lumino&type=Date&theme=dark" />
-    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=LuminolMC/Luminol&type=Date" />
-    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=LuminolMC/Luminol&type=Date" />
+## Please ⭐star us!
+<a href="https://star-history.com/#LuminolMC/Luminol&LuminolMC/LightingLuminol&Date">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol&type=Date&theme=dark" />
+    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol&type=Date" />
+    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol&type=Date" />
   </picture>
+</a>

README_CN.md

@@ -1,8 +1,7 @@
 <img src="./public/image/Luminol_5.png" alt="Logo" align="right" width="250">
 
 # Luminol
-
-<h4>Luminol 是一个基于folia的分支，具有许多有用的优化、可配置的原版特性和更多的API支持，它专为生存和无政府服务器设计</h4>
+<h4>Luminol 是一个基于Folia的分支，具有许多有用的优化、可配置的原版特性和更多的API支持，它专为生存和无政府服务器设计</h4>
 
 [![MIT License](https://img.shields.io/github/license/LuminolMC/Luminol?style=flat-square)](LICENSE)
 [![Issues](https://img.shields.io/github/issues/LuminolMC/Luminol?style=flat-square)](https://github.com/LuminolMC/Luminol/issues)
@@ -20,39 +19,55 @@
 - 更多的插件开发API支持（进行中）
 
 ## 下载
-任何版本都可以在 [release](https://github.com/LuminolMC/Luminol/releases), 中找到，您也可以通过[以下步骤](./README_CN.md#构建)自己构建。
+任何版本都可以在 [Release](https://github.com/LuminolMC/Luminol/releases) 中找到，你也可以通过[以下步骤](./README_CN.md#构建)自己构建。
 
 ## 构建
-要构建一个paperclip jar，你需要运行以下命令。你可以在build/libs中找到jar（注意：需要JDK17）
+要构建一个paperclip jar，你需要运行以下命令。你可以在build/libs中找到jar（注意：需要`JDK17`）
+
  ```shell
  ./gradlew applyPatches && ./gradlew createReobfPaperclipJar
 ```
+
 ## 使用API
 使用 Gradle:
+
 ```kotlin
 dependencies {
-    compileOnly("me.earthme.luminol:luminol-api:1.20.2-R0.1-SNAPSHOT")
+    compileOnly("me.earthme.luminol:luminol-api:1.20.4-R0.1-SNAPSHOT")
 }
  ```
+
 使用 Maven
+
 ```xml
 <dependency>
   <groupId>me.earthme.luminol</groupId>
   <artifactId>luminol-api</artifactId>
-  <version>1.20.2-R0.1-SNAPSHOT</version>
+  <version>1.20.4-R0.1-SNAPSHOT</version>
 </dependency>
 ```
 
 ## 联系方式
 > 如果您对这个项目感兴趣或有任何问题，请随时向我们提问。
 
-QQ群：368632360
+QQ群：`368632360` | QQ频道：[点击加入](https://pd.qq.com/s/eq9krf9j)
 
 ## 关于 Issue
 当您遇到任何问题时，请向我们提问，我们将尽力解决，但请记得清楚地描述您的问题并提供足够的日志等信息。
 
 ## 贡献代码
-可查看 [Contributing](./docs/CONTRIBUTING_cn.md)
+可[查看 Contributing](./docs/CONTRIBUTING_cn.md)
 
 ## BStats
-![bStats](https://bstats.org/signatures/server-implementation/Luminol.svg "bStats")
+![bStats](https://bstats.org/signatures/server-implementation/Luminol.svg "bStats")
+
+## 请给我们一个 ⭐Star！
+> 你的每一个免费的 ⭐Star 就是我们每一个前进的动力。
+
+<a href="https://star-history.com/#LuminolMC/Luminol&LuminolMC/LightingLuminol&Date">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=LuminolMC/Luminol%2CLuminolMC/LightingLuminol&type=Date&theme=dark" />
+    <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>

patches/server/0003-Empty-config-file-base.patch

@@ -101,10 +101,10 @@ 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..7dc4b97c396aab1128ad4761b3f3ac6ee9d07205
+index 0000000000000000000000000000000000000000..63d1de1cebe2700010191560ea8b80dfdac2f9bc
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/LuminolConfig.java
-@@ -0,0 +1,183 @@
+@@ -0,0 +1,185 @@
 +package me.earthme.luminol.config;
 +
 +import com.electronwill.nightconfig.core.file.CommentedFileConfig;
@@ -148,7 +148,7 @@ index 0000000000000000000000000000000000000000..7dc4b97c396aab1128ad4761b3f3ac6e
 +            instanceAllModule();
 +            loadAllModules();
 +        }catch (Exception e){
-+            e.printStackTrace();
++            logger.error("Failed to load config modules!",e);
 +        }
 +
 +        configFileInstance.save();
@@ -205,18 +205,17 @@ index 0000000000000000000000000000000000000000..7dc4b97c396aab1128ad4761b3f3ac6e
 +
 +                final Object actuallyValue = configFileInstance.get(fullConfigKeyName);
 +                field.set(null,actuallyValue);
-+
-+
 +            }
 +        }
 +
 +        singleConfigModule.onLoaded(configFileInstance);
 +    }
 +
-+    public static Set<Class<?>> getClasses(String pack) {
-+        Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
++    public static @NotNull Set<Class<?>> getClasses(String pack) {
++        Set<Class<?>> classes = new LinkedHashSet<>();
 +        String packageDirName = pack.replace('.', '/');
 +        Enumeration<URL> dirs;
++
 +        try {
 +            dirs = Thread.currentThread().getContextClassLoader().getResources(packageDirName);
 +            while (dirs.hasMoreElements()) {
@@ -232,21 +231,24 @@ index 0000000000000000000000000000000000000000..7dc4b97c396aab1128ad4761b3f3ac6e
 +                        Enumeration<JarEntry> entries = jar.entries();
 +                        findClassesInPackageByJar(pack, entries, packageDirName, classes);
 +                    } catch (IOException e) {
-+                        e.printStackTrace();
++                        throw new RuntimeException(e);
 +                    }
 +                }
 +            }
 +        } catch (IOException e) {
-+            e.printStackTrace();
++            throw new RuntimeException(e);
 +        }
++
 +        return classes;
 +    }
 +
 +    private static void findClassesInPackageByFile(String packageName, String packagePath, Set<Class<?>> classes) {
 +        File dir = new File(packagePath);
++
 +        if (!dir.exists() || !dir.isDirectory()) {
 +            return;
 +        }
++
 +        File[] dirfiles = dir.listFiles((file) -> file.isDirectory() || file.getName().endsWith(".class"));
 +        if (dirfiles != null) {
 +            for (File file : dirfiles) {
@@ -257,7 +259,7 @@ index 0000000000000000000000000000000000000000..7dc4b97c396aab1128ad4761b3f3ac6e
 +                    try {
 +                        classes.add(Class.forName(packageName + '.' + className));
 +                    } catch (ClassNotFoundException e) {
-+                        e.printStackTrace();
++                        throw new RuntimeException(e);
 +                    }
 +                }
 +            }
@@ -281,7 +283,7 @@ index 0000000000000000000000000000000000000000..7dc4b97c396aab1128ad4761b3f3ac6e
 +                    try {
 +                        classes.add(Class.forName(packageName + '.' + className));
 +                    } catch (ClassNotFoundException e) {
-+                        e.printStackTrace();
++                        throw new RuntimeException(e);
 +                    }
 +                }
 +            }
@@ -289,7 +291,7 @@ index 0000000000000000000000000000000000000000..7dc4b97c396aab1128ad4761b3f3ac6e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 0f8c868fce0a054a0ba356350baf4c3824c2c958..d99e0acf0000c566fdb1bffb149ec13a55d7c8dd 100644
+index 6b3242117d62175de462d04e4d178b49ae2521e9..d6b480565340f5edbf81d7b57c3199292b020615 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;

patches/server/0016-Teleport-async-if-entity-was-moving-to-another-regio.patch

@@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..9ccd6a3a07abfce54dccf9b6e01d0050
 +public class FoliaEntityMovingFixConfig implements IConfigModule {
 +    @ConfigInfo(baseName = "enabled")
 +    public static boolean enabled = false;
-+    @ConfigInfo(baseName = "warnOnDetected")
++    @ConfigInfo(baseName = "warn_on_detected")
 +    public static boolean warnOnDetected = true;
 +
 +    @Override