ported changes from 1.20 branch

Author: supermassimo

build.gradle

@@ -87,8 +87,8 @@ configurations {
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
 
-    //implementation 'curse.maven:dynamictrees-252818:7201567'
-    implementation 'com.dtteam.dynamictrees:dynamictrees-neoforge-1.21.1:1.6.0-BETA03'
+    implementation 'curse.maven:dynamictrees-252818:7513464'
+    //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,8 +2,8 @@
 mod_id=dynamictreesplus
 mod_name=Dynamic Trees Plus
 mod_license=MIT
-mod_version=1.3.1-BETA01
-version_type=beta
+mod_version=1.3.1
+version_type=stable
 mod_group_id=com.dtteam.dynamictreesplus
 mod_authors=Ferreusveritas, Max Hyper, Harley O'Connor
 mod_credits=

src/main/java/com/dtteam/dynamictreesplus/DynamicTreesPlus.java

@@ -33,6 +33,7 @@ public class DynamicTreesPlus {
     public DynamicTreesPlus(IEventBus modBus, ModContainer modContainer) {
 
         modContainer.registerConfig(ModConfig.Type.SERVER, DTPConfigs.SERVER_CONFIG);
+        modContainer.registerConfig(ModConfig.Type.COMMON, DTPConfigs.COMMON_CONFIG);
 
         modBus.addListener(this::clientSetup);
         modBus.addListener(this::commonSetup);

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

@@ -9,20 +9,19 @@
 import com.dtteam.dynamictrees.systems.GrowSignal;
 import com.dtteam.dynamictrees.tree.family.Family;
 import com.dtteam.dynamictreesplus.systems.mushroomlogic.MushroomCapDisc;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.HugeMushroomBlock;
 import net.minecraft.world.level.block.PipeBlock;
@@ -31,6 +30,7 @@
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 
 public class DynamicCapBlock extends HugeMushroomBlock implements TreePart, UpdatesSurroundNeighbors {

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

@@ -10,16 +10,18 @@
 public class DTPConfigs {
 
     public static ModConfigSpec SERVER_CONFIG;
-//    public static ModConfigSpec COMMON_CONFIG;
+    public static ModConfigSpec COMMON_CONFIG;
 //    public static ModConfigSpec CLIENT_CONFIG;
 
     public static final ModConfigSpec.BooleanValue CAN_BONE_MEAL_CACTUS;
     public static final ModConfigSpec.BooleanValue CACTUS_PRICKLE_ON_MOVE_ONLY;
     public static final ModConfigSpec.BooleanValue CACTUS_KILL_ITEMS;
+    public static final ModConfigSpec.BooleanValue REPLACE_MUSHROOM_SAPLING_ON_PLACEMENT;
+    public static final ModConfigSpec.BooleanValue REPLACE_MUSHROOM_SAPLING_ON_GROWTH;
 
     static {
         final ModConfigSpec.Builder SERVER_BUILDER = new ModConfigSpec.Builder();
-//        final ModConfigSpec.Builder COMMON_BUILDER = new ModConfigSpec.Builder();
+        final ModConfigSpec.Builder COMMON_BUILDER = new ModConfigSpec.Builder();
 //        final ModConfigSpec.Builder CLIENT_BUILDER = new ModConfigSpec.Builder();
 
         SERVER_BUILDER.comment("Cactus Settings").push("cactus");
@@ -31,14 +33,18 @@ public class DTPConfigs {
                 define("cactusKillItems", false);
         SERVER_BUILDER.pop();
 
-        SERVER_BUILDER.comment("Mushroom Settings").push("mushroom.json");
-        SERVER_BUILDER.pop();
-
         SERVER_BUILDER.comment("Miscellaneous").push("misc");
         SERVER_BUILDER.pop();
 
+        COMMON_BUILDER.comment("Mushroom Settings").push("mushroom");
+        REPLACE_MUSHROOM_SAPLING_ON_PLACEMENT = COMMON_BUILDER.comment("Only relevant if 'replaceVanillaSapling' to be set to TRUE in Dynamic Trees common config. If enabled mushrooms will be replaced by their dynamic counterparts as soon as they are placed.").
+                define("replaceMushroomSaplingOnPlacement", false);
+        REPLACE_MUSHROOM_SAPLING_ON_GROWTH = COMMON_BUILDER.comment("Only relevant if 'replaceVanillaSapling' to be set to TRUE in Dynamic Trees common config. If enabled mushrooms will be replaced by their dynamic counterparts when they grow into a giant mushroom.").
+                define("replaceMushroomSaplingOnGrowth", true);
+        COMMON_BUILDER.pop();
+
         SERVER_CONFIG = SERVER_BUILDER.build();
-//        COMMON_CONFIG = COMMON_BUILDER.build();
+        COMMON_CONFIG = COMMON_BUILDER.build();
 //        CLIENT_CONFIG = CLIENT_BUILDER.build();
     }
 

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

@@ -34,6 +34,7 @@
 import com.dtteam.dynamictreesplus.block.mushroom.CapProperties;
 import com.dtteam.dynamictreesplus.block.mushroom.DynamicCapBlock;
 import com.dtteam.dynamictreesplus.block.mushroom.DynamicCapCenterBlock;
+import com.dtteam.dynamictreesplus.init.DTPConfigs;
 import com.dtteam.dynamictreesplus.init.DTPRegistries;
 import com.dtteam.dynamictreesplus.systems.mushroomlogic.MushroomShapeConfiguration;
 import com.dtteam.dynamictreesplus.systems.mushroomlogic.context.MushroomCapContext;
@@ -200,6 +201,19 @@ public ResourceLocation getSaplingSmartModelLocation() {
         return DynamicTrees.location("block/smartmodel/mushroom_" + (this.getSaplingShape() == CommonVoxelShapes.FLAT_MUSHROOM ? "flat" : "round"));
     }
 
+    public boolean shouldReplaceSaplingWhenPlaced(BlockState originalSapling) {
+        if (DTPConfigs.REPLACE_MUSHROOM_SAPLING_ON_PLACEMENT.get())
+            return super.shouldReplaceSaplingWhenPlaced(originalSapling);
+        return false;
+    }
+
+    @Override
+    public boolean shouldReplaceSaplingWhenGrown(BlockState originalSapling) {
+        if (DTPConfigs.REPLACE_MUSHROOM_SAPLING_ON_GROWTH.get())
+            return super.shouldReplaceSaplingWhenGrown(originalSapling);
+        return false;
+    }
+
     @Override
     public boolean isAcceptableSoil(LevelReader level, BlockPos pos, BlockState soilBlockState) {
         return (SoilHelper.isSoilAcceptable(soilBlockState, soilTypeFlags) || level.getRawBrightness(pos.above(), 0) <= getMaxLightForPlanting())

src/main/resources/META-INF/neoforge.mods.toml

@@ -32,6 +32,6 @@ credits='''${mod_credits}'''
 [[dependencies.${mod_id}]]
     modId="dynamictrees"
     mandatory=true
-    versionRange="[1.5.0-BETA5,)"
+    versionRange="[1.6.0,)"
     ordering="AFTER"
     side="BOTH"