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

Small rule fixes

Browse source
This commit is contained in:
paulevsGitch 2021-11-28 19:34:42 +03:00
parent dde1276785
commit cdbeede9f4
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/ru/bclib/api/spawning/SpawnRuleBuilder.java
View file

@ -15,7 +15,9 @@ import net.minecraft.world.level.levelgen.Heightmap.Types;
import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.AABB;
import ru.bclib.interfaces.SpawnRule; import ru.bclib.interfaces.SpawnRule;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -86,7 +88,7 @@ public class SpawnRuleBuilder<M extends Mob> {
* @return same {@link SpawnRuleBuilder} instance. * @return same {@link SpawnRuleBuilder} instance.
*/ */
public SpawnRuleBuilder onlyOnValidBlocks() { public SpawnRuleBuilder onlyOnValidBlocks() {
entryInstance = getFromCache("below_max_height", () -> { entryInstance = getFromCache("only_on_valid_blocks", () -> {
return new SpawnRuleEntry(0, (type, world, spawnReason, pos, random) -> { return new SpawnRuleEntry(0, (type, world, spawnReason, pos, random) -> {
BlockPos below = pos.below(); BlockPos below = pos.below();
return world.getBlockState(below).isValidSpawn(world, below, type); return world.getBlockState(below).isValidSpawn(world, below, type);
@ -101,12 +103,14 @@ public class SpawnRuleBuilder<M extends Mob> {
* @return same {@link SpawnRuleBuilder} instance. * @return same {@link SpawnRuleBuilder} instance.
*/ */
public SpawnRuleBuilder onlyOnBlocks(Block... blocks) { public SpawnRuleBuilder onlyOnBlocks(Block... blocks) {
String id = "" + blocks.length; StringBuilder builder = new StringBuilder();
for(Block bl : blocks){
id += "_" + bl.getDescriptionId();
}
final Block[] floorBlocks = blocks; final Block[] floorBlocks = blocks;
entryInstance = getFromCache("below_max_height_" + id, () -> { Arrays.sort(floorBlocks, Comparator.comparing(Block::getDescriptionId));
for (Block block : floorBlocks) {
builder.append('_');
builder.append(block.getDescriptionId());
}
entryInstance = getFromCache("only_on_blocks" + builder, () -> {
return new SpawnRuleEntry(0, (type, world, spawnReason, pos, random) -> { return new SpawnRuleEntry(0, (type, world, spawnReason, pos, random) -> {
Block below = world.getBlockState(pos.below()).getBlock(); Block below = world.getBlockState(pos.below()).getBlock();
for (Block floor: floorBlocks) { for (Block floor: floorBlocks) {