mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-10 09:46:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging

Browse Source 
# Conflicts:
#	common/api/core/src/main/java/com/dfsek/terra/api/Logger.java
This commit is contained in:
solonovamax
2021-09-24 13:50:21 -04:00
parent b6c40302b6 0a6cde69d6
commit b03c8b4a11
271 changed files with 123 additions and 3977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java
View File

@@ -13,7 +13,7 @@ import com.dfsek.terra.api.addon.TerraAddon;
public class ConfigPackAddonsTemplate implements ConfigTemplate {
@Value("addons")
@Default
private final Set<TerraAddon> addons = new HashSet<>();
private Set<TerraAddon> addons = new HashSet<>();
public Set<TerraAddon> getAddons() {

1
common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
View File

@@ -353,6 +353,7 @@ public class ConfigPackImpl implements ConfigPack {
if(registryMap.containsKey(configType.getTypeKey()
.getType())) { // Someone already registered something; we need to copy things to the
// new registry.
main.getDebugLogger().warning("Copying values from old registry for " + configType.getTypeKey());
registryMap.get(configType.getTypeKey().getType()).getLeft().forEach(((OpenRegistry<Object>) openRegistry)::register);
}
selfLoader.registerLoader(configType.getTypeKey().getType(), openRegistry);

3
common/implementation/src/test/java/noise/ColorConfigTemplate.java
View File

@@ -11,8 +11,7 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
public class ColorConfigTemplate implements ConfigTemplate {
@Value("enable")
@Default
private @Meta
final boolean enable = false;
private @Meta boolean enable = false;
@Value("colors")
private @Meta ProbabilityCollection<@Meta Integer> colors;