BiomeBuilder -> SeededTerraBiome

This commit is contained in:
dfsek
2021-07-17 21:37:57 -07:00
parent 689fe0bc70
commit 3a94c5287c
20 changed files with 58 additions and 64 deletions
@@ -7,11 +7,11 @@ import com.dfsek.terra.api.config.ConfigFactory;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.config.ConfigType;
import com.dfsek.terra.api.registry.OpenRegistry;
import com.dfsek.terra.api.util.seeded.BiomeBuilder;
import com.dfsek.terra.api.util.seeded.SeededTerraBiome;
import java.util.function.Supplier;
public class BiomeConfigType implements ConfigType<BiomeTemplate, BiomeBuilder> {
public class BiomeConfigType implements ConfigType<BiomeTemplate, SeededTerraBiome> {
private final ConfigPack pack;
private final BiomeFactory factory;
@@ -26,20 +26,20 @@ public class BiomeConfigType implements ConfigType<BiomeTemplate, BiomeBuilder>
}
@Override
public ConfigFactory<BiomeTemplate, BiomeBuilder> getFactory() {
public ConfigFactory<BiomeTemplate, SeededTerraBiome> getFactory() {
return factory;
}
@Override
public Class<BiomeBuilder> getTypeClass() {
return BiomeBuilder.class;
public Class<SeededTerraBiome> getTypeClass() {
return SeededTerraBiome.class;
}
@Override
public Supplier<OpenRegistry<BiomeBuilder>> registrySupplier() {
return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<BiomeBuilder>) (t, c, loader) -> {
public Supplier<OpenRegistry<SeededTerraBiome>> registrySupplier() {
return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<SeededTerraBiome>) (t, c, loader) -> {
if(c.equals("SELF")) return null;
BiomeBuilder obj = registry.get((String) c);
SeededTerraBiome obj = registry.get((String) c);
if(obj == null)
throw new LoadException("No such " + t.getType().getTypeName() + " matching \"" + c + "\" was found in this registry.");
return obj;
@@ -3,9 +3,9 @@ package com.dfsek.terra.addons.biome;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.config.ConfigFactory;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.util.seeded.BiomeBuilder;
import com.dfsek.terra.api.util.seeded.SeededTerraBiome;
public class BiomeFactory implements ConfigFactory<BiomeTemplate, BiomeBuilder> {
public class BiomeFactory implements ConfigFactory<BiomeTemplate, SeededTerraBiome> {
private final ConfigPack pack;
public BiomeFactory(ConfigPack pack) {
@@ -13,7 +13,7 @@ public class BiomeFactory implements ConfigFactory<BiomeTemplate, BiomeBuilder>
}
@Override
public BiomeBuilder build(BiomeTemplate template, TerraPlugin main) {
return new UserDefinedBiomeBuilder(template);
public SeededTerraBiome build(BiomeTemplate template, TerraPlugin main) {
return new UserDefinedSeededTerraBiome(template);
}
}
@@ -2,19 +2,19 @@ package com.dfsek.terra.addons.biome;
import com.dfsek.terra.api.properties.Context;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.util.seeded.BiomeBuilder;
import com.dfsek.terra.api.util.seeded.SeededTerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class UserDefinedBiomeBuilder implements BiomeBuilder {
public class UserDefinedSeededTerraBiome implements SeededTerraBiome {
private final BiomeTemplate template;
private final Context context = new Context();
private final Map<Long, UserDefinedBiome> biomeMap = new ConcurrentHashMap<>();
public UserDefinedBiomeBuilder(BiomeTemplate template) {
public UserDefinedSeededTerraBiome(BiomeTemplate template) {
this.template = template;
}