Start generating leaves from the top branch position, not random order

This commit is contained in:
mezz committed 2016-05-21 17:50:47 -07:00
1 parent a84ad5c828
commit 7bd7357684
32 files changed
+74 -33

No files matched your search

@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -61,7 +62,7 @@ public class WorldGenAcacia extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (BlockPos branchEnd : branchEnds) {
int leafSpawn = branchEnd.getY();
int canopyThickness = Math.max(1, Math.round(leafSpawn / 10.0f));
@@ -12,6 +12,10 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -57,7 +61,13 @@ public abstract class WorldGenArboriculture extends WorldGenBase {
}
if (genPos != null) {
Set<BlockPos> branchEnds = generateTrunk(world, rand, wood, genPos);
List<BlockPos> branchEnds = new ArrayList<>(generateTrunk(world, rand, wood, genPos));
Collections.sort(branchEnds, new Comparator<BlockPos>() {
@Override
public int compare(BlockPos o1, BlockPos o2) {
return Integer.compare(o2.getY(), o1.getY());
}
});
generateLeaves(world, rand, leaf, branchEnds, genPos);
generateExtras(world, rand, genPos);
return true;
@@ -84,7 +94,7 @@ public abstract class WorldGenArboriculture extends WorldGenBase {
@Nonnull
protected abstract Set<BlockPos> generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos);
protected abstract void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos);
protected abstract void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos);
protected abstract void generateExtras(World world, Random rand, BlockPos startPos);
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -36,7 +37,7 @@ public class WorldGenBalsa extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
BlockPos.MutableBlockPos leafCenter = new BlockPos.MutableBlockPos(startPos.add(0, height, 0));
float leafRadius = (girth - 1.0f) / 2.0f;
@@ -11,6 +11,7 @@
package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -41,7 +42,7 @@ public class WorldGenBaobab extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (BlockPos branchEnd : branchEnds) {
WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, girth, 2, WorldGenHelper.EnumReplaceMode.AIR);
}
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -45,7 +46,7 @@ public class WorldGenCherry extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn, 0), girth, (float) 1 + girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
@@ -11,6 +11,7 @@
package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -42,7 +43,7 @@ public class WorldGenChestnut extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
@@ -11,6 +11,7 @@
package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -33,7 +34,7 @@ public class WorldGenCocobolo extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height;
for (BlockPos treeTop : branchEnds) {
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -35,7 +36,7 @@ public class WorldGenDate extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
float radiusMultiplier = height / 6f;
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -60,7 +61,7 @@ public class WorldGenEbony extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (int times = 0; times < 2 * height; times++) {
int h = 2 * girth + rand.nextInt(height - girth);
if (rand.nextBoolean() && h < height / 2) {
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -36,7 +37,7 @@ public class WorldGenGreenheart extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -45,7 +46,7 @@ public class WorldGenIpe extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
float adjustedGirth = girth * .65f;
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -55,7 +56,7 @@ public class WorldGenJungle extends WorldGenTreeVanilla {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int height = this.height;
if (girth >= 2) {
height *= 1.5f;
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -45,7 +46,7 @@ public class WorldGenKapok extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -35,7 +36,7 @@ public class WorldGenLarch extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
float sizeMultiplier = Math.max(height / 8, 1.0f);
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -35,7 +36,7 @@ public class WorldGenLemon extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int yCenter = height - girth;
yCenter = yCenter > 2 ? yCenter : 3;
int radius = Math.round((2 + rand.nextInt(girth)) * (height / 4.0f));
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -41,7 +42,7 @@ public class WorldGenMahoe extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (BlockPos branchEnd : branchEnds) {
WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 2 + girth, 2, WorldGenHelper.EnumReplaceMode.AIR);
}
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -41,7 +42,7 @@ public class WorldGenMahogany extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (BlockPos branchEnd : branchEnds) {
WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 2 + girth, 2, WorldGenHelper.EnumReplaceMode.AIR);
}
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -40,7 +41,7 @@ public class WorldGenMaple extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (BlockPos branchEnd : branchEnds) {
WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 2 + girth, 2, WorldGenHelper.EnumReplaceMode.AIR);
}
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -73,7 +74,7 @@ public class WorldGenPadauk extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
@@ -11,6 +11,7 @@
package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -34,7 +35,7 @@ public class WorldGenPapaya extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (BlockPos branchEnd : branchEnds) {
WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 1 + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -40,7 +41,7 @@ public class WorldGenPine extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (BlockPos branchEnd : branchEnds) {
WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 2 + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -35,7 +36,7 @@ public class WorldGenPlum extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int yCenter = height - girth;
yCenter = yCenter > 2 ? yCenter : 3;
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -35,7 +36,7 @@ public class WorldGenPoplar extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
float leafRadius = (girth - 1.0f) / 2.0f;
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -51,7 +52,7 @@ public class WorldGenSequoia extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (BlockPos branchEnd : branchEnds) {
WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 1.0f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
@@ -11,6 +11,7 @@
package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -35,7 +36,7 @@ public class WorldGenSilverLime extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (BlockPos branchEnd : branchEnds) {
WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
}
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -46,7 +47,7 @@ public class WorldGenSpruce extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
@@ -11,6 +11,7 @@
package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -37,7 +38,7 @@ public class WorldGenTeak extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
float leafMultiplier = height / 6.0f;
if (leafMultiplier > 2) {
leafMultiplier = 2;
@@ -13,6 +13,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -48,7 +49,7 @@ public abstract class WorldGenTree extends WorldGenArboriculture {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafHeight = height + 1;
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafHeight--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafHeight--, 0), girth, 0.5f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR);
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -46,7 +47,7 @@ public class WorldGenWalnut extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -46,7 +47,7 @@ public class WorldGenWenge extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
@@ -12,6 +12,7 @@ package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -46,7 +47,7 @@ public class WorldGenWillow extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
int leafSpawn = height + 1;
WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT);
@@ -11,6 +11,7 @@
package forestry.arboriculture.worldgen;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
import java.util.Set;
@@ -36,7 +37,7 @@ public class WorldGenZebrawood extends WorldGenTree {
}
@Override
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set<BlockPos> branchEnds, BlockPos startPos) {
protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List<BlockPos> branchEnds, BlockPos startPos) {
for (BlockPos branchEnd : branchEnds) {
WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 1.0f + girth, 2, WorldGenHelper.EnumReplaceMode.AIR);
}