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

Fixed BCLib compat

Browse source
This commit is contained in:
Frank 2021-12-09 21:39:12 +01:00
parent 2a0f58a729
commit ef025d05dd
29 changed files with 21 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/registry/EndBiomes.java
View file

@ -160,6 +160,6 @@ public class EndBiomes {
}
public static EndCaveBiome getCaveBiome(int x, int z) {
return (EndCaveBiome) caveBiomeMap.getBiome(x, z);
return (EndCaveBiome) caveBiomeMap.getBiome(x, 5, z);
}
}

2
src/main/java/ru/betterend/world/biome/EndBiome.java
View file

@ -13,7 +13,7 @@ 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.BiomeAPI;
import ru.bclib.api.biomes.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.bclib.world.biomes.BCLBiome;
import ru.betterend.BetterEnd;
import ru.betterend.interfaces.StructureFeaturesAccessor;

2
src/main/java/ru/betterend/world/biome/land/AmberLandBiome.java
View file

@ -3,7 +3,7 @@ package ru.betterend.world.biome.land;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.block.state.BlockState;
import ru.bclib.api.biomes.BCLBiomeBuilder;
import ru.bclib.api.biomes.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;

2
src/main/java/ru/betterend/world/biome/land/BlossomingSpiresBiome.java
View file

@ -3,7 +3,7 @@ package ru.betterend.world.biome.land;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.block.state.BlockState;
import ru.bclib.api.biomes.BCLBiomeBuilder;
import ru.bclib.api.biomes.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;

3
src/main/java/ru/betterend/world/biome/land/ChorusForestBiome.java
View file

@ -5,9 +5,8 @@ import net.minecraft.data.worldgen.placement.EndPlacements;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
import net.minecraft.world.level.levelgen.SurfaceRules;
import ru.bclib.api.biomes.BCLBiomeBuilder;
import ru.bclib.api.biomes.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;

3
src/main/java/ru/betterend/world/biome/land/CrystalMountainsBiome.java
View file

@ -2,9 +2,8 @@ package ru.betterend.world.biome.land;
import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndSounds;

3
src/main/java/ru/betterend/world/biome/land/DragonGraveyardsBiome.java
View file

@ -2,9 +2,8 @@ package ru.betterend.world.biome.land;
import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;

3
src/main/java/ru/betterend/world/biome/land/DryShrublandBiome.java
View file

@ -2,9 +2,8 @@ package ru.betterend.world.biome.land;
import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndSounds;

3
src/main/java/ru/betterend/world/biome/land/DustWastelandsBiome.java
View file

@ -3,9 +3,8 @@ package ru.betterend.world.biome.land;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndSounds;
import ru.betterend.world.biome.EndBiome;

2
src/main/java/ru/betterend/world/biome/land/FoggyMushroomlandBiome.java
View file

@ -4,7 +4,7 @@ import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;

3
src/main/java/ru/betterend/world/biome/land/GlowingGrasslandsBiome.java
View file

@ -2,9 +2,8 @@ package ru.betterend.world.biome.land;
import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;

3
src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java
View file

@ -2,9 +2,8 @@ package ru.betterend.world.biome.land;
import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;

2
src/main/java/ru/betterend/world/biome/land/MegalakeBiome.java
View file

@ -4,7 +4,7 @@ import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;

3
src/main/java/ru/betterend/world/biome/land/MegalakeGroveBiome.java
View file

@ -2,9 +2,8 @@ package ru.betterend.world.biome.land;
import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;

2
src/main/java/ru/betterend/world/biome/land/NeonOasisBiome.java
View file

@ -5,7 +5,7 @@ import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndSounds;

3
src/main/java/ru/betterend/world/biome/land/PaintedMountainsBiome.java
View file

@ -3,9 +3,8 @@ package ru.betterend.world.biome.land;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndSounds;
import ru.betterend.registry.EndStructures;

3
src/main/java/ru/betterend/world/biome/land/ShadowForestBiome.java
View file

@ -3,9 +3,8 @@ package ru.betterend.world.biome.land;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;

2
src/main/java/ru/betterend/world/biome/land/SulphurSpringsBiome.java
View file

@ -5,7 +5,7 @@ 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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndFeatures;

2
src/main/java/ru/betterend/world/biome/land/UmbraValleyBiome.java
View file

@ -3,7 +3,7 @@ package ru.betterend.world.biome.land;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;

3
src/main/java/ru/betterend/world/biome/land/UmbrellaJungleBiome.java
View file

@ -2,9 +2,8 @@ package ru.betterend.world.biome.land;
import net.minecraft.world.entity.EntityType;
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.SurfaceMaterialProvider;
import ru.bclib.interfaces.SurfaceMaterialProvider;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndFeatures;
import ru.betterend.registry.EndParticles;

2
src/main/java/ru/betterend/world/features/terrain/DesertLakeFeature.java
View file

@ -124,7 +124,6 @@ public class DesertLakeFeature extends DefaultFeature {
}
pos = POS.below();
if (world.getBlockState(pos).is(TagAPI.BLOCK_GEN_TERRAIN)) {
//TODO: 1.18 this needs to change to a dynamic block
state = EndBiome.findTopMaterial(world, pos); //world.getBiome(pos).getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial();
if (y > waterLevel + 1) BlocksHelper.setWithoutUpdate(world, pos, state);
else if (y > waterLevel)
@ -197,7 +196,6 @@ public class DesertLakeFeature extends DefaultFeature {
}
else if (y < waterLevel) {
if (world.isEmptyBlock(POS.above())) {
//TODO: 1.18 this needs to change to a dynamic block
state = EndBiome.findTopMaterial(world, pos); //world.getBiome(POS).getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial();
BlocksHelper.setWithoutUpdate(
world,

2
src/main/java/ru/betterend/world/features/terrain/EndLakeFeature.java
View file

@ -128,7 +128,6 @@ public class EndLakeFeature extends DefaultFeature {
}
pos = POS.below();
if (world.getBlockState(pos).is(TagAPI.BLOCK_GEN_TERRAIN)) {
//TODO: 1.18 this needs to change to a dynamic block
state = EndBiome.findTopMaterial(world, pos);
//state = world.getBiome(pos)
// .getGenerationSettings()
@ -200,7 +199,6 @@ public class EndLakeFeature extends DefaultFeature {
// Make border
else if (y < waterLevel && y2 + x2 + z2 <= rb) {
if (world.isEmptyBlock(POS.above())) {
//TODO: 1.18 this needs to change to a dynamic block
state = EndBiome.findTopMaterial(world, pos);
// state = world.getBiome(POS)
// .getGenerationSettings()

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

@ -65,11 +65,9 @@ public class FloatingSpireFeature extends SpireFeature {
if (random.nextInt(16) == 0) {
support.add(info.getPos().above());
}
//TODO: 1.18 this needs to change to a dynamic block
return EndBiome.findTopMaterial(world, info.getPos());//world.getBiome(info.getPos()).getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial();
}
else if (info.getState(Direction.UP, 3).isAir()) {
//TODO: 1.18 this needs to change to a dynamic block
return EndBiome.findUnderMaterial(world, info.getPos());
// return world.getBiome(info.getPos())
// .getGenerationSettings()

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

@ -68,12 +68,10 @@ public class SpireFeature extends DefaultFeature {
if (random.nextInt(16) == 0) {
support.add(info.getPos().above());
}
//TODO: 1.18 this needs to change to a dynamic block
return EndBiome.findTopMaterial(world, info.getPos());
//return world.getBiome(info.getPos()).getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial();
}
else if (info.getState(Direction.UP, 3).isAir()) {
//TODO: 1.18 this needs to change to a dynamic block
return EndBiome.findUnderMaterial(world, info.getPos());
// return world.getBiome(info.getPos())
// .getGenerationSettings()

1
src/main/java/ru/betterend/world/features/terrain/caves/CaveChunkPopulatorFeature.java
View file

@ -42,7 +42,6 @@ public class CaveChunkPopulatorFeature extends DefaultFeature {
MutableBlockPos max = new MutableBlockPos().set(pos);
fillSets(sx, sz, world.getChunk(pos), floorPositions, ceilPositions, min, max);
EndCaveBiome biome = supplier.get();
//TODO: 1.18 This needs to change to a configured material
BlockState surfaceBlock = Blocks.END_STONE.defaultBlockState(); //biome.getBiome().getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial();
placeFloor(world, biome, floorPositions, random, surfaceBlock);
placeCeil(world, biome, ceilPositions, random);

1
src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java
View file

@ -76,7 +76,6 @@ public abstract class EndCaveFeature extends DefaultFeature {
}
});
//TODO: 1.18 this needs to change to a dynamic block
BlockState surfaceBlock = Blocks.END_STONE.defaultBlockState(); //biome.getBiome().getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial();
placeFloor(world, biome, floorPositions, random, surfaceBlock);
placeCeil(world, biome, ceilPositions, random);

1
src/main/java/ru/betterend/world/features/terrain/caves/TunelCaveFeature.java
View file

@ -168,7 +168,6 @@ public class TunelCaveFeature extends EndCaveFeature {
}
floorSets.forEach((biome, floorPositions) -> {
//TODO: 1.18 this needs to change to a dynamic block
BlockState surfaceBlock = Blocks.END_STONE.defaultBlockState();
// BlockState surfaceBlock = biome.getBiome()
// .getGenerationSettings()

3
src/main/java/ru/betterend/world/structures/piece/CrystalMountainPiece.java
View file

@ -30,7 +30,6 @@ public class CrystalMountainPiece extends MountainPiece {
public CrystalMountainPiece(BlockPos center, float radius, float height, Random random, Biome biome) {
super(EndStructures.MOUNTAIN_PIECE, center, radius, height, random, biome);
//TODO: 1.18 this needs to change to a dynamic block
top = EndBiome.findTopMaterial(biome); //biome.getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial();
}
@ -40,7 +39,7 @@ public class CrystalMountainPiece extends MountainPiece {
@Override
protected void fromNbt(CompoundTag tag) {
super.fromNbt(tag);//TODO: 1.18 this needs to change to a dynamic block
super.fromNbt(tag);
top = EndBiome.findTopMaterial(BiomeAPI.getBiome(biomeID)); //BiomeAPI.getBiome(biomeID).getBiome().getGenerationSettings().getSurfaceBuilderConfig().getTopMaterial();
}

3
src/main/java/ru/betterend/world/structures/piece/LakePiece.java
View file

@ -133,7 +133,6 @@ public class LakePiece extends BasePiece {
)) {
state = chunk.getBlockState(mut.above());
if (state.isAir()) {
//TODO: 1.18 this needs to change to a dynamic block
state = EndBiome.findTopMaterial(world, worldPos);
// state = random.nextBoolean() ? ENDSTONE : world.getBiome(worldPos)
// .getGenerationSettings()
@ -170,7 +169,6 @@ public class LakePiece extends BasePiece {
BlockState bState = chunk.getBlockState(mut);
if (bState.isAir()) {
//TODO: 1.18 this needs to change to a dynamic block
bState = EndBiome.findTopMaterial(world, mut.offset(sx, 0, sz));
// bState = random.nextBoolean() ? ENDSTONE : world.getBiome(mut.offset(sx, 0, sz))
// .getGenerationSettings()
@ -194,7 +192,6 @@ public class LakePiece extends BasePiece {
mut.setY(y + 1);
BlockState bState = chunk.getBlockState(mut);
if (bState.isAir()) {
//TODO: 1.18 this needs to change to a dynamic block
bState =EndBiome.findTopMaterial(world, mut.offset(sx, 0, sz));
// bState = random.nextBoolean() ? ENDSTONE : world.getBiome(mut.offset(sx, 0, sz))
// .getGenerationSettings()