added check to offset trees when generating over foliage

Author: supermassimo

gradle.properties

@@ -1,6 +1,6 @@
 modName=DynamicTrees
 modId=dynamictrees
-modVersion=1.4.4
+modVersion=1.4.5
 
 group=com.ferreusveritas.dynamictrees
 

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

@@ -84,6 +84,21 @@ protected void generateTrees(LevelContext levelContext, BiomeDatabase biomeDatab
         }
     }
 
+    private BlockPos OffsetPosIfOnFoliage(LevelAccessor level, BlockPos groundPos){
+        if (isNonReplaceableFoliage(level, groundPos)){
+            if (isNonReplaceableFoliage(level, groundPos.below())){
+                return groundPos.below(2);
+            }
+            return groundPos.below();
+        }
+        return groundPos;
+    }
+
+    private boolean isNonReplaceableFoliage(LevelAccessor pLevel, BlockPos pPos){
+        BlockState state = pLevel.getBlockState(pPos);
+        return !state.isAir() && validTreePos(pLevel, pPos);
+    }
+
     public static boolean validTreePos(LevelSimulatedReader pLevel, BlockPos pPos) {
         return pLevel.isStateAtPosition(pPos, (state) ->
                 state.isAir() || state.is(BlockTags.REPLACEABLE_BY_TREES) || state.is(DTBlockTags.FOLIAGE));
@@ -94,6 +109,8 @@ protected GeneratorResult generateTree(LevelContext levelContext, BiomeDatabase.
             return GeneratorResult.NO_GROUND;
         }
 
+        groundPos = OffsetPosIfOnFoliage(levelContext.accessor(), groundPos);;
+
         // If there is already a rooty block, a cave rooted tree has taken this disc, so ignore
         if (levelContext.accessor().getBlockState(groundPos).getBlock() instanceof RootyBlock) {
             return GeneratorResult.ALREADY_GENERATED;