diff --git a/gradle.properties b/gradle.properties index 4e480125c..2f401c85c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ modName=DynamicTrees modId=dynamictrees -modVersion=1.2.0 +modVersion=1.2.1 group=com.ferreusveritas.dynamictrees mcVersion=1.19.2 diff --git a/src/main/resources/assets/dynamictrees/textures/patchouli/images/burgeoning.png b/src/main/resources/assets/dynamictrees/textures/patchouli/images/burgeoning.png new file mode 100644 index 000000000..2107e3bf7 Binary files /dev/null and b/src/main/resources/assets/dynamictrees/textures/patchouli/images/burgeoning.png differ diff --git a/src/main/resources/assets/dynamictrees/textures/patchouli/images/mega_spruce.png b/src/main/resources/assets/dynamictrees/textures/patchouli/images/mega_spruce.png new file mode 100644 index 000000000..f309bd7e5 Binary files /dev/null and b/src/main/resources/assets/dynamictrees/textures/patchouli/images/mega_spruce.png differ diff --git a/src/main/resources/assets/dynamictrees/textures/patchouli/images/rooty_soil.png b/src/main/resources/assets/dynamictrees/textures/patchouli/images/rooty_soil.png new file mode 100644 index 000000000..dfae19781 Binary files /dev/null and b/src/main/resources/assets/dynamictrees/textures/patchouli/images/rooty_soil.png differ diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/dirt_bucket.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/dirt_bucket.json index a68b90061..fd1e95bfe 100644 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/dirt_bucket.json +++ b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/dirt_bucket.json @@ -3,7 +3,7 @@ "read_by_default": "true", "icon": "dynamictrees:dirt_bucket", "category": "dynamictrees:mechanics", - "sortnum": 3, + "sortnum": 1, "pages": [ { "type": "spotlight", diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/rooty_soil.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/rooty_soil.json index bfbd4d7ba..8431e3cae 100644 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/rooty_soil.json +++ b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/rooty_soil.json @@ -8,11 +8,15 @@ { "type": "text", "title": "Rooty Soil", - "text": "- Provides nutrients to trees and can be depleted over time.$(br2)- Applied with bone meal will increase soil fertility and allows the tree to grow past its mature state.$(br2)- Applied with various brewed potions for different effects." + "text": "- Provides nutrients to trees and can be depleted over time.$(br2)- Applying bone meal will increase soil fertility and allows the tree to grow past its mature state.$(br2)- Comparators can be used to sense soil fertility level." }, { - "type": "text", - "text": "- Special effect particles are created on the entire tree when an acting substance is applied to the soil or bottom-most trunk block.$(br2)- Comparators can be used to sense soil fertility level." + "type": "image", + "images": [ + "dynamictrees:textures/patchouli/images/rooty_soil.png" + ], + "text": "Rooty grass block of a birch tree.", + "border": true } ] } \ No newline at end of file diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/staff.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/staff.json index 0fd373a0e..4f792e7a0 100644 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/staff.json +++ b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/mechanics/staff.json @@ -3,7 +3,7 @@ "read_by_default": "true", "icon": "dynamictrees:staff", "category": "dynamictrees:mechanics", - "sortnum": 1, + "sortnum": 3, "pages": [ { "type": "spotlight", diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/base_potion.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/base_potion.json index 0b1b3c2ac..a435738ae 100644 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/base_potion.json +++ b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/base_potion.json @@ -5,7 +5,7 @@ "sortnum": 1, "pages": [ { - "type": "brewing", + "type": "dynamictrees:brewing", "title": "Biochar Base Potion", "ingredient": "minecraft:charcoal", "bottle": "minecraft:potion{Potion:'minecraft:awkward'}", @@ -13,16 +13,13 @@ "text": "This is the brewing recipe for the base potion.$(br2)All other potions from dynamic trees use this during brewing." }, { - "type": "relations", - "title": "Relations", + "type": "patchouli:relations", + "title": "Uses", "entries": [ - "potions/burgeoning_potion", - "potions/depletion_potion", - "potions/fertility_potion", - "potions/gigas_potion", - "potions/persistance_potion", - "potions/base_transformation_potion", - "potions/transformation_potion" + "dynamictrees:potions/burgeoning_potion", + "dynamictrees:potions/depletion_potion", + "dynamictrees:potions/gigas_potion", + "dynamictrees:potions/transformation_potion" ] } ] diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/base_transformation_potion.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/base_transformation_potion.json deleted file mode 100644 index 68efd5be3..000000000 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/base_transformation_potion.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "Base Potion of Transformation", - "icon": "dynamictrees:dendro_potion{potion_index:6}", - "category": "dynamictrees:potions", - "sortnum": 4, - "pages": [ - { - "type": "brewing", - "title": "Base Potion of Transformation", - "ingredient": "minecraft:prismarine_crystals", - "bottle": "dynamictrees:dendro_potion", - "output": "dynamictrees:dendro_potion{potion_index:6}", - "text": "This is the brewing recipe for the base transformation potion.$(br2)All other transformation potions use this." - }, - { - "type": "relations", - "title": "Relations", - "entries": [ - "potions/base_potion", - "potions/burgeoning_potion", - "potions/depletion_potion", - "potions/fertility_potion", - "potions/gigas_potion", - "potions/persistance_potion", - "potions/transformation_potion" - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/burgeoning_potion.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/burgeoning_potion.json index 8c31193ee..b465fd50c 100644 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/burgeoning_potion.json +++ b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/burgeoning_potion.json @@ -5,25 +5,20 @@ "sortnum": 3, "pages": [ { - "type": "brewing", + "type": "dynamictrees:brewing", "title": "Potion of Burgeoning", "ingredient": "minecraft:ghast_tear", "bottle": "dynamictrees:dendro_potion", "output": "dynamictrees:dendro_potion{potion_index:3}", - "text": "This potion causes the tree to rapidly grow and replenishes its fertility. It will continue to grow until the soil is dry. The growth effect can be extended for as long as needed by replenishing the fertility every so often." + "text": "This potion replenishes the tree's fertility and causes it to rapidly grow until the soil is dry. The growth effect can be extended for as long as needed by replenishing the fertility every so often." }, { - "type": "relations", - "title": "Relations", - "entries": [ - "potions/base_potion", - "potions/depletion_potion", - "potions/fertility_potion", - "potions/gigas_potion", - "potions/persistance_potion", - "potions/base_transformation_potion", - "potions/transformation_potion" - ] + "type": "image", + "images": [ + "dynamictrees:textures/patchouli/images/burgeoning.png" + ], + "text": "Particles visible when the tree is under the effect of Burgeoning.", + "border": true } ] } \ No newline at end of file diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/depletion_potion.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/depletion_potion.json index 2dbf8416d..1f460fb41 100644 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/depletion_potion.json +++ b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/depletion_potion.json @@ -5,25 +5,12 @@ "sortnum": 2, "pages": [ { - "type": "brewing", + "type": "dynamictrees:brewing", "title": "Potion of Depletion", "ingredient": "minecraft:slime_ball", "bottle": "dynamictrees:dendro_potion", "output": "dynamictrees:dendro_potion{potion_index:1}", - "text": "This potion depletes the soil and causes the tree to stop growing." - }, - { - "type": "relations", - "title": "Relations", - "entries": [ - "potions/base_potion", - "potions/burgeoning_potion", - "potions/fertility_potion", - "potions/gigas_potion", - "potions/persistance_potion", - "potions/base_transformation_potion", - "potions/transformation_potion" - ] + "text": "This potion depletes the soil and causes the tree to stop growing.$(br2)Useful to decorate with smaller trees." } ] } \ No newline at end of file diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/gigas_potion.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/gigas_potion.json index 16a91d1e2..096245a17 100644 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/gigas_potion.json +++ b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/gigas_potion.json @@ -5,25 +5,20 @@ "sortnum": 5, "pages": [ { - "type": "brewing", + "type": "dynamictrees:brewing", "title": "Potion of Gigas", "ingredient": "minecraft:pumpkin_seeds", "bottle": "dynamictrees:dendro_potion", "output": "dynamictrees:dendro_potion{potion_index:2}", - "text": "This potion changes the tree species to its mega equivalent. Note that this only works on trees that have mega variants - spruce and jungle only by default." + "text": "Makes the tree grow to a gigantic size. Note that this only works on trees that have mega variants - spruce and jungle by default.$(br1)This is the equivalent of placing saplings in a 2x2 pattern." }, { - "type": "relations", - "title": "Relations", - "entries": [ - "potions/base_potion", - "potions/burgeoning_potion", - "potions/depletion_potion", - "potions/fertility_potion", - "potions/persistance_potion", - "potions/base_transformation_potion", - "potions/transformation_potion" - ] + "type": "image", + "images": [ + "dynamictrees:textures/patchouli/images/mega_spruce.png" + ], + "text": "A regular spruce tree next to a fully grown mega spruce tree.", + "border": true } ] } \ No newline at end of file diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/transformation_potion.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/transformation_potion.json index a348f63b8..30dcac605 100644 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/transformation_potion.json +++ b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/entries/potions/transformation_potion.json @@ -2,28 +2,23 @@ "name": "Potion of Transformation", "icon": "dynamictrees:dendro_potion{potion_index:6}", "category": "dynamictrees:potions", - "sortnum": 3, + "sortnum": 4, "pages": [ { - "type": "brewing", - "title": "Potion of Transformation", + "type": "dynamictrees:brewing", + "title": "Base Potion", + "ingredient": "minecraft:prismarine_crystals", + "bottle": "dynamictrees:dendro_potion", + "output": "dynamictrees:dendro_potion{potion_index:6}", + "text": "This is the brewing recipe for the base transformation potion.$(br2)All other transformation potions use this." + }, + { + "type": "dynamictrees:brewing", + "title": "Transformation Potion", "ingredient": "dynamictrees:oak_seed", "bottle": "dynamictrees:dendro_potion{potion_index:6}", "output": "dynamictrees:dendro_potion{potion_index:6,target:'dynamictrees:oak'}", "text": "This potion changes an existing tree into another tree species.$(br2)The species of tree depends on the seed you use in the recipe. The example above uses an Oak Acorn." - }, - { - "type": "relations", - "title": "Relations", - "entries": [ - "potions/base_potion", - "potions/burgeoning_potion", - "potions/depletion_potion", - "potions/fertility_potion", - "potions/gigas_potion", - "potions/persistance_potion", - "potions/base_transformation_potion" - ] } ] } \ No newline at end of file diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/templates/brewing.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/templates/brewing.json index dbfed18a5..e1217ae6e 100644 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/templates/brewing.json +++ b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/templates/brewing.json @@ -1,13 +1,13 @@ { "components": [ { - "type": "header", + "type": "patchouli:header", "text": "#title", "x": -1, "y": -6 }, { - "type": "image", + "type": "patchouli:image", "image": "dynamictrees:textures/patchouli/gui/brewing.png", "width": "256", "height": "256", @@ -20,43 +20,43 @@ "scale": 0.5 }, { - "type": "item", + "type": "patchouli:item", "item": "minecraft:blaze_powder", "x": 2, "y": 7 }, { - "type": "item", + "type": "patchouli:item", "item": "#ingredient", "x": 64, "y": 7 }, { - "type": "item", + "type": "patchouli:item", "item": "#bottle", "x": 63, "y": 48 }, { - "type": "item", + "type": "patchouli:item", "item": "#bottle", "x": 40, "y": 41 }, { - "type": "item", + "type": "patchouli:item", "item": "#bottle", "x": 86, "y": 41 }, { - "type": "item", + "type": "patchouli:item", "item": "#output", "x": 97, "y": 7 }, { - "type": "text", + "type": "patchouli:text", "text": "#text", "x": 1, "y": 70, diff --git a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/templates/brewing2.json b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/templates/brewing2.json index 0dffe9da9..c545d227b 100644 --- a/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/templates/brewing2.json +++ b/src/main/resources/data/dynamictrees/patchouli_books/guide/en_us/templates/brewing2.json @@ -1,13 +1,13 @@ { "components": [ { - "type": "header", + "type": "patchouli:header", "text": "#title", "x": -1, "y": -6 }, { - "type": "image", + "type": "patchouli:image", "image": "dynamictrees:textures/patchouli/gui/brewing.png", "width": "256", "height": "256", @@ -20,49 +20,49 @@ "scale": 0.5 }, { - "type": "item", + "type": "patchouli:item", "item": "minecraft:blaze_powder", "x": 2, "y": 7 }, { - "type": "item", + "type": "patchouli:item", "item": "#ingredient", "x": 64, "y": 7 }, { - "type": "item", + "type": "patchouli:item", "item": "#bottle", "x": 63, "y": 48 }, { - "type": "item", + "type": "patchouli:item", "item": "#bottle", "x": 40, "y": 41 }, { - "type": "item", + "type": "patchouli:item", "item": "#bottle", "x": 86, "y": 41 }, { - "type": "item", + "type": "patchouli:item", "item": "#output", "x": 97, "y": 7 }, { - "type": "header", + "type": "patchouli:header", "text": "#title2", "x": -1, "y": 70 }, { - "type": "image", + "type": "patchouli:image", "image": "dynamictrees:textures/patchouli/gui/brewing.png", "width": "256", "height": "256", @@ -75,37 +75,37 @@ "scale": 0.5 }, { - "type": "item", + "type": "patchouli:item", "item": "minecraft:blaze_powder", "x": 2, "y": 82 }, { - "type": "item", + "type": "patchouli:item", "item": "#ingredient2", "x": 64, "y": 82 }, { - "type": "item", + "type": "patchouli:item", "item": "#bottle2", "x": 63, "y": 123 }, { - "type": "item", + "type": "patchouli:item", "item": "#bottle2", "x": 40, "y": 116 }, { - "type": "item", + "type": "patchouli:item", "item": "#bottle2", "x": 86, "y": 116 }, { - "type": "item", + "type": "patchouli:item", "item": "#output2", "x": 97, "y": 82