added getBranchForPlacement to family

Author: supermassimo

gradle.properties

@@ -1,6 +1,6 @@
 modName=DynamicTrees
 modId=dynamictrees
-modVersion=0.10.0-Beta33
+modVersion=0.10.0-Beta33.1
 group=com.ferreusveritas.dynamictrees
 
 mcVersion=1.16.5

src/main/java/com/ferreusveritas/dynamictrees/trees/Family.java

@@ -445,6 +445,19 @@ public Optional<BranchBlock> getBranch() {
         return Optionals.ofBlock(branch);
     }
 
+    /**
+     * Version of getBranch() used by jocodes to generate the tree.
+     * By default it acts just like getBranch() but it can be overriden
+     * by addons to customize the branch selected by the jocode
+     * @param world     The world the tree is generating in
+     * @param species   The species of the tree generated
+     * @param pos       The position of the branch block
+     * @return branch block picked
+     */
+    public Optional<BranchBlock> getBranchForPlacement(IWorld world, Species species, BlockPos pos) {
+        return getBranch();
+    }
+
     public Optional<BranchBlock> getStrippedBranch() {
         return Optionals.ofBlock(strippedBranch);
     }

src/main/java/com/ferreusveritas/dynamictrees/worldgen/JoCode.java

@@ -385,7 +385,7 @@ protected boolean setBlockForGeneration(IWorld world, Species species, BlockPos
                 world.getBlockState(pos).getBlock().is(DTBlockTags.FOLIAGE) ||
                 world.getBlockState(pos).getBlock().is(BlockTags.FLOWERS)) &&
                 (!careful || this.isClearOfNearbyBranches(world, pos, dir.getOpposite()))) {
-            species.getFamily().getBranch().ifPresent(branch ->
+            species.getFamily().getBranchForPlacement(world, species, pos).ifPresent(branch ->
                     branch.setRadius(world, pos, species.getFamily().getPrimaryThickness(), null, careful ? 3 : 2)
             );
             return false;