From dc271f08a58f322bed616770e37d6c2cb8238ec9 Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 17 Jan 2022 14:09:13 +0100 Subject: [PATCH] Adopted Changes to `BCLBiomeBuilder`(paulevsGitch/BCLib#63) --- src/main/java/ru/betterend/world/biome/EndBiome.java | 10 +++++----- .../world/biome/cave/EmptyAuroraCaveBiome.java | 10 +++++----- .../betterend/world/biome/cave/EmptyEndCaveBiome.java | 8 +++++--- .../world/biome/cave/EmptySmaragdantCaveBiome.java | 10 +++++----- .../ru/betterend/world/biome/cave/EndCaveBiome.java | 9 +++++---- .../ru/betterend/world/biome/cave/JadeCaveBiome.java | 10 +++++----- .../world/biome/cave/LushAuroraCaveBiome.java | 10 +++++----- .../world/biome/cave/LushSmaragdantCaveBiome.java | 10 +++++----- 8 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/main/java/ru/betterend/world/biome/EndBiome.java b/src/main/java/ru/betterend/world/biome/EndBiome.java index 7e0601d4..25c27a65 100644 --- a/src/main/java/ru/betterend/world/biome/EndBiome.java +++ b/src/main/java/ru/betterend/world/biome/EndBiome.java @@ -10,18 +10,18 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.SurfaceRules; import ru.bclib.api.biomes.BCLBiomeBuilder; +import ru.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.api.surface.SurfaceRuleBuilder; import ru.bclib.interfaces.SurfaceMaterialProvider; import ru.bclib.world.biomes.BCLBiome; +import ru.bclib.world.biomes.BCLBiomeSettings; import ru.betterend.BetterEnd; import ru.betterend.interfaces.StructureFeaturesAccessor; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndSounds; -import java.util.function.BiFunction; - public class EndBiome extends BCLBiome implements SurfaceMaterialProvider { public static class DefaultSurfaceMaterialProvider implements SurfaceMaterialProvider{ public static final BlockState END_STONE = Blocks.END_STONE.defaultBlockState(); @@ -85,7 +85,7 @@ public class EndBiome extends BCLBiome implements SurfaceMaterialProvider { protected abstract void addCustomBuildData(BCLBiomeBuilder builder); - public BiFunction getSupplier(){ + public BiomeSupplier getSupplier(){ return EndBiome::new; } @@ -98,8 +98,8 @@ public class EndBiome extends BCLBiome implements SurfaceMaterialProvider { } } - public EndBiome(ResourceLocation biomeID, Biome biome) { - super(biomeID, biome); + public EndBiome(ResourceLocation biomeID, Biome biome, BCLBiomeSettings settings) { + super(biomeID, biome, settings); } public static EndBiome create(Config biomeConfig){ diff --git a/src/main/java/ru/betterend/world/biome/cave/EmptyAuroraCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EmptyAuroraCaveBiome.java index b7b0bdc5..8d6dbdb4 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EmptyAuroraCaveBiome.java +++ b/src/main/java/ru/betterend/world/biome/cave/EmptyAuroraCaveBiome.java @@ -2,16 +2,16 @@ package ru.betterend.world.biome.cave; import net.minecraft.resources.ResourceLocation; import ru.bclib.api.biomes.BCLBiomeBuilder; +import ru.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; +import ru.bclib.world.biomes.BCLBiomeSettings; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndParticles; import ru.betterend.world.biome.EndBiome; -import java.util.function.BiFunction; - public class EmptyAuroraCaveBiome extends EndCaveBiome.Config { public static class Biome extends EndCaveBiome { - public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) { - super(biomeID, biome); + public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome, BCLBiomeSettings settings) { + super(biomeID, biome, settings); this.addFloorFeature(EndFeatures.BIG_AURORA_CRYSTAL, 1); @@ -44,7 +44,7 @@ public class EmptyAuroraCaveBiome extends EndCaveBiome.Config { } @Override - public BiFunction getSupplier() { + public BiomeSupplier getSupplier() { return EmptyAuroraCaveBiome.Biome::new; } } diff --git a/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java index 4adf3ece..d6e1b52c 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java +++ b/src/main/java/ru/betterend/world/biome/cave/EmptyEndCaveBiome.java @@ -2,6 +2,8 @@ package ru.betterend.world.biome.cave; import net.minecraft.resources.ResourceLocation; import ru.bclib.api.biomes.BCLBiomeBuilder; +import ru.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; +import ru.bclib.world.biomes.BCLBiomeSettings; import ru.betterend.registry.EndFeatures; import ru.betterend.world.biome.EndBiome; @@ -9,8 +11,8 @@ import java.util.function.BiFunction; public class EmptyEndCaveBiome extends EndCaveBiome.Config { public static class Biome extends EndCaveBiome { - public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) { - super(biomeID, biome); + public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome, BCLBiomeSettings settings) { + super(biomeID, biome, settings); this.addFloorFeature(EndFeatures.END_STONE_STALAGMITE, 1); this.addCeilFeature(EndFeatures.END_STONE_STALACTITE, 1); @@ -38,7 +40,7 @@ public class EmptyEndCaveBiome extends EndCaveBiome.Config { } @Override - public BiFunction getSupplier() { + public BiomeSupplier getSupplier() { return Biome::new; } } diff --git a/src/main/java/ru/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java index 38a1b643..a90d3536 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java +++ b/src/main/java/ru/betterend/world/biome/cave/EmptySmaragdantCaveBiome.java @@ -2,16 +2,16 @@ package ru.betterend.world.biome.cave; import net.minecraft.resources.ResourceLocation; import ru.bclib.api.biomes.BCLBiomeBuilder; +import ru.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; +import ru.bclib.world.biomes.BCLBiomeSettings; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndParticles; import ru.betterend.world.biome.EndBiome; -import java.util.function.BiFunction; - public class EmptySmaragdantCaveBiome extends EndCaveBiome.Config { public static class Biome extends EndCaveBiome { - public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) { - super(biomeID, biome); + public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome, BCLBiomeSettings settings) { + super(biomeID, biome, settings); this.addFloorFeature(EndFeatures.SMARAGDANT_CRYSTAL, 1); this.addFloorFeature(EndFeatures.SMARAGDANT_CRYSTAL_SHARD, 20); @@ -45,7 +45,7 @@ public class EmptySmaragdantCaveBiome extends EndCaveBiome.Config { } @Override - public BiFunction getSupplier() { + public BiomeSupplier getSupplier() { return EmptySmaragdantCaveBiome.Biome::new; } } diff --git a/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java index 0b1a1db3..d1047305 100644 --- a/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java +++ b/src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java @@ -8,8 +8,10 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.feature.Feature; import ru.bclib.api.biomes.BCLBiomeBuilder; +import ru.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.util.WeightedList; +import ru.bclib.world.biomes.BCLBiomeSettings; import ru.bclib.world.features.BCLFeature; import ru.betterend.BetterEnd; import ru.betterend.registry.EndSounds; @@ -17,7 +19,6 @@ import ru.betterend.world.biome.EndBiome; import ru.betterend.world.features.terrain.caves.CaveChunkPopulatorFeature; import java.util.Random; -import java.util.function.BiFunction; public class EndCaveBiome extends EndBiome { public static abstract class Config extends EndBiome.Config { @@ -45,7 +46,7 @@ public class EndCaveBiome extends EndBiome { } @Override - public BiFunction getSupplier() { + public BiomeSupplier getSupplier() { return EndCaveBiome::new; } } @@ -53,8 +54,8 @@ public class EndCaveBiome extends EndBiome { private WeightedList> floorFeatures = new WeightedList>(); private WeightedList> ceilFeatures = new WeightedList>(); - public EndCaveBiome(ResourceLocation biomeID, Biome biome) { - super(biomeID, biome); + public EndCaveBiome(ResourceLocation biomeID, Biome biome, BCLBiomeSettings settings) { + super(biomeID, biome, settings); } public void addFloorFeature(Feature feature, float weight) { diff --git a/src/main/java/ru/betterend/world/biome/cave/JadeCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/JadeCaveBiome.java index 90382c99..39e22937 100644 --- a/src/main/java/ru/betterend/world/biome/cave/JadeCaveBiome.java +++ b/src/main/java/ru/betterend/world/biome/cave/JadeCaveBiome.java @@ -5,20 +5,20 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.level.block.state.BlockState; import ru.bclib.api.biomes.BCLBiomeBuilder; +import ru.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; +import ru.bclib.world.biomes.BCLBiomeSettings; import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.registry.EndBlocks; import ru.betterend.world.biome.EndBiome; -import java.util.function.BiFunction; - public class JadeCaveBiome extends EndCaveBiome.Config { public static class Biome extends EndCaveBiome { private static final OpenSimplexNoise WALL_NOISE = new OpenSimplexNoise("jade_cave".hashCode()); private static final OpenSimplexNoise DEPTH_NOISE = new OpenSimplexNoise("depth_noise".hashCode()); private static final BlockState[] JADE = new BlockState[3]; - public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) { - super(biomeID, biome); + public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome, BCLBiomeSettings settings) { + super(biomeID, biome, settings); JADE[0] = EndBlocks.VIRID_JADESTONE.stone.defaultBlockState(); JADE[1] = EndBlocks.AZURE_JADESTONE.stone.defaultBlockState(); @@ -47,7 +47,7 @@ public class JadeCaveBiome extends EndCaveBiome.Config { } @Override - public BiFunction getSupplier() { + public BiomeSupplier getSupplier() { return JadeCaveBiome.Biome::new; } } diff --git a/src/main/java/ru/betterend/world/biome/cave/LushAuroraCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/LushAuroraCaveBiome.java index 95518656..fd452ad1 100644 --- a/src/main/java/ru/betterend/world/biome/cave/LushAuroraCaveBiome.java +++ b/src/main/java/ru/betterend/world/biome/cave/LushAuroraCaveBiome.java @@ -4,19 +4,19 @@ import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.state.BlockState; import ru.bclib.api.biomes.BCLBiomeBuilder; +import ru.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; import ru.bclib.blocks.BlockProperties; import ru.bclib.interfaces.SurfaceMaterialProvider; +import ru.bclib.world.biomes.BCLBiomeSettings; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndParticles; import ru.betterend.world.biome.EndBiome; -import java.util.function.BiFunction; - public class LushAuroraCaveBiome extends EndCaveBiome.Config { public static class Biome extends EndCaveBiome { - public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) { - super(biomeID, biome); + public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome, BCLBiomeSettings settings) { + super(biomeID, biome, settings); this.addFloorFeature(EndFeatures.BIG_AURORA_CRYSTAL, 1); this.addFloorFeature(EndFeatures.CAVE_BUSH, 5); @@ -63,7 +63,7 @@ public class LushAuroraCaveBiome extends EndCaveBiome.Config { } @Override - public BiFunction getSupplier() { + public BiomeSupplier getSupplier() { return LushAuroraCaveBiome.Biome::new; } diff --git a/src/main/java/ru/betterend/world/biome/cave/LushSmaragdantCaveBiome.java b/src/main/java/ru/betterend/world/biome/cave/LushSmaragdantCaveBiome.java index 6674466b..240e7a52 100644 --- a/src/main/java/ru/betterend/world/biome/cave/LushSmaragdantCaveBiome.java +++ b/src/main/java/ru/betterend/world/biome/cave/LushSmaragdantCaveBiome.java @@ -3,18 +3,18 @@ package ru.betterend.world.biome.cave; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.state.BlockState; import ru.bclib.api.biomes.BCLBiomeBuilder; +import ru.bclib.api.biomes.BCLBiomeBuilder.BiomeSupplier; import ru.bclib.interfaces.SurfaceMaterialProvider; +import ru.bclib.world.biomes.BCLBiomeSettings; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndFeatures; import ru.betterend.registry.EndParticles; import ru.betterend.world.biome.EndBiome; -import java.util.function.BiFunction; - public class LushSmaragdantCaveBiome extends EndCaveBiome.Config { public static class Biome extends EndCaveBiome { - public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome) { - super(biomeID, biome); + public Biome(ResourceLocation biomeID, net.minecraft.world.level.biome.Biome biome, BCLBiomeSettings settings) { + super(biomeID, biome, settings); this.addFloorFeature(EndFeatures.SMARAGDANT_CRYSTAL, 1); this.addFloorFeature(EndFeatures.SMARAGDANT_CRYSTAL_SHARD, 20); @@ -48,7 +48,7 @@ public class LushSmaragdantCaveBiome extends EndCaveBiome.Config { } @Override - public BiFunction getSupplier() { + public BiomeSupplier getSupplier() { return LushSmaragdantCaveBiome.Biome::new; }