fixed crash with DT 1.6

Author: supermassimo

build.gradle

@@ -88,7 +88,7 @@ dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
 
     //implementation 'curse.maven:dynamictrees-252818:7201567'
-    implementation 'com.dtteam.dynamictrees:dynamictrees-neoforge-1.21.1:1.5.1'
+    implementation 'com.dtteam.dynamictrees:dynamictrees-neoforge-1.21.1:1.6.0-BETA03'
 
     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-BETA04
+mod_version=1.3.1-BETA01
 version_type=beta
 mod_group_id=com.dtteam.dynamictreesplus
 mod_authors=Ferreusveritas, Max Hyper, Harley O'Connor

src/main/java/com/dtteam/dynamictreesplus/systems/featuregen/CactusFruitGenFeature.java

@@ -73,7 +73,7 @@ protected boolean postGrow(GenFeatureConfiguration configuration, PostGrowContex
             final BlockPos rootPos = context.pos();
             final float fruitingFactor = fruit.seasonalFruitProductionFactor(context.levelContext(), rootPos);
 
-            if (fruitingFactor > fruit.getMinProductionFactor() && fruitingFactor > world.getRandom().nextFloat()) {
+            if (fruitingFactor > fruit.getRequiredProductionFactor() && fruitingFactor > world.getRandom().nextFloat()) {
                 final FindEndsNode endFinder = new FindEndsNode();
                 TreeHelper.startAnalysisFromRoot(world, rootPos, new MapSignal(endFinder));
                 final List<BlockPos> endPoints = endFinder.getEnds();

src/main/java/com/dtteam/dynamictreesplus/tree/CactusSpecies.java

@@ -3,6 +3,7 @@
 import com.dtteam.dynamictrees.api.network.MapSignal;
 import com.dtteam.dynamictrees.api.registry.RegistryHandler;
 import com.dtteam.dynamictrees.api.registry.TypedRegistry;
+import com.dtteam.dynamictrees.api.season.ClimateZoneType;
 import com.dtteam.dynamictrees.block.branch.BranchBlock;
 import com.dtteam.dynamictrees.block.leaves.LeavesProperties;
 import com.dtteam.dynamictrees.block.soil.SoilHelper;
@@ -25,17 +26,14 @@
 import com.dtteam.dynamictreesplus.systems.thicknesslogic.CactusThicknessLogic;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Holder;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
-import net.neoforged.neoforge.common.Tags;
 
 import java.util.List;
 import java.util.Optional;
@@ -54,12 +52,10 @@ public CactusSpecies(ResourceLocation name, Family family, LeavesProperties leav
 
     @Override
     public Species setPreReloadDefaults() {
+        this.setPreferredClimate(ClimateZoneType.ARID);
         return this.setSaplingShape(DTPRegistries.MEDIUM_CACTUS_SAPLING_SHAPE)
                 .setSaplingSound(SoundType.WOOL)
                 .setDefaultGrowingParameters()
-                .envFactor(Tags.Biomes.IS_SNOWY, 0.25f)
-                .envFactor(Tags.Biomes.IS_COLD, 0.5f)
-                .envFactor(Tags.Biomes.IS_SANDY, 1.05f)
                 .setGrowthLogicKit(DTPRegistries.STRAIGHT_LOGIC);
     }
 
@@ -97,12 +93,6 @@ public JoCode getJoCode(String joCodeString) {
         return new JoCodeCactus(joCodeString);
     }
 
-    @Override
-    public boolean isBiomePerfect(Holder<Biome> biome) {
-        return this.perfectBiomes.size() > 0 ? super.isBiomePerfect(biome) :
-                biome.is(Tags.Biomes.IS_DRY) && biome.is(Tags.Biomes.IS_SANDY);
-    }
-
     @Override
     public boolean handleRot(LevelAccessor level, List<BlockPos> ends, BlockPos rootPos, BlockPos treePos, int fertility, boolean worldGen) {
         return false;
@@ -164,7 +154,7 @@ public void generate(DynamicTreeGenerationContext context) {
         public boolean setBlockForGeneration(LevelAccessor level, Species species, BlockPos pos, Direction dir,
                                              boolean careful, boolean isLast) {
             final Optional<BranchBlock> branch = species.getFamily().getBranch();
-            if (!(species instanceof CactusSpecies) || !branch.isPresent()) {
+            if (!(species instanceof CactusSpecies) || branch.isEmpty()) {
                 return false;
             }
             BlockState defaultBranchState = branch.get().defaultBlockState();

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

@@ -4,6 +4,7 @@
 import com.dtteam.dynamictrees.api.network.BranchDestructionData;
 import com.dtteam.dynamictrees.api.network.MapSignal;
 import com.dtteam.dynamictrees.api.registry.TypedRegistry;
+import com.dtteam.dynamictrees.api.season.ClimateZoneType;
 import com.dtteam.dynamictrees.api.voxmap.SimpleVoxmap;
 import com.dtteam.dynamictrees.block.CommonVoxelShapes;
 import com.dtteam.dynamictrees.block.branch.BranchBlock;
@@ -54,7 +55,6 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
-import net.neoforged.neoforge.common.Tags;
 import oshi.util.tuples.Pair;
 
 import javax.annotation.Nullable;
@@ -100,11 +100,9 @@ public HugeMushroomSpecies(ResourceLocation name, Family family, final MushroomS
 
     @Override
     public Species setPreReloadDefaults() {
+        this.setPreferredClimate(ClimateZoneType.ARID);
         return this.setSaplingShape(CommonVoxelShapes.ROUND_MUSHROOM)
                 .setDefaultGrowingParameters()
-                .envFactor(Tags.Biomes.IS_DRY, 0.25f)
-                .envFactor(Tags.Biomes.IS_HOT, 0.75f)
-                .envFactor(Tags.Biomes.IS_COLD, 1.05f)
                 .setCanSaplingGrowNaturally(false)
                 .setGrowthLogicKit(DTPRegistries.STRAIGHT_LOGIC);
     }

src/main/resources/trees/dynamictreesplus/species/brown_mushroom.json

@@ -16,6 +16,7 @@
       "min_age_curve_factor": 0.2
     }
   },
+  "climate_tolerance": 1.0,
   "primitive_sapling": "brown_mushroom",
   "sapling_shape": "flat_mushroom",
   "acceptable_soils": ["fungus_like"],

src/main/resources/trees/dynamictreesplus/species/mega_brown_mushroom.json

@@ -16,6 +16,7 @@
       "curve_factor_variation": 0.05
     }
   },
+  "climate_tolerance": 1.0,
   "acceptable_soils": ["fungus_like"],
   "features" : [
     "bottom_flare",

src/main/resources/trees/dynamictreesplus/species/mega_cactus.json

@@ -14,5 +14,7 @@
       "mod": 6
     }
   },
+  "preferred_climate": "arid",
+  "climate_tolerance": 0.6,
   "cactus_thickness_logic": "dynamictreesplus:mega"
 }

src/main/resources/trees/dynamictreesplus/species/mega_red_mushroom.json

@@ -14,6 +14,7 @@
       "max_age_curve_factor": 0.4
     }
   },
+  "climate_tolerance": 1.0,
   "acceptable_soils": ["fungus_like"],
   "features" : [
     "bottom_flare",

src/main/resources/trees/dynamictreesplus/species/pillar_cactus.json

@@ -8,6 +8,8 @@
   "signal_energy": 8,
   "growth_rate": 1,
   "soil_longevity": 1,
+  "preferred_climate": "arid",
+  "climate_tolerance": 0.4,
   "cactus_thickness_logic": "dynamictreesplus:pillar",
   "mega_species": "dynamictreesplus:mega_cactus"
 }