From a1175480b3414a9799c7132db76b0c874de19e65 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 5 Jul 2022 20:09:06 +0200 Subject: [PATCH] [Change] removed some deprecated api calls --- .../org/betterx/betterend/entity/CubozoaEntity.java | 2 +- .../org/betterx/betterend/entity/EndFishEntity.java | 2 +- .../org/betterx/betterend/entity/EndSlimeEntity.java | 4 ++-- .../org/betterx/betterend/registry/EndFeatures.java | 8 ++++++-- .../org/betterx/betterend/world/biome/EndBiome.java | 12 +++++++++++- .../world/features/terrain/FloatingSpireFeature.java | 2 +- .../world/features/terrain/SpireFeature.java | 2 +- .../world/features/terrain/caves/EndCaveFeature.java | 9 ++++++--- .../features/terrain/caves/TunelCaveFeature.java | 6 ++++-- 9 files changed, 33 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/betterx/betterend/entity/CubozoaEntity.java b/src/main/java/org/betterx/betterend/entity/CubozoaEntity.java index ce847d15..32059398 100644 --- a/src/main/java/org/betterx/betterend/entity/CubozoaEntity.java +++ b/src/main/java/org/betterx/betterend/entity/CubozoaEntity.java @@ -51,7 +51,7 @@ public class CubozoaEntity extends AbstractSchoolingFish { ) { SpawnGroupData data = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityTag); - if (BiomeAPI.getFromBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) { + if (BiomeAPI.getBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) { this.entityData.set(VARIANT, (byte) 1); } diff --git a/src/main/java/org/betterx/betterend/entity/EndFishEntity.java b/src/main/java/org/betterx/betterend/entity/EndFishEntity.java index 142f0162..76566aa9 100644 --- a/src/main/java/org/betterx/betterend/entity/EndFishEntity.java +++ b/src/main/java/org/betterx/betterend/entity/EndFishEntity.java @@ -59,7 +59,7 @@ public class EndFishEntity extends AbstractSchoolingFish { ) { SpawnGroupData data = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityTag); - if (BiomeAPI.getFromBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) { + if (BiomeAPI.getBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) { this.entityData.set(VARIANT, (byte) (random.nextInt(VARIANTS_SULPHUR) + VARIANTS_NORMAL)); } diff --git a/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java b/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java index ab1229ec..8ab94993 100644 --- a/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java +++ b/src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java @@ -89,7 +89,7 @@ public class EndSlimeEntity extends Slime { CompoundTag entityTag ) { SpawnGroupData data = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityTag); - BCLBiome biome = BiomeAPI.getFromBiome(world.getBiome(blockPosition())); + BCLBiome biome = BiomeAPI.getBiome(world.getBiome(blockPosition())); if (biome == EndBiomes.FOGGY_MUSHROOMLAND) { this.setMossy(); } else if (biome == EndBiomes.MEGALAKE || biome == EndBiomes.MEGALAKE_GROVE) { @@ -227,7 +227,7 @@ public class EndSlimeEntity extends Slime { if (!world.getBlockState(pos.below()).is(CommonBlockTags.END_STONES)) { return false; } - BCLBiome biome = BiomeAPI.getFromBiome(world.getBiome(pos)); + BCLBiome biome = BiomeAPI.getBiome(world.getBiome(pos)); if (biome == EndBiomes.CHORUS_FOREST || biome == EndBiomes.MEGALAKE) { return true; } diff --git a/src/main/java/org/betterx/betterend/registry/EndFeatures.java b/src/main/java/org/betterx/betterend/registry/EndFeatures.java index 213e0b39..308e5b12 100644 --- a/src/main/java/org/betterx/betterend/registry/EndFeatures.java +++ b/src/main/java/org/betterx/betterend/registry/EndFeatures.java @@ -1223,8 +1223,12 @@ public class EndFeatures { BiomeAPI.addBiomeFeature(biome, feature); } - boolean hasCaves = bclbiome.getCustomData("has_caves", true) && !(bclbiome instanceof EndCaveBiome); - //TODO: 1.19 Test Cave generation + + boolean hasCaves = !(bclbiome instanceof EndCaveBiome); + if (!(bclbiome instanceof EndCaveBiome) && bclbiome instanceof EndBiome endBiome) { + hasCaves = endBiome.hasCaves(); + } + if (hasCaves && !BiomeAPI.wasRegisteredAsEndVoidBiome(id) /*!BiomeAPI.END_VOID_BIOME_PICKER.containsImmutable(id)*/) { if (Configs.BIOME_CONFIG.getBoolean(id, "hasCaves", true)) { BiomeAPI.addBiomeFeature(biome, ROUND_CAVE); diff --git a/src/main/java/org/betterx/betterend/world/biome/EndBiome.java b/src/main/java/org/betterx/betterend/world/biome/EndBiome.java index d0d3ff72..4f7fc360 100644 --- a/src/main/java/org/betterx/betterend/world/biome/EndBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/EndBiome.java @@ -23,6 +23,16 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.SurfaceRules; public class EndBiome extends BCLBiome implements SurfaceMaterialProvider { + private boolean hasCaves = true; + + void setHasCaves(boolean v) { + this.hasCaves = v; + } + + public boolean hasCaves() { + return hasCaves; + } + public static class DefaultSurfaceMaterialProvider implements SurfaceMaterialProvider { public static final BlockState END_STONE = Blocks.END_STONE.defaultBlockState(); @@ -121,7 +131,7 @@ public class EndBiome extends BCLBiome implements SurfaceMaterialProvider { EndBiome biome = builder.build(biomeConfig.getSupplier()); - biome.addCustomData("has_caves", biomeConfig.hasCaves()); + biome.setHasCaves(biomeConfig.hasCaves()); biome.setSurfaceMaterial(biomeConfig.surfaceMaterial()); EndTags.addBiomeSurfaceToEndGroup(biome); diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/FloatingSpireFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/FloatingSpireFeature.java index c14badfc..53c05530 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/FloatingSpireFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/FloatingSpireFeature.java @@ -86,7 +86,7 @@ public class FloatingSpireFeature extends SpireFeature { sdf.fillRecursive(world, center); support.forEach((bpos) -> { - if (BiomeAPI.getFromBiome(world.getBiome(bpos)) == EndBiomes.BLOSSOMING_SPIRES) { + if (BiomeAPI.getBiome(world.getBiome(bpos)) == EndBiomes.BLOSSOMING_SPIRES) { EndFeatures.TENANEA_BUSH.getFeature() .place(new FeaturePlaceContext( Optional.empty(), diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/SpireFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/SpireFeature.java index 9a9272fa..f24cd178 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/SpireFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/SpireFeature.java @@ -86,7 +86,7 @@ public class SpireFeature extends DefaultFeature { }).fillRecursive(world, center); support.forEach((bpos) -> { - if (BiomeAPI.getFromBiome(world.getBiome(bpos)) == EndBiomes.BLOSSOMING_SPIRES) { + if (BiomeAPI.getBiome(world.getBiome(bpos)) == EndBiomes.BLOSSOMING_SPIRES) { EndFeatures.TENANEA_BUSH.getFeature() .place(new FeaturePlaceContext( Optional.empty(), diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java index 92378f90..cc4dcdb9 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java @@ -253,9 +253,12 @@ public abstract class EndCaveFeature extends DefaultFeature { for (int x = -2; x < 3; x++) { for (int z = -2; z < 3; z++) { Holder biome = world.getBiome(pos.offset(x << 4, 0, z << 4)); - BCLBiome endBiome = BiomeAPI.getFromBiome(biome); - boolean hasCaves = endBiome.getCustomData("has_caves", true); - if (!hasCaves && BiomeAPI.wasRegisteredAsEndLandBiome(endBiome.getID())) { + BCLBiome bclBiome = BiomeAPI.getBiome(biome); + boolean hasCaves = true; + if (bclBiome instanceof EndBiome endBiome) + hasCaves = endBiome.hasCaves(); + + if (!hasCaves && BiomeAPI.wasRegisteredAsEndLandBiome(bclBiome.getID())) { return true; } } diff --git a/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java b/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java index 543b52cb..6e53110f 100644 --- a/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java +++ b/src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java @@ -259,7 +259,9 @@ public class TunelCaveFeature extends EndCaveFeature { protected boolean hasCavesInBiome(WorldGenLevel world, BlockPos pos) { Holder biome = world.getBiome(pos); - BCLBiome endBiome = BiomeAPI.getFromBiome(biome); - return endBiome.getCustomData("has_caves", true); + BCLBiome bclBiome = BiomeAPI.getBiome(biome); + if (bclBiome instanceof EndBiome endBiome) + return endBiome.hasCaves(); + return true; } }