From e80e998cec9d41f5509b60605b8ae5134af6bae6 Mon Sep 17 00:00:00 2001 From: Astrash Date: Fri, 20 Oct 2023 09:32:33 +1100 Subject: [PATCH] Only log warnings with debug logging --- .../addons/biome/image/ImageBiomeProviderAddon.java | 3 ++- .../addons/biome/pipeline/BiomePipelineAddon.java | 3 ++- .../java/com/dfsek/terra/addons/ore/OreAddon.java | 3 ++- .../java/com/dfsek/terra/api/config/PluginConfig.java | 2 ++ .../java/com/dfsek/terra/config/PluginConfigImpl.java | 11 +++++++++++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java index ecef73f5d..142b7e034 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java @@ -50,6 +50,7 @@ public class ImageBiomeProviderAddon implements AddonInitializer { () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class))); }) .failThrough(); - logger.warn("The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-image-v2 addon for future pack development instead."); + if(platform.getTerraConfig().isDebugLog()) + logger.warn("The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-image-v2 addon for future pack development instead."); } } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java index 6765ab3c3..0200f17ad 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java @@ -90,6 +90,7 @@ public class BiomePipelineAddon implements AddonInitializer { event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry)); }); - logger.warn("The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-pipeline-v2 addon for future pack development instead."); + if(platform.getTerraConfig().isDebugLog()) + logger.warn("The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-pipeline-v2 addon for future pack development instead."); } } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java index 7ac64ef2b..ff2ddf54c 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java @@ -35,6 +35,7 @@ public class OreAddon implements AddonInitializer { .then(event -> event.getPack().registerConfigType(new OreConfigType(), addon.key("ORE"), 1)) .failThrough(); - logger.warn("The ore-config addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the ore-config-v2 addon for future pack development instead."); + if(platform.getTerraConfig().isDebugLog()) + logger.warn("The ore-config addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the ore-config-v2 addon for future pack development instead."); } } diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java b/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java index 2d540e483..f70b61ff0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java @@ -21,6 +21,8 @@ public interface PluginConfig { boolean isDebugScript(); + boolean isDebugLog(); + int getBiomeSearchResolution(); int getStructureCache(); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java index ee40850d6..810206513 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java @@ -51,6 +51,10 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig { @Default private boolean debugScript = false; + @Value("debug.log") + @Default + private boolean debugLog = false; + @Value("biome-search-resolution") @Default private int biomeSearch = 4; @@ -91,6 +95,8 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig { logger.info("Debug profiler enabled."); if(debugScript) logger.info("Script debug blocks enabled."); + if(debugLog) + logger.info("Debug logging enabled."); } @Override @@ -113,6 +119,11 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig { return debugScript; } + @Override + public boolean isDebugLog() { + return debugLog; + } + @Override public int getBiomeSearchResolution() { return biomeSearch;