updated to work with last DT version

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.0-BETA13'
+    implementation 'com.dtteam.dynamictrees:dynamictrees-neoforge-1.21.1:1.5.1'
 
     runtimeOnly 'curse.maven:jade-324717:6291517'
     runtimeOnly "curse.maven:jei-238222:5846880"
@@ -183,3 +183,9 @@ idea {
         downloadJavadoc = true
     }
 }
+
+tasks.jar {
+    manifest {
+        archiveFileName.set("${project.name}-neoforge-${minecraft_version}-${project.version}.jar")
+    }
+}

gradle.properties

@@ -2,7 +2,7 @@
 mod_id=dynamictreesplus
 mod_name=Dynamic Trees Plus
 mod_license=MIT
-mod_version=1.3.0-BETA03
+mod_version=1.3.0-BETA04
 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/CapProperties.java

@@ -204,15 +204,11 @@ public void setFireSpreadSpeed(int fireSpreadSpeed) {
         this.fireSpreadSpeed = fireSpreadSpeed;
     }
 
-    public MapColor getDefaultMapColor() {
-        return MapColor.WOOD;
-    }
-
-    public BlockBehaviour.Properties getDefaultBlockProperties(final MapColor mapColor) {
+    public BlockBehaviour.Properties getDefaultBlockProperties() {
         return BlockBehaviour.Properties.of()
-                .mapColor(mapColor)
-                .strength(0.2F)
-                .sound(SoundType.WOOD);
+                .mapColor(MapColor.WOOD)
+                .sound(SoundType.WOOD)
+                .strength(0.2F);
     }
 
     public int getMaxAge(HugeMushroomSpecies species) {

src/main/java/com/dtteam/dynamictreesplus/resources/CapPropertiesResourceLoader.java

@@ -107,7 +107,6 @@ public MapColor getDefaultMapColor() {
     private void generateBlocks(CapProperties capProperties, JsonObject json) {
         final BlockBehaviour.Properties blockProperties = JsonHelper.getBlockProperties(
                 json,
-                capProperties.getDefaultMapColor(),
                 capProperties::getDefaultBlockProperties,
                 error -> this.logError(capProperties.getRegistryName(), error),
                 warning -> this.logWarning(capProperties.getRegistryName(), warning)

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

@@ -7,6 +7,7 @@
 import com.dtteam.dynamictreesplus.block.CactusBranchBlock;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.SoundType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.material.MapColor;
 
 public class CactusFamily extends Family {
@@ -18,13 +19,10 @@ public CactusFamily(final ResourceLocation registryName) {
     }
 
     @Override
-    public MapColor getDefaultBranchMapColor() {
-        return MapColor.PLANT;
-    }
-
-    @Override
-    public SoundType getDefaultBranchSoundType() {
-        return SoundType.WOOL;
+    public BlockBehaviour.Properties getDefaultBranchProperties() {
+        return super.getDefaultBranchProperties()
+                .sound(SoundType.WOOL)
+                .mapColor(MapColor.PLANT);
     }
 
     @Override

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

@@ -1,9 +1,9 @@
 {
   "primitive_cap": "brown_mushroom_block",
-  "material_color": "DIRT",
   "age_zero_shape": "slab",
   "model_overrides": {
     "cap_center_age_0_parent": "minecraft:block/slab"
   },
-  "mushroom_item": "brown_mushroom"
+  "mushroom_item": "brown_mushroom",
+  "map_color": "DIRT"
 }

src/main/resources/trees/dynamictreesplus/cap_properties/red_mushroom.json

@@ -1,5 +1,5 @@
 {
   "primitive_cap": "red_mushroom_block",
-  "material_color": "COLOR_RED",
-  "mushroom_item": "red_mushroom"
+  "mushroom_item": "red_mushroom",
+  "map_color": "COLOR_RED"
 }