diff --git a/MODSRC/vazkii/botania/test/WorldTreeGenerator.java b/MODSRC/vazkii/botania/test/WorldTreeGenerator.java index 4f865844a..2a2fe6e21 100644 --- a/MODSRC/vazkii/botania/test/WorldTreeGenerator.java +++ b/MODSRC/vazkii/botania/test/WorldTreeGenerator.java @@ -12,6 +12,7 @@ package vazkii.botania.test; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; @@ -32,46 +33,52 @@ public class WorldTreeGenerator { } public void generate() { - for(int i = 0; i < 116; i++) - generateRing(i, (int) Math.sqrt(256 - (Math.min(i, 64) - 5) * 2)); + for(int i = 0; i < 156; i++) { + generateRing(i, (int) Math.sqrt(256 - (Math.min(i, 100) - 5) * 2) * 2); + generateRing(i, (int) (Math.sqrt(256 - (Math.min(i, 100) - 5) * 2) * 2) - 1); + } System.out.println("Blocks Placed: " + blocksPlaced); } public void generateRing(int yoff, int radius) { - Block block = ModBlocks.livingwood; + Block block = ModBlocks.dreamwood; + Block leaves = Blocks.leaves2; + y = yoff; - for(int i = 0; i < 360; i++) { + for(int i = 0; i < 720; i++) { if(i % 90 == 0) continue; - int meta = world.rand.nextInt(200) == 0 ? 5 : 0; - generateRingVal(radius, i, block, meta); + int meta = world.rand.nextInt(20) == 0 ? 5 : 0; + generateRingVal(radius, i * 0.5F, block, meta); } int mul = 4; for(int i = 0; i < mul; i++) for(int j = 0; j < mul; j++) { int meta = world.rand.nextInt(4) == 0 ? 5 : 0; - int angle = (y - j) * mul % 360; + int angle = (y - j) * mul % 720; generateRingVal(radius - i - 3, angle, block, meta); generateRingVal(radius - i - 3, angle + 180, block, meta); } - mul = 3; + mul = 2; for(int i = 0; i < mul; i++) for(int j = 0; j < mul; j++) { - int meta = world.rand.nextInt(20) == 0 ? 5 : 0; - int angle = (y - j) * mul % 360; - generateRingVal(radius + i - 1, angle + 90, block, meta); - generateRingVal(radius + i - 1, angle + 270, block, meta); + int meta = world.rand.nextInt(5) == 0 ? 5 : 0; + int angle = (y - j) * mul % 720; + generateRingVal(radius + i + 2, angle + 90, block, meta); + generateRingVal(radius + i + 2, angle + 270, block, meta); + generateRingVal(radius + i + 2, angle + 180, block, meta); + generateRingVal(radius + i + 2, angle, block, meta); } } - public void generateRingVal(int radius, int angle, Block block, int meta) { + public void generateRingVal(int radius, float angle, Block block, int meta) { int nx = (int) (Math.cos(angle * Math.PI / 180D) * radius); int nz = (int) (Math.sin(angle * Math.PI / 180D) * radius);