From 7bd7357684298c3f28007e174a3abe2e5c6b1b2e Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 21 May 2016 17:50:47 -0700 Subject: [PATCH] Start generating leaves from the top branch position, not random order --- .../arboriculture/worldgen/WorldGenAcacia.java | 3 ++- .../worldgen/WorldGenArboriculture.java | 14 ++++++++++++-- .../arboriculture/worldgen/WorldGenBalsa.java | 3 ++- .../arboriculture/worldgen/WorldGenBaobab.java | 3 ++- .../arboriculture/worldgen/WorldGenCherry.java | 3 ++- .../arboriculture/worldgen/WorldGenChestnut.java | 3 ++- .../arboriculture/worldgen/WorldGenCocobolo.java | 3 ++- .../arboriculture/worldgen/WorldGenDate.java | 3 ++- .../arboriculture/worldgen/WorldGenEbony.java | 3 ++- .../arboriculture/worldgen/WorldGenGreenheart.java | 3 ++- .../arboriculture/worldgen/WorldGenIpe.java | 3 ++- .../arboriculture/worldgen/WorldGenJungle.java | 3 ++- .../arboriculture/worldgen/WorldGenKapok.java | 3 ++- .../arboriculture/worldgen/WorldGenLarch.java | 3 ++- .../arboriculture/worldgen/WorldGenLemon.java | 3 ++- .../arboriculture/worldgen/WorldGenMahoe.java | 3 ++- .../arboriculture/worldgen/WorldGenMahogany.java | 3 ++- .../arboriculture/worldgen/WorldGenMaple.java | 3 ++- .../arboriculture/worldgen/WorldGenPadauk.java | 3 ++- .../arboriculture/worldgen/WorldGenPapaya.java | 3 ++- .../arboriculture/worldgen/WorldGenPine.java | 3 ++- .../arboriculture/worldgen/WorldGenPlum.java | 3 ++- .../arboriculture/worldgen/WorldGenPoplar.java | 3 ++- .../arboriculture/worldgen/WorldGenSequoia.java | 3 ++- .../arboriculture/worldgen/WorldGenSilverLime.java | 3 ++- .../arboriculture/worldgen/WorldGenSpruce.java | 3 ++- .../arboriculture/worldgen/WorldGenTeak.java | 3 ++- .../arboriculture/worldgen/WorldGenTree.java | 3 ++- .../arboriculture/worldgen/WorldGenWalnut.java | 3 ++- .../arboriculture/worldgen/WorldGenWenge.java | 3 ++- .../arboriculture/worldgen/WorldGenWillow.java | 3 ++- .../arboriculture/worldgen/WorldGenZebrawood.java | 3 ++- 32 files changed, 74 insertions(+), 33 deletions(-) diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java index 377c570c5..f52be74d0 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { for (BlockPos branchEnd : branchEnds) { int leafSpawn = branchEnd.getY(); int canopyThickness = Math.max(1, Math.round(leafSpawn / 10.0f)); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java index 73508ae8e..07812cd75 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java @@ -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 branchEnds = generateTrunk(world, rand, wood, genPos); + List branchEnds = new ArrayList<>(generateTrunk(world, rand, wood, genPos)); + Collections.sort(branchEnds, new Comparator() { + @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 generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos); - protected abstract void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, Set branchEnds, BlockPos startPos); + protected abstract void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos); protected abstract void generateExtras(World world, Random rand, BlockPos startPos); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java index d02da9352..b67947ffd 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { BlockPos.MutableBlockPos leafCenter = new BlockPos.MutableBlockPos(startPos.add(0, height, 0)); float leafRadius = (girth - 1.0f) / 2.0f; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java index 52c66aa6c..f793cfeb5 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { for (BlockPos branchEnd : branchEnds) { WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, girth, 2, WorldGenHelper.EnumReplaceMode.AIR); } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java index d905c8097..40893dfd2 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List 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); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java index b81e98207..0b852a66c 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java index 2a9db359a..50258b29a 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height; for (BlockPos treeTop : branchEnds) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java index 41c485da5..dcc6fc88a 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; float radiusMultiplier = height / 6f; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java index d8dc94e11..418c73400 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List 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) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java index 22f75d80a..513b14774 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java index 45afd6b5a..6529f175b 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; float adjustedGirth = girth * .65f; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java index a0dae78e7..32ab96963 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int height = this.height; if (girth >= 2) { height *= 1.5f; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java index df68dfde5..8e11bbd0d 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java index 0e51243af..26a7f38b2 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; float sizeMultiplier = Math.max(height / 8, 1.0f); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java index 63a220316..de956862e 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int yCenter = height - girth; yCenter = yCenter > 2 ? yCenter : 3; int radius = Math.round((2 + rand.nextInt(girth)) * (height / 4.0f)); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java index 607f067d7..3f72c1d07 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { for (BlockPos branchEnd : branchEnds) { WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 2 + girth, 2, WorldGenHelper.EnumReplaceMode.AIR); } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java index 78e095ee2..3fee91fbc 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { for (BlockPos branchEnd : branchEnds) { WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 2 + girth, 2, WorldGenHelper.EnumReplaceMode.AIR); } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java index e8fe22824..b8923cf43 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { for (BlockPos branchEnd : branchEnds) { WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 2 + girth, 2, WorldGenHelper.EnumReplaceMode.AIR); } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java index 57b21e13e..3f92d9bb1 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java index f54bf53b3..56b25335a 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { for (BlockPos branchEnd : branchEnds) { WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 1 + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java index cc723879a..5a51a46da 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { for (BlockPos branchEnd : branchEnds) { WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 2 + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java index de23cd540..a2bf26898 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int yCenter = height - girth; yCenter = yCenter > 2 ? yCenter : 3; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java index 5be57f97f..fb68a6540 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; float leafRadius = (girth - 1.0f) / 2.0f; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java index 293fb050f..3b94fc446 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { for (BlockPos branchEnd : branchEnds) { WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 1.0f + girth, 1, WorldGenHelper.EnumReplaceMode.AIR); } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenSilverLime.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSilverLime.java index 02f2e89e2..e4c83d36f 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenSilverLime.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenSilverLime.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { for (BlockPos branchEnd : branchEnds) { WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, girth, 1, WorldGenHelper.EnumReplaceMode.AIR); } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java index a80a5e974..f2e1da88e 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java index 7b484c598..52df4dc3b 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { float leafMultiplier = height / 6.0f; if (leafMultiplier > 2) { leafMultiplier = 2; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java index 12a06c95d..6d04792b3 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List 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); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java index 3971326e0..7fa2de442 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java index f146db161..a07e99975 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java index 4493e98e9..916894820 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; WorldGenHelper.generateCylinderFromTreeStartPos(world, leaf, startPos.add(0, leafSpawn--, 0), girth, girth, 1, WorldGenHelper.EnumReplaceMode.SOFT); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java index 7ed6d474a..692538436 100644 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java @@ -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 branchEnds, BlockPos startPos) { + protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { for (BlockPos branchEnd : branchEnds) { WorldGenHelper.generateCylinderFromPos(world, leaf, branchEnd, 1.0f + girth, 2, WorldGenHelper.EnumReplaceMode.AIR); }