From 5e658adad35aa9fb9764a9cb246e789f63d03e17 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Sun, 28 Sep 2025 13:12:54 +0800 Subject: [PATCH] Update Luminol --- gradle.properties | 2 +- .../features/0001-Rebrand-to-Lophine.patch | 10 ++--- .../features/0002-Transformed-Configs.patch | 22 +++++----- .../0003-Leaves-Item-overstack-util.patch | 3 +- .../modules/experiment/CommandConfig.java | 14 +++---- .../EntityDamageSourceTraceConfig.java | 4 +- .../RayTrackingEntityTrackerConfig.java | 12 +++--- .../modules/fixes/EndVoidRingsConfig.java | 6 +-- .../function/ContainerExpansionConfig.java | 18 ++++----- .../modules/function/FakeplayerConfig.java | 36 ++++++++--------- .../modules/function/LanguageConfig.java | 6 +-- .../modules/function/OldFeatureConfig.java | 20 +++++----- .../modules/function/RedStoneConfig.java | 8 ++-- .../function/SurvuxProtocolConfig.java | 40 +++++++++---------- .../modules/function/VillagerConfig.java | 8 ++-- .../modules/misc/DisableCheckConfig.java | 6 +-- .../config/modules/removed/RemovedConfig.java | 26 ++++++------ 17 files changed, 120 insertions(+), 121 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0b2e3a2..b49e8ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ mcVersion=1.21.8 release=2 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=9f70ddad5c0092970f05ff0d71f688539d472bbb +luminolRef=432fe842d34b18fc29e39c6bd94f07e68785a3bb org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch b/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch index fa68fab..ae6dc9f 100644 --- a/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch +++ b/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand to Lophine diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java -index 5e341cdc1c6ff75552140ab16bc9ccd237d896d0..a780214137d10f2faa92042b2f32c77a6598fa8d 100644 +index 6f294437d8791487d559e52a23a859c0572c0034..4d7e7d7a9c16d416d0ba4c77be061718c9793cb1 100644 --- a/src/main/java/me/earthme/luminol/config/ConfigManager.java +++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java @@ -22,6 +22,7 @@ public class ConfigManager { @@ -17,15 +17,15 @@ index 5e341cdc1c6ff75552140ab16bc9ccd237d896d0..a780214137d10f2faa92042b2f32c77a } diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java -index f164e41975adee8b68dbcb400007681c0b66a4f8..4e76fb3b1274f2fde734089b20458f6561c39700 100644 +index df5d926fb4401dd93d658fe14ae4d9d58cff68f9..b6d84fea596cfa78032151ab2f206b6b3d5dd197 100644 --- a/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java +++ b/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java @@ -8,7 +8,7 @@ import me.earthme.luminol.enums.EnumConfigCategory; - @ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "server_mod_name") + @ConfigClassInfo(category = EnumConfigCategory.MISC, name = "server_mod_name") public class ServerModNameConfig implements IConfigModule { - @ConfigInfo(baseName = "name") + @ConfigInfo(name = "name") - public static String serverModName = "Luminol"; + public static String serverModName = "Lophine"; - @ConfigInfo(baseName = "vanilla_spoof") + @ConfigInfo(name = "vanilla_spoof") public static boolean fakeVanilla = false; diff --git a/lophine-server/luminol-patches/features/0002-Transformed-Configs.patch b/lophine-server/luminol-patches/features/0002-Transformed-Configs.patch index 5c7d840..52ddee9 100644 --- a/lophine-server/luminol-patches/features/0002-Transformed-Configs.patch +++ b/lophine-server/luminol-patches/features/0002-Transformed-Configs.patch @@ -5,26 +5,26 @@ Subject: [PATCH] Transformed Configs diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java -index 4e906e8e0ebd57b9f7000e4194280e3e3636e52c..14eefd162c9facd54a53718a7a0b1b0266e1ada8 100644 +index 66ae993896ba38a7fa5302d4ff88a52e4a0bb72c..c6d53d720437f43a713469049de3d90d1082cd2e 100644 --- a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java +++ b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java @@ -11,6 +11,7 @@ public class CommandConfig implements IConfigModule { - @TransformedConfig(name = "enable", category = {"experiment", "force_the_data_command_to_be_enabled"}) - @ConfigInfo(baseName = "enable_data_command") + @TransformedConfig(name = "enable", directory = {"experiment", "force_the_data_command_to_be_enabled"}) + @ConfigInfo(name = "enable_data_command") public static boolean data = false; -+ @TransformedConfig(name = "command_block_enabled", category = {"experiment", "command"}, originInstance = "lophine") - @TransformedConfig(name = "enabled", category = {"experiment", "force_enable_command_block_command_execution"}) - @ConfigInfo(baseName = "enable_command_block") ++ @TransformedConfig(name = "command_block_enabled", directory = {"experiment", "command"}, originInstance = "lophine") + @TransformedConfig(name = "enabled", directory = {"experiment", "force_enable_command_block_command_execution"}) + @ConfigInfo(name = "enable_command_block") public static boolean commandBlock = false; diff --git a/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java b/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java -index 192a67360db810934d02a15c955af3579e6f6b20..fbafc5a8aa2581301e62e12adb22169ab7fd8e19 100644 +index 35e6014f04093050a9a62b895b43e5c5d8c6a28e..11abfb884f972fd73ca4c13a6e309de1bcd23fd5 100644 --- a/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java +++ b/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java @@ -8,6 +8,7 @@ import me.earthme.luminol.enums.EnumConfigCategory; - @ConfigClassInfo(configAttribution = EnumConfigCategory.OPTIMIZATIONS, mainName = "force_disable_packet_limiter_of_paper") + @ConfigClassInfo(category = EnumConfigCategory.OPTIMIZATIONS, name = "force_disable_packet_limiter_of_paper") public class PaperPacketLimiterConfig implements IConfigModule { -+ @TransformedConfig(name = "unlimit-packet", category = {"misc", "network"}, originInstance = "lophine") - @TransformedConfig(name = "force_disable", category = {"misc", "force_disable_packet_limiter_of_paper"}) - @ConfigInfo(baseName = "force_disable") ++ @TransformedConfig(name = "unlimit-packet", directory = {"misc", "network"}, originInstance = "lophine") + @TransformedConfig(name = "force_disable", directory = {"misc", "force_disable_packet_limiter_of_paper"}) + @ConfigInfo(name = "force_disable") public static boolean forceDisable = false; diff --git a/lophine-server/luminol-patches/features/0003-Leaves-Item-overstack-util.patch b/lophine-server/luminol-patches/features/0003-Leaves-Item-overstack-util.patch index aea4eff..c2c4e44 100644 --- a/lophine-server/luminol-patches/features/0003-Leaves-Item-overstack-util.patch +++ b/lophine-server/luminol-patches/features/0003-Leaves-Item-overstack-util.patch @@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/d93e9766d3797d130 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java b/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java -index 102de78be0eb82d6898b4104fad1bf5e8366f993..0f8c9d4932c8bbd619f21d4aa28b890e14439b46 100644 +index 3a6314ed7f62c6473ce9ddc9deeee2a32b9d2893..23a0f8100eb3162331161635e8051981c4e34aed 100644 --- a/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java +++ b/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java @@ -17,12 +17,173 @@ @@ -185,4 +185,3 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..0f8c9d4932c8bbd619f21d4aa28b890e + } + } } -\ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java index 9c30887..0ca1caa 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java @@ -6,27 +6,27 @@ import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "command") +@ConfigClassInfo(category = EnumConfigCategory.EXPERIMENT, name = "command") public class CommandConfig implements IConfigModule { - @ConfigInfo(baseName = "tick_command_enabled", comments = + @ConfigInfo(name = "tick_command_enabled", comments = """ Allow to use tick command""") public static boolean tick = false; - @ConfigInfo(baseName = "datapack_command_enabled", comments = + @ConfigInfo(name = "datapack_command_enabled", comments = """ Allow to use datapack command --- datapack hot-update unsupported, please restart server""") public static boolean datapack = false; - @ConfigInfo(baseName = "function_command_enabled", comments = + @ConfigInfo(name = "function_command_enabled", comments = """ Allow to use function command""") public static boolean function = false; - @TransformedConfig(name = "enable-waypoint", category = {"experiment", "waypoint bar"}) - @TransformedConfig(name = "enable-waypoint", category = {"experiment", "waypoint_bar"}) - @ConfigInfo(baseName = "waypoint_command_enabled", comments = """ + @TransformedConfig(name = "enable-waypoint", directory = {"experiment", "waypoint bar"}) + @TransformedConfig(name = "enable-waypoint", directory = {"experiment", "waypoint_bar"}) + @ConfigInfo(name = "waypoint_command_enabled", comments = """ Allow to use waypoint command """) public static boolean waypoint = false; diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/EntityDamageSourceTraceConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/EntityDamageSourceTraceConfig.java index eb51b47..ac87312 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/EntityDamageSourceTraceConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/EntityDamageSourceTraceConfig.java @@ -5,9 +5,9 @@ import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "entity_damage_source_trace") +@ConfigClassInfo(category = EnumConfigCategory.EXPERIMENT, name = "entity_damage_source_trace") public class EntityDamageSourceTraceConfig implements IConfigModule { - @ConfigInfo(baseName = "enabled", comments = + @ConfigInfo(name = "enabled", comments = """ Allow trace damage source cross different Region Scheduler.""") public static boolean enabled = false; diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RayTrackingEntityTrackerConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RayTrackingEntityTrackerConfig.java index cc362f7..e4d22ef 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RayTrackingEntityTrackerConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RayTrackingEntityTrackerConfig.java @@ -5,16 +5,16 @@ import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "ray_tracking_entity_tracker") +@ConfigClassInfo(category = EnumConfigCategory.EXPERIMENT, name = "ray_tracking_entity_tracker") public class RayTrackingEntityTrackerConfig implements IConfigModule { - @ConfigInfo(baseName = "enabled") + @ConfigInfo(name = "enabled") public static boolean enabled = false; - @ConfigInfo(baseName = "skip_marker_armor_stands") + @ConfigInfo(name = "skip_marker_armor_stands") public static boolean skipMarkerArmorStands = true; - @ConfigInfo(baseName = "check_interval_ms") + @ConfigInfo(name = "check_interval_ms") public static int checkIntervalMs = 10; - @ConfigInfo(baseName = "tracing_distance") + @ConfigInfo(name = "tracing_distance") public static int tracingDistance = 48; - @ConfigInfo(baseName = "hitbox_limit") + @ConfigInfo(name = "hitbox_limit") public static int hitboxLimit = 50; } \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/fixes/EndVoidRingsConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/fixes/EndVoidRingsConfig.java index f7646c4..7a53b16 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/fixes/EndVoidRingsConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/fixes/EndVoidRingsConfig.java @@ -6,10 +6,10 @@ import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.FIXES, mainName = "end-void-ring") +@ConfigClassInfo(category = EnumConfigCategory.FIXES, name = "end-void-ring") public class EndVoidRingsConfig implements IConfigModule { - @TransformedConfig(name = "enabled", category = {"gameplay", "end_void_rings"}) - @ConfigInfo(baseName = "enabled", comments = """ + @TransformedConfig(name = "enabled", directory = {"gameplay", "end_void_rings"}) + @ConfigInfo(name = "enabled", comments = """ If enabled, it will generate end void rings, like MC-159283.""") public static boolean enabled = false; } diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/ContainerExpansionConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/ContainerExpansionConfig.java index 1dd9c69..f75c7cd 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/ContainerExpansionConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/ContainerExpansionConfig.java @@ -7,30 +7,30 @@ import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "container_expansion") +@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "container_expansion") public class ContainerExpansionConfig implements IConfigModule { - @TransformedConfig(name = "barrel_rows", category = {"misc", "container_expansion"}) + @TransformedConfig(name = "barrel_rows", directory = {"misc", "container_expansion"}) @CommandSuggestions(suggest = {"1", "2", "3", "4", "5", "6"}) - @ConfigInfo(baseName = "barrel_rows", comments = + @ConfigInfo(name = "barrel_rows", comments = """ range: 1~6""") public static int barrelRows = 3; - @TransformedConfig(name = "enderchest_rows", category = {"misc", "container_expansion"}) + @TransformedConfig(name = "enderchest_rows", directory = {"misc", "container_expansion"}) @CommandSuggestions(suggest = {"1", "2", "3", "4", "5", "6"}) - @ConfigInfo(baseName = "enderchest_rows", comments = + @ConfigInfo(name = "enderchest_rows", comments = """ range: 1~6""") public static int enderchestRows = 3; - @TransformedConfig(name = "shulker_stackable_count", category = {"misc", "container_expansion"}) + @TransformedConfig(name = "shulker_stackable_count", directory = {"misc", "container_expansion"}) @CommandSuggestions(suggest = {"1", "2", "32", "64"}) - @ConfigInfo(baseName = "shulker_stackable_count", comments = + @ConfigInfo(name = "shulker_stackable_count", comments = """ range: 1~64""") public static int shulkerCount = 1; - @TransformedConfig(name = "same_nbt_shulker_stackable", category = {"misc", "container_expansion"}) - @ConfigInfo(baseName = "same_nbt_shulker_stackable") + @TransformedConfig(name = "same_nbt_shulker_stackable", directory = {"misc", "container_expansion"}) + @ConfigInfo(name = "same_nbt_shulker_stackable") public static boolean nbtShulkerStackable = false; } \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/FakeplayerConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/FakeplayerConfig.java index 8c47fd2..ad4e2df 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/FakeplayerConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/FakeplayerConfig.java @@ -10,73 +10,73 @@ import org.leavesmc.leaves.command.bot.BotCommand; import java.util.List; -@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "fakeplayer") +@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "fakeplayer") public class FakeplayerConfig implements IConfigModule { - @ConfigInfo(baseName = "enable", comments = """ + @ConfigInfo(name = "enable", comments = """ Enable fakeplayer functionality""") public static boolean enable = true; - @ConfigInfo(baseName = "unable-fakeplayer-names", comments = """ + @ConfigInfo(name = "unable-fakeplayer-names", comments = """ List of names that cannot be used for fakeplayers""") public static List unableNames = List.of("player-name"); - @ConfigInfo(baseName = "limit", comments = """ + @ConfigInfo(name = "limit", comments = """ Maximum number of fakeplayers allowed""") public static int limit = 10; - @ConfigInfo(baseName = "prefix", comments = """ + @ConfigInfo(name = "prefix", comments = """ Prefix for fakeplayer names""") public static String prefix = ""; - @ConfigInfo(baseName = "suffix", comments = """ + @ConfigInfo(name = "suffix", comments = """ Suffix for fakeplayer names""") public static String suffix = ""; - @ConfigInfo(baseName = "regen-amount", comments = """ + @ConfigInfo(name = "regen-amount", comments = """ Regeneration amount for fakeplayers""") public static double regenAmount = 0.0; - @ConfigInfo(baseName = "resident-fakeplayer", comments = """ + @ConfigInfo(name = "resident-fakeplayer", comments = """ Allow fakeplayers to be resident""") public static boolean canResident = false; - @ConfigInfo(baseName = "open-fakeplayer-inventory", comments = """ + @ConfigInfo(name = "open-fakeplayer-inventory", comments = """ Allow opening fakeplayer inventory""") public static boolean canOpenInventory = false; - @ConfigInfo(baseName = "use-action", comments = """ + @ConfigInfo(name = "use-action", comments = """ Allow fakeplayers to use actions""") public static boolean canUseAction = true; - @ConfigInfo(baseName = "modify-config", comments = """ + @ConfigInfo(name = "modify-config", comments = """ Allow modifying fakeplayer config""") public static boolean canModifyConfig = false; - @ConfigInfo(baseName = "manual-save-and-load", comments = """ + @ConfigInfo(name = "manual-save-and-load", comments = """ Allow manual save and load of fakeplayers""") public static boolean canManualSaveAndLoad = false; - @ConfigInfo(baseName = "cache-skin", comments = """ + @ConfigInfo(name = "cache-skin", comments = """ Use skin cache for fakeplayers""") public static boolean useSkinCache = false; - @ConfigInfo(baseName = "always-send-data", comments = """ + @ConfigInfo(name = "always-send-data", comments = """ Always send data for fakeplayers""") public static boolean canSendDataAlways = true; - @ConfigInfo(baseName = "skip-sleep-check", comments = """ + @ConfigInfo(name = "skip-sleep-check", comments = """ Skip sleep check for fakeplayers""") public static boolean canSkipSleep = false; - @ConfigInfo(baseName = "spawn-phantom", comments = """ + @ConfigInfo(name = "spawn-phantom", comments = """ Allow phantoms to spawn for fakeplayers""") public static boolean canSpawnPhantom = false; - @ConfigInfo(baseName = "simulation-distance", comments = """ + @ConfigInfo(name = "simulation-distance", comments = """ Simulation distance for fakeplayers (-1 for default)""") public static int simulationDistance = -1; - @ConfigInfo(baseName = "enable-locator-bar", comments = """ + @ConfigInfo(name = "enable-locator-bar", comments = """ Enable locator bar for fakeplayers""") public static boolean enableLocatorBar = false; diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/LanguageConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/LanguageConfig.java index 25185df..bd09e00 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/LanguageConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/LanguageConfig.java @@ -6,10 +6,10 @@ import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "language") +@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "language") public class LanguageConfig implements IConfigModule { - @TransformedConfig(name = "lang", category = {"optimizations", "language"}) - @ConfigInfo(baseName = "lang", comments = """ + @TransformedConfig(name = "lang", directory = {"optimizations", "language"}) + @ConfigInfo(name = "lang", comments = """ Please use the key from https://minecraft.wiki/w/Language Sample of format: en_us zh_cn zh_hk zh_tw""") public static String lang = "en_us"; diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/OldFeatureConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/OldFeatureConfig.java index 8826ec0..7fc4456 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/OldFeatureConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/OldFeatureConfig.java @@ -6,22 +6,22 @@ import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "old-feature") +@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "old-feature") public class OldFeatureConfig implements IConfigModule { - @TransformedConfig(name = "spawn_invulnerable_time", category = {"misc", "old-feature"}) - @ConfigInfo(baseName = "spawn_invulnerable_time") + @TransformedConfig(name = "spawn_invulnerable_time", directory = {"misc", "old-feature"}) + @ConfigInfo(name = "spawn_invulnerable_time") public static boolean spawnInvulnerableTime = false; - @TransformedConfig(name = "old_zombie_reinforcement", category = {"misc", "old-feature"}) - @ConfigInfo(baseName = "old_zombie_reinforcement") + @TransformedConfig(name = "old_zombie_reinforcement", directory = {"misc", "old-feature"}) + @ConfigInfo(name = "old_zombie_reinforcement") public static boolean oldZombieReinforcement = false; - @TransformedConfig(name = "old_explosion_damage_calculator", category = {"misc", "old-feature"}) - @ConfigInfo(baseName = "old_explosion_damage_calculator") + @TransformedConfig(name = "old_explosion_damage_calculator", directory = {"misc", "old-feature"}) + @ConfigInfo(name = "old_explosion_damage_calculator") public static boolean oldExplosionDamageCalculator = false; - @TransformedConfig(name = "old_raid_behavior", category = {"misc", "old-feature"}) - @TransformedConfig(name = "give_bad_omen_when_kill_raid_captain", category = {"misc", "revert_raid_changes"}, transformComments = false) - @ConfigInfo(baseName = "old_raid_behavior") + @TransformedConfig(name = "old_raid_behavior", directory = {"misc", "old-feature"}) + @TransformedConfig(name = "give_bad_omen_when_kill_raid_captain", directory = {"misc", "revert_raid_changes"}, transformComments = false) + @ConfigInfo(name = "old_raid_behavior") public static boolean oldRaidBehavior = false; } \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/RedStoneConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/RedStoneConfig.java index 314c7b9..e3185be 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/RedStoneConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/RedStoneConfig.java @@ -6,11 +6,11 @@ import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "redstone") +@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "redstone") public class RedStoneConfig implements IConfigModule { - @TransformedConfig(name = "shears_rotate", category = {"misc", "redstone"}) - @TransformedConfig(name = "allow_skip_cooldown", category = {"misc", "redstone"}) - @ConfigInfo(baseName = "shears_rotate", comments = + @TransformedConfig(name = "shears_rotate", directory = {"misc", "redstone"}) + @TransformedConfig(name = "allow_skip_cooldown", directory = {"misc", "redstone"}) + @ConfigInfo(name = "shears_rotate", comments = """ Allows you to use the Shears to right-click to rotate the block.""") public static boolean shears = false; diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/SurvuxProtocolConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/SurvuxProtocolConfig.java index c066252..928a586 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/SurvuxProtocolConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/SurvuxProtocolConfig.java @@ -9,46 +9,46 @@ import me.earthme.luminol.enums.EnumConfigCategory; import java.util.List; -@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "survux-protocol") +@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "survux-protocol") public class SurvuxProtocolConfig implements IConfigModule { - @TransformedConfig(name = "entity-protocol", category = {"misc", "survux-protocol"}) - @ConfigInfo(baseName = "entity-protocol") + @TransformedConfig(name = "entity-protocol", directory = {"misc", "survux-protocol"}) + @ConfigInfo(name = "entity-protocol") public static boolean entityProtocol = false; - @TransformedConfig(name = "hud-logger-protocol", category = {"misc", "survux-protocol"}) - @ConfigInfo(baseName = "hud-logger-protocol") + @TransformedConfig(name = "hud-logger-protocol", directory = {"misc", "survux-protocol"}) + @ConfigInfo(name = "hud-logger-protocol") public static boolean hudLoggerProtocol = false; - @TransformedConfig(name = "hud-metadata-protocol", category = {"misc", "survux-protocol"}) - @ConfigInfo(baseName = "hud-metadata-protocol") + @TransformedConfig(name = "hud-metadata-protocol", directory = {"misc", "survux-protocol"}) + @ConfigInfo(name = "hud-metadata-protocol") public static boolean hudMetadataProtocol = false; - @TransformedConfig(name = "hud-metadata-share-seed", category = {"misc", "survux-protocol"}) - @ConfigInfo(baseName = "hud-metadata-share-seed") + @TransformedConfig(name = "hud-metadata-share-seed", directory = {"misc", "survux-protocol"}) + @ConfigInfo(name = "hud-metadata-share-seed") public static boolean hudMetadataShareSeed = false; - @TransformedConfig(name = "structure-protocol", category = {"misc", "survux-protocol"}) - @ConfigInfo(baseName = "structure-protocol") + @TransformedConfig(name = "structure-protocol", directory = {"misc", "survux-protocol"}) + @ConfigInfo(name = "structure-protocol") public static boolean structureProtocol = false; - @TransformedConfig(name = "hud-enabled-loggers", category = {"misc", "survux-protocol"}) - @ConfigInfo(baseName = "hud-enabled-loggers") + @TransformedConfig(name = "hud-enabled-loggers", directory = {"misc", "survux-protocol"}) + @ConfigInfo(name = "hud-enabled-loggers") public static List hudEnabledLoggers = List.of("tps", "mob_caps"); - @TransformedConfig(name = "hud-update-interval", category = {"misc", "survux-protocol"}) - @ConfigInfo(baseName = "hud-update-interval") + @TransformedConfig(name = "hud-update-interval", directory = {"misc", "survux-protocol"}) + @ConfigInfo(name = "hud-update-interval") public static int hudUpdateInterval = 1; - @TransformedConfig(name = "litematics-enabled", category = {"misc", "survux-protocol"}) - @ConfigInfo(baseName = "litematics-enabled") + @TransformedConfig(name = "litematics-enabled", directory = {"misc", "survux-protocol"}) + @ConfigInfo(name = "litematics-enabled") public static boolean litematicsEnabled = false; - @TransformedConfig(name = "litematics-max-nbt-size", category = {"misc", "survux-protocol"}) + @TransformedConfig(name = "litematics-max-nbt-size", directory = {"misc", "survux-protocol"}) @CommandSuggestions(suggest = {"-1", "2097152"}) - @ConfigInfo(baseName = "litematics-max-nbt-size") + @ConfigInfo(name = "litematics-max-nbt-size") public static int litematicsMaxNbtSize = 2097152; @CommandSuggestions(suggest = {"-1", "1200"}) - @ConfigInfo(baseName = "litematics-print-max-delay-ticks", comments = "The max delay ticks for printing litematics, -1 to disable") + @ConfigInfo(name = "litematics-print-max-delay-ticks", comments = "The max delay ticks for printing litematics, -1 to disable") public static int maxDelay = 1200; } diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/VillagerConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/VillagerConfig.java index 3a18086..74fe6a7 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/VillagerConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/VillagerConfig.java @@ -6,11 +6,11 @@ import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "villager") +@ConfigClassInfo(category = EnumConfigCategory.MISC, name = "villager") public class VillagerConfig implements IConfigModule { - @TransformedConfig(name = "villager-infinite-trade", category = {"misc", "villager"}) - @TransformedConfig(name = "villager-infinite-trade", category = {"misc", "villager-config"}) - @ConfigInfo(baseName = "villager-infinite-trade", comments = + @TransformedConfig(name = "villager-infinite-trade", directory = {"misc", "villager"}) + @TransformedConfig(name = "villager-infinite-trade", directory = {"misc", "villager-config"}) + @ConfigInfo(name = "villager-infinite-trade", comments = """ Allow villager infinite trade (limit of 524288 times) ---- we won't edit saved data, only edit in send data to client. diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/DisableCheckConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/DisableCheckConfig.java index ca25de7..a5b6d3c 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/DisableCheckConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/DisableCheckConfig.java @@ -5,13 +5,13 @@ import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "disable-check") +@ConfigClassInfo(category = EnumConfigCategory.MISC, name = "disable-check") public class DisableCheckConfig implements IConfigModule { - @ConfigInfo(baseName = "disable-op-move-check", comments = """ + @ConfigInfo(name = "disable-op-move-check", comments = """ Disable the check for the operator's move check""") public static boolean disableOpMoveCheck = false; - @ConfigInfo(baseName = "disable-op-fly-check", comments = """ + @ConfigInfo(name = "disable-op-fly-check", comments = """ Disable the check for the operator's fly check""") public static boolean disableOpFlyCheck = false; } diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java index 2e870c2..3008ec9 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java @@ -6,20 +6,20 @@ import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; import me.earthme.luminol.enums.EnumConfigCategory; -@ConfigClassInfo(configAttribution = EnumConfigCategory.REMOVED, mainName = "removed_config") +@ConfigClassInfo(category = EnumConfigCategory.REMOVED, name = "removed_config") public class RemovedConfig implements IConfigModule { - @TransformedConfig(name = "disable_end_crystal_check", category = {"fixes", "end_crystal"}, transform = false) - @TransformedConfig(name = "disable_end_crystal_check", category = {"misc", "end_crystal"}, transform = false) - @TransformedConfig(name = "allow_skip_cooldown", category = {"misc", "revert_raid_changes"}, transform = false) - @TransformedConfig(name = "bad_omen_infinite", category = {"misc", "revert_raid_changes"}, transform = false) - @TransformedConfig(name = "skip_height_check", category = {"misc", "revert_raid_changes"}, transform = false) - @TransformedConfig(name = "skip_self_raid_check", category = {"misc", "revert_raid_changes"}, transform = false) - @TransformedConfig(name = "use_old_position_find", category = {"misc", "revert_raid_changes"}, transform = false) - @TransformedConfig(name = "vanilla_hopper", category = {"misc", "redstone"}, transform = false) - @TransformedConfig(name = "old_replaceable_by_mushrooms", category = {"misc", "old-feature"}, transform = false) - @TransformedConfig(name = "old_nether_portal_collision", category = {"misc", "old-feature"}, transform = false) - @TransformedConfig(name = "better_shulker_box", category = {"misc", "container_expansion"}, transform = false) - @ConfigInfo(baseName = "removed", comments = + @TransformedConfig(name = "disable_end_crystal_check", directory = {"fixes", "end_crystal"}, transform = false) + @TransformedConfig(name = "disable_end_crystal_check", directory = {"misc", "end_crystal"}, transform = false) + @TransformedConfig(name = "allow_skip_cooldown", directory = {"misc", "revert_raid_changes"}, transform = false) + @TransformedConfig(name = "bad_omen_infinite", directory = {"misc", "revert_raid_changes"}, transform = false) + @TransformedConfig(name = "skip_height_check", directory = {"misc", "revert_raid_changes"}, transform = false) + @TransformedConfig(name = "skip_self_raid_check", directory = {"misc", "revert_raid_changes"}, transform = false) + @TransformedConfig(name = "use_old_position_find", directory = {"misc", "revert_raid_changes"}, transform = false) + @TransformedConfig(name = "vanilla_hopper", directory = {"misc", "redstone"}, transform = false) + @TransformedConfig(name = "old_replaceable_by_mushrooms", directory = {"misc", "old-feature"}, transform = false) + @TransformedConfig(name = "old_nether_portal_collision", directory = {"misc", "old-feature"}, transform = false) + @TransformedConfig(name = "better_shulker_box", directory = {"misc", "container_expansion"}, transform = false) + @ConfigInfo(name = "removed", comments = """ RemovedConfig redirect to here, no any function.""") public static boolean enabled = true;