summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/WorldGenMegaTree.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/WorldGenMegaTree.java')
-rw-r--r--src/main/java/net/minecraft/server/WorldGenMegaTree.java225
1 files changed, 84 insertions, 141 deletions
diff --git a/src/main/java/net/minecraft/server/WorldGenMegaTree.java b/src/main/java/net/minecraft/server/WorldGenMegaTree.java
index 6ffae2fb..f83894f5 100644
--- a/src/main/java/net/minecraft/server/WorldGenMegaTree.java
+++ b/src/main/java/net/minecraft/server/WorldGenMegaTree.java
@@ -2,180 +2,123 @@ package net.minecraft.server;
import java.util.Random;
-import org.bukkit.BlockChangeDelegate; // CraftBukkit
+import org.bukkit.craftbukkit.CraftBlockChangeDelegate; // CraftBukkit
-public class WorldGenMegaTree extends WorldGenerator implements BlockSapling.TreeGenerator { // CraftBukkit add interface
+public class WorldGenMegaTree extends WorldGenMegaTreeAbstract implements BlockSapling.TreeGenerator { // CraftBukkit - add interface
- private final int a;
- private final int b;
- private final int c;
+ private boolean e;
- public WorldGenMegaTree(boolean flag, int i, int j, int k) {
- super(flag);
- this.a = i;
- this.b = j;
- this.c = k;
+ public WorldGenMegaTree(boolean flag, boolean flag1) {
+ super(flag, 13, 15, 1, 1);
+ this.e = flag1;
}
public boolean a(World world, Random random, int i, int j, int k) {
// CraftBukkit start - Moved to generate
- return this.generate((BlockChangeDelegate) world, random, i, j, k);
+ return this.generate(new CraftBlockChangeDelegate((org.bukkit.BlockChangeDelegate) world), random, i, j, k);
}
- public boolean generate(BlockChangeDelegate world, Random random, int i, int j, int k) {
+ public boolean generate(CraftBlockChangeDelegate world, Random random, int i, int j, int k) {
// CraftBukkit end
- int l = random.nextInt(3) + this.a;
- boolean flag = true;
+ int l = this.a(random);
- if (j >= 1 && j + l + 1 <= 256) {
- int i1;
- int j1;
- int k1;
- int l1;
-
- for (i1 = j; i1 <= j + 1 + l; ++i1) {
- byte b0 = 2;
+ if (!this.a(world, random, i, j, k, l)) {
+ return false;
+ } else {
+ this.c(world, i, k, j + l, 0, random);
- if (i1 == j) {
- b0 = 1;
- }
+ for (int i1 = 0; i1 < l; ++i1) {
+ Block block = world.getType(i, j + i1, k);
- if (i1 >= j + 1 + l - 2) {
- b0 = 2;
+ if (block.getMaterial() == Material.AIR || block.getMaterial() == Material.LEAVES) {
+ this.setTypeAndData(world, i, j + i1, k, Blocks.LOG, this.b);
}
- for (j1 = i - b0; j1 <= i + b0 && flag; ++j1) {
- for (k1 = k - b0; k1 <= k + b0 && flag; ++k1) {
- if (i1 >= 0 && i1 < 256) {
- l1 = world.getTypeId(j1, i1, k1);
- if (l1 != 0 && l1 != Block.LEAVES.id && l1 != Block.GRASS.id && l1 != Block.DIRT.id && l1 != Block.LOG.id && l1 != Block.SAPLING.id) {
- flag = false;
- }
- } else {
- flag = false;
- }
+ if (i1 < l - 1) {
+ block = world.getType(i + 1, j + i1, k);
+ if (block.getMaterial() == Material.AIR || block.getMaterial() == Material.LEAVES) {
+ this.setTypeAndData(world, i + 1, j + i1, k, Blocks.LOG, this.b);
}
- }
- }
- if (!flag) {
- return false;
- } else {
- i1 = world.getTypeId(i, j - 1, k);
- if ((i1 == Block.GRASS.id || i1 == Block.DIRT.id) && j < 256 - l - 1) {
- world.setTypeIdAndData(i, j - 1, k, Block.DIRT.id, 0);
- world.setTypeIdAndData(i + 1, j - 1, k, Block.DIRT.id, 0);
- world.setTypeIdAndData(i, j - 1, k + 1, Block.DIRT.id, 0);
- world.setTypeIdAndData(i + 1, j - 1, k + 1, Block.DIRT.id, 0);
- this.a(world, i, k, j + l, 2, random);
-
- for (int i2 = j + l - 2 - random.nextInt(4); i2 > j + l / 2; i2 -= 2 + random.nextInt(4)) {
- float f = random.nextFloat() * 3.1415927F * 2.0F;
-
- k1 = i + (int) (0.5F + MathHelper.cos(f) * 4.0F);
- l1 = k + (int) (0.5F + MathHelper.sin(f) * 4.0F);
- this.a(world, k1, l1, i2, 0, random);
-
- for (int j2 = 0; j2 < 5; ++j2) {
- k1 = i + (int) (1.5F + MathHelper.cos(f) * (float) j2);
- l1 = k + (int) (1.5F + MathHelper.sin(f) * (float) j2);
- this.setTypeAndData(world, k1, i2 - 3 + j2 / 2, l1, Block.LOG.id, this.b);
- }
+ block = world.getType(i + 1, j + i1, k + 1);
+ if (block.getMaterial() == Material.AIR || block.getMaterial() == Material.LEAVES) {
+ this.setTypeAndData(world, i + 1, j + i1, k + 1, Blocks.LOG, this.b);
}
- for (j1 = 0; j1 < l; ++j1) {
- k1 = world.getTypeId(i, j + j1, k);
- if (k1 == 0 || k1 == Block.LEAVES.id) {
- this.setTypeAndData(world, i, j + j1, k, Block.LOG.id, this.b);
- if (j1 > 0) {
- if (random.nextInt(3) > 0 && world.isEmpty(i - 1, j + j1, k)) {
- this.setTypeAndData(world, i - 1, j + j1, k, Block.VINE.id, 8);
- }
-
- if (random.nextInt(3) > 0 && world.isEmpty(i, j + j1, k - 1)) {
- this.setTypeAndData(world, i, j + j1, k - 1, Block.VINE.id, 1);
- }
- }
- }
-
- if (j1 < l - 1) {
- k1 = world.getTypeId(i + 1, j + j1, k);
- if (k1 == 0 || k1 == Block.LEAVES.id) {
- this.setTypeAndData(world, i + 1, j + j1, k, Block.LOG.id, this.b);
- if (j1 > 0) {
- if (random.nextInt(3) > 0 && world.isEmpty(i + 2, j + j1, k)) {
- this.setTypeAndData(world, i + 2, j + j1, k, Block.VINE.id, 2);
- }
-
- if (random.nextInt(3) > 0 && world.isEmpty(i + 1, j + j1, k - 1)) {
- this.setTypeAndData(world, i + 1, j + j1, k - 1, Block.VINE.id, 1);
- }
- }
- }
-
- k1 = world.getTypeId(i + 1, j + j1, k + 1);
- if (k1 == 0 || k1 == Block.LEAVES.id) {
- this.setTypeAndData(world, i + 1, j + j1, k + 1, Block.LOG.id, this.b);
- if (j1 > 0) {
- if (random.nextInt(3) > 0 && world.isEmpty(i + 2, j + j1, k + 1)) {
- this.setTypeAndData(world, i + 2, j + j1, k + 1, Block.VINE.id, 2);
- }
-
- if (random.nextInt(3) > 0 && world.isEmpty(i + 1, j + j1, k + 2)) {
- this.setTypeAndData(world, i + 1, j + j1, k + 2, Block.VINE.id, 4);
- }
- }
- }
-
- k1 = world.getTypeId(i, j + j1, k + 1);
- if (k1 == 0 || k1 == Block.LEAVES.id) {
- this.setTypeAndData(world, i, j + j1, k + 1, Block.LOG.id, this.b);
- if (j1 > 0) {
- if (random.nextInt(3) > 0 && world.isEmpty(i - 1, j + j1, k + 1)) {
- this.setTypeAndData(world, i - 1, j + j1, k + 1, Block.VINE.id, 8);
- }
-
- if (random.nextInt(3) > 0 && world.isEmpty(i, j + j1, k + 2)) {
- this.setTypeAndData(world, i, j + j1, k + 2, Block.VINE.id, 4);
- }
- }
- }
- }
+ block = world.getType(i, j + i1, k + 1);
+ if (block.getMaterial() == Material.AIR || block.getMaterial() == Material.LEAVES) {
+ this.setTypeAndData(world, i, j + i1, k + 1, Blocks.LOG, this.b);
}
-
- return true;
- } else {
- return false;
}
}
- } else {
- return false;
}
+
+ return true;
}
// CraftBukkit - Changed signature
- private void a(BlockChangeDelegate world, int i, int j, int k, int l, Random random) {
- byte b0 = 2;
+ private void c(CraftBlockChangeDelegate world, int i, int j, int k, int l, Random random) {
+ int i1 = random.nextInt(5);
- for (int i1 = k - b0; i1 <= k; ++i1) {
- int j1 = i1 - k;
- int k1 = l + 1 - j1;
+ if (this.e) {
+ i1 += this.a;
+ } else {
+ i1 += 3;
+ }
- for (int l1 = i - k1; l1 <= i + k1 + 1; ++l1) {
- int i2 = l1 - i;
+ int j1 = 0;
- for (int j2 = j - k1; j2 <= j + k1 + 1; ++j2) {
- int k2 = j2 - j;
+ for (int k1 = k - i1; k1 <= k; ++k1) {
+ int l1 = k - k1;
+ int i2 = l + MathHelper.d((float) l1 / (float) i1 * 3.5F);
- if ((i2 >= 0 || k2 >= 0 || i2 * i2 + k2 * k2 <= k1 * k1) && (i2 <= 0 && k2 <= 0 || i2 * i2 + k2 * k2 <= (k1 + 1) * (k1 + 1)) && (random.nextInt(4) != 0 || i2 * i2 + k2 * k2 <= (k1 - 1) * (k1 - 1))) {
- int l2 = world.getTypeId(l1, i1, j2);
+ this.a(world, i, k1, j, i2 + (l1 > 0 && i2 == j1 && (k1 & 1) == 0 ? 1 : 0), random);
+ j1 = i2;
+ }
+ }
- if (l2 == 0 || l2 == Block.LEAVES.id) {
- this.setTypeAndData(world, l1, i1, j2, Block.LEAVES.id, this.c);
- }
- }
+ // CraftBukkit - Changed signature
+ public void b(CraftBlockChangeDelegate world, Random random, int i, int j, int k) {
+ this.c(world, random, i - 1, j, k - 1);
+ this.c(world, random, i + 2, j, k - 1);
+ this.c(world, random, i - 1, j, k + 2);
+ this.c(world, random, i + 2, j, k + 2);
+
+ for (int l = 0; l < 5; ++l) {
+ int i1 = random.nextInt(64);
+ int j1 = i1 % 8;
+ int k1 = i1 / 8;
+
+ if (j1 == 0 || j1 == 7 || k1 == 0 || k1 == 7) {
+ this.c(world, random, i - 3 + j1, j, k - 3 + k1);
+ }
+ }
+ }
+
+ // CraftBukkit - Changed signature
+ private void c(CraftBlockChangeDelegate world, Random random, int i, int j, int k) {
+ for (int l = -2; l <= 2; ++l) {
+ for (int i1 = -2; i1 <= 2; ++i1) {
+ if (Math.abs(l) != 2 || Math.abs(i1) != 2) {
+ this.a(world, i + l, j, k + i1);
}
}
}
}
+
+ // CraftBukkit - Changed signature
+ private void a(CraftBlockChangeDelegate world, int i, int j, int k) {
+ for (int l = j + 2; l >= j - 3; --l) {
+ Block block = world.getType(i, l, k);
+
+ if (block == Blocks.GRASS || block == Blocks.DIRT) {
+ this.setTypeAndData(world, i, l, k, Blocks.DIRT, 2);
+ break;
+ }
+
+ if (block.getMaterial() != Material.AIR && l < j) {
+ break;
+ }
+ }
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 21:59:57 +0000