fixed mega fir jocodes and biome overrides

gradle.properties

@@ -1,6 +1,6 @@
 modName=DynamicTreesBOP
 modId=dtbop
-modVersion=3.0.0-Beta5
+modVersion=3.0.0
 group=therealeststu.dtbop
 
 mcVersion=1.18.2

src/generated/resources/.cache/cache

@@ -51,6 +51,7 @@ a31c500c009d48c26d1967cc11c7f81f00c63bea assets/dtbop/blockstates/redwood_root.j
 23bb639a4c71ef39f99ad6f5171133afcf0a319b assets/dtbop/blockstates/redwood_sapling.json
 448eb3b3b3b60e09585ceae5d2050f6ee186fbdd assets/dtbop/blockstates/rooty_black_sand.json
 2df89e5c35225327b9321954e87b6faba05622ac assets/dtbop/blockstates/rooty_dried_salt.json
+ec0d64a546e78cdc50387a78146b4455bdddfbec assets/dtbop/blockstates/rooty_glowing_moss_block.json
 fbbf881211d991917e5b09304d55971989e53289 assets/dtbop/blockstates/rooty_mud.json
 9c7ed3e45838a36c912326c26f65cce256238895 assets/dtbop/blockstates/rooty_orange_sand.json
 8cc12e50f08ceb1d5bf60f7ac41f0b903e1ef16b assets/dtbop/blockstates/rooty_origin_grass_block.json
@@ -185,6 +186,7 @@ c2f08a71b78b1d01e524bc353c2cab77b7750c14 data/dtbop/loot_tables/blocks/poplar_le
 0c0bbbeed85328e7b62574f1d9d2b1e0e1271f2f data/dtbop/loot_tables/blocks/rainbow_birch_leaves.json
 084319dc88c87136ca6ab5b7d593e812a36be467 data/dtbop/loot_tables/blocks/redwood_leaves.json
 98e0f08cd5527c067f19c2cdf65690045a22019f data/dtbop/loot_tables/blocks/silk_undergrowth_web.json
+98e0f08cd5527c067f19c2cdf65690045a22019f data/dtbop/loot_tables/blocks/silk_web.json
 b5b5943747059789bdd3271118d3b2dbad8968d5 data/dtbop/loot_tables/blocks/sparse_acacia_leaves.json
 e99c4293e30ae0fa3c79c29b761f7e6f53a36c22 data/dtbop/loot_tables/blocks/sparse_oak_leaves.json
 f9c69617b25b7fff39eb6e93f3e0d5408158fe71 data/dtbop/loot_tables/blocks/spruce_poplar_leaves.json
@@ -242,6 +244,7 @@ be3261b7d5f46f13f1dff9bb9290d9d7ea3f11f3 data/dtbop/loot_tables/trees/branches/s
 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/poplar.json
 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/rainbow_birch.json
 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/redwood.json
+4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/silk.json
 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/silk_undergrowth.json
 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/sparse_acacia.json
 4c52d020b8802156ae80c1cf9f6cb977a3bf11fc data/dtbop/loot_tables/trees/leaves/sparse_oak.json

src/generated/resources/assets/dtbop/blockstates/rooty_glowing_moss_block.json

@@ -0,0 +1,14 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "biomesoplenty:block/glowing_moss_block"
+      }
+    },
+    {
+      "apply": {
+        "model": "dynamictrees:block/roots"
+      }
+    }
+  ]
+}

src/generated/resources/data/dtbop/loot_tables/trees/leaves/silk.json

@@ -0,0 +1,41 @@
+{
+  "type": "dynamictrees:leaves",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "conditions": [
+            {
+              "condition": "minecraft:table_bonus",
+              "enchantment": "minecraft:fortune",
+              "chances": [
+                0.1,
+                0.1333333,
+                0.1666666,
+                0.2
+              ]
+            }
+          ],
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 1.0,
+                "max": 2.0
+              },
+              "add": false
+            },
+            {
+              "function": "minecraft:explosion_decay"
+            }
+          ],
+          "name": "minecraft:string"
+        }
+      ]
+    }
+  ]
+}

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

@@ -1,65 +1,26 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
 loaderVersion="[36,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-
-# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
-# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
 license="MIT"
 
-# A URL to refer people to when problems occur with this mod
-#issueTrackerURL="https://github.com/supermassimo/DynamicTrees-ExC/issues" #optional
-
-# A list of mods - how many allowed here is determined by the individual mod loader
 [[mods]] #mandatory
-
-# The modid of the mod
 modId="dtbop" #mandatory
-
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
-# see the associated build.gradle script for how to populate this completely automatically during a build
 version="${file.jarVersion}" #mandatory
-
-# A display name for the mod
 displayName="Dynamic Trees for Biomes o' Plenty" #mandatory
-
-# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
 updateJSONURL="https://github.com/the-realest-stu/DynamicTrees-BOP/blob/master/version_info.json?raw=true" #optional
-
-# A URL for the "homepage" for this mod, displayed in the mod UI
 displayURL="https://www.curseforge.com/minecraft/mc-mods/dtbop" #optional
-
-# A file name (in the root of the mod JAR) containing a logo for display
 logoFile="" #optional
-
-# A text field displayed in the mod UI
 credits="ferreusveritas" #optional
-
-# A text field displayed in the mod UI
 authors="mangoose, Max Hyper" #optional
 
-# The description text for the mod (multi line!) (#mandatory)
 description='''
 Compatibility Mod between Dynamic trees and Biomes o' plenty
 '''
 
-# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
 [[dependencies.dtbop]] #optional
-    # the modid of the dependency
     modId="forge" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
     mandatory=true #mandatory
-    # The version range of the dependency
     versionRange="[36,)" #mandatory
-    # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
     ordering="NONE"
-    # Side this dependency is applied on - BOTH, CLIENT or SERVER
     side="BOTH"
 
 [[dependencies.dtbop]]
@@ -72,20 +33,20 @@ Compatibility Mod between Dynamic trees and Biomes o' plenty
 [[dependencies.dtbop]]
     modId="dynamictrees"
     mandatory=true
-    versionRange="[0.11.0,)"
+    versionRange="[1.0.0,)"
     ordering="AFTER"
     side="BOTH"
 
 [[dependencies.dtbop]]
     modId="dynamictreesplus"
     mandatory=false
-    versionRange="[0.1.0,)"
+    versionRange="[1.0.0,)"
     ordering="AFTER"
     side="BOTH"
 
 [[dependencies.dtbop]]
     modId="biomesoplenty"
     mandatory=true
-    versionRange="[16.0.0.109,17.0.0.0)"
+    versionRange="[1.18.2-16.0.0.109,1.19.0-17.0.0.0)"
     ordering="AFTER"
     side="BOTH"

src/main/resources/assets/dtbop/lang/en_us.json

@@ -29,11 +29,11 @@
   "species.dtbop.orange_autumn":"Autumnal Oak",
   "species.dtbop.yellow_autumn":"Autumnal Birch",
   "species.dtbop.maple":"Red Maple",
-  "species.dtbop.dead":"Bare",
-  "species.dtbop.dying":"Dying",
-  "species.dtbop.tall_dead":"Tall Bare",
-  "species.dtbop.tall_dying":"Tall Dying",
-  "species.dtbop.infested":"Infested",
+  "species.dtbop.dead":"Bare Tree",
+  "species.dtbop.dying":"Dying Tree",
+  "species.dtbop.tall_dead":"Tall Bare Tree",
+  "species.dtbop.tall_dying":"Tall Dying Tree",
+  "species.dtbop.infested":"Infested Oak",
   "species.dtbop.silk":"Silked",
   "species.dtbop.flowering_oak":"Flowering Oak",
   "species.dtbop.flowering_apple_oak":"Flowering Apple",
@@ -62,6 +62,11 @@
   "species.dtbop.sparse_oak":"Sparse Oak",
   "species.dtbop.sparse_acacia":"Sparse Acacia",
   "species.dtbop.short_jungle":"Short Jungle",
+  "species.dtbop.flowering_oak_undergrowth":"Flowering Oak Undergrowth",
+  "species.dtbop.infested_oak_undergrowth":"Infested Oak Undergrowth",
+  "species.dtbop.silk_undergrowth":"Silked Undergrowth",
+  "species.dtbop.acacia_undergrowth":"Acacia Undergrowth",
+  "species.dtbop.spruce_undergrowth":"Spruce Undergrowth",
 
   "block.dtbop.palm_branch":"Palm",
   "block.dtbop.dead_branch":"Dead Tree",