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

Completed the Thicket

This commit is contained in:
Adubbz 2015-04-12 13:00:15 +10:00
parent 3fa19ac90c
commit 5ffd96b86d
3 changed files with 131 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenThicket.java
View File

@ -21,6 +21,7 @@ import biomesoplenty.common.block.BlockGem;
import biomesoplenty.common.block.BlockGem.GemType;
import biomesoplenty.common.world.feature.GeneratorFlora;
import biomesoplenty.common.world.feature.GeneratorOreSingle;
import biomesoplenty.common.world.feature.GeneratorWaterside;
import biomesoplenty.common.world.feature.tree.GeneratorBasicTree;
import biomesoplenty.common.world.feature.tree.GeneratorBush;
@ -41,9 +42,11 @@ public class BiomeGenThicket extends BOPBiome
treeGenerator.add(4, new GeneratorBush(17, Blocks.log.getDefaultState(), Blocks.leaves.getDefaultState()));
this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
//TODO: Add the rest of the generators, requires plant blocks
this.addGenerator("gravel", GeneratorStage.SAND_PASS2, new GeneratorWaterside(6, 7, Blocks.gravel.getDefaultState()));
this.addGenerator("flowers", GeneratorStage.FLOWERS, new GeneratorFlora(5, Blocks.red_flower.getDefaultState()));
//this.addGenerator("thorns", GeneratorStage.FLOWERS, new GeneratorFlora(55, BOPBlocks.foliage.getDefaultState().withProperty(BlockBOPPlant., FoliageType.LEAFPILE));
this.addGenerator("thorns", GeneratorStage.FLOWERS, new GeneratorFlora(55, BlockBOPPlant.getVariantState(AllPlants.THORN)));
this.addGenerator("shrubs", GeneratorStage.FLOWERS, new GeneratorFlora(5, BlockBOPPlant.getVariantState(AllPlants.SHRUB)));
this.addGenerator("leaf_piles", GeneratorStage.FLOWERS, new GeneratorFlora(5, BlockBOPPlant.getVariantState(AllPlants.LEAFPILE)));
this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS, new GeneratorFlora(10, BlockBOPPlant.getVariantState(AllPlants.DEADLEAFPILE)));

2
src/main/java/biomesoplenty/common/init/ModGenerators.java
View File

@ -15,6 +15,7 @@ import biomesoplenty.common.world.feature.GeneratorFlora;
import biomesoplenty.common.world.feature.GeneratorGrass;
import biomesoplenty.common.world.feature.GeneratorOreCluster;
import biomesoplenty.common.world.feature.GeneratorOreSingle;
import biomesoplenty.common.world.feature.GeneratorWaterside;
import biomesoplenty.common.world.feature.tree.GeneratorBasicTree;
import biomesoplenty.common.world.feature.tree.GeneratorBush;
@ -30,5 +31,6 @@ public class ModGenerators
registerGenerator("bush", GeneratorBush.class);
registerGenerator("flora", GeneratorFlora.class);
registerGenerator("grass", GeneratorGrass.class);
registerGenerator("waterside", GeneratorWaterside.class);
}
}

124
src/main/java/biomesoplenty/common/world/feature/GeneratorWaterside.java Normal file
View File

@ -0,0 +1,124 @@
/*******************************************************************************
* Copyright 2015, 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.feature;
import java.util.List;
import java.util.Random;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import scala.actors.threadpool.Arrays;
import biomesoplenty.api.biome.generation.GeneratorCustomizable;
import biomesoplenty.common.util.biome.GeneratorUtils;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.google.gson.JsonSerializationContext;
public class GeneratorWaterside extends GeneratorCustomizable
{
private int amountPerChunk;
private int maxRadius;
private IBlockState state;
private List<IBlockState> replacedStates;
public GeneratorWaterside() {}
public GeneratorWaterside(int amountPerChunk, int maxRadius, IBlockState state, IBlockState... replacedStates)
{
this.amountPerChunk = amountPerChunk;
this.maxRadius = maxRadius;
this.state = state;
this.replacedStates = Arrays.asList(replacedStates);
}
public GeneratorWaterside(int amountPerChunk, int maxRadius, IBlockState state)
{
this(amountPerChunk, maxRadius, state, Blocks.grass.getDefaultState(), Blocks.dirt.getDefaultState());
}
@Override
public void scatter(World world, Random random, BlockPos pos)
{
for (int i = 0; i < this.amountPerChunk; i++)
{
int x = random.nextInt(16) + 8;
int z = random.nextInt(16) + 8;
generate(world, random, world.getTopSolidOrLiquidBlock(pos.add(x, 0, z)));
}
}
@Override
public boolean generate(World world, Random random, BlockPos pos)
{
//Check we are generating around water
if (world.getBlockState(pos).getBlock().getMaterial() != Material.water)
{
return false;
}
else
{
//The minimum radius must be 2, so two is subtracted from the random number calculation
//and is added back on at the end
int radius = random.nextInt(this.maxRadius - 2) + 2;
byte heightRadius = 2;
for (int x = pos.getX() - radius; x <= pos.getX() + radius; ++x)
{
for (int z = pos.getZ() - radius; z <= pos.getZ() + radius; ++z)
{
int xDiff = x - pos.getX();
int zDiff = z - pos.getZ();
//Only replace blocks if the point is within an actual circle of the given radius
//The for loops merely create a square with a length and width 2 * radius
//x^2 + y^2 = r^2 is the equation of a circle
if (xDiff * xDiff + zDiff * zDiff <= radius * radius)
{
for (int y = pos.getY() - heightRadius; y <= pos.getY() + heightRadius; y++)
{
BlockPos posToReplace = new BlockPos(x, y, z);
IBlockState stateToReplace = world.getBlockState(posToReplace);
//If the list contains the state of the current block, replace it
if (replacedStates.contains(stateToReplace))
{
world.setBlockState(posToReplace, this.state, 2);
}
}
}
}
}
return true;
}
}
@Override
public void writeToJson(JsonObject json, JsonSerializationContext context)
{
json.addProperty("amount_per_chunk", this.amountPerChunk);
json.addProperty("max_radius", this.maxRadius);
json.add("state", context.serialize(this.state));
json.add("replaced_states", context.serialize(this.replacedStates));
}
@Override
public void readFromJson(JsonObject json, JsonDeserializationContext context)
{
this.amountPerChunk = json.get("amount_per_chunk").getAsInt();
this.maxRadius = json.get("max_radius").getAsInt();
this.state = GeneratorUtils.deserializeStateNonNull(json, "state", context);
this.replacedStates = context.deserialize(json.get("replaced_states"), IBlockState.class);
}
}