Fixed #20 #19 #10

Author: supermassimo

gradle.properties

@@ -2,8 +2,8 @@
 mod_id=dtphc2
 mod_name=Dynamic Trees PHC2
 mod_license=MIT
-mod_version=1.4.0-BETA01
-version_type=beta
+mod_version=1.4.0
+version_type=stable
 mod_group_id=maxhyper.dtphc2
 mod_authors=Max Hyper
 mod_credits=Ferreusveritas, ChefExperte and HawkSteak

src/main/java/maxhyper/dtphc2/blocks/IFallingFruit.java

@@ -42,7 +42,7 @@ default boolean doFall(BlockState state, Level world, BlockPos pos){
         if (!world.hasNearbyAlivePlayer(pos.getX(), rootY, pos.getZ(), getPlayerDistanceToFall())){
             return false;
         }
-        if (pos.getY() >= 0 && FallingBlock.isFree(world.getBlockState(pos.below()))) {
+        if (pos.getY() >= world.getMinBuildHeight() && FallingBlock.isFree(world.getBlockState(pos.below()))) {
             if (world.isLoaded(pos)) {
                 if (!world.isClientSide()) {
                     FallingBlockEntity fallingBlockEntity = getFallingEntity(world, pos, state);

src/main/java/maxhyper/dtphc2/genfeatures/SyrupGenFeature.java

@@ -75,8 +75,14 @@ private void dripSyrup(LevelAccessor world, BlockPos rootPos) {
     }
 
     public float seasonalFruitProductionFactor(LevelContext levelContext, BlockPos pos, GenFeatureConfiguration config) {
-        float season = SeasonHelper.getSeasonValue(levelContext, pos);
-        return config.getAsOptional(SEASONAL_OFFSET).isPresent() ? SeasonHelper.globalSeasonalFruitProductionFactor(levelContext, new BlockPos(0,(int)(season*64),-1), -config.get(SEASONAL_OFFSET), true) : 1.0F;
+        Float season = SeasonHelper.getSeasonValue(levelContext, pos);
+        if (config.getAsOptional(SEASONAL_OFFSET).isEmpty() || season == null) return 1.0f;
+
+        return SeasonHelper.globalSeasonalFruitProductionFactor(
+                levelContext,
+                new BlockPos(0,(int)(season*64),-1),
+                -config.get(SEASONAL_OFFSET),
+                true);
     }
 
 }

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

@@ -72,4 +72,9 @@ file="META-INF/accesstransformer.cfg"
     modId="dtterralith"
     type="optional"
     versionRange="(0.0,)"
+    ordering="AFTER"
+[[dependencies.${mod_id}]]
+    modId="dtbloomingnature"
+    type="optional"
+    versionRange="(0.0,)"
     ordering="AFTER"

src/main/resources/data/dtphc2/loot_table/blocks/passion_fruit_vine.json

@@ -18,6 +18,41 @@
           }
         }
       ]
+    },
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "dtphc2:passion_fruit_vine"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:any_of",
+          "terms": [
+            {
+              "ability": "shears_dig",
+              "condition": "neoforge:can_item_perform_ability"
+            },
+            {
+              "condition": "minecraft:match_tool",
+              "predicate": {
+                "predicates": {
+                  "minecraft:enchantments": [
+                    {
+                      "enchantments": "minecraft:silk_touch",
+                      "levels": {
+                        "min": 1
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
     }
   ],
   "functions": [

src/main/resources/data/dtphc2/loot_table/blocks/peppercorn_vine.json

@@ -36,6 +36,41 @@
           }
         }
       ]
+    },
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "dtphc2:peppercorn_vine"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:any_of",
+          "terms": [
+            {
+              "ability": "shears_dig",
+              "condition": "neoforge:can_item_perform_ability"
+            },
+            {
+              "condition": "minecraft:match_tool",
+              "predicate": {
+                "predicates": {
+                  "minecraft:enchantments": [
+                    {
+                      "enchantments": "minecraft:silk_touch",
+                      "levels": {
+                        "min": 1
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
     }
   ],
   "functions": [

src/main/resources/data/dtphc2/loot_table/blocks/vanilla_vine.json

@@ -18,6 +18,41 @@
           }
         }
       ]
+    },
+    {
+      "rolls": 1.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "dtphc2:vanilla_vine"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:any_of",
+          "terms": [
+            {
+              "ability": "shears_dig",
+              "condition": "neoforge:can_item_perform_ability"
+            },
+            {
+              "condition": "minecraft:match_tool",
+              "predicate": {
+                "predicates": {
+                  "minecraft:enchantments": [
+                    {
+                      "enchantments": "minecraft:silk_touch",
+                      "levels": {
+                        "min": 1
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      ]
     }
   ],
   "functions": [

src/main/resources/trees/dynamictrees/species/oak.json

@@ -24,6 +24,7 @@
       "can_craft_seed_to_sapling": false
     }
   ],
+  "drop_seeds": true,
   "fruits": [
     "dtphc2:acorn"
   ],