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

Fixed ID handling

Browse source
This commit is contained in:
Frank 2021-12-03 01:40:50 +01:00
parent c6dc52a60d
commit 4ac4202555
1 changed files with 55 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/main/java/ru/bclib/api/biomes/BiomeAPI.java
View file

@ -423,6 +423,16 @@ public class BiomeAPI {
addBiomeFeature(biome, feature.getPlacedFeature(), feature.getDecoration()); addBiomeFeature(biome, feature.getPlacedFeature(), feature.getDecoration());
} }
/**
* Adds new features to existing biome.
* @param biomeID {@link ResourceLocation} for the {@link Biome} to add features in.
* @param feature {@link ConfiguredFeature} to add.
*
*/
public static void addBiomeFeature(ResourceLocation biomeID, BCLFeature feature) {
addBiomeFeature(biomeID, feature.getPlacedFeature(), feature.getDecoration());
}
/** /**
* Adds new features to existing biome. * Adds new features to existing biome.
* @param biome {@link Biome} to add features in. * @param biome {@link Biome} to add features in.
@ -430,9 +440,19 @@ public class BiomeAPI {
* @param step a {@link Decoration} step for the feature. * @param step a {@link Decoration} step for the feature.
*/ */
public static void addBiomeFeature(Biome biome, PlacedFeature feature, Decoration step) { public static void addBiomeFeature(Biome biome, PlacedFeature feature, Decoration step) {
addBiomeFeature(getBiomeID(biome), feature, step);
}
/**
* Adds new features to existing biome.
* @param biomeID {@link ResourceLocation} of the {@link Biome} to add features in.
* @param feature {@link ConfiguredFeature} to add.
* @param step a {@link Decoration} step for the feature.
*/
private static void addBiomeFeature(ResourceLocation biomeID, PlacedFeature feature, Decoration step) {
BuiltinRegistries.PLACED_FEATURE BuiltinRegistries.PLACED_FEATURE
.getResourceKey(feature) .getResourceKey(feature)
.ifPresent(key -> BiomeModifications.addFeature(ctx -> ctx.getBiomeKey().equals(BuiltinRegistries.BIOME.getKey(biome)), step, key)); .ifPresent(key -> BiomeModifications.addFeature(ctx -> ctx.getBiomeKey().location().equals(biomeID), step, key));
} }
/** /**
@ -446,17 +466,26 @@ public class BiomeAPI {
} }
} }
// TODO: 1.18 There are no more StructureFeatures in the Biomes, they are in a separate registry now
/** /**
* Adds new structure feature to existing biome. * Adds new structure feature to existing biome.
* @param biome {@link Biome} to add structure feature in. * @param biome {@link Biome} to add structure feature in.
* @param structure {@link ConfiguredStructureFeature} to add. * @param structure {@link ConfiguredStructureFeature} to add.
*/ */
public static void addBiomeStructure(Biome biome, ConfiguredStructureFeature structure) { public static void addBiomeStructure(Biome biome, ConfiguredStructureFeature structure) {
addBiomeStructure(getBiomeID(biome), structure);
}
/**
* Adds new structure feature to existing biome.
* @param biomeID {@link ResourceLocation} of the {@link Biome} to add structure feature in.
* @param structure {@link ConfiguredStructureFeature} to add.
*/
public static void addBiomeStructure(ResourceLocation biomeID, ConfiguredStructureFeature structure) {
BuiltinRegistries.CONFIGURED_STRUCTURE_FEATURE BuiltinRegistries.CONFIGURED_STRUCTURE_FEATURE
.getResourceKey(structure) .getResourceKey(structure)
.ifPresent(key -> BiomeModifications.addStructure(ctx -> ctx.getBiomeKey().location().equals(BuiltinRegistries.BIOME.getKey(biome)), key)); .ifPresent(key -> BiomeModifications.addStructure(ctx -> ctx.getBiomeKey().location().equals(biomeID), key));
} }
/** /**
* Adds new structure feature to existing biome. * Adds new structure feature to existing biome.
* @param biome {@link Biome} to add structure feature in. * @param biome {@link Biome} to add structure feature in.
@ -465,6 +494,15 @@ public class BiomeAPI {
public static void addBiomeStructure(Biome biome, BCLStructureFeature structure) { public static void addBiomeStructure(Biome biome, BCLStructureFeature structure) {
addBiomeStructure(biome, structure.getFeatureConfigured()); addBiomeStructure(biome, structure.getFeatureConfigured());
} }
/**
* Adds new structure feature to existing biome.
* @param biomeID {@link ResourceLocation} of the {@link Biome} to add structure feature in.
* @param structure {@link BCLStructureFeature} to add.
*/
public static void addBiomeStructure(ResourceLocation biomeID, BCLStructureFeature structure) {
addBiomeStructure(biomeID, structure.getFeatureConfigured());
}
/** /**
* Adds new structure features to existing biome. * Adds new structure features to existing biome.
@ -486,14 +524,21 @@ public class BiomeAPI {
* @param maxGroupCount maximum mobs in group. * @param maxGroupCount maximum mobs in group.
*/ */
public static <M extends Mob> void addBiomeMobSpawn(Biome biome, EntityType<M> entityType, int weight, int minGroupCount, int maxGroupCount) { public static <M extends Mob> void addBiomeMobSpawn(Biome biome, EntityType<M> entityType, int weight, int minGroupCount, int maxGroupCount) {
ResourceLocation biomeKey = BuiltinRegistries.BIOME.getKey(biome); addBiomeMobSpawn(getBiomeID(biome), entityType, weight, minGroupCount, maxGroupCount);
}
/**
* Adds mob spawning to specified biome.
* @param biomeID {@link ResourceLocation} of the {@link Biome }to add mob spawning.
* @param entityType {@link EntityType} mob type.
* @param weight spawn weight.
* @param minGroupCount minimum mobs in group.
* @param maxGroupCount maximum mobs in group.
*/
public static <M extends Mob> void addBiomeMobSpawn(ResourceLocation biomeID, EntityType<M> entityType, int weight, int minGroupCount, int maxGroupCount) {
BiomeModifications.addSpawn( BiomeModifications.addSpawn(
ctx -> ctx.getBiomeKey().equals(biomeKey), ctx -> ctx.getBiomeKey().location().equals(biomeID),
entityType.getCategory(), entityType.getCategory(), entityType, weight, minGroupCount, maxGroupCount
entityType,
weight,
minGroupCount,
maxGroupCount
); );
} }