Repo-Mirror/LuminolMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Clean LuminolConfig

Browse Source
This commit is contained in:
MrHua269
2024-02-20 09:28:02 +00:00
parent 2d1a64177a
commit 4aaa78b7fc
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0003-Empty-config-file-base.patch
View File

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