From 55e024dab04fb3f029de50b8f8620b41b22bed77 Mon Sep 17 00:00:00 2001 From: Astrash Date: Sat, 30 Jul 2022 11:51:54 +1000 Subject: [PATCH] Change layer signatures --- .../dfsek/terra/addons/chunkgenerator/api/LayerPalette.java | 5 +++-- .../terra/addons/chunkgenerator/api/LayerPredicate.java | 2 +- .../layer/palette/BiomeDefinedLayerPalette.java | 6 ++++-- .../chunkgenerator/layer/palette/SimpleLayerPalette.java | 5 +++-- .../chunkgenerator/layer/predicate/BelowLayerPredicate.java | 2 +- .../chunkgenerator/layer/predicate/RangeLayerPredicate.java | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/api/LayerPalette.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/api/LayerPalette.java index c4eb14f06..bce83f62b 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/api/LayerPalette.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/api/LayerPalette.java @@ -12,8 +12,9 @@ import java.util.Map; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.properties.Properties; -import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.util.Palette; +import com.dfsek.terra.api.world.info.WorldProperties; public abstract class LayerPalette { @@ -27,7 +28,7 @@ public abstract class LayerPalette { this.resetsGroup = resetsGroup; } - public abstract Palette get(long seed, Biome biome, int x, int y, int z); + public abstract Palette get(int x, int y, int z, WorldProperties world, BiomeProvider biomeProvider); public final Group getGroup() { return group; diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/api/LayerPredicate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/api/LayerPredicate.java index ce2170d34..95c09b798 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/api/LayerPredicate.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/api/LayerPredicate.java @@ -5,5 +5,5 @@ import com.dfsek.terra.api.world.info.WorldProperties; public interface LayerPredicate { - boolean test(int x, int y, int z, WorldProperties properties, BiomeProvider provider); + boolean test(int x, int y, int z, WorldProperties worldProperties, BiomeProvider biomeProvider); } diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/BiomeDefinedLayerPalette.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/BiomeDefinedLayerPalette.java index c53efea26..2eb965f03 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/BiomeDefinedLayerPalette.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/BiomeDefinedLayerPalette.java @@ -15,7 +15,9 @@ 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.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.util.Palette; +import com.dfsek.terra.api.world.info.WorldProperties; public class BiomeDefinedLayerPalette extends LayerPalette { @@ -28,8 +30,8 @@ public class BiomeDefinedLayerPalette extends LayerPalette { } @Override - public Palette get(long seed, Biome biome, int x, int y, int z) { - return biome.getContext().get(BiomeLayerPalettes.class).palettes().get(this); + public Palette get(int x, int y, int z, WorldProperties worldProperties, BiomeProvider biomeProvider) { + return biomeProvider.getBiome(x, y, z, worldProperties.getSeed()).getContext().get(BiomeLayerPalettes.class).palettes().get(this); } public Optional getDefaultPalette() { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/SimpleLayerPalette.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/SimpleLayerPalette.java index e39beacef..ff9858230 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/SimpleLayerPalette.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/SimpleLayerPalette.java @@ -1,8 +1,9 @@ package com.dfsek.terra.addons.chunkgenerator.layer.palette; import com.dfsek.terra.addons.chunkgenerator.api.LayerPalette; -import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.util.Palette; +import com.dfsek.terra.api.world.info.WorldProperties; public class SimpleLayerPalette extends LayerPalette { @@ -15,7 +16,7 @@ public class SimpleLayerPalette extends LayerPalette { } @Override - public Palette get(long seed, Biome biome, int x, int y, int z) { + public Palette get(int x, int y, int z, WorldProperties world, BiomeProvider biomeProvider) { return palette; } } diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/BelowLayerPredicate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/BelowLayerPredicate.java index 5eb85d4f8..2f5f4faf3 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/BelowLayerPredicate.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/BelowLayerPredicate.java @@ -14,7 +14,7 @@ public class BelowLayerPredicate implements LayerPredicate { } @Override - public boolean test(int x, int y, int z, WorldProperties properties, BiomeProvider biomeProvider) { + public boolean test(int x, int y, int z, WorldProperties worldProperties, BiomeProvider biomeProvider) { return y < this.y; } } diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/RangeLayerPredicate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/RangeLayerPredicate.java index d116bb686..c7d108a11 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/RangeLayerPredicate.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/RangeLayerPredicate.java @@ -14,7 +14,7 @@ public class RangeLayerPredicate implements LayerPredicate { this.range = range; } @Override - public boolean test(int x, int y, int z, WorldProperties world, BiomeProvider provider) { + public boolean test(int x, int y, int z, WorldProperties worldProperties, BiomeProvider biomeProvider) { return range.isInRange(y); } }