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

noise addon + pack.yml noise functions

Browse Source
This commit is contained in:
dfsek
2021-07-05 20:35:39 -07:00
parent b8e1e99b84
commit 39f5aef0c5
6 changed files with 54 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,9 +70,6 @@ public class ConfigPackImpl implements ConfigPack {
private final RegistryFactory registryFactory = new RegistryFactoryImpl();
private final Map<Type, TypeLoader<?>> loaders = new HashMap<>();
private final Map<Type, TemplateProvider<ObjectTemplate<?>>> objectLoaders = new HashMap<>();
private final AbstractConfigLoader abstractConfigLoader = new AbstractConfigLoader();
private final ConfigLoader selfLoader = new ConfigLoader();
private final Scope varScope = new Scope();
@@ -184,12 +181,6 @@ public class ConfigPackImpl implements ConfigPack {
toWorldConfig(new TerraWorldImpl(new DummyWorld(), this, main)); // Build now to catch any errors immediately.
}
@SuppressWarnings("unchecked")
private void applyLoaders(TypeRegistry registry) {
loaders.forEach(registry::registerLoader);
objectLoaders.forEach((t, l) -> registry.registerLoader(t, (TemplateProvider<ObjectTemplate<Object>>) ((Object) l)));
}
private Map<Class<?>, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>> newRegistryMap() {
Map<Class<?>, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>> map = new HashMap<Class<?>, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>>() {
@Serial
@@ -219,14 +210,15 @@ public class ConfigPackImpl implements ConfigPack {
}
@Override
public <T> ConfigPackImpl applyLoader(Type type, TypeLoader<T> loader) {
loaders.put(type, loader);
abstractConfigLoader.registerLoader(type, loader);
selfLoader.registerLoader(type, loader);
return this;
}
@SuppressWarnings("unchecked")
@Override
public <T> ConfigPackImpl applyLoader(Type type, TemplateProvider<ObjectTemplate<T>> loader) {
objectLoaders.put(type, (TemplateProvider<ObjectTemplate<?>>) ((Object) loader));
abstractConfigLoader.registerLoader(type, loader);
selfLoader.registerLoader(type, loader);
return this;
}
@@ -236,8 +228,6 @@ public class ConfigPackImpl implements ConfigPack {
@SuppressWarnings({"unchecked", "rawtypes"})
private void load(long start, TerraPlugin main) throws ConfigException {
applyLoaders(abstractConfigLoader);
applyLoaders(selfLoader);
configTypes.values().forEach(list -> list.forEach(pair -> configTypeRegistry.register(pair.getLeft(), pair.getRight())));
for(Map.Entry<String, Double> var : template.getVariables().entrySet()) {

7
common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java
View File

@@ -16,9 +16,6 @@ public class ConfigPackTemplate implements ConfigTemplate {
@Value("id")
private String id;
@Value("noise")
private Map<String, NoiseSeeded> noiseBuilderMap;
@Value("addons")
@Default
private Set<TerraAddon> addons = new HashSet<>();
@@ -139,10 +136,6 @@ public class ConfigPackTemplate implements ConfigTemplate {
return vanillaStructures;
}
public Map<String, NoiseSeeded> getNoiseBuilderMap() {
return noiseBuilderMap;
}
public Map<String, Double> getVariables() {
return variables;
}