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

Implement biome defined layer palettes

Browse Source
This commit is contained in:
Astrash
2022-07-16 18:56:30 +10:00
parent b57b71baa7
commit edcba9707d
3 changed files with 99 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/LayeredChunkGeneratorAddon.java
View File

@@ -14,6 +14,7 @@ import com.dfsek.terra.addons.chunkgenerator.config.pack.LayerPalettePackConfigT
import com.dfsek.terra.addons.chunkgenerator.config.pack.LayerPredicatePackConfigTemplate;
import com.dfsek.terra.addons.chunkgenerator.config.pack.LayerResolverPackConfigTemplate;
import com.dfsek.terra.addons.chunkgenerator.config.pack.LayerSamplerPackConfigTemplate;
import com.dfsek.terra.addons.chunkgenerator.config.palette.BiomeDefinedLayerPaletteTemplate;
import com.dfsek.terra.addons.chunkgenerator.config.palette.SimpleLayerPaletteTemplate;
import com.dfsek.terra.addons.chunkgenerator.config.predicate.BelowLayerPredicateTemplate;
import com.dfsek.terra.addons.chunkgenerator.config.predicate.RangeLayerPredicateTemplate;
@@ -22,10 +23,12 @@ import com.dfsek.terra.addons.chunkgenerator.config.resolve.PaletteLayerResolver
import com.dfsek.terra.addons.chunkgenerator.config.resolve.PredicateLayerResolverTemplate;
import com.dfsek.terra.addons.chunkgenerator.config.sampler.SimpleLayerSamplerTemplate;
import com.dfsek.terra.addons.chunkgenerator.generation.LayeredChunkGenerator;
import com.dfsek.terra.addons.chunkgenerator.layer.palette.BiomeDefinedLayerPalette;
import com.dfsek.terra.addons.chunkgenerator.util.InstanceWrapper;
import com.dfsek.terra.addons.manifest.api.AddonInitializer;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.addon.BaseAddon;
import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.inject.annotations.Inject;
@@ -83,6 +86,7 @@ public class LayeredChunkGeneratorAddon implements AddonInitializer {
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<LayerPalette>>> paletteTypeRegistry = event.getPack().getOrCreateRegistry(LAYER_PALETTE_TYPE_TOKEN);
paletteTypeRegistry.register(addon.key("PALETTE"), SimpleLayerPaletteTemplate::new);
paletteTypeRegistry.register(addon.key("BIOME_DEFINED"), BiomeDefinedLayerPaletteTemplate::new);
CheckedRegistry<InstanceWrapper<LayerPalette>> paletteRegistry = event.getPack().getOrCreateRegistry(LAYER_PALETTE_TOKEN);
event.loadTemplate(new LayerPalettePackConfigTemplate()).getPalettes().forEach((key, palette) -> {
paletteRegistry.register(addon.key(key), new InstanceWrapper<>(palette));
@@ -110,5 +114,11 @@ public class LayeredChunkGeneratorAddon implements AddonInitializer {
pack -> new LayeredChunkGenerator(platform, resolver));
})
.failThrough();
platform.getEventManager()
.getHandler(FunctionalEventHandler.class)
.register(addon, ConfigurationLoadEvent.class)
.priority(1000)
.then(BiomeDefinedLayerPalette.injectLayerPalettes);
}
}

22
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/BiomeDefinedLayerPaletteTemplate.java Normal file
View File

@@ -0,0 +1,22 @@
package com.dfsek.terra.addons.chunkgenerator.config.palette;
import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value;
import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.addons.chunkgenerator.api.LayerPalette;
import com.dfsek.terra.addons.chunkgenerator.layer.palette.BiomeDefinedLayerPalette;
import com.dfsek.terra.api.world.chunk.generation.util.Palette;
public class BiomeDefinedLayerPaletteTemplate implements ObjectTemplate<LayerPalette> {
@Value("default")
@Default
private Palette defaultPalette = null;
@Override
public LayerPalette get() {
return new BiomeDefinedLayerPalette(defaultPalette);
}
}

67
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/BiomeDefinedLayerPalette.java Normal file
View File

@@ -0,0 +1,67 @@
package com.dfsek.terra.addons.chunkgenerator.layer.palette;
import com.dfsek.tectonic.api.config.template.dynamic.DynamicTemplate;
import com.dfsek.tectonic.api.config.template.dynamic.DynamicValue;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import com.dfsek.terra.addons.chunkgenerator.LayeredChunkGeneratorAddon;
import com.dfsek.terra.addons.chunkgenerator.api.LayerPalette;
import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
import com.dfsek.terra.api.properties.Properties;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.chunk.generation.util.Palette;
public class BiomeDefinedLayerPalette implements LayerPalette {
private final Palette defaultPalette;
public BiomeDefinedLayerPalette(Palette defaultPalette) {
this.defaultPalette = defaultPalette;
}
@Override
public Palette get(long seed, Biome biome, int x, int y, int z) {
return biome.getContext().get(BiomeLayerPalettes.class).palettes().get(this);
}
public Optional<Palette> getDefaultPalette() {
return Optional.ofNullable(defaultPalette);
}
public static Consumer<ConfigurationLoadEvent> injectLayerPalettes = event -> {
if(event.is(Biome.class)) {
Map<BiomeDefinedLayerPalette, String> paletteFields = new HashMap<>();
DynamicTemplate.Builder templateBuilder = DynamicTemplate.builder();
event.getPack().getRegistry(LayeredChunkGeneratorAddon.LAYER_PALETTE_TOKEN).forEach((registryKey, registryEntry) -> {
LayerPalette layerPalette = registryEntry.get();
// Add template value for each BiomeDefinedLayerPalette
if (layerPalette instanceof BiomeDefinedLayerPalette biomeLayerPalette) {
String id = registryKey.getID();
String fieldName = id + "LayerPalette";
paletteFields.put(biomeLayerPalette, fieldName);
DynamicValue.Builder<Palette> value = DynamicValue.builder("layers." + id, Palette.class);
biomeLayerPalette.getDefaultPalette().ifPresent(value::setDefault);
templateBuilder.value(fieldName, value.build());
}
});
DynamicTemplate layerPaletteBiomeTemplate = event.load(templateBuilder.build());
Map<BiomeDefinedLayerPalette, Palette> paletteMap = paletteFields.entrySet().stream().collect(
Collectors.toMap(Entry::getKey, entry -> layerPaletteBiomeTemplate.get(entry.getValue(), Palette.class)));
event.getLoadedObject(Biome.class).getContext().put(new BiomeLayerPalettes(paletteMap));
}
};
public record BiomeLayerPalettes(Map<BiomeDefinedLayerPalette, Palette> palettes) implements Properties {
}
}