Skip to content

Commit

Permalink
Cleanup some of the world generator code
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbegt committed Jan 2, 2018
1 parent b0a43d3 commit 11b0a75
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 104 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/progwml6/natura/world/worldgen/CloudGenerator.java
View file
Expand Up @@ -12,8 +12,8 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraftforge.fml.common.IWorldGenerator;

public class CloudGenerator implements IWorldGenerator
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/progwml6/natura/world/worldgen/clouds/CloudsGenerator.java
View file
Expand Up @@ -6,8 +6,8 @@
import net.minecraft.init.Blocks;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraftforge.fml.common.IWorldGenerator;

public class CloudsGenerator implements IWorldGenerator
Expand Down Expand Up @@ -37,14 +37,14 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG

public void generateCloud(Random random, World world, BlockPos pos)
{
int rand = random.nextInt(3) - 1;
int rand1 = random.nextInt(3) - 1;
int xRand = random.nextInt(3) - 1;
int zRand = random.nextInt(3) - 1;

for (int block = 0; block < this.cloudSize; block++)
{
int xIter = pos.getX() + (random.nextInt(3) - 1) + rand;
int xIter = pos.getX() + (random.nextInt(3) - 1) + xRand;
int yIter = pos.getY();
int zIter = pos.getZ() + (random.nextInt(3) - 1) + rand1;
int zIter = pos.getZ() + (random.nextInt(3) - 1) + zRand;

if (random.nextBoolean() && !this.flatCloud || this.flatCloud && random.nextInt(10) == 0)
{
Expand Down
27 changes: 26 additions & 1 deletion src/main/java/com/progwml6/natura/world/worldgen/saguaro/SaguaroGenerator.java
View file
Expand Up @@ -11,8 +11,8 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraftforge.fml.common.IWorldGenerator;

public class SaguaroGenerator implements IWorldGenerator
Expand Down Expand Up @@ -49,6 +49,17 @@ public void generateSaguaro(Random random, World worldIn, BlockPos position)
if (this.findGround)
{
this.basePos = this.findGround(worldIn, position);
while (position.getY() > 1 && worldIn.isAirBlock(position) || worldIn.getBlockState(position).getBlock().isLeaves(worldIn.getBlockState(position), worldIn, position))
{
this.basePos = position.down();
}

if (!(blocksMatch(worldIn, position)))
{
return;
}

this.basePos = this.basePos.up();
}
else
{
Expand All @@ -68,6 +79,20 @@ public void generateSaguaro(Random random, World worldIn, BlockPos position)
}
}

private boolean blocksMatch(World world, BlockPos pos)
{
Block underBlock = world.getBlockState(pos).getBlock();

if (!(underBlock == Blocks.SAND))
{
return true;
}
else
{
return false;
}
}

private boolean validSaguaroLocation()
{
BlockPos down = this.basePos.down();
Expand Down
160 changes: 64 additions & 96 deletions src/main/java/com/progwml6/natura/world/worldgen/trees/overworld/HopseedTreeGenerator.java
View file
Expand Up @@ -2,7 +2,6 @@

import java.util.Random;

import com.progwml6.natura.common.config.Config;
import com.progwml6.natura.overworld.NaturaOverworld;
import com.progwml6.natura.world.worldgen.trees.BaseTreeGenerator;

Expand All @@ -13,9 +12,8 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockPos.MutableBlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.IChunkGenerator;

public class HopseedTreeGenerator extends BaseTreeGenerator
{
Expand Down Expand Up @@ -58,54 +56,66 @@ public void generateTree(Random random, World worldIn, BlockPos position)

if (this.seekHeight)
{
position = this.findGround(worldIn, position);
while (position.getY() > 1 && worldIn.isAirBlock(position) || worldIn.getBlockState(position).getBlock().isLeaves(worldIn.getBlockState(position), worldIn, position))
{
position = position.down();
}

if (position.getY() < 0)
{
return;
}
}

boolean flag = true;
if (!(blocksMatch(worldIn, position)))
{
return;
}

position = position.up();

boolean hasSpace = true;

if (position.getY() >= 1 && position.getY() + height + 1 <= 256)
{
for (int j = position.getY(); j <= position.getY() + 1 + height; ++j)
int radius;

for (int y = position.getY(); y <= position.getY() + 1 + height; ++y)
{
int k = 2;
radius = 1;

if (j == position.getY())
if (y == position.getY())
{
k = 1;
radius = 0;
}

if (j >= position.getY() + 1 + height - 2)
if (y >= position.getY() + 1 + height - 2)
{
k = 2;
radius = 2;
}

MutableBlockPos mutableblockpos = new MutableBlockPos();

for (int l = position.getX() - k; l <= position.getX() + k && flag; ++l)
for (int x = position.getX() - radius; x <= position.getX() + radius && hasSpace; ++x)
{
for (int i1 = position.getZ() - k; i1 <= position.getZ() + k && flag; ++i1)
for (int z = position.getZ() - radius; z <= position.getZ() + radius && hasSpace; ++z)
{
if (j >= 0 && j < 256)
if (y >= 0 && y < 256)
{
if (!this.isReplaceable(worldIn, mutableblockpos.setPos(l, j, i1)))
if (!this.isReplaceable(worldIn, mutableblockpos.setPos(x, y, z)))
{
flag = false;
hasSpace = false;
}
}
else
{
flag = false;
hasSpace = false;
}
}
}
}

if (!flag)
if (!hasSpace)
{
}
else
Expand Down Expand Up @@ -173,124 +183,82 @@ public void generateTree(Random random, World worldIn, BlockPos position)
}
}

BlockPos findGround(World world, BlockPos pos)
private boolean blocksMatch(World world, BlockPos pos)
{
if (world.getWorldType() == WorldType.FLAT && this.isSapling)
{
int returnHeight = 0;

boolean foundGround = false;

int height = Config.flatSeaLevel + 64;

do
{
height--;
BlockPos position = new BlockPos(pos.getX(), height, pos.getZ());

Block underBlock = world.getBlockState(position).getBlock();

if (underBlock == Blocks.DIRT || underBlock == Blocks.GRASS || height < Config.flatSeaLevel)
{
returnHeight = height + 1;

foundGround = true;
}
}
while (!foundGround);
Block underBlock = world.getBlockState(pos).getBlock();

return new BlockPos(pos.getX(), returnHeight, pos.getZ());
if (!(underBlock == Blocks.DIRT || underBlock == Blocks.GRASS))
{
return true;
}
else
{
int returnHeight = 0;

boolean foundGround = false;

int height = Config.seaLevel + 64;

do
{
height--;
BlockPos position = new BlockPos(pos.getX(), height, pos.getZ());

Block underBlock = world.getBlockState(position).getBlock();

if (underBlock == Blocks.DIRT || underBlock == Blocks.GRASS || height < Config.seaLevel)
{
returnHeight = height + 1;

foundGround = true;
}
}
while (!foundGround);

return new BlockPos(pos.getX(), returnHeight, pos.getZ());
return false;
}
}

private void growLogs(World worldIn, BlockPos position)
private void growLogs(World worldIn, BlockPos positionIn)
{
this.setBlockAndMetadata(worldIn, position, this.log);
this.setBlockAndMetadata(worldIn, position.add(+1, 0, 0), this.log);
this.setBlockAndMetadata(worldIn, position.add(0, 0, +1), this.log);
this.setBlockAndMetadata(worldIn, position.add(+1, 0, +1), this.log);

this.setBlockAndMetadata(worldIn, position.add(0, +1, 0), this.log);
this.setBlockAndMetadata(worldIn, position.add(+1, +1, 0), this.log);
this.setBlockAndMetadata(worldIn, position.add(0, +1, +1), this.log);
this.setBlockAndMetadata(worldIn, position.add(+1, +1, +1), this.log);
this.setBlockAndMetadata(worldIn, positionIn, this.log);
this.setBlockAndMetadata(worldIn, positionIn.add(+1, 0, 0), this.log);
this.setBlockAndMetadata(worldIn, positionIn.add(0, 0, +1), this.log);
this.setBlockAndMetadata(worldIn, positionIn.add(+1, 0, +1), this.log);

this.setBlockAndMetadata(worldIn, positionIn.add(0, +1, 0), this.log);
this.setBlockAndMetadata(worldIn, positionIn.add(+1, +1, 0), this.log);
this.setBlockAndMetadata(worldIn, positionIn.add(0, +1, +1), this.log);
this.setBlockAndMetadata(worldIn, positionIn.add(+1, +1, +1), this.log);
}

protected void growLeaves(World world, Random random, BlockPos pos, int height)
protected void growLeaves(World worldIn, Random random, BlockPos positionIn, int height)
{
for (int y = pos.getY() - 2 + height; y <= pos.getY() + height; ++y)
for (int y = positionIn.getY() - 2 + height; y <= positionIn.getY() + height; ++y)
{
int subract = y - (pos.getY() + height);
int subract = y - (positionIn.getY() + height);
int subract2 = 2 + 1 - subract;

for (int x = pos.getX() - subract2; x <= pos.getX() + subract2; ++x)
for (int x = positionIn.getX() - subract2; x <= positionIn.getX() + subract2; ++x)
{
int mathX = x - pos.getX();
int mathX = x - positionIn.getX();

for (int z = pos.getZ() - subract2; z <= pos.getZ() + subract2; ++z)
for (int z = positionIn.getZ() - subract2; z <= positionIn.getZ() + subract2; ++z)
{
int mathZ = z - pos.getZ();
int mathZ = z - positionIn.getZ();

BlockPos blockpos = new BlockPos(x, y, z);
IBlockState state = world.getBlockState(blockpos);
IBlockState state = worldIn.getBlockState(blockpos);

if ((mathX >= 0 || mathZ >= 0 || mathX * mathX + mathZ * mathZ <= subract2 * subract2) && (mathX <= 0 && mathZ <= 0 || mathX * mathX + mathZ * mathZ <= (subract2 + 1) * (subract2 + 1)) && (random.nextInt(4) != 0 || mathX * mathX + mathZ * mathZ <= (subract2 - 1) * (subract2 - 1)) && (state.getBlock().isAir(state, world, blockpos) || state.getBlock().isLeaves(state, world, blockpos) || state.getBlock().canBeReplacedByLeaves(state, world, blockpos)))
if ((mathX >= 0 || mathZ >= 0 || mathX * mathX + mathZ * mathZ <= subract2 * subract2) && (mathX <= 0 && mathZ <= 0 || mathX * mathX + mathZ * mathZ <= (subract2 + 1) * (subract2 + 1)) && (random.nextInt(4) != 0 || mathX * mathX + mathZ * mathZ <= (subract2 - 1) * (subract2 - 1)) && (state.getBlock().isAir(state, worldIn, blockpos) || state.getBlock().isLeaves(state, worldIn, blockpos) || state.getBlock().canBeReplacedByLeaves(state, worldIn, blockpos)))
{
this.setBlockAndMetadata(world, blockpos, this.leaves);
this.setBlockAndMetadata(worldIn, blockpos, this.leaves);
}
}
}
}
}

protected void setBlockAndMetadata(World world, BlockPos pos, IBlockState stateNew)
protected void setBlockAndMetadata(World worldIn, BlockPos positionIn, IBlockState stateNew)
{
IBlockState state = world.getBlockState(pos);
IBlockState state = worldIn.getBlockState(positionIn);
Block block = state.getBlock();

if (block.isAir(state, world, pos) || block.canPlaceBlockAt(world, pos) || world.getBlockState(pos) == this.leaves)
if (block.isAir(state, worldIn, positionIn) || block.canPlaceBlockAt(worldIn, positionIn) || worldIn.getBlockState(positionIn) == this.leaves)
{
world.setBlockState(pos, stateNew, 2);
worldIn.setBlockState(positionIn, stateNew, 2);
}
}

public boolean isReplaceable(World world, BlockPos pos)
public boolean isReplaceable(World worldIn, BlockPos positionIn)
{
IBlockState state = world.getBlockState(pos);
IBlockState state = worldIn.getBlockState(positionIn);

return state.getBlock().isAir(state, world, pos) || state.getBlock().isLeaves(state, world, pos) || state.getBlock().isWood(world, pos);
return state.getBlock().isAir(state, worldIn, positionIn) || state.getBlock().isLeaves(state, worldIn, positionIn) || state.getBlock().isWood(worldIn, positionIn);
}

private void onPlantGrow(World world, BlockPos pos, BlockPos source)
private void onPlantGrow(World worldIn, BlockPos positionIn, BlockPos source)
{
IBlockState state = world.getBlockState(pos);
IBlockState state = worldIn.getBlockState(positionIn);

state.getBlock().onPlantGrow(state, world, pos, source);
state.getBlock().onPlantGrow(state, worldIn, positionIn, source);
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/progwml6/natura/world/worldgen/trees/overworld/SakuraTreeGenerator.java
View file
Expand Up @@ -17,8 +17,8 @@
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.IChunkGenerator;

public class SakuraTreeGenerator extends BaseTreeGenerator
{
Expand Down

0 comments on commit 11b0a75

Please sign in to comment.