From 87d0c8b07edbce3f7fb44a0577dd3266fadc26dd Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 8 Oct 2022 11:00:46 +0200 Subject: [PATCH] Added config for verbose logging )on by default, #41) --- .../v2/levelgen/biomes/InternalBiomeAPI.java | 6 ++++-- .../org/betterx/bclib/commands/PrintInfo.java | 1 - .../java/org/betterx/bclib/config/Config.java | 1 + .../org/betterx/bclib/config/Configs.java | 1 + .../org/betterx/bclib/config/MainConfig.java | 9 +++++++++ .../together/world/event/WorldBootstrap.java | 19 +++++++++++-------- .../worldPreset/TogetherWorldPreset.java | 3 ++- 7 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java index ab40d731..b5bd336b 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java @@ -1,6 +1,7 @@ package org.betterx.bclib.api.v2.levelgen.biomes; import org.betterx.bclib.BCLib; +import org.betterx.bclib.config.Configs; import org.betterx.bclib.mixin.common.BiomeGenerationSettingsAccessor; import net.minecraft.core.Holder; @@ -180,8 +181,9 @@ public class InternalBiomeAPI { } public static void applyModifications(BiomeSource source, ResourceKey dimension) { - BCLib.LOGGER.info("\nApply Modifications for " + dimension.location() + source.toString() - .replace("\n", "\n ")); + if (Configs.MAIN_CONFIG.verboseLogging()) + BCLib.LOGGER.info("\nApply Modifications for " + dimension.location() + source.toString() + .replace("\n", "\n ")); final Set> biomes = source.possibleBiomes(); List>> modifications = MODIFICATIONS.get(dimension); diff --git a/src/main/java/org/betterx/bclib/commands/PrintInfo.java b/src/main/java/org/betterx/bclib/commands/PrintInfo.java index c9aaba80..d9486903 100644 --- a/src/main/java/org/betterx/bclib/commands/PrintInfo.java +++ b/src/main/java/org/betterx/bclib/commands/PrintInfo.java @@ -22,7 +22,6 @@ import net.fabricmc.loader.api.ModContainer; public class PrintInfo { static int printDimensions(CommandContext ctx) { - MutableComponent result = Component.literal("World Dimensions: ") .setStyle(Style.EMPTY.withBold(true).withColor(ChatFormatting.BLUE)); diff --git a/src/main/java/org/betterx/bclib/config/Config.java b/src/main/java/org/betterx/bclib/config/Config.java index 45223139..05ceb3a0 100644 --- a/src/main/java/org/betterx/bclib/config/Config.java +++ b/src/main/java/org/betterx/bclib/config/Config.java @@ -45,6 +45,7 @@ public abstract class Config { DataExchangeAPI.addAutoSyncFile(aid.modID, aid.uniqueID, keeper.getConfigFile()); AUTO_SYNC_CONFIGS.put(aid, this); + BCLib.LOGGER.info("Added Config " + configID + " to auto sync (" + (diffContent ? "content diff" : "file hash") + ")"); diff --git a/src/main/java/org/betterx/bclib/config/Configs.java b/src/main/java/org/betterx/bclib/config/Configs.java index b83926b6..75bceba6 100644 --- a/src/main/java/org/betterx/bclib/config/Configs.java +++ b/src/main/java/org/betterx/bclib/config/Configs.java @@ -20,6 +20,7 @@ public class Configs { public static final BiomesConfig BIOMES_CONFIG = new BiomesConfig(); public static final String MAIN_PATCH_CATEGORY = "patches"; + public static final String MAIN_LOG_CATEGORY = "logs"; public static void save() { MAIN_CONFIG.saveChanges(); diff --git a/src/main/java/org/betterx/bclib/config/MainConfig.java b/src/main/java/org/betterx/bclib/config/MainConfig.java index 3bb49fd5..f45c217e 100644 --- a/src/main/java/org/betterx/bclib/config/MainConfig.java +++ b/src/main/java/org/betterx/bclib/config/MainConfig.java @@ -3,6 +3,11 @@ package org.betterx.bclib.config; import org.betterx.bclib.BCLib; public class MainConfig extends NamedPathConfig { + public static final ConfigToken VERBOSE_LOGGING = ConfigToken.Boolean( + true, + "verbose", + Configs.MAIN_LOG_CATEGORY + ); public static final ConfigToken APPLY_PATCHES = ConfigToken.Boolean( true, "applyPatches", @@ -30,4 +35,8 @@ public class MainConfig extends NamedPathConfig { public boolean repairBiomes() { return get(REPAIR_BIOMES); } + + public boolean verboseLogging() { + return get(VERBOSE_LOGGING); + } } diff --git a/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java b/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java index 857e21eb..6f95717f 100644 --- a/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java +++ b/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java @@ -1,6 +1,7 @@ package org.betterx.worlds.together.world.event; import org.betterx.bclib.BCLib; +import org.betterx.bclib.config.Configs; import org.betterx.worlds.together.WorldsTogether; import org.betterx.worlds.together.levelgen.WorldGenUtil; import org.betterx.worlds.together.mixin.common.RegistryOpsAccessor; @@ -303,15 +304,17 @@ public class WorldBootstrap { entry.getValue() )); - output += "\n - " + entry.getKey().location().toString() + ": " + - "\n " + entry.getValue().generator().toString() + " " + - entry.getValue() - .generator() - .getBiomeSource() - .toString() - .replace("\n", "\n "); + if (Configs.MAIN_CONFIG.verboseLogging()) + output += "\n - " + entry.getKey().location().toString() + ": " + + "\n " + entry.getValue().generator().toString() + " " + + entry.getValue() + .generator() + .getBiomeSource() + .toString() + .replace("\n", "\n "); } - BCLib.LOGGER.info(output); + if (Configs.MAIN_CONFIG.verboseLogging()) + BCLib.LOGGER.info(output); SurfaceRuleUtil.injectSurfaceRulesToAllDimensions(worldGenSettings); WorldEventsImpl.ON_FINALIZED_WORLD_LOAD.emit(e -> e.done(worldGenSettings)); diff --git a/src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java b/src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java index 5a4e602c..4810188b 100644 --- a/src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java +++ b/src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java @@ -1,6 +1,7 @@ package org.betterx.worlds.together.worldPreset; import org.betterx.bclib.BCLib; +import org.betterx.bclib.config.Configs; import org.betterx.worlds.together.WorldsTogether; import org.betterx.worlds.together.levelgen.WorldGenUtil; import org.betterx.worlds.together.mixin.common.WorldPresetAccessor; @@ -105,7 +106,7 @@ public class TogetherWorldPreset extends WorldPreset { public static @NotNull Map, ChunkGenerator> loadWorldDimensions() { final RegistryAccess registryAccess = WorldBootstrap.getLastRegistryAccessOrElseBuiltin(); - if (registryAccess == BuiltinRegistries.ACCESS) { + if (registryAccess == BuiltinRegistries.ACCESS && Configs.MAIN_CONFIG.verboseLogging()) { BCLib.LOGGER.info("Loading from builtin Registry"); } final RegistryOps registryOps = RegistryOps.create(NbtOps.INSTANCE, registryAccess);