MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Change] removed some deprecated api calls

Browse source
This commit is contained in:
Frank 2022-07-05 20:09:06 +02:00
parent 19add56099
commit a1175480b3
9 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/betterx/betterend/entity/CubozoaEntity.java
View file

@ -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);
}

2
src/main/java/org/betterx/betterend/entity/EndFishEntity.java
View file

@ -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));
}

4
src/main/java/org/betterx/betterend/entity/EndSlimeEntity.java
View file

@ -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;
}

8
src/main/java/org/betterx/betterend/registry/EndFeatures.java
View file

@ -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);

12
src/main/java/org/betterx/betterend/world/biome/EndBiome.java
View file

@ -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);

2
src/main/java/org/betterx/betterend/world/features/terrain/FloatingSpireFeature.java
View file

@ -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<NoneFeatureConfiguration>(
Optional.empty(),

2
src/main/java/org/betterx/betterend/world/features/terrain/SpireFeature.java
View file

@ -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<NoneFeatureConfiguration>(
Optional.empty(),

9
src/main/java/org/betterx/betterend/world/features/terrain/caves/EndCaveFeature.java
View file

@ -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> 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;
}
}

6
src/main/java/org/betterx/betterend/world/features/terrain/caves/TunelCaveFeature.java
View file

@ -259,7 +259,9 @@ public class TunelCaveFeature extends EndCaveFeature {
protected boolean hasCavesInBiome(WorldGenLevel world, BlockPos pos) {
Holder<Biome> 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;
}
}