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

New bonemeal API (consumers, allows to add any plant/structure)

Browse source
This commit is contained in:
Frank 2022-05-27 17:13:59 +02:00
parent d985792cae
commit 5d970a27ba
2 changed files with 114 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/main/java/org/betterx/bclib/api/BonemealAPI.java
View file

@ -1,21 +1,25 @@
package org.betterx.bclib.api; package org.betterx.bclib.api;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.RandomSource; import net.minecraft.util.RandomSource;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.betterx.bclib.util.BlocksHelper;
import org.betterx.bclib.util.WeightedList; import org.betterx.bclib.util.WeightedList;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.function.BiConsumer;
public class BonemealAPI { public class BonemealAPI {
private static final Map<ResourceLocation, Map<Block, WeightedList<Block>>> WATER_GRASS_BIOMES = Maps.newHashMap(); private static final Map<ResourceLocation, Map<Block, WeightedList<BiConsumer<Level, BlockPos>>>> WATER_GRASS_BIOMES = Maps.newHashMap();
private static final Map<ResourceLocation, Map<Block, WeightedList<Block>>> LAND_GRASS_BIOMES = Maps.newHashMap(); private static final Map<ResourceLocation, Map<Block, WeightedList<BiConsumer<Level, BlockPos>>>> LAND_GRASS_BIOMES = Maps.newHashMap();
private static final Map<Block, WeightedList<Block>> WATER_GRASS_TYPES = Maps.newHashMap(); private static final Map<Block, WeightedList<BiConsumer<Level, BlockPos>>> WATER_GRASS_TYPES = Maps.newHashMap();
private static final Map<Block, WeightedList<Block>> LAND_GRASS_TYPES = Maps.newHashMap(); private static final Map<Block, WeightedList<BiConsumer<Level, BlockPos>>> LAND_GRASS_TYPES = Maps.newHashMap();
private static final Map<Block, Block> SPREADABLE_BLOCKS = Maps.newHashMap(); private static final Map<Block, Block> SPREADABLE_BLOCKS = Maps.newHashMap();
private static final Set<Block> TERRAIN_TO_SPREAD = Sets.newHashSet(); private static final Set<Block> TERRAIN_TO_SPREAD = Sets.newHashSet();
private static final Set<Block> TERRAIN = Sets.newHashSet(); private static final Set<Block> TERRAIN = Sets.newHashSet();
@ -39,21 +43,33 @@ public class BonemealAPI {
} }
public static void addLandGrass(Block plant, Block... terrain) { public static void addLandGrass(Block plant, Block... terrain) {
addLandGrass(makeConsumer(plant), terrain);
}
public static void addLandGrass(BiConsumer<Level, BlockPos> plant, Block... terrain) {
for (Block block : terrain) { for (Block block : terrain) {
addLandGrass(plant, block, 1F); addLandGrass(plant, block, 1F);
} }
} }
public static void addLandGrass(ResourceLocation biome, Block plant, Block... terrain) { public static void addLandGrass(ResourceLocation biome, Block plant, Block... terrain) {
addLandGrass(biome, makeConsumer(plant), terrain);
}
public static void addLandGrass(ResourceLocation biome, BiConsumer<Level, BlockPos> plant, Block... terrain) {
for (Block block : terrain) { for (Block block : terrain) {
addLandGrass(biome, plant, block, 1F); addLandGrass(biome, plant, block, 1F);
} }
} }
public static void addLandGrass(Block plant, Block terrain, float chance) { public static void addLandGrass(Block plant, Block terrain, float chance) {
WeightedList<Block> list = LAND_GRASS_TYPES.get(terrain); addLandGrass(makeConsumer(plant), terrain, chance);
}
public static void addLandGrass(BiConsumer<Level, BlockPos> plant, Block terrain, float chance) {
WeightedList<BiConsumer<Level, BlockPos>> list = LAND_GRASS_TYPES.get(terrain);
if (list == null) { if (list == null) {
list = new WeightedList<Block>(); list = new WeightedList<>();
LAND_GRASS_TYPES.put(terrain, list); LAND_GRASS_TYPES.put(terrain, list);
} }
TERRAIN.add(terrain); TERRAIN.add(terrain);
@ -61,14 +77,21 @@ public class BonemealAPI {
} }
public static void addLandGrass(ResourceLocation biome, Block plant, Block terrain, float chance) { public static void addLandGrass(ResourceLocation biome, Block plant, Block terrain, float chance) {
Map<Block, WeightedList<Block>> map = LAND_GRASS_BIOMES.get(biome); addLandGrass(biome, makeConsumer(plant), terrain, chance);
}
public static void addLandGrass(ResourceLocation biome,
BiConsumer<Level, BlockPos> plant,
Block terrain,
float chance) {
Map<Block, WeightedList<BiConsumer<Level, BlockPos>>> map = LAND_GRASS_BIOMES.get(biome);
if (map == null) { if (map == null) {
map = Maps.newHashMap(); map = Maps.newHashMap();
LAND_GRASS_BIOMES.put(biome, map); LAND_GRASS_BIOMES.put(biome, map);
} }
WeightedList<Block> list = map.get(terrain); WeightedList<BiConsumer<Level, BlockPos>> list = map.get(terrain);
if (list == null) { if (list == null) {
list = new WeightedList<Block>(); list = new WeightedList<>();
map.put(terrain, list); map.put(terrain, list);
} }
TERRAIN.add(terrain); TERRAIN.add(terrain);
@ -76,21 +99,33 @@ public class BonemealAPI {
} }
public static void addWaterGrass(Block plant, Block... terrain) { public static void addWaterGrass(Block plant, Block... terrain) {
addWaterGrass(makeConsumer(plant), terrain);
}
public static void addWaterGrass(BiConsumer<Level, BlockPos> plant, Block... terrain) {
for (Block block : terrain) { for (Block block : terrain) {
addWaterGrass(plant, block, 1F); addWaterGrass(plant, block, 1F);
} }
} }
public static void addWaterGrass(ResourceLocation biome, Block plant, Block... terrain) { public static void addWaterGrass(ResourceLocation biome, Block plant, Block... terrain) {
addWaterGrass(biome, makeConsumer(plant), terrain);
}
public static void addWaterGrass(ResourceLocation biome, BiConsumer<Level, BlockPos> plant, Block... terrain) {
for (Block block : terrain) { for (Block block : terrain) {
addWaterGrass(biome, plant, block, 1F); addWaterGrass(biome, plant, block, 1F);
} }
} }
public static void addWaterGrass(Block plant, Block terrain, float chance) { public static void addWaterGrass(Block plant, Block terrain, float chance) {
WeightedList<Block> list = WATER_GRASS_TYPES.get(terrain); addWaterGrass(makeConsumer(plant), terrain, chance);
}
public static void addWaterGrass(BiConsumer<Level, BlockPos> plant, Block terrain, float chance) {
WeightedList<BiConsumer<Level, BlockPos>> list = WATER_GRASS_TYPES.get(terrain);
if (list == null) { if (list == null) {
list = new WeightedList<Block>(); list = new WeightedList<>();
WATER_GRASS_TYPES.put(terrain, list); WATER_GRASS_TYPES.put(terrain, list);
} }
TERRAIN.add(terrain); TERRAIN.add(terrain);
@ -98,23 +133,32 @@ public class BonemealAPI {
} }
public static void addWaterGrass(ResourceLocation biome, Block plant, Block terrain, float chance) { public static void addWaterGrass(ResourceLocation biome, Block plant, Block terrain, float chance) {
Map<Block, WeightedList<Block>> map = WATER_GRASS_BIOMES.get(biome); addWaterGrass(biome, makeConsumer(plant), terrain, chance);
}
public static void addWaterGrass(ResourceLocation biome,
BiConsumer<Level, BlockPos> plant,
Block terrain,
float chance) {
Map<Block, WeightedList<BiConsumer<Level, BlockPos>>> map = WATER_GRASS_BIOMES.get(biome);
if (map == null) { if (map == null) {
map = Maps.newHashMap(); map = Maps.newHashMap();
WATER_GRASS_BIOMES.put(biome, map); WATER_GRASS_BIOMES.put(biome, map);
} }
WeightedList<Block> list = map.get(terrain); WeightedList<BiConsumer<Level, BlockPos>> list = map.get(terrain);
if (list == null) { if (list == null) {
list = new WeightedList<Block>(); list = new WeightedList<>();
map.put(terrain, list); map.put(terrain, list);
} }
TERRAIN.add(terrain); TERRAIN.add(terrain);
list.add(plant, chance); list.add(plant, chance);
} }
public static Block getLandGrass(ResourceLocation biomeID, Block terrain, RandomSource random) { public static BiConsumer<Level, BlockPos> getLandGrass(ResourceLocation biomeID,
Map<Block, WeightedList<Block>> map = LAND_GRASS_BIOMES.get(biomeID); Block terrain,
WeightedList<Block> list = null; RandomSource random) {
Map<Block, WeightedList<BiConsumer<Level, BlockPos>>> map = LAND_GRASS_BIOMES.get(biomeID);
WeightedList<BiConsumer<Level, BlockPos>> list;
if (map != null) { if (map != null) {
list = map.get(terrain); list = map.get(terrain);
if (list == null) { if (list == null) {
@ -126,9 +170,11 @@ public class BonemealAPI {
return list == null ? null : list.get(random); return list == null ? null : list.get(random);
} }
public static Block getWaterGrass(ResourceLocation biomeID, Block terrain, RandomSource random) { public static BiConsumer<Level, BlockPos> getWaterGrass(ResourceLocation biomeID,
Map<Block, WeightedList<Block>> map = WATER_GRASS_BIOMES.get(biomeID); Block terrain,
WeightedList<Block> list = null; RandomSource random) {
Map<Block, WeightedList<BiConsumer<Level, BlockPos>>> map = WATER_GRASS_BIOMES.get(biomeID);
WeightedList<BiConsumer<Level, BlockPos>> list;
if (map != null) { if (map != null) {
list = map.get(terrain); list = map.get(terrain);
if (list == null) { if (list == null) {
@ -139,4 +185,8 @@ public class BonemealAPI {
} }
return list == null ? null : list.get(random); return list == null ? null : list.get(random);
} }
private static BiConsumer<Level, BlockPos> makeConsumer(Block block) {
return (level, pos) -> BlocksHelper.setWithoutUpdate(level, pos, block);
}
} }

83
src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java
View file

@ -17,20 +17,23 @@ import org.betterx.bclib.api.biomes.BiomeAPI;
import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.BlocksHelper;
import org.betterx.bclib.util.MHelper; import org.betterx.bclib.util.MHelper;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.function.BiConsumer;
@Mixin(BoneMealItem.class) @Mixin(BoneMealItem.class)
public class BoneMealItemMixin { public class BoneMealItemMixin {
private static final MutableBlockPos bclib_BLOCK_POS = new MutableBlockPos(); @Unique
private static final MutableBlockPos BCLIB_BLOCK_POS = new MutableBlockPos();
@Inject(method = "useOn", at = @At("HEAD"), cancellable = true) @Inject(method = "useOn", at = @At("HEAD"), cancellable = true)
private void bclib_onUse(UseOnContext context, CallbackInfoReturnable<InteractionResult> info) { private void bclib_onUse(UseOnContext context, CallbackInfoReturnable<InteractionResult> info) {
Level world = context.getLevel(); Level world = context.getLevel();
BlockPos blockPos = context.getClickedPos(); BlockPos blockPos = context.getClickedPos();
if (!world.isClientSide) { if (!world.isClientSide()) {
BlockPos offseted = blockPos.relative(context.getClickedFace());
if (BonemealAPI.isTerrain(world.getBlockState(blockPos).getBlock())) { if (BonemealAPI.isTerrain(world.getBlockState(blockPos).getBlock())) {
boolean consume = false; boolean consume = false;
if (BonemealAPI.isSpreadableTerrain(world.getBlockState(blockPos).getBlock())) { if (BonemealAPI.isSpreadableTerrain(world.getBlockState(blockPos).getBlock())) {
@ -61,22 +64,23 @@ public class BoneMealItemMixin {
} }
} }
private boolean bclib_growLandGrass(Level world, BlockPos pos) { @Unique
private boolean bclib_growLandGrass(Level level, BlockPos pos) {
int y1 = pos.getY() + 3; int y1 = pos.getY() + 3;
int y2 = pos.getY() - 3; int y2 = pos.getY() - 3;
boolean result = false; boolean result = false;
for (int i = 0; i < 64; i++) { for (byte i = 0; i < 64; i++) {
int x = (int) (pos.getX() + world.random.nextGaussian() * 2); int x = (int) (pos.getX() + level.random.nextGaussian() * 2);
int z = (int) (pos.getZ() + world.random.nextGaussian() * 2); int z = (int) (pos.getZ() + level.random.nextGaussian() * 2);
bclib_BLOCK_POS.setX(x); BCLIB_BLOCK_POS.setX(x);
bclib_BLOCK_POS.setZ(z); BCLIB_BLOCK_POS.setZ(z);
for (int y = y1; y >= y2; y--) { for (int y = y1; y >= y2; y--) {
bclib_BLOCK_POS.setY(y); BCLIB_BLOCK_POS.setY(y);
BlockPos down = bclib_BLOCK_POS.below(); BlockPos down = BCLIB_BLOCK_POS.below();
if (world.isEmptyBlock(bclib_BLOCK_POS) && !world.isEmptyBlock(down)) { if (level.isEmptyBlock(BCLIB_BLOCK_POS) && !level.isEmptyBlock(down)) {
BlockState grass = bclib_getLandGrassState(world, down); BiConsumer<Level, BlockPos> grass = bclib_getLandGrassState(level, down);
if (grass != null) { if (grass != null) {
BlocksHelper.setWithoutUpdate(world, bclib_BLOCK_POS, grass); grass.accept(level, BCLIB_BLOCK_POS);
result = true; result = true;
} }
break; break;
@ -86,23 +90,24 @@ public class BoneMealItemMixin {
return result; return result;
} }
private boolean bclib_growWaterGrass(Level world, BlockPos pos) { @Unique
private boolean bclib_growWaterGrass(Level level, BlockPos pos) {
int y1 = pos.getY() + 3; int y1 = pos.getY() + 3;
int y2 = pos.getY() - 3; int y2 = pos.getY() - 3;
boolean result = false; boolean result = false;
for (int i = 0; i < 64; i++) { for (byte i = 0; i < 64; i++) {
int x = (int) (pos.getX() + world.random.nextGaussian() * 2); int x = (int) (pos.getX() + level.random.nextGaussian() * 2);
int z = (int) (pos.getZ() + world.random.nextGaussian() * 2); int z = (int) (pos.getZ() + level.random.nextGaussian() * 2);
bclib_BLOCK_POS.setX(x); BCLIB_BLOCK_POS.setX(x);
bclib_BLOCK_POS.setZ(z); BCLIB_BLOCK_POS.setZ(z);
for (int y = y1; y >= y2; y--) { for (int y = y1; y >= y2; y--) {
bclib_BLOCK_POS.setY(y); BCLIB_BLOCK_POS.setY(y);
BlockPos down = bclib_BLOCK_POS.below(); BlockPos down = BCLIB_BLOCK_POS.below();
if (BlocksHelper.isFluid(world.getBlockState(bclib_BLOCK_POS)) && !BlocksHelper.isFluid(world.getBlockState( if (BlocksHelper.isFluid(level.getBlockState(BCLIB_BLOCK_POS)) && !BlocksHelper.isFluid(level.getBlockState(
down))) { down))) {
BlockState grass = bclib_getWaterGrassState(world, down); BiConsumer<Level, BlockPos> grass = bclib_getWaterGrassState(level, down);
if (grass != null) { if (grass != null) {
BlocksHelper.setWithoutUpdate(world, bclib_BLOCK_POS, grass); grass.accept(level, BCLIB_BLOCK_POS);
result = true; result = true;
} }
break; break;
@ -112,26 +117,25 @@ public class BoneMealItemMixin {
return result; return result;
} }
private BlockState bclib_getLandGrassState(Level world, BlockPos pos) { @Unique
BlockState state = world.getBlockState(pos); private BiConsumer<Level, BlockPos> bclib_getLandGrassState(Level level, BlockPos pos) {
Block block = state.getBlock(); BlockState state = level.getBlockState(pos);
block = BonemealAPI.getLandGrass(BiomeAPI.getBiomeID(world.getBiome(pos)), block, world.getRandom()); return BonemealAPI.getLandGrass(BiomeAPI.getBiomeID(level.getBiome(pos)), state.getBlock(), level.getRandom());
return block == null ? null : block.defaultBlockState();
} }
private BlockState bclib_getWaterGrassState(Level world, BlockPos pos) { @Unique
BlockState state = world.getBlockState(pos); private BiConsumer<Level, BlockPos> bclib_getWaterGrassState(Level level, BlockPos pos) {
Block block = state.getBlock(); BlockState state = level.getBlockState(pos);
block = BonemealAPI.getWaterGrass(BiomeAPI.getBiomeID(world.getBiome(pos)), block, world.getRandom()); return BonemealAPI.getWaterGrass(BiomeAPI.getBiomeID(level.getBiome(pos)), state.getBlock(), level.getRandom());
return block == null ? null : block.defaultBlockState();
} }
private BlockState bclib_getSpreadable(Level world, BlockPos pos) { @Unique
Vec3i[] offsets = MHelper.getOffsets(world.getRandom()); private BlockState bclib_getSpreadable(Level level, BlockPos pos) {
BlockState center = world.getBlockState(pos); Vec3i[] offsets = MHelper.getOffsets(level.getRandom());
BlockState center = level.getBlockState(pos);
for (Vec3i dir : offsets) { for (Vec3i dir : offsets) {
BlockPos p = pos.offset(dir); BlockPos p = pos.offset(dir);
BlockState state = world.getBlockState(p); BlockState state = level.getBlockState(p);
Block terrain = BonemealAPI.getSpreadable(state.getBlock()); Block terrain = BonemealAPI.getSpreadable(state.getBlock());
if (center.is(terrain)) { if (center.is(terrain)) {
if (bclib_haveSameProperties(state, center)) { if (bclib_haveSameProperties(state, center)) {
@ -145,6 +149,7 @@ public class BoneMealItemMixin {
return null; return null;
} }
@Unique
private boolean bclib_haveSameProperties(BlockState state1, BlockState state2) { private boolean bclib_haveSameProperties(BlockState state1, BlockState state2) {
Property<?>[] properties1 = state1.getProperties().toArray(new Property[0]); Property<?>[] properties1 = state1.getProperties().toArray(new Property[0]);
Property<?>[] properties2 = state2.getProperties().toArray(new Property[0]); Property<?>[] properties2 = state2.getProperties().toArray(new Property[0]);