mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 14:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ver/6.0.0' into ver/6.0.0

Browse Source
This commit is contained in:
dfsek
2021-11-21 19:54:00 -07:00
parent 1a9fdabc4a f1fbe8e55c
commit 75bd324897
8 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/chunk-generator-noise-3d
+1 -1
Submodule common/addons/chunk-generator-noise-3d updated: b85bc70f14...51b30fb818
common/addons/config-structure
+1 -1
Submodule common/addons/config-structure updated: ba6b654f97...04865538bf
common/addons/language-yaml
+1 -1
Submodule common/addons/language-yaml updated: 5957a2bf7d...b9f98da059
common/addons/manifest-addon-loader
+1 -1
Submodule common/addons/manifest-addon-loader updated: e89c175081...c5db2fcd23
common/addons/structure-terrascript-loader
+1 -1
Submodule common/addons/structure-terrascript-loader updated: 3f89e60dea...355e024025
common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java
-2
View File
@@ -19,8 +19,6 @@ public interface PluginConfig {
boolean isDebugCommands(); boolean isDebugCommands();
boolean isDebugLogging();
boolean isDebugProfiler(); boolean isDebugProfiler();
boolean isDebugScript(); boolean isDebugScript();
common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
-9
View File
@@ -43,10 +43,6 @@ public class PluginConfigImpl implements ConfigTemplate, com.dfsek.terra.api.con
@Default @Default
private boolean debugCommands = false; private boolean debugCommands = false;
@Value("debug.log")
@Default
private boolean debugLog = false; // TODO: 2021-08-30 remove me
@Value("debug.profiler") @Value("debug.profiler")
@Default @Default
private boolean debugProfiler = false; private boolean debugProfiler = false;
@@ -128,11 +124,6 @@ public class PluginConfigImpl implements ConfigTemplate, com.dfsek.terra.api.con
return debugCommands; return debugCommands;
} }
@Override
public boolean isDebugLogging() {
return debugLog;
}
@Override @Override
public boolean isDebugProfiler() { public boolean isDebugProfiler() {
return debugProfiler; return debugProfiler;
common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
+1 -1
View File
@@ -398,7 +398,7 @@ public class ConfigPackImpl implements ConfigPack {
Map<String, Configuration> configurations = new HashMap<>(); Map<String, Configuration> 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); MetaStringPreprocessor stringPreprocessor = new MetaStringPreprocessor(configurations);
selfLoader.registerPreprocessor(Meta.class, stringPreprocessor); selfLoader.registerPreprocessor(Meta.class, stringPreprocessor);