Feat/improve trees gen

resources/trees.py

@@ -5,13 +5,21 @@
 
 JO_PATH = '../src/main/resources/trees/dttfc/jo_codes/'
 
+MEGA_SPRUCE_LOGIC_KIT = {
+		'name': 'conifer',
+		'properties': {
+			'energy_divisor': 5,
+		},
+	}
 
 def generate(rm: ResourceManager):
     for name in ALL_SPECIES:
         if name == 'acacia':
             species(rm, name, tapering=0.15, signal_energy=12, up_probability=0, lowest_branch_height=3, growth_rate=0.7)
         elif name == 'birch':
             species(rm, name, tapering=0.1, signal_energy=14, up_probability=4, lowest_branch_height=4, growth_rate=1.25),
+        elif name == 'aspen':
+            species(rm, name, tapering=0.12, signal_energy=14, up_probability=4, lowest_branch_height=4, growth_rate=1.25),
         elif name == 'sequoia':
             species(rm, name, tapering=0.25, signal_energy=24, up_probability=3, lowest_branch_height=4, growth_rate=1.2, growth_logic_kit='conifer')
         elif name == 'spruce':
@@ -22,32 +30,48 @@ def generate(rm: ResourceManager):
             species(rm, name, tapering=0.2, signal_energy=24, up_probability=3, lowest_branch_height=2, growth_rate=1, growth_logic_kit='jungle')
         elif name == 'mangrove':
             species(rm, name, tapering=0.25, signal_energy=20, up_probability=8, lowest_branch_height=2, growth_rate=0.6, spec_type='mangrove', soils=['dirt_like', 'mud_like', 'water_like'], extra_data={'root_tapering': 0.2, 'root_signal_energy': 20.0, 'roots_growth_logic_kit': 'mangrove_roots', 'primitive_sapling': 'mangrove_propagule', 'model_overrides': {'sapling': 'dynamictrees:block/smartmodel/water_sapling_thin'}, 'plantable_on_fluid': True})
+        elif name == 'douglas_fir':
+            species(rm, name, tapering=0.20, signal_energy=32, up_probability=9, lowest_branch_height=3, growth_rate=0.8, growth_logic_kit=MEGA_SPRUCE_LOGIC_KIT)
+        elif name == "rosewood":
+            species(rm, name, tapering=0.3, signal_energy=16, up_probability=0.0, lowest_branch_height=6, growth_rate=0.7, growth_logic_kit="dark_oak")
+        elif name in ["hickory", "chestnut", "blackwood"]:
+            species(rm, name, tapering=0.25, signal_energy=20, up_probability=0, lowest_branch_height=6, growth_rate=1, growth_logic_kit="dark_oak")
+        elif name == 'maple':
+            species(rm, name, tapering=0.25, signal_energy=15, up_probability=8, lowest_branch_height=7, growth_rate=1)
+        elif name == 'sycamore':
+            species(rm, name, tapering=0.1, signal_energy=12, up_probability=12, lowest_branch_height=3, growth_rate=1.2)
+        elif name == 'pine':
+            species(rm, name, tapering=0.20, signal_energy=20, up_probability=9, lowest_branch_height=5, growth_rate=1.1, growth_logic_kit=MEGA_SPRUCE_LOGIC_KIT)
         else:
             species(rm, name)
 
-        if name == 'birch':
-            family(rm, name, conifer_variants=True)
-        elif name == 'sequoia' or name == 'spruce':
+        if name == 'sequoia' or name == 'spruce':
             family(rm, name, max_branch_radius=24, conifer_variants=True)
         elif name == 'palm':
             family(rm, name, thickness1=3, thickness2=4, fam_type='dttfc:diagonal_palm')
         elif name == 'kapok':
             family(rm, name, max_branch_radius=24, roots=True, max_signal=64)
         elif name == 'mangrove':
             family(rm, name, fam_type='dttfc:mangrove', max_branch_radius=8, extra_data={'default_soil': 'dttfc:mangrove_aerial_roots', 'primitive_root': 'tfc:tree_roots', 'primitive_filled_root': 'tfc:muddy_roots/loam', 'primitive_covered_root': 'tfc:mud/loam', 'root_system_acceptable_soils': ['dirt_like', 'mud_like', 'sand_like']})
+        elif name == 'pine':
+            family(rm, name, conifer_variants=True)
         else:
             family(rm, name)
 
         if name == 'acacia':
             leaves_properties(rm, name, cell_kit='dynamictrees:acacia', smother=2)
-        elif name == 'sequoia' or name == 'spruce':
-            leaves_properties(rm, name, cell_kit='dynamictrees:conifer', smother=3)
+        elif name  in ['douglas_fir', 'sequoia']:
+            leaves_properties(rm, name, cell_kit='dynamictrees:conifer', smother=3)    
+        elif name in ['spruce', 'pine']:
+            leaves_properties(rm, name, cell_kit='dynamictrees:conifer')
         elif name == 'palm':
             leaves_properties(rm, name, cell_kit='dttfc:palm', leaf_type='palm')
         elif name == 'kapok':
             leaves_properties(rm, name, light=12)
         elif name == 'mangrove':
             leaves_properties(rm, name, leaf_type='scruffy', smother=6)
+        elif name == "rosewood":
+            leaves_properties(rm, name, cell_kit='dynamictrees:acacia')
         else:
             leaves_properties(rm, name)
 

src/main/resources/trees/dttfc/families/birch.json

@@ -3,6 +3,5 @@
   "common_species": "dttfc:birch",
   "common_leaves": "dttfc:birch",
   "primitive_log": "tfc:wood/log/birch",
-  "primitive_stripped_log": "tfc:wood/stripped_log/birch",
-  "conifer_variants": true
+  "primitive_stripped_log": "tfc:wood/stripped_log/birch"
 }

src/main/resources/trees/dttfc/families/pine.json

@@ -3,5 +3,6 @@
   "common_species": "dttfc:pine",
   "common_leaves": "dttfc:pine",
   "primitive_log": "tfc:wood/log/pine",
-  "primitive_stripped_log": "tfc:wood/stripped_log/pine"
+  "primitive_stripped_log": "tfc:wood/stripped_log/pine",
+  "conifer_variants": true
 }

src/main/resources/trees/dttfc/jo_codes/pine.txt

@@ -1,106 +1,140 @@
-2:JJJJJJ
-2:JJJJJJJ
-2:JJJJJJJP
-2:JJJJJJP
-2:JJJJJOJ+Xf
-2:JJJJJOJ6
-2:JJJJJOJx6+X18
-2:JJJJJOP09
-2:JJJJJOPX
-2:JJJJJP
-3:JJJOJx+Xc+b+nuXv
-3:JJJOJxJ+S+nt+S+b+nv
-3:JJJOJxP0+Xf1+ny7
-3:JJOJxOJ+Xmfnyy9+efvk+Svzftf
-3:JJOJxOJP0+fX006+t7fSv
-3:JJOJxOJP0+t+fX0+t+b6XSv
-3:JJOJxOJP0+vz6+k+evc6169q
-3:JJOJxOP0+b6X0n1vzfXtz6
-3:JJOJxOP007+vXz0969q
-3:JJOJxOP09+V8+bvtf
-3:JJOJxOP0nX117f007fXb18
-3:JJOJxOPX1+Xek7+tfyk707
-3:JOJxOJ+Xz8+Svzc+kXt+VvzufvkX
-3:JOJxOJJ+Xj+b09+kfuXvyU+bv0i9r
-3:JOJxOJP0076X1uXf0+Snb71vf
-3:JOJxOJP0n1vz6+n1vzd67d
-4:JOJxOJJ+Xz+ky89r+S+mfk9zftXyWU9+b0nr+kmXfty+fv
-4:JOJxOJP06v1t+WnWvXenbv1uvy7+k0+XfyWvnb1+nf
-4:JOJxOJx+X09+S9z9+WS+k9veb+nt+WS8nzzz98nty+fv
-4:JOJxOJx+X0nvyXzenv0j9t+Sy9+b09f0mS+fnty+fvzb+ki9S
-4:JOJxOJx6X1uvXy06vbn1r+S1670nb18+tf0mny76U
-4:JOJxOJxJ+X09+WWXvnzzz98nt+mS8nuS9z9+Snz+ki9tf
-4:JOJxOJxJ+Xf1X0067b+V1671vb+td+k0+XfyWuvXi7ev07
-4:JOJxOJxJ+Xz8+WV8+bvty9+bc+mSy98zfi9tXkn
-4:JOJxOJxJP007+vS+mj6+t177f00nzfS9z176166Wt6n
-4:JOJxOJxOJ6+Xz+nvyS+bn0mXnvyXzbv0mXz89uS+b9+Vvebn0nt
-4:JOJxOJxOPXny+b+k9+bz+nv0yXmfnuXt+Sy+k99uXz9
-4:JOJxOJxP0n1vzfS+mnft16+ek+vfS06+k0+fX1uq7fzenfS0+t6
-4:JOJxOJxPX1+nyWnXb07+uuvfS70mXfevf0ky7+Wt60nV71vcn
-4:JOJxOJxPX1178+t1+Xf0mnfyS7evf1uvXy0mnXWvU70mnfet7n
-4:JOJxOJxPXz+mXnvyS+b+kXtz9+SV+bz+k9v0ky79q
-4:JOJxOP0+t+b6+k+d616+k0+fX1uvXzen176Wn16
-5:JOJxOJ+X1q8zfnzefnyWX18+tvkz+Xnzzzz89vk+WSy+vnky89uS9f
-5:JOJxOJx+Xz+nt+ed89V+Syy98nzdf0mb8Xtz9XyWS+nvzeefnv0mXz8nty+ft
-5:JOJxOJx6+eb9+WXvkz+Xnzz9+WWXnvkXyWS+t8n1eb9vmbnkz8
-5:JOJxOJxJ+X09fyy9+eefnvknyWX09+bz9+ky+fnty+fvyyWX099uXvzzmfnvkS
-5:JOJxOJxJ+XvyyXt+b8k+WWXvnzzz989uXz9+Syy89+mfmS8z89uXzft
-5:JOJxOJxJP0n1vf0+tfz6S+k0+fX1uvz6+b0+vfX1ut+fS+enevenfWk0+fXS0+vX
-5:JOJxOJxOJ+Xfy+f09+S+mfnufvzz98y8+eefvk9yXufv
-5:JOJxOJxOJ6+fy+vnyX1z98z8+efvyy98nzef18+Sy+vn1ufy98mfy8
-5:JOJxOJxOPX0+vf0n1vzfS+k+t+b6X1uvz6+ek71760nWvX
-5:JOJxOJxOPX0Xufvzefn0yXnuS9+SX0zfmXnub9y9+bzf09v0yWXnmfk9WS9v
-5:JOJxOJxOPX1+nf0ny16717+t+WnXenf1uvy7+k0+XfyWv067ev07
-5:JOJxOJxOPX1+ny7+uvf0076X116+mnXb+t1+Xf0mny7+S1+nXb1+nf
-5:JOJxOJxOPXy+fvyX0z89z9+S+mfnufvyWX09+bz+nv0mXz89uXz9
-5:JOJxOJxP0n1+fS+tvz07vWk6X1uvz6+b0+vfWk616+k0nz6X1uuvXb+b07176Wt6X
-5:JOJxOJxPX00nX11vS7f00k+fXuut67env00mnz6+b0+vfS0691t6WvX
-5:JOJxOJxPX0f1176X0n1vzfS+ek71760n16X
-6:JOJxOJP11167fU+kn1vzen176S+t1vzfXz0mnfb1760mnXWvWnX
-6:JOJxOJx6Xyy9+fk+Sy9+bz+nv0mXz89uXz9+WSy+nvnzzef0989uS+b9v
-6:JOJxOJxJ+S+fvyWXvzc+kz89uXvyWX09+bz+nv09uXz9+S0XuXv0zefnmXmfnubz99uXz9
-6:JOJxOJxJ+X09vyWX09+bz+nv0k9ufvyWX09+bz9+ky+fnty+fvyyyy898mXnzzzz898mfntyvd
-6:JOJxOJxJ+XvzefvyWXv1uXvkz+XnyWXn1zft8mfXzzzz898mfnyyWX188mXntz+S9v
-6:JOJxOJxJOJ6+f1Xi+ef186y+vnzzz98nymXntz+Xvzzzz98nty9+WWWXvk98kz+Xn
-6:JOJxOJxOJ6+mnX1167+mmnXf1evfSX0mnX1uvz6+b0+vfS0+vX0mk6X1ut+fS+b0n17fSWn16
-6:JOJxOJxOJP0+vz6+t+b606+k+t+b6X0mnz6+t1+fXzen176Wn16+mk0+fXbf11uvz67evfS0n1vS
-6:JOJxOJxOJPXz+X18+b+uXvmXnzzz89vWWXvk+eb8nymXntz+Xv
-6:JOJxOJxOPX0+vf0nz17616+mmnXb+t176Wn16+knz17fWt606
-6:JOJxOJxOPXy+f09vyS+b09+ky+fnvzeb+nv0yXmfmXnuXuft+SyWX09+ntX0zcfmXmfmXnubzft9uXufv
-6:JOJxOJxOPf0n1167+t1+fXz07fWk616+k06+t1+fXzen176Wn16+t1176+enet70760mnz661606
-6:JOJxOJxP0+Xf1v0nyXb+Wv0671+nf1uvy7+Wk6Xek717
-6:JOJxOJxP0+fX0n1Xb+uuvXb60nWvX0mnz6+t1+fXzen176Wn16
-6:JOJxOJxP09+k+t+b6+k07+et7076Wn16+k0+fXut+b6
-6:JOJxOJxPXyy98z8+Sy8+bz+nv0mXntz9+Syy98+bzz98+ky8z89uS+b9v
-7:JOJxOJP0f1vX0mnz6+t1+fXzenfS16+tzvV+ek077vWknWvWnX
-7:JOJxOJx7+k+fWvX0mnX1uvz6+b0+vfS06+j0nb+uuuvfXb176WvWnX
-7:JOJxOJxJ+WXvzfk+bz+nv0yXmfntz9+WWXvk+eefvk9uXz9+VuXvzzzz9898mS+fk
-7:JOJxOJxJ6+Snz+kntvzefn0y8nty+fvzeefnt+mSy88zfmXnuSy99uXz9
-7:JOJxOJxJP06+t+k+S7f1uvf0mny7+Xb1+nf1+Wk61670nb
-7:JOJxOJxJP0717+t17+enb606+k0+fX1uvz6+bfS0+vXz0k+tvb0+vfWk06+t166Wn16
-7:JOJxOJxOJ+Xz9+mfnuXz9+Sy+nvzef09+ky+fnty+fvyt+eefnt8mXz8+SyX0nvzeb+nt+kz8y89uXufv
-7:JOJxOJxOJ6606+jn11vfSn0mnXzuvfWt606+kmnz6+t1176+b1venfS0n16X
-7:JOJxOJxOJP0+vXz0+vfWvX0n1vz6X0mnf1uvz6+b0+vfS0+vX0mmnfX1t1+fXzb0+vfS0+t6X
-7:JOJxOJxOJx6+n16+k+evfWvX0mnX1uvXzen176Wn16+mmnXb+uuvXfS0+vX0k0+fX1uuvfXzet7076Wk+vS
-7:JOJxOJxOJxPX06+t+b606+mnX1167f1uvz6+b0+vfWk616+k0067+t1vzfXzenevfS0n16X
-7:JOJxOJxOPX007+vX0mnz6+t17+bfS16+k06+t1+fXzen176Wn16+mmmnfXb07+uuuvfXb176Wn16X
-7:JOJxOJxOPXy+b8+Xzf0k9t+mS+b8nuS+b9vyWWXnvzeb+nt+kyXz8nty9z9
-7:JOJxOJxOPXzf1vmXnzz9+WXvk+bz+vnyWX18+tz+Xvkz+Xnzeb+vn1ufyXt8yWXnmfmXn
-7:JOJxOJxP007+uvfS+t+enfWnX0mnz6+t1+fXzenfS0+vX0mk+b6X1uuvfS+bevfSWn16
-7:JOJxOJxP0nq+mmnfX11fXb17+t1+fXzj6Wn16+mk067enf11uvz67evfS0n1vS
-8:JOJxOJJ+WXnufvyWX18+ub9vmb8y8+bz8+Sy+vn1ufXky8
-8:JOJxOJJ+c609+mkz67+ut1+fXb176WnX1uevb6vz0nb0nb60mk66160616
-8:JOJxOJx+S8+b+nuXvzzfk9yXufvyyWX099+befvkyXmfn
-8:JOJxOJx+Xz8+mXnq+SXzef09+ky89uXvyWX09+mfmXnufuXv
-8:JOJxOJxJ+S+mfnvyyXt+eefnvkfzzef098mXz89yWnvtz9+S0yXk9WXvzbzf0nv0mfky+fnty+b9uXz9
-8:JOJxOJxJ+Xz+k9+S+b+k9vyWXnzef09+ky+fnty+fvyyWX09+kntvebz+nv0mfntz9
-8:JOJxOJxJ+Xz+nv0y+fnuXz9+Sy+nvzef09+nty+fvzef09+mS8ntz9
-8:JOJxOJxJ+Xz+nvzz89y9+Sy+nv0zfmXnub9y9+bz+nv0yXnuS9z9
-8:JOJxOJxJ+Xz8+mXz89yy97z9+SyX09+b0fufv0mXz8nty9z9+SyWX09+nty9+mbzfvmXmb8y89z9ty+fv
-8:JOJxOJxJ+Xz9+b+mXnuXvyWX09+f0mXz89uXz9+WWXnt+bz+nvky+fn
-8:JOJxOJxOJ+Xz8+S+b+k9vyXzf0nt+Sy+nv0zfmXnrz9+Syy89+bzf09v0mfmXnty9z9
-8:JOJxOJxOJ+Xz9+f09t+SXzb+ky+fnty+fvyWS+k9+bz+nv0mfi9uXz9vzebz+nv09r+mSyX098z8y8z89tyXz9v
-8:JOJxOJxOJ6+n1+fX0n1vzfS+k0+fX1uvz6+b0+vfS0+vX00067f111676Wn16
-8:JOJxOJxOJ6+v07+k+S717+ut7f00067fS1+nX11vb+mmnXb6WvX
-8:JOJxOJxP0+vz6+en1760+vX00nb+uuvXb6V+t1+fXz0nb6Wn16
-8:JOJxOJxP0+vz6+k+t+b6Xz00791760n1vS+mk6X1uvz67evf
+8:JJJOJxOJxOJPz+X18+fy+vnz+X18+efvmXnyy89z9
+8:JJJOJxOJxOJxOJx+vnz6+X18+fy+vnz+X186y+vnzfyX1vk+bz+vnyWX18+tz+Xvkz+Xn
+8:JJJOJxOJxOJxOJ96+fy+vnz+X18+b+S+t8nzfyX1vk+WXvmfn
+8:JJJOJxOJxOJxP18+vnz+X18+fy9+S+ufvmfnzfy+t8n
+8:JJJOJxOJxOJxOPfz6+X18+fy9+X18+efvyy98nzfyX1vk
+8:JJJOJxOJxOJxP18+fXy+vnz+X18+efnyy89v1z+Xvmfy8
+8:JJJOJxOJxOJxJ6+f18+f18+fy8+S+ufvmfnzz9+WXvk
+8:JJJOJxOJxOJxOJ68+fy+vnz+X18+b+uXvmXnzfyX1vk+b+X1vk
+8:JJJOJxOJxOJxOJ7+fXz+X18+fy+vnzfyX18nzvyy98nzfyX1vk
+8:JJJOJxOJxOJxPz96+fy+vnz9+efvyy98nzfyy98n
+8:JJJOJxOJxOJxOPX18+fy+vnz+X18+f18+b+S+t8nz+WXnt
+8:JJJOJxOJxOJxJ+fXz+X18+fvz+X18+efnyy89vzfyX1vk
+8:JJJOJxOJxOJxOJx66+X18+fy+vnz+vnzz+vnWX18+b+S+t8nzef18+WWXvk9ufy9
+8:JJJOJxOJxOJx7+fXz+X18+fy+vnzf1y98y8+b+S+t8
+8:JJJOJxOJxOJxPvz+Xvz+X18+fy+vnzz8+WXnt+b+X1vk
+8:JJJOJxOJxOJxOPz68+fy+vnz+Xvz+X18+b+S+t8nzf18y8
+8:JJJOJxOJxOJxOPfnz+Xvz+X18+fv1z+Xvmfy8+efnuXv
+8:JJJOJxOJxOJxOPn18+fXz+X186+S+ufvmfnzz8+WXnt
+8:JJJOJxOJxOJxOJxPvz6+f18+fy+vnzfyX1vk+b+S8nzfy+t8nzzz89vyyy89vkz+Xn
+8:JJJOJxOJxOJJJPz+X18+U9vy+ufvk+efnyy89vzef18+qy98y8z8
+7:JJJOJxOJxOJxJ8+X18+fy8+fy+vnzfyX1vk+b+S+t8n
+7:JJJOJxOJxOJxOPf18+fy+vnz+Xvz+XvzfyX1vk+fyX1vk
+7:JJJOJxOJxOJxJ7+Xnz+X18+fy+vnzfyX1vk+b+uXvk
+7:JJJOJxOJxOJxOJ9+fny+vnzfyX1vk+ef186y+vnzfyX1vn1yXufvmS8z8
+7:JJJOJxOJxOJxOJx9+fXnz+X18+fy+vnzz9+WXvk+b+uXvmXnz+Sy+vn1ufy98mfy8
+7:JJJOJxOJxOJxOJPfz+X18+fy8+fy9+efvyy98nzf1y98nz+Sy+vn1ufy98mfy8
+7:JJJOJxOJxOJxJ9+fy+vnz+X18+fy+vnyy98z8+b+S+t8n
+7:JJJOJxOJxOJxPvz+Xnz+X18+S+ufvmfnzfyX1vk+S+ufvmfn
+7:JJJOJxOJxOJxJ+fXz+X18+fy+vny+vnzz89y9+b+S+t8n
+7:JJJOJxOJxOJxOJ9+fXz+X18+X18+b+uXvmXnzf1y98y8+S+ufvmfn
+7:JJJOJxOJxOJxOJ7+vnz+X18+f18+b+S+t8n1z+Xvmfy8+b+S+t8n
+7:JJJOJxOJxOJxOJxP18+fvz+X18+fy+vnzfyX1vk+b+S+t8nzf1y98nzef18+Sy+vntz+Xv
+7:JJJOJxOJxOJxOP18+fXz+X18+fy+vnz+Xvzf1y98y8+fyX18n
+7:JJJOJxOJxOJxOJx+vnfz+X18+fy9+fy9+b+S+t8nyX1z98z8+eufvmfnX
+7:JJJOJxOJxOJxOJxP18+fvz+X18+fy+vnzfyX1vk+ufy98z+Xnzz+vnWX18+bz+vnyWX18+tz+Xvkz+Xn
+7:JJJOJxOJxOJxOJxP18+Xvz+X18+Xnmfy8+b+S+t8nzf1y98Xzzz89vyyy89vkz+Xn
+7:JJJOJxOJxOJxOPn18+fy8+fy9+X18+efnyy89vzfyX1vk
+7:JJJOJxOJxOJxP18+fvz+Xvz+X18+b+S+t8nzfyX1vk
+7:JJJOJxOJxOJxPz6+vnz+Xnz+X18+b+S+t8nzfyy89v
+7:JJJOJxOJxOJJPz8+fy+vnz+X18+b+S+t8nzfyX1vn
+6:JJJOJxOJxOJxJPvz+X18+fy9+efvmXnzvyy98n1vmfy8
+6:JJJOJxOJxOJxOJxPz6+vnz+Xvz6+efvyy98nyvmfnzfy+t8+Sy+vn1zfuXvmb8y8
+6:JJJOJxOJxOJxOJPz6+X18+fnzz8+WXnt+d6y+vnyX1vk+bz+vnyWX18+tz+Xvkz+Xn
+6:JJJOJxOJxOJxOPv18+fy8+fy+vny9+efnyy89vzfyX1vk
+6:JJJOJxOJxOJxOJPny+vnz+vnz+X18+b+S+t8nzfyX1vk+bz+vnyWX18+tz+Xvkz+Xn
+6:JJJOJxOJxOJxOJxPf18+fy8+fy+vnzz89y9+f1XmXnyX1z98z8+bz+vnyWX18+tz+Xvkz+Xn
+6:JJJOJxOJxOJJxPXz+Xnz+X18+b9vzz9+WXvk+b+S+t8n
+6:JJJOJxOJxOJxOJ8+fXz+Xvz9+efvyy98nzz9+WXvk+fyX1vk
+6:JJJOJxOJxOJxPX18+fy8+fvzfyX1vk+b+S+t8n
+6:JJJOJxOJxOJxOJ7+X18+fy+vnz+X18+S+ufvmfnzz8+WXnt+eb+vk6y9
+6:JJJOJxOJxOJxOJ+vnz6+X18+fy+vnzz+vnWX18+S+ufvmfnzfyX1vk
+6:JJJOJxOJxOJJ8+fy+vnzz+vnWX18+b+S+t8nyy89f
+6:JJJOJxOJxOJxOJ+vnz6+fy8+fy+vnzz89y9+efvyy98nyX1vk
+6:JJJOJxOJxOJxOJxPX18+fy8+fy+vnzfyX1vk+WXnufvzfyX1vk+bz+vnyWX18+tz+Xvkz+Xn
+6:JJJOJxOJxOJxOJxPfvz+Xnz+Xvzfyy98nyy89z9+b+S+t8nzef18+X1ufy98mfy8
+6:JJJOJxOJxOJxPz6+vnz+X18+fy9+b+uXvmXnzf18y8
+6:JJJOJxOJxOJxOJ8+vnz8+fy+vnzz9+WXvk+b+uXvmXnzfyX1vn
+6:JJJOJxOJxOJxOJPXy+vnz+XnzfuXvzfyX1vk+efnyy89vzzz89vyt8mfy8
+6:JJJOJxOJxOJxOJJ7+fy+vnz+XvzfyX1vk+b+S+t8nzfyXt+eefvk+WWXvk9ufy9
+6:JJJOJxOJxOJxJ6+f18+X18+fy+vnzz8+WXnt+b+S+t8n
+5:JJJOJxOJxOJxOJ+vnXz+vnz+X18+b+S+t8nzz8+U9vzz8+WXnt
+5:JJJOJxOJxOJxPz6+fXz+X18+fy+vn1z+Xvmfy8+efvmXn
+5:JJJOJxOJxOJxP18+vnz+X18+X18+efnuXvyX1z98z8
+5:JJJOJxOJxOJxJPfz+X18+fy+vnzfyX1vk+efvyy98nzf1vmXn
+5:JJJOJxOJxOJxJ9+fy+vnz+XnyX1vmfnzfyX1vk+b+S+t8n
+5:JJJOJxOJxOJx6+vnz+Xvy+vnzz8+WXnt+b+S+vk
+5:JJJOJxOJxOJxJ+vnz+Xnz+X18+fy+vnzz9+WXvk+b+S+t8
+5:JJJOJxOJxOJx7+fy+vnz+X18+b+uXvmXnzfyX1vk+b+X1vk
+5:JJJOJxOJxOJxP18+fXz+vnz+X18+S+ufvmfnzfyX1vk
+5:JJJOJxOJxOJxPvvz+X18+efnyy89vzfyX1vk+ef186y8
+5:JJJOJxOJxOJxOJxPvz6+fy+vnz+X189z+Xvzf1XmXnzfyX1vk+fyWX18+tz+Xvn
+5:JJJOJxOJxOJxOJ8+fXz+X18+fy+vnzz8+WXnt+b+uXvmXnyX1fmfn
+5:JJJOJxOJxOJxOPX18+fy+vnz+X18+fXyX1z98z8+b+uXvi
+5:JJJOJxOJxOJxOJxPnfz+X18+X18+efnyy89vzz98nzfyy98nzef18+Sy+vn1ufy98mfy8
+5:JJJOJxOJxOJxJ9+fnz+X18+c9Xzf1y98y8+b+uXvmXn
+5:JJJOJxOJxOJxOJPXy9+fy+vnz+X18+b+uXvmXnzfyX1vnyyy98nub9y9
+5:JJJOJxOJxOJxOPz6+Xnz+X18+b+uXvmXnyX1z98z8+b+t8+eefvk6yy89v
+5:JJJOJxOJxOJxOJx+fXvz+X18+fy+vnz+X18+efvyy98nyy98z8+bz+vnyWX18+tz+Xvkz+Xn
+5:JJJOJxOJxOJxOJ+vnz+Xnz+X18+fy+vnzz9+WXvk+b+uXvmXnzfyX1vk
+5:JJJOJxOJxOJxOJxPX18+fy+vnz+XnyX1z98nzfyX1vk+b+S+t8nzzz89vyWX188mfy8
+4:JJJOJxOJxOJxOJ+fXz+vnz+X18+fy9+b+uXvmXnyX1z98z8+b+X1vn
+4:JJJOJxOJxOJxJ+fXz+X18+fy+vnz+X18+WXnufvzfyX1vk
+4:JJJOJxOJxOJxOJx89+X18+fy+vnz+Xnzf1y98y8+b+S+t8+d+WWXnt8mfy8
+4:JJJOJxOJxOJxOJ+fXz6+fy+vnz+X18+b+S+t8nzf1y98y8+efnyy89v
+4:JJJOJxOJxOJxOP18+vnz+X18+fy+vnz+XnyX1z98z8+b+X1vn
+4:JJJOJxOJxOJxOJ+Xnfz+X18+fy+vnWX18+b+S+t8nzz89
+4:JJJOJxOJxOJxOJJ+vny+vnz+Xvzz89y9+S+ufvk+b+S+t8nzefny+tz+Xvky8
+4:JJJOJxOJxOJxOJxPvz+Xvz+Xny9+WXvk+b+S+t8nzfyX1vnzef18+X18mfy8
+4:JJJOJxOJxOJxJJ+fy+vnz+Xvmfy8+efvi+b+S+t8nyWX18+ufuXvjz8
+4:JJJOJxOJxOJxOJ99+fy8+fy9+efnyy89vzz8+WXnt+X1z98z8
+4:JJJOJxOJxOJxOJx68+fy9+fy8+fy9+efvyy98nzfyX1vk+bz+vnX
+4:JJJOJxOJxOJxP18+Xvz+vny+vnzfyX1vk+S+ufvn
+4:JJJOJxOJxOJxOJ69+fy+vnzfyX1vk+uXvi+b+S+t8nyWX18+vjz8
+4:JJJOJxOJxOJxOJP188+fy9+b+S8nzz9+V8nz+WXnt+V8efn
+4:JJJOJxOJxOJxPvz6+fy+vnz+X18+efnyy89vzfyX1vk
+4:JJJOJxOJxOJxOP18+vnz+X18+fy9+fy+vnzz9+WXvk+fyX1vk
+4:JJJOJxOJxOJxPz9+fy9+fy+vny9+b+S+t8nzfy+vk
+4:JJJOJxOJxOJxJ+fXy+vnz+vnz+XvzfyX1vk+efvyy98n
+4:JJJOJxOJxOJxJPfz+vnz+XnyX1z98z8+S+ufvk+b+S+vk
+4:JJJOJxOJxOJxOPz67+fy8+fy+vnz+X18+efnyy89vzfyX1vk
+3:JJJJJJJJOJxJP18+f18
+3:JJJJJJJOJxPz6+fX
+3:JJJJJJJJOJxJ+vnz+Xn
+3:JJJJJJJJOJxPz6+f18
+3:JJJJJJJJOJx+vnv
+3:JJJJJJJOJxP18+fX
+3:JJJJJJJJJOP18
+3:JJJJJJJOJxOJPfz+X18+Xn
+3:JJJJJJJJOJx+vnf
+3:JJJJJJJOJxP18+fn
+3:JJJJJJJJOJx+fX18
+3:JJJJJJJOJxPz6+fX
+3:JJJJJJJJOJxP18+vn
+3:JJJJJJJJJOJx+fXf
+3:JJJJJJJJOJxOJ6+vnv
+3:JJJJJJJJOJxP189
+3:JJJJJJJJOJxPz6+fX
+3:JJJJJJJOJxPz6+X18
+3:JJJJJJJOJxOJ8+vnz9
+3:JJJJJJJJOJxP18+fX
+2:JJJJJJJJJJ
+2:JJJJJJJJJJJP
+2:JJJJJJJJJJJP
+2:JJJJJJJJJJP
+2:JJJJJJJJJJJ
+2:JJJJJJJJJJJP
+2:JJJJJJJJJJJP
+2:JJJJJJJJJJJ
+2:JJJJJJJJJJP
+2:JJJJJJJJJJJP
+2:JJJJJJJJJP
+2:JJJJJJJJJP
+2:JJJJJJJJJJJ
+2:JJJJJJJJJP
+2:JJJJJJJJJJP
+2:JJJJJJJJJJ
+2:JJJJJJJJJOJPn
+2:JJJJJJJJJJJ
+2:JJJJJJJJJP
+2:JJJJJJJJOJ9

src/main/resources/trees/dttfc/leaves_properties/douglas_fir.json

@@ -1,4 +1,6 @@
 {
   "__comment__": "This file was automatically created by mcresources",
-  "primitive_leaves": "tfc:wood/leaves/douglas_fir"
+  "primitive_leaves": "tfc:wood/leaves/douglas_fir",
+  "cell_kit": "dynamictrees:conifer",
+  "smother": 3
 }

src/main/resources/trees/dttfc/leaves_properties/pine.json

@@ -1,4 +1,5 @@
 {
   "__comment__": "This file was automatically created by mcresources",
-  "primitive_leaves": "tfc:wood/leaves/pine"
+  "primitive_leaves": "tfc:wood/leaves/pine",
+  "cell_kit": "dynamictrees:conifer"
 }

src/main/resources/trees/dttfc/leaves_properties/rosewood.json

@@ -1,4 +1,5 @@
 {
   "__comment__": "This file was automatically created by mcresources",
-  "primitive_leaves": "tfc:wood/leaves/rosewood"
+  "primitive_leaves": "tfc:wood/leaves/rosewood",
+  "cell_kit": "dynamictrees:acacia"
 }

src/main/resources/trees/dttfc/leaves_properties/spruce.json

@@ -1,6 +1,5 @@
 {
   "__comment__": "This file was automatically created by mcresources",
   "primitive_leaves": "tfc:wood/leaves/spruce",
-  "cell_kit": "dynamictrees:conifer",
-  "smother": 3
+  "cell_kit": "dynamictrees:conifer"
 }

src/main/resources/trees/dttfc/species/aspen.json

@@ -1,5 +1,10 @@
 {
   "__comment__": "This file was automatically created by mcresources",
   "family": "dttfc:aspen",
-  "can_bone_meal_tree": false
+  "can_bone_meal_tree": false,
+  "tapering": 0.12,
+  "signal_energy": 14,
+  "up_probability": 4,
+  "lowest_branch_height": 4,
+  "growth_rate": 1.25
 }