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

Merge remote-tracking branch 'origin/1.18' into 1.18

Browse source
This commit is contained in:
paulevsGitch 2021-12-01 11:15:43 +03:00
commit 548cedcffe
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/ru/bclib/api/BiomeAPI.java
View file

@ -455,9 +455,20 @@ public class BiomeAPI {
* @param structure {@link ConfiguredStructureFeature} to add.
*/
public static void addBiomeStructure(Biome biome, ConfiguredStructureFeature structure) {
BuiltinRegistries.CONFIGURED_STRUCTURE_FEATURE
.getResourceKey(structure)
.ifPresent(key -> BiomeModifications.addStructure(ctx -> ctx.getBiomeKey().equals(BuiltinRegistries.BIOME.getKey(biome)), key));
BuiltinRegistries.CONFIGURED_STRUCTURE_FEATURE.getResourceKey(structure)
.ifPresent((key)->
BiomeModifications.addStructure(
(ctx)-> ctx.getBiomeKey().location().equals(BuiltinRegistries.BIOME.getKey(biome)),
key
));
}
/**
* Adds new structure feature to existing biome.
* @param biome {@link Biome} to add structure feature in.
* @param structure {@link BCLStructureFeature} to add.
*/
public static void addBiomeStructure(Biome biome, BCLStructureFeature structure) {
addBiomeStructure(biome, structure.getFeatureConfigured());
}
/**

10
src/main/java/ru/bclib/world/biomes/BCLBiomeDef.java
View file

@ -27,6 +27,7 @@ import net.minecraft.world.level.levelgen.carver.CarverConfiguration;
import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import ru.bclib.api.BiomeAPI;
import ru.bclib.config.IdConfig;
import ru.bclib.config.PathConfig;
import ru.bclib.util.ColorUtil;
@ -147,12 +148,12 @@ public class BCLBiomeDef {
}
public BCLBiomeDef setSurface(Block block) {
//TODO: 1.18 add back surface Code
return this;
}
public BCLBiomeDef setSurface(Block block1, Block block2) {
//TODO: 1.18 add back surface Code
return this;
}
@ -349,7 +350,7 @@ public class BCLBiomeDef {
if (particleConfig != null) effects.ambientParticle(particleConfig);
effects.backgroundMusic(music != null ? new Music(music, 600, 2400, true) : Musics.END);
return new Biome.BiomeBuilder()
Biome b = new Biome.BiomeBuilder()
.precipitation(precipitation)
.biomeCategory(category)
//.depth(depth)
@ -360,6 +361,9 @@ public class BCLBiomeDef {
.mobSpawnSettings(spawnSettings.build())
.generationSettings(generationSettings.build())
.build();
structures.forEach((structure) -> BiomeAPI.addBiomeStructure(b, structure));
return b;
}
public float getTerrainHeight() {