etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Re-added bushes

Browse source
This commit is contained in:
Adubbz 2019-02-24 22:05:34 +11:00
parent 6770e18d50
commit 2002152d8a
2 changed files with 118 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java
View file

@ -8,10 +8,7 @@
package biomesoplenty.common.world.gen.feature;
import biomesoplenty.api.block.BOPBlocks;
import biomesoplenty.common.world.gen.feature.tree.BasicTreeFeature;
import biomesoplenty.common.world.gen.feature.tree.BayouTreeFeature;
import biomesoplenty.common.world.gen.feature.tree.BulbTreeFeature;
import biomesoplenty.common.world.gen.feature.tree.TaigaTreeFeature;
import biomesoplenty.common.world.gen.feature.tree.*;
import net.minecraft.init.Blocks;
import net.minecraft.world.gen.feature.AbstractTreeFeature;
import net.minecraft.world.gen.feature.NoFeatureConfig;
@ -23,6 +20,7 @@ public class BOPBiomeFeatures
public static final AbstractTreeFeature<NoFeatureConfig> OAK_TREE = new BasicTreeFeature.Builder().create();
public static final AbstractTreeFeature<NoFeatureConfig> BAYOU_TREE = new BayouTreeFeature.Builder().create();
public static final AbstractTreeFeature<NoFeatureConfig> BULB_TREE = new BulbTreeFeature.Builder().create();
public static final AbstractTreeFeature<NoFeatureConfig> BUSH = new BushTreeFeature.Builder().create();
public static final SurfaceBuilderConfig LOAMY_GRASS_DIRT_GRAVEL_SURFACE = new SurfaceBuilderConfig(BOPBlocks.loamy_grass_block.getDefaultState(), BOPBlocks.loamy_dirt.getDefaultState(), Blocks.GRAVEL.getDefaultState());
}

116
src/main/java/biomesoplenty/common/world/gen/feature/tree/BushTreeFeature.java Normal file
View file

@ -0,0 +1,116 @@
/*******************************************************************************
* Copyright 2014-2019, the Biomes O' Plenty Team
*
* This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
*
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
******************************************************************************/
package biomesoplenty.common.world.gen.feature.tree;
import biomesoplenty.common.util.biome.GeneratorUtil;
import biomesoplenty.common.util.block.IBlockPosQuery;
import net.minecraft.block.BlockLeaves;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import java.util.Random;
import java.util.Set;
public class BushTreeFeature extends TreeFeatureBase
{
public static class Builder extends BuilderBase<BushTreeFeature.Builder, BushTreeFeature>
{
public Builder()
{
this.minHeight = 2;
this.maxHeight = 4;
this.replace = (world, pos) ->
{
Material mat = world.getBlockState(pos).getMaterial();
return mat == Material.AIR || mat == Material.LEAVES;
};
}
@Override
public BushTreeFeature create()
{
// Bushes shouldn't check for decay
if (this.leaves != Blocks.AIR.getDefaultState())
this.leaves = this.leaves.with(BlockLeaves.PERSISTENT, Boolean.valueOf(true));
if (this.altLeaves != Blocks.AIR.getDefaultState())
this.altLeaves = this.altLeaves.with(BlockLeaves.PERSISTENT, Boolean.valueOf(true));
return new BushTreeFeature(this.updateNeighbours, this.placeOn, this.replace, this.log, this.leaves, this.altLeaves, this.vine, this.hanging, this.trunkFruit, this.minHeight, this.maxHeight);
}
}
protected BushTreeFeature(boolean notify, IBlockPosQuery placeOn, IBlockPosQuery replace, IBlockState log, IBlockState leaves, IBlockState altLeaves, IBlockState vine, IBlockState hanging, IBlockState trunkFruit, int minHeight, int maxHeight)
{
super(notify, placeOn, replace, log, leaves, altLeaves, vine, hanging, trunkFruit, minHeight, maxHeight);
}
@Override
protected boolean place(Set<BlockPos> changedBlocks, IWorld world, Random random, BlockPos startPos)
{
// Move down until we reach the ground
while (startPos.getY() > 1 && world.isAirBlock(startPos) || world.getBlockState(startPos).getMaterial() == Material.AIR) {startPos = startPos.down();}
if (!this.placeOn.matches(world, startPos))
{
// Abandon if we can't place the tree on this block
return false;
}
// choose a random height
int height = GeneratorUtil.nextIntBetween(random, this.minHeight, this.maxHeight);
// start from the block above the ground block
BlockPos pos = startPos.up();
//Generate a bush 3 blocks tall, with the bottom block already set to a log
for (int y = 0; y < height; ++y)
{
// log in the center
if (height - y > 1)
{
this.setLog(changedBlocks, world, pos.add(0, y, 0));
}
//Reduces the radius closer to the top of the bush
int leavesRadius = (height - y > 1 ? 2 : 1);
for (int x = -leavesRadius; x <= leavesRadius; ++x)
{
for (int z = -leavesRadius; z <= leavesRadius; ++z)
{
//Randomly prevent the generation of leaves on the corners of each layer
if (Math.abs(x) < leavesRadius || Math.abs(z) < leavesRadius || random.nextInt(2) != 0)
{
if (this.altLeaves != Blocks.AIR.getDefaultState())
{
if (random.nextInt(4) == 0)
{
this.setAltLeaves(world, pos.add(x, y, z));
}
else
{
this.setLeaves(world, pos.add(x, y, z));
}
}
else
{
this.setLeaves(world, pos.add(x, y, z));
}
}
}
}
}
return true;
}
}