updated to latest DT version

Author: supermassimo

build.gradle

@@ -87,8 +87,8 @@ configurations {
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
 
-    implementation 'curse.maven:dynamictrees-252818:6565776'
-    //implementation ':dynamictrees-neoforge:1.21.1-1.5.0-BETA05'
+    //implementation 'curse.maven:dynamictrees-252818:7201567'
+    implementation 'com.dtteam.dynamictrees:dynamictrees-neoforge-1.21.1:1.5.0-BETA13'
 
     runtimeOnly 'curse.maven:jade-324717:6291517'
     runtimeOnly "curse.maven:jei-238222:5846880"

gradle.properties

@@ -2,7 +2,7 @@
 mod_id=dynamictreesplus
 mod_name=Dynamic Trees Plus
 mod_license=MIT
-mod_version=1.3.0-BETA02
+mod_version=1.3.0-BETA03
 version_type=beta
 mod_group_id=com.dtteam.dynamictreesplus
 mod_authors=Ferreusveritas, Max Hyper, Harley O'Connor

src/main/java/com/dtteam/dynamictreesplus/block/mushroom/MushroomBranchBlock.java

@@ -31,6 +31,7 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootTable;
+import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
@@ -110,7 +111,8 @@ public BranchDestructionData destroyBranchFromNode(Level level, BlockPos cutPos,
             cutDir = Direction.DOWN;
         }
 
-        return new BranchDestructionData(species, stateMapper.getBranchConnectionMap(), destroyedLeaves, leavesDropsList, endPoints, volumeSum.getVolume(), cutPos, cutPos, cutDir, toolDir, trunkHeight);
+        Pair<ResourceLocation, Integer> soilState = getCachedSoilState(level, cutPos.offset(cutDir.getNormal()), true);
+        return new BranchDestructionData(species, stateMapper.getBranchConnectionMap(), destroyedLeaves, leavesDropsList, endPoints, volumeSum.getVolume(), cutPos, cutPos, cutDir, toolDir, trunkHeight, soilState);
     }
 
     //Method is called destroy leaves but this one is to destroy mushroom caps

src/main/java/com/dtteam/dynamictreesplus/init/DTPRegistries.java

@@ -27,8 +27,10 @@
 import com.dtteam.dynamictreesplus.tree.HugeMushroomFamily;
 import com.dtteam.dynamictreesplus.tree.HugeMushroomSpecies;
 import com.dtteam.dynamictreesplus.worldgen.canceller.CactusFeatureCanceller;
+import com.dtteam.dynamictreesplus.worldgen.canceller.MushroomFeatureCanceller;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.level.block.CactusBlock;
+import net.minecraft.world.level.levelgen.feature.configurations.HugeMushroomFeatureConfiguration;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -103,6 +105,7 @@ public static void registerSpeciesType(final TypeRegistryEvent<Species> event) {
     public static void onFeatureCancellerRegistry(final RegistryEvent<FeatureCanceller> event) {
         if (event.isEntryOfType(FeatureCanceller.class)) {
             event.getRegistry().registerAll(new CactusFeatureCanceller<>(DynamicTreesPlus.location("cactus"), CactusBlock.class));
+            event.getRegistry().registerAll(new MushroomFeatureCanceller<>(DynamicTreesPlus.location("mushroom"), HugeMushroomFeatureConfiguration.class));
         }
     }
 

src/main/java/com/dtteam/dynamictreesplus/worldgen/canceller/MushroomFeatureCanceller.java

@@ -0,0 +1,51 @@
+package com.dtteam.dynamictreesplus.worldgen.canceller;
+
+import com.dtteam.dynamictrees.api.worldgen.BiomePropertySelectors;
+import com.dtteam.dynamictrees.api.worldgen.FeatureCanceller;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
+import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.RandomBooleanFeatureConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.RandomFeatureConfiguration;
+
+import java.util.stream.Stream;
+
+
+public class MushroomFeatureCanceller<T extends FeatureConfiguration> extends FeatureCanceller {
+    private final Class<T> mushroomFeatureConfigClass;
+
+    public MushroomFeatureCanceller(final ResourceLocation registryName, final Class<T> mushroomFeatureConfigClass) {
+        super(registryName);
+        this.mushroomFeatureConfigClass = mushroomFeatureConfigClass;
+    }
+
+    @Override
+    public boolean shouldCancel(final ConfiguredFeature<?, ?> configuredFeature, final BiomePropertySelectors.NormalFeatureCancellation featureCancellations) {
+        final ResourceLocation featureRegistryName = BuiltInRegistries.FEATURE.getKey(configuredFeature.feature());
+
+        if (featureRegistryName == null) {
+            return false;
+        }
+
+        // Mushrooms come in RandomBooleanFeatureConfiguration or RandomFeatureConfiguration
+        if (configuredFeature.config() instanceof RandomFeatureConfiguration randomFeatureConfig) {
+            return randomFeatureContainsConfigClass(randomFeatureConfig.getFeatures())
+                    && featureCancellations.shouldCancelNamespace(featureRegistryName.getNamespace());
+        }
+
+        if (configuredFeature.config() instanceof RandomBooleanFeatureConfiguration randomBoolConfig) {
+            return randomFeatureContainsConfigClass(randomBoolConfig.getFeatures())
+                    && featureCancellations.shouldCancelNamespace(featureRegistryName.getNamespace());
+        }
+
+        //If it's not in a random feature config it may be alone.
+        return this.mushroomFeatureConfigClass.isInstance(configuredFeature.config());
+    }
+
+    private boolean randomFeatureContainsConfigClass(Stream<ConfiguredFeature<?, ?>> randomFeatureConfig) {
+        Stream<FeatureConfiguration> stream = randomFeatureConfig.map(ConfiguredFeature::config);
+        return stream.anyMatch(this.mushroomFeatureConfigClass::isInstance);
+    }
+
+}

src/main/resources/trees/dynamictreesplus/world_gen/default.json

@@ -54,7 +54,7 @@
     "apply": {
       "species": {
         "random": {
-          "dark_oak": 24,
+          "dark_oak": 20,
           "dynamictreesplus:red_mushroom": 2,
           "dynamictreesplus:brown_mushroom": 1
         }

src/main/resources/trees/dynamictreesplus/world_gen/feature_cancellers.json

@@ -6,5 +6,21 @@
       "type": "dynamictreesplus:cactus",
       "namespace": "minecraft"
     }
+  },
+  {
+    "_comment": "Cancel regular mushroom generation from the mushroom fields biome.",
+    "select": { "name": "minecraft:mushroom_fields" },
+    "cancellers": {
+      "type": "dynamictreesplus:mushroom",
+      "namespace": "minecraft"
+    }
+  },
+  {
+    "_comment": "Cancel regular mushroom generation from dark forests.",
+    "select": { "name": "minecraft:dark_forest" },
+    "cancellers": {
+      "types": ["dynamictreesplus:mushroom", "tree"],
+      "namespace": "minecraft"
+    }
   }
 ]