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

delete SeededBuilder

Browse Source
This commit is contained in:
dfsek
2021-07-19 21:47:21 -07:00
parent d997fc69bf
commit 24a4ff4044
13 changed files with 18 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
import com.dfsek.terra.api.registry.meta.RegistryFactory;
import com.dfsek.terra.api.util.reflection.ReflectionUtil;
import com.dfsek.terra.api.util.generic.pair.ImmutablePair;
import com.dfsek.terra.api.util.seeded.SeededBuilder;
import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider;
@@ -84,7 +83,7 @@ public class ConfigPackImpl implements ConfigPack {
private final Set<TerraAddon> addons;
private final SeededBuilder<BiomeProvider> seededBiomeProvider;
private final BiomeProvider seededBiomeProvider;
private final Map<Type, ImmutablePair<OpenRegistry<?>, CheckedRegistry<?>>> registryMap = new HashMap<>();
@@ -125,7 +124,6 @@ public class ConfigPackImpl implements ConfigPack {
ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
selfLoader.load(packPostTemplate, configuration);
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);
@@ -178,7 +176,6 @@ public class ConfigPackImpl implements ConfigPack {
selfLoader.load(packPostTemplate, configuration);
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);
@@ -295,7 +292,7 @@ public class ConfigPackImpl implements ConfigPack {
}
@Override
public SeededBuilder<BiomeProvider> getBiomeProviderBuilder() {
public BiomeProvider getBiomeProviderBuilder() {
return seededBiomeProvider;
}

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

@@ -2,14 +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.SeededBuilder;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class ConfigPackPostTemplate implements ConfigTemplate {
@Value("biomes")
private SeededBuilder<BiomeProvider> providerBuilder;
private BiomeProvider providerBuilder;
public SeededBuilder<BiomeProvider> getProviderBuilder() {
public BiomeProvider getProviderBuilder() {
return providerBuilder;
}
}