From 8a5666227d456b41240134c5d90e5bb061afb21c Mon Sep 17 00:00:00 2001 From: NeumimTo Date: Fri, 22 Oct 2021 22:53:55 +0200 Subject: [PATCH 1/2] fix win loading --- .../main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index c906b3aeb..6e7f6df88 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -381,7 +381,7 @@ public class ConfigPackImpl implements ConfigPack { Map configurations = new HashMap<>(); - platform.getEventManager().callEvent(new ConfigurationDiscoveryEvent(this, loader, configurations::put)); // Create all the configs. + platform.getEventManager().callEvent(new ConfigurationDiscoveryEvent(this, loader, (s, c) -> configurations.put(s.replace("\\","/"), c))); // Create all the configs. MetaStringPreprocessor stringPreprocessor = new MetaStringPreprocessor(configurations); selfLoader.registerPreprocessor(Meta.class, stringPreprocessor); From e60dfe024200d11bb9f07ff9806be21d43a40906 Mon Sep 17 00:00:00 2001 From: solonovamax Date: Sun, 21 Nov 2021 20:13:06 -0500 Subject: [PATCH 2/2] Remove debug logging config value Signed-off-by: solonovamax --- common/addons/chunk-generator-noise-3d | 2 +- common/addons/config-structure | 2 +- common/addons/language-yaml | 2 +- common/addons/manifest-addon-loader | 2 +- common/addons/structure-terrascript-loader | 2 +- .../java/com/dfsek/terra/api/config/PluginConfig.java | 2 -- .../java/com/dfsek/terra/config/PluginConfigImpl.java | 9 --------- 7 files changed, 5 insertions(+), 16 deletions(-) diff --git a/common/addons/chunk-generator-noise-3d b/common/addons/chunk-generator-noise-3d index b85bc70f1..51b30fb81 160000 --- a/common/addons/chunk-generator-noise-3d +++ b/common/addons/chunk-generator-noise-3d @@ -1 +1 @@ -Subproject commit b85bc70f1424d86bbb568a9345e58c800fc6cf3f +Subproject commit 51b30fb818daa2dd8e6a15308f15cd4ee68e4b5b diff --git a/common/addons/config-structure b/common/addons/config-structure index ba6b654f9..04865538b 160000 --- a/common/addons/config-structure +++ b/common/addons/config-structure @@ -1 +1 @@ -Subproject commit ba6b654f97316cf6987360dba61e4e39a125879b +Subproject commit 04865538bfa596f361c7364c607b492bbe754451 diff --git a/common/addons/language-yaml b/common/addons/language-yaml index 5957a2bf7..b9f98da05 160000 --- a/common/addons/language-yaml +++ b/common/addons/language-yaml @@ -1 +1 @@ -Subproject commit 5957a2bf7dbf6f6c2487d31d189fa127e0090964 +Subproject commit b9f98da059b4daa9513c09151170f5239fd76d71 diff --git a/common/addons/manifest-addon-loader b/common/addons/manifest-addon-loader index e89c17508..c5db2fcd2 160000 --- a/common/addons/manifest-addon-loader +++ b/common/addons/manifest-addon-loader @@ -1 +1 @@ -Subproject commit e89c175081921387008e258a67e861d6a9c0bc22 +Subproject commit c5db2fcd23c8cd16b1ad836fbb9ae7dac7c356bb diff --git a/common/addons/structure-terrascript-loader b/common/addons/structure-terrascript-loader index 3f89e60de..355e02402 160000 --- a/common/addons/structure-terrascript-loader +++ b/common/addons/structure-terrascript-loader @@ -1 +1 @@ -Subproject commit 3f89e60dea9f583cb95f39f275000ff4d6586705 +Subproject commit 355e024025e9906f76c2c1c4332081549b597c6c diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java index a1df1bc09..386a83a8f 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java @@ -19,8 +19,6 @@ public interface PluginConfig { boolean isDebugCommands(); - boolean isDebugLogging(); - boolean isDebugProfiler(); boolean isDebugScript(); diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java index 633b1a741..9b77249a0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java @@ -43,10 +43,6 @@ public class PluginConfigImpl implements ConfigTemplate, com.dfsek.terra.api.con @Default private boolean debugCommands = false; - @Value("debug.log") - @Default - private boolean debugLog = false; // TODO: 2021-08-30 remove me - @Value("debug.profiler") @Default private boolean debugProfiler = false; @@ -128,11 +124,6 @@ public class PluginConfigImpl implements ConfigTemplate, com.dfsek.terra.api.con return debugCommands; } - @Override - public boolean isDebugLogging() { - return debugLog; - } - @Override public boolean isDebugProfiler() { return debugProfiler;