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

BiomeProviderBuilder -> SeededBiomeProvider

Browse Source
This commit is contained in:
dfsek
2021-07-17 21:51:18 -07:00
parent ec28f613d3
commit d4112e46c7
11 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ import com.dfsek.terra.api.registry.OpenRegistry;
import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
import com.dfsek.terra.api.registry.meta.RegistryFactory;
import com.dfsek.terra.api.util.generic.pair.ImmutablePair;
import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
import com.dfsek.terra.api.util.seeded.SeededBiomeProvider;
import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider;
import com.dfsek.terra.api.world.generator.GenerationStageProvider;
@@ -82,7 +82,7 @@ public class ConfigPackImpl implements ConfigPack {
private final Set<TerraAddon> addons;
private final BiomeProviderBuilder biomeProviderBuilder;
private final SeededBiomeProvider seededBiomeProvider;
private final Map<Class<?>, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>> registryMap = new HashMap<>();
@@ -122,8 +122,8 @@ public class ConfigPackImpl implements ConfigPack {
ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
selfLoader.load(packPostTemplate, configuration);
biomeProviderBuilder = packPostTemplate.getProviderBuilder();
biomeProviderBuilder.build(0); // Build dummy provider to catch errors at load time.
seededBiomeProvider = packPostTemplate.getProviderBuilder();
seededBiomeProvider.build(0); // Build dummy provider to catch errors at load time.
checkDeadEntries(main);
} catch(FileNotFoundException e) {
throw new LoadException("No pack.yml file found in " + folder.getAbsolutePath(), e);
@@ -175,8 +175,8 @@ public class ConfigPackImpl implements ConfigPack {
ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
selfLoader.load(packPostTemplate, configuration);
biomeProviderBuilder = packPostTemplate.getProviderBuilder();
biomeProviderBuilder.build(0); // Build dummy provider to catch errors at load time.
seededBiomeProvider = packPostTemplate.getProviderBuilder();
seededBiomeProvider.build(0); // Build dummy provider to catch errors at load time.
checkDeadEntries(main);
} catch(IOException e) {
throw new LoadException("Unable to load pack.yml from ZIP file", e);
@@ -293,8 +293,8 @@ public class ConfigPackImpl implements ConfigPack {
}
@Override
public BiomeProviderBuilder getBiomeProviderBuilder() {
return biomeProviderBuilder;
public SeededBiomeProvider getBiomeProviderBuilder() {
return seededBiomeProvider;
}
@SuppressWarnings("unchecked")

6
common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackPostTemplate.java
View File

@@ -2,13 +2,13 @@ package com.dfsek.terra.config.pack;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.config.ConfigTemplate;
import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
import com.dfsek.terra.api.util.seeded.SeededBiomeProvider;
public class ConfigPackPostTemplate implements ConfigTemplate {
@Value("biomes")
private BiomeProviderBuilder providerBuilder;
private SeededBiomeProvider providerBuilder;
public BiomeProviderBuilder getProviderBuilder() {
public SeededBiomeProvider getProviderBuilder() {
return providerBuilder;
}
}