diff --git a/lophine-server/src/main/java/fun/bm/lophine/carpet/CarpetCompatSync.java b/lophine-server/src/main/java/fun/bm/lophine/carpet/CarpetCompatSync.java index 0f6c0a1..ffaa96b 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/carpet/CarpetCompatSync.java +++ b/lophine-server/src/main/java/fun/bm/lophine/carpet/CarpetCompatSync.java @@ -5,6 +5,7 @@ import fun.bm.lophine.carpet.config.modules.CounterCompatConfig; import fun.bm.lophine.carpet.config.modules.FakePlayerCompatConfig; import fun.bm.lophine.carpet.config.modules.GeneralCompatConfig; import fun.bm.lophine.config.modules.experiment.CommandConfig; +import fun.bm.lophine.config.modules.experiment.RedStoneConfig; import fun.bm.lophine.config.modules.fixes.UpdateSuppressionCrashFixConfig; import fun.bm.lophine.config.modules.function.CreativeFlyNoClipConfig; import fun.bm.lophine.config.modules.function.FakeplayerConfig; @@ -23,9 +24,12 @@ public final class CarpetCompatSync { public static void apply() { if (init) return; - if (CoreConfig.enabled) applyGeneralRules(); - applyFakePlayerRules(); - applyCounterRules(); + if (CoreConfig.enabled) { + applyGeneralRules(); + applyFakePlayerRules(); + applyCounterRules(); + } + CarpetLoggerProtocol.refreshConfiguredDefaults(!init); registerProtocolRules(); init = true; } @@ -33,13 +37,12 @@ public final class CarpetCompatSync { private static void applyGeneralRules() { LanguageConfig.lang = GeneralCompatConfig.language; UpdateSuppressionCrashFixConfig.enabled = GeneralCompatConfig.amsUpdateSuppressionCrashFix || GeneralCompatConfig.yeetUpdateSuppressionCrash; - fun.bm.lophine.config.modules.experiment.RedStoneConfig.redstoneIgnoreUpwardsUpdate = GeneralCompatConfig.dustTrapdoorReintroduced; - fun.bm.lophine.config.modules.experiment.RedStoneConfig.cce = GeneralCompatConfig.shulkerBoxCCEReintroduced; - fun.bm.lophine.config.modules.experiment.RedStoneConfig.instantBlockUpdater = GeneralCompatConfig.instantBlockUpdaterReintroduced; + RedStoneConfig.redstoneIgnoreUpwardsUpdate = GeneralCompatConfig.dustTrapdoorReintroduced; + RedStoneConfig.cce = GeneralCompatConfig.shulkerBoxCCEReintroduced; + RedStoneConfig.instantBlockUpdater = GeneralCompatConfig.instantBlockUpdaterReintroduced; CommandConfig.tick = GeneralCompatConfig.commandTick; CreativeFlyNoClipConfig.enabled = GeneralCompatConfig.creativeNoClip; OptimizedDragonRespawnConfig.optimizedRespawn = GeneralCompatConfig.optimizedDragonRespawn; - CarpetLoggerProtocol.refreshConfiguredDefaults(!init); } private static void applyFakePlayerRules() { diff --git a/lophine-server/src/main/java/fun/bm/lophine/carpet/config/modules/CoreConfig.java b/lophine-server/src/main/java/fun/bm/lophine/carpet/config/modules/CoreConfig.java index 86d4528..fbe3e7c 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/carpet/config/modules/CoreConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/carpet/config/modules/CoreConfig.java @@ -14,8 +14,9 @@ import me.earthme.luminol.enums.EnumConfigCategory; public class CoreConfig implements IConfigModule { @ConfigInfo(name = "enabled", comments = """ Enable carpet features. - If you want to use any function in general directory from Carpet modifier, + If you want to use some function from Carpet modifier, you need to enable it. + (some function is not managed by this option) ONLY GENERAL DIRECTORY WAS CONTROLLED BY THIS OPTION. WARNING: IF YOU ENABLED IT, ORIGINAL CONFIG IN LOPHINE CONFIG WILL BE OVERWRITTEN.""")