Rewrite config, Add configurable beacon effect ranges

Author: MidnightTale

atdeprecated-server/minecraft-patches/features/0001-Setup-config.patch

@@ -12,7 +12,7 @@ index cf72cb8b418239b56c755486b03a321672e16bc3..d9178fe7a52f7b98c82a03533e4c942e
                  JvmProfiler.INSTANCE.start(Environment.SERVER);
              }
 
-+            fun.mntale.atdeprecated.config.Config.init(); // // atDeprecated - atDeprecated config
++            fun.mntale.atdeprecated.config.AtCoreConfig.init(); // atDeprecated - atDeprecated config
              me.earthme.luminol.config.ConfigManager.initConfigs(); // Luminol - Luminol config
              io.papermc.paper.plugin.PluginInitializerManager.load(optionSet); // Paper
              Bootstrap.bootStrap();
@@ -24,7 +24,7 @@ index c6c6432c2efeb7b95c2894b188cd966321ae3186..270cf5a1fce8eda5cd11e221b0026cd7
          this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
          this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
          // Paper end - initialize global and world-defaults configuration
-+        fun.mntale.atdeprecated.config.Config.load(); // atDeprecated - load config file
++        fun.mntale.atdeprecated.config.AtCoreConfig.load(); // atDeprecated - load config file
          me.earthme.luminol.config.ConfigManager.loadConfigFiles(); // Luminol - load config file
          if (false) this.server.spark.enableEarlyIfRequested(); // Paper - spark // Luminol - Force disable builtin spark
          // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save

atdeprecated-server/minecraft-patches/features/0002-Add-config-for-beacon-ranges.patch

@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MidnightTale <[email protected]>
+Date: Thu, 24 Jul 2025 04:10:47 +0700
+Subject: [PATCH] Add config for beacon ranges
+
+
+diff --git a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+index b27a40e69046414d5302882b72ac8b3f848e18df..2a6d1801eed11ae39eb062bb9557213cb25dcd4d 100644
+--- a/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
++++ b/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+@@ -143,7 +143,11 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+ 
+     public double getEffectRange() {
+         if (this.effectRange < 0) {
+-            return this.levels * 10 + 10;
++            List<Integer> ranges = fun.mntale.atdeprecated.config.AtCoreConfig.BEACON_CONFIG.getParsedRanges();
++            if (this.levels > 0 && this.levels <= ranges.size()) {
++                return ranges.get(this.levels - 1);
++            }
++            return 0;
+         } else {
+             return effectRange;
+         }
+@@ -338,7 +342,11 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+     }
+ 
+     private static double computeBeaconRange(final int beaconLevel) {
+-        return beaconLevel * 10 + 10; // Diff from applyEffects
++        List<Integer> ranges = fun.mntale.atdeprecated.config.AtCoreConfig.BEACON_CONFIG.getParsedRanges();
++        if (beaconLevel > 0 && beaconLevel <= ranges.size()) {
++            return ranges.get(beaconLevel - 1);
++        }
++        return 0;
+     }
+ 
+     public static List<Player> getHumansInRange(final Level level, final BlockPos pos, final int beaconLevel, final @Nullable BeaconBlockEntity blockEntity) {

atdeprecated-server/minecraft-patches/removes/0001-Better-beacon-range.patch

@@ -0,0 +1,26 @@
+package fun.mntale.atdeprecated.config;
+
+import fun.mntale.atdeprecated.config.modules.features.BeaconConfig;
+import fun.mntale.atdeprecated.config.modules.removed.RemovedConfig;
+import java.io.File;
+
+public class AtCoreConfig {
+    private static final ConfigManager configManager = new ConfigManager(new File("atdeprecated/atdeprecated-global.toml"));
+
+    public static final BeaconConfig BEACON_CONFIG = new BeaconConfig();
+    public static final RemovedConfig REMOVED_CONFIG = new RemovedConfig();
+
+    public static void init() {
+        registerModules();
+        configManager.preload();
+    }
+
+    public static void load() {
+        configManager.load();
+    }
+
+    private static void registerModules() {
+        configManager.registerModule(BEACON_CONFIG);
+        configManager.registerModule(REMOVED_CONFIG);
+    }
+}

atdeprecated-server/src/main/java/fun/mntale/atdeprecated/config/AtCoreConfig.java

@@ -0,0 +1,95 @@
+package fun.mntale.atdeprecated.config;
+
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
+import fun.mntale.atdeprecated.config.annotations.ConfigInfo;
+import fun.mntale.atdeprecated.config.annotations.RemovedEntry;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConfigManager {
+    private final File configFile;
+    private final List<IConfigModule> modules = new ArrayList<>();
+    private CommentedFileConfig config;
+
+    public ConfigManager(File configFile) {
+        this.configFile = configFile;
+    }
+
+    public void registerModule(IConfigModule module) {
+        modules.add(module);
+    }
+
+    public void preload() {
+        if (!configFile.exists()) {
+            try {
+                configFile.getParentFile().mkdirs();
+                configFile.createNewFile();
+            } catch (IOException e) {
+                throw new RuntimeException("Failed to create config file", e);
+            }
+        }
+        config = CommentedFileConfig.of(configFile);
+        config.load();
+    }
+
+    public void load() {
+        for (IConfigModule module : modules) {
+            loadModule(module);
+        }
+        save();
+    }
+
+    private void loadModule(IConfigModule module) {
+        for (Field field : module.getClass().getDeclaredFields()) {
+            if (field.isAnnotationPresent(ConfigInfo.class)) {
+                loadValue(module, field);
+            }
+            if (field.isAnnotationPresent(RemovedEntry.class)) {
+                for (RemovedEntry removed : field.getAnnotationsByType(RemovedEntry.class)) {
+                    String path = String.join(".", removed.category()) + "." + removed.name();
+                    if (config.contains(path)) {
+                        config.remove(path);
+                    }
+                }
+            }
+        }
+    }
+
+    private void loadValue(IConfigModule module, Field field) {
+        ConfigInfo info = field.getAnnotation(ConfigInfo.class);
+        String path = module.getCategory().getKey() + "." + module.getBaseName() + "." + (info.name().isEmpty() ? field.getName() : info.name());
+        Object value = config.get(path);
+        try {
+            if (value == null) {
+                config.set(path, field.get(module));
+                config.setComment(path, info.comments());
+            } else {
+                field.set(module, value);
+            }
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException("Failed to access config field", e);
+        }
+    }
+
+    public void save() {
+        for (IConfigModule module : modules) {
+            for (Field field : module.getClass().getDeclaredFields()) {
+                if (field.isAnnotationPresent(ConfigInfo.class)) {
+                    ConfigInfo info = field.getAnnotation(ConfigInfo.class);
+                    String path = module.getCategory().getKey() + "." + module.getBaseName() + "." + (info.name().isEmpty() ? field.getName() : info.name());
+                    try {
+                        config.set(path, field.get(module));
+                        config.setComment(path, info.comments());
+                    } catch (IllegalAccessException e) {
+                        throw new RuntimeException("Failed to access config field", e);
+                    }
+                }
+            }
+        }
+        config.save();
+    }
+}

atdeprecated-server/src/main/java/fun/mntale/atdeprecated/config/Config.java

@@ -0,0 +1,20 @@
+package fun.mntale.atdeprecated.config;
+
+public enum EnumConfigCategory {
+    FIXES("fixes"),
+    OPTIMIZATIONS("optimizations"),
+    MISC("misc"),
+    FEATURES("features"),
+    EXPERIMENT("experiment"),
+    REMOVED("removed");
+
+    private final String key;
+
+    EnumConfigCategory(String key) {
+        this.key = key;
+    }
+
+    public String getKey() {
+        return key;
+    }
+}

atdeprecated-server/src/main/java/fun/mntale/atdeprecated/config/ConfigManager.java

@@ -0,0 +1,6 @@
+package fun.mntale.atdeprecated.config;
+
+public interface IConfigModule {
+    EnumConfigCategory getCategory();
+    String getBaseName();
+}