DynamicTreesTeam · Harleyoc1 · Aug 27, 2022 · Aug 24, 2022
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ group=com.maxhyper.dtneapolitan
 mcVersion=1.16.5
 forgeVersion=36.2.39
 
-dynamicTreesVersion=0.10.0-Beta-LR12
+dynamicTreesVersion=0.10.0-Beta-LR14
 dynamicTreesPlusVersion=0.1.0-Beta-LR2
 hwylaVersion=1.10.11-B78_1.16.2
 jeiVersion=7.7.1.139

diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -1,4 +1,9 @@
+07f673f554b5f95ee258f653e2a19415eeff6b1c data/dtneapolitan/loot_tables/blocks/banana_leaves.json
+87a2d1a698bd60050ced02c98ee10c9753fe36bf data/dtneapolitan/loot_tables/trees/branches/banana.json
+0d24489a7aacbdcdeb210892cc325cabf351d098 data/dtneapolitan/loot_tables/trees/leaves/banana.json
+87346bf3b649896e7cbb95303db1554715b6ae0f data/dtneapolitan/loot_tables/trees/voluntary/banana.json
 68a078d27d688123521a9927bc5cd5c3d446db3f data/dynamictrees/tags/blocks/branches_that_burn.json
 6a1f0aff5df8726a5d9cd0ec1e28cfe884a57a40 data/dynamictrees/tags/blocks/leaves.json
 7f1478ccc437e5464d4fd92866b37fe558cab337 data/dynamictrees/tags/blocks/saplings.json
+68a078d27d688123521a9927bc5cd5c3d446db3f data/dynamictrees/tags/items/branches_that_burn.json
 4ac2e7c165e12b28b64f250f6d806773ced534aa data/dynamictrees/tags/items/seeds.json
diff --git a/src/generated/resources/data/dtneapolitan/loot_tables/trees/branches/banana.json b/src/generated/resources/data/dtneapolitan/loot_tables/trees/branches/banana.json
@@ -0,0 +1,39 @@
+{
+  "type": "dynamictrees:branches",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "dynamictrees:multiply_logs_count"
+            },
+            {
+              "function": "minecraft:explosion_decay"
+            }
+          ],
+          "name": "neapolitan:banana_stalk"
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "dynamictrees:multiply_sticks_count"
+            },
+            {
+              "function": "minecraft:explosion_decay"
+            }
+          ],
+          "name": "minecraft:stick"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/generated/resources/data/dtneapolitan/loot_tables/trees/voluntary/banana.json b/src/generated/resources/data/dtneapolitan/loot_tables/trees/voluntary/banana.json
@@ -0,0 +1,20 @@
+{
+  "type": "dynamictrees:voluntary",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "conditions": [
+            {
+              "condition": "dynamictrees:voluntary_seed_drop_chance",
+              "rarity": 1.0
+            }
+          ],
+          "name": "dtneapolitan:banana_seed"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json b/src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "dtneapolitan:banana_branch"
+  ]
+}
diff --git a/src/main/java/maxhyper/dtneapolitan/DTNeapolitanRegistries.java b/src/main/java/maxhyper/dtneapolitan/DTNeapolitanRegistries.java
@@ -5,12 +5,10 @@
 import com.ferreusveritas.dynamictrees.blocks.leaves.LeavesProperties;
 import com.ferreusveritas.dynamictrees.systems.fruit.Fruit;
 import com.ferreusveritas.dynamictrees.systems.genfeatures.GenFeature;
-import com.ferreusveritas.dynamictrees.trees.Family;
 import com.ferreusveritas.dynamictrees.trees.Species;
 import maxhyper.dtneapolitan.blocks.BananaLeavesProperties;
 import maxhyper.dtneapolitan.fruits.BananaFruit;
 import maxhyper.dtneapolitan.genfeatures.DTNeapolitanGenFeatures;
-import maxhyper.dtneapolitan.trees.BananaFamily;
 import maxhyper.dtneapolitan.trees.BananaSpecies;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -21,11 +19,6 @@ public class DTNeapolitanRegistries {
 
     public static final ResourceLocation BANANA = new ResourceLocation(DynamicTreesNeapolitan.MOD_ID, "banana");
 
-    @SubscribeEvent
-    public static void registerFamilyTypes(final TypeRegistryEvent<Family> event) {
-        event.registerType(BANANA, BananaFamily.TYPE);
-    }
-
     @SubscribeEvent
     public static void registerSpeciesType(final TypeRegistryEvent<Species> event) {
         event.registerType(BANANA, BananaSpecies.TYPE);

diff --git a/src/main/java/maxhyper/dtneapolitan/DynamicTreesNeapolitan.java b/src/main/java/maxhyper/dtneapolitan/DynamicTreesNeapolitan.java
@@ -69,14 +69,8 @@ private void clientSetup(final FMLClientSetupEvent event) {
     }
 
     public void gatherData(final GatherDataEvent event) {
-        GatherDataHelper.gatherAllData(
-                MOD_ID,
-                event,
-                SoilProperties.REGISTRY,
-                Family.REGISTRY,
-                Species.REGISTRY,
-                LeavesProperties.REGISTRY
-        );;
+        GatherDataHelper.gatherTagData(MOD_ID, event);
+        GatherDataHelper.gatherLootData(MOD_ID, event);
     }
 
 }
diff --git a/src/main/java/maxhyper/dtneapolitan/trees/BananaFamily.java b/src/main/java/maxhyper/dtneapolitan/trees/BananaFamily.java
diff --git a/src/main/resources/data/dtneapolitan/loot_tables/blocks/banana_leaves.json b/src/main/resources/data/dtneapolitan/loot_tables/blocks/banana_leaves.json
@@ -0,0 +1,61 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:alternatives",
+          "children": [
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:alternative",
+                  "terms": [
+                    {
+                      "condition": "minecraft:match_tool",
+                      "predicate": {
+                        "item": "minecraft:shears"
+                      }
+                    },
+                    {
+                      "condition": "minecraft:match_tool",
+                      "predicate": {
+                        "enchantments": [
+                          {
+                            "enchantment": "minecraft:silk_touch",
+                            "levels": {
+                              "min": 1
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                }
+              ],
+              "name": "neapolitan:banana_frond"
+            },
+            {
+              "type": "dynamictrees:weighted_item",
+              "conditions": [
+                {
+                  "condition": "minecraft:survives_explosion"
+                },
+                {
+                  "condition": "dynamictrees:seasonal_seed_drop_chance"
+                }
+              ],
+              "items": {
+                "neapolitan:small_banana_frond": 1,
+                "neapolitan:banana_frond": 1,
+                "neapolitan:large_banana_frond": 1
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/main/resources/data/dtneapolitan/loot_tables/trees/leaves/banana.json b/src/main/resources/data/dtneapolitan/loot_tables/trees/leaves/banana.json
@@ -0,0 +1,36 @@
+{
+  "type": "dynamictrees:leaves",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "dynamictrees:weighted_item",
+          "conditions": [
+            {
+              "condition": "minecraft:survives_explosion"
+            },
+            {
+              "condition": "minecraft:table_bonus",
+              "enchantment": "minecraft:fortune",
+              "chances": [
+                0.0625,
+                0.125,
+                0.1875,
+                0.25
+              ]
+            },
+            {
+              "condition": "dynamictrees:seasonal_seed_drop_chance"
+            }
+          ],
+          "items": {
+            "neapolitan:small_banana_frond": 1,
+            "neapolitan:banana_frond": 1,
+            "neapolitan:large_banana_frond": 1
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/main/resources/trees/dtneapolitan/families/banana.json b/src/main/resources/trees/dtneapolitan/families/banana.json
@@ -1,10 +1,15 @@
 {
-  "type": "dtneapolitan:banana",
   "common_leaves": "dtneapolitan:banana",
   "common_species": "dtneapolitan:banana",
   "primitive_log": "neapolitan:banana_stalk",
   "generate_stripped_branch": false,
   "max_branch_radius": 8,
   "primary_thickness": 3,
-  "secondary_thickness": 3
+  "secondary_thickness": 3,
+  "branch_properties": {
+    "material": "grass",
+    "material_color": "color_brown",
+    "sound": "stem",
+    "harvest_tool": "hoe"
+  }
 }
diff --git a/src/main/resources/trees/dtneapolitan/species/banana.json b/src/main/resources/trees/dtneapolitan/species/banana.json
@@ -39,26 +39,5 @@
         "fruit": "dtneapolitan:banana"
       }
     }
-  ],
-  "drop_creators": [
-    "log",
-    {
-      "name": "normal",
-      "properties": {
-        "drops": {
-          "leaves": {
-            "id": "weighted",
-            "properties": {
-              "items": {
-                "neapolitan:large_banana_frond": 1,
-                "neapolitan:banana_frond": 1,
-                "neapolitan:small_banana_frond": 1
-              },
-              "chance": 1
-            }
-          }
-        }
-      }
-    }
   ]
 }