Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rewrite water spring population code, actual 7.0.9

Browse source
This commit is contained in:
asiekierka 2015-06-11 09:52:12 +02:00
parent 5bbb6a9049
commit 30d90f48b5
1 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
common/buildcraft/core/SpringPopulate.java
View file

@ -25,10 +25,9 @@ public class SpringPopulate {
@SubscribeEvent
public void populate(PopulateChunkEvent.Post event) {
boolean doGen = TerrainGen.populate(event.chunkProvider, event.world, event.rand, event.chunkX, event.chunkZ, event.hasVillageGenerated, PopulateChunkEvent.Populate.EventType.CUSTOM);
if (!doGen) {
if (!doGen || !BlockSpring.EnumSpring.WATER.canGen) {
event.setResult(Result.ALLOW);
return;
}
@ -55,43 +54,30 @@ public class SpringPopulate {
int posX = x + random.nextInt(16);
int posZ = z + random.nextInt(16);
for (int i = 8; i >= 0; i--) {
for (int i = 0; i < 5; i++) {
Block candidate = world.getBlock(posX, i, posZ);
if (candidate != Blocks.bedrock) {
continue;
}
world.setBlock(posX, i, posZ, BuildCraftCore.springBlock);
// Handle flat bedrock maps
int y = i > 0 ? i : i - 1;
for (int j = i + 2; j < world.getActualHeight() - 10; j++) {
if (!boreToSurface(world, posX, j, posZ)) {
if (world.isAirBlock(posX, j, posZ)) {
world.setBlock(posX, j, posZ, Blocks.water);
}
int toGround = 50 - random.nextInt(25);
world.setBlock(posX, y + 1, posZ, BuildCraftCore.springBlock);
for (int j = y + 2; j < toGround; j++) {
if (world.isAirBlock(posX, j, posZ)) {
world.setBlock(posX, j, posZ, Blocks.water);
break;
} else {
world.setBlock(posX, j, posZ, Blocks.water);
}
}
break;
}
}
private boolean boreToSurface(World world, int x, int y, int z) {
if (world.isAirBlock(x, y, z)) {
return false;
}
Block existing = world.getBlock(x, y, z);
if (existing != Blocks.stone
&& existing != Blocks.dirt
&& existing != Blocks.gravel
&& existing != Blocks.grass) {
return false;
}
world.setBlock(x, y, z, Blocks.water);
return true;
}
}