mushroom shape fix

Author: supermassimo

src/main/java/com/ferreusveritas/dynamictreesplus/systems/mushroomlogic/shapekits/BellShape.java

@@ -54,7 +54,7 @@ protected void registerProperties() {
 
     @Override
     public List<BlockPos> getShapeCluster(MushroomShapeConfiguration configuration, MushroomCapContext context){
-        return placeRing(configuration, context, context.age(), ringAction.GET);
+        return placeRing(configuration, context, ringAction.GET);
     }
 
     @Override
@@ -69,12 +69,12 @@ public float getChanceToAge(MushroomShapeConfiguration configuration) {
 
     @Override
     public void generateMushroomCap(MushroomShapeConfiguration configuration, MushroomCapContext context) {
-        placeRing(configuration, context, Math.min(context.age(), configuration.get(MAX_CAP_AGE)), ringAction.PLACE);
+        placeRing(configuration, context, ringAction.PLACE);
     }
 
     @Override
     public void clearMushroomCap (MushroomShapeConfiguration configuration, MushroomCapContext context){
-        placeRing(configuration, context, context.age(),ringAction.CLEAR);
+        placeRing(configuration, context, ringAction.CLEAR);
     }
 
     enum ringAction {
@@ -83,7 +83,7 @@ enum ringAction {
         GET
     }
 
-    private List<BlockPos> placeRing (MushroomShapeConfiguration configuration, MushroomCapContext context, int age, ringAction action){
+    private List<BlockPos> placeRing (MushroomShapeConfiguration configuration, MushroomCapContext context, ringAction action){
         DynamicCapCenterBlock centerBlock = context.species().getCapProperties().getDynamicCapCenterBlock().orElse(null);
         List<BlockPos> ringPositions = new LinkedList<>();
         if (centerBlock == null) return ringPositions;
@@ -92,6 +92,7 @@ private List<BlockPos> placeRing (MushroomShapeConfiguration configuration, Mush
         int power = configuration.get(CURVE_POWER);
 
         float fac = calculateFactor(configuration, context);
+        int age = context.age();
 
         int y = 0;
         int radius = 1;

src/main/java/com/ferreusveritas/dynamictreesplus/tree/HugeMushroomSpecies.java

@@ -377,9 +377,11 @@ public void generate(GenerationContext context) {
 
             private void generateMushroomCap(GenerationContext context, HugeMushroomSpecies species, List<Pair<BlockPos, Integer>> capAges){
                 LevelAccessor level = context.level();
-                for (Pair<BlockPos, Integer> capAge : capAges){
-                    level.setBlock(capAge.getA(), capProperties.getDynamicCapState(true, capAge.getB()), 2);
-                    species.getMushroomShapeKit().generateMushroomCap(new MushroomCapContext(level, capAge.getA(), species, capAge.getB()));
+                for (Pair<BlockPos, Integer> posAge : capAges){
+                    int age = Math.min(posAge.getB(), species.getMushroomShapeKit().getMaxCapAge());
+                    BlockPos centerPos = posAge.getA();
+                    level.setBlock(centerPos, capProperties.getDynamicCapState(true, age), 2);
+                    species.getMushroomShapeKit().generateMushroomCap(new MushroomCapContext(level, centerPos, species, age));
                 }
             }
 

src/main/resources/trees/dynamictreesplus/families/mushroom.json

@@ -6,6 +6,7 @@
   "stick": "air",
   "generate_stripped_branch": false,
   "max_branch_radius": 24,
+  "max_signal_depth": 64,
   "texture_overrides": {
     "branch": "block/mushroom_stem",
     "branch_top": "block/mushroom_block_inside"