fixed canopies getting cut off during worldgen

Author: supermassimo

build.gradle.kts

@@ -92,8 +92,8 @@ dependencies {
     compileOnly(fg.deobf("mezz.jei:jei-$mcVersion-common-api:${property("jeiVersion")}"))
     runtimeOnly(fg.deobf("mezz.jei:jei-$mcVersion-forge:${property("jeiVersion")}"))
 
-    implementation(fg.deobf("curse.maven:glitchcore-955399:${property("gcVersion")}"))
-    implementation(fg.deobf("curse.maven:SereneSeasons-291874:${property("ssVersion")}"))
+    compileOnly(fg.deobf("curse.maven:glitchcore-955399:${property("gcVersion")}"))
+    compileOnly(fg.deobf("curse.maven:SereneSeasons-291874:${property("ssVersion")}"))
 
     runtimeOnly(fg.deobf("vazkii.patchouli:Patchouli:${property("patchouliVersion")}"))
 

src/main/java/com/ferreusveritas/dynamictrees/api/TreeHelper.java

@@ -72,14 +72,14 @@ public static void ageVolume(LevelAccessor level, SimpleVoxmap leafMap, int iter
                     int prevHydro = leafMap.getVoxel(iPos);//The leafMap should contain accurate hydro data
                     int newHydro = ((Ageable) block).age(level, iPos, blockState, level.getRandom(), safeBounds);//Get new values from neighbors
                     if (newHydro == -1) {
-                        //Leaf block died.  Take it out of the leafMap and iterMap
+                        //Leaf block died. Take it out of the leafMap and iterMap
                         leafMap.setVoxel(iPos, (byte) 0);
                         iterMap.setVoxel(iPos, (byte) 0);
                     } else {
                         //Leaf did not die so the block is still leaves
                         if (prevHydro == newHydro) { //But it didn't change
                             iterMap.setVoxel(iPos, (byte) 0); //Stop iterating over it if it's not changing
-                        } else {//Oh wait.. it did change
+                        } else {//Oh, wait... it did change
                             //Update both maps with this new hydro value
                             leafMap.setVoxel(iPos, (byte) newHydro);
                             iterMap.setVoxel(iPos, (byte) newHydro);

src/main/java/com/ferreusveritas/dynamictrees/block/leaves/DynamicLeavesBlock.java

@@ -270,12 +270,6 @@ public int updateHydro(LevelAccessor accessor, BlockPos pos, BlockState state, b
             // does not affect appearance or behavior, unless appearanceChangesWithHydro. For the same reason we use the 0x04 flag to prevent the block from being re-rendered.
             // however if the new hydro is 0, it means the leaves were removed and we do need to update, so the flag is 3.
             int flag = newHydro == 0 ? 3 : (appearanceChangesWithHydro(oldHydro, newHydro) ? 2 : 4);
-//            if (newHydro == 0 && !worldGen
-//                    && (accessor instanceof Level level)
-//                    //if the old hydro is the default then its most likely a block that was just placed and failed
-//                    && oldHydro != getProperties().getCellKit().getDefaultHydration()) {
-//                dropResources(state, level, pos);
-//            }
             accessor.setBlock(pos, placeState, flag);
         }
         return newHydro;

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

@@ -196,8 +196,11 @@ public void generate(GenerationContext context) {
         }
 
         // If a branch exists then the growth was successful.
-
-        final SimpleVoxmap leafMap = new SimpleVoxmap(radius * 2 + 1, species.getWorldGenLeafMapHeight(), radius * 2 + 1).setMapAndCenter(treePos, new BlockPos(radius, 0, radius));
+        SimpleVoxmap leafCluster = species.getLeavesProperties().getCellKit().getLeafCluster();
+        int leafMapXLen = radius * 2 + leafCluster.getLenX();
+        int leafMapZLen = radius * 2 + leafCluster.getLenZ();
+        final SimpleVoxmap leafMap = new SimpleVoxmap(leafMapXLen, species.getWorldGenLeafMapHeight(), leafMapZLen)
+                .setMapAndCenter(treePos, new BlockPos(leafMapXLen/2, 0, leafMapZLen/2));
         final NodeInspector inflator = species.getNodeInflator(leafMap); // This is responsible for thickening the branches.
         final FindEndsNode endFinder = new FindEndsNode(); // This is responsible for gathering a list of branch end points.
         final MapSignal signal = new MapSignal(inflator, endFinder); // The inflator signal will "paint" a temporary voxmap of all of the leaves and branches.