From cabef65e555256f76abf8f70b312be38c9ea22e0 Mon Sep 17 00:00:00 2001 From: Nacolla Date: Fri, 30 Jan 2026 15:29:51 -0300 Subject: [PATCH 1/6] Port to 1.21.1: Complete Rewrite (Azalea, Ancient Fruit, Leaves, Crash Fixes) --- .gitattributes | 2 - .gitignore | 41 +-- LICENSE | 21 -- build.gradle | 84 ++++++ build.gradle.kts | 186 ------------ buildSrc/build.gradle.kts | 16 - gradle.properties | 35 +-- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 282 +++++++++++------- gradlew.bat | 43 +-- settings.gradle | 11 + .../0e1c6e2993f5d031b19c4124fb324d60b80705ea | 12 + .../23823ddc2382fa6882f3540e9ccede1e362f28c5 | 38 +++ .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 30 ++ .../dcc54e5cfe81a1f6a56ae9d2aa2232d08868920a | 7 + .../df78a35a8ce97e9c08619e9ed581d3037a4665e2 | 5 + .../dtquark/blockstates/ancient_branch.json | 7 + .../dtquark/blockstates/ancient_fruit.json | 16 + .../dtquark/blockstates/ancient_leaves.json | 7 + .../dtquark/blockstates/ancient_sapling.json | 7 + .../dtquark/blockstates/azalea_branch.json | 7 + .../dtquark/blockstates/azalea_leaves.json | 7 + .../dtquark/blockstates/blossom_branch.json | 7 + .../blockstates/fiery_blossom_leaves.json | 7 + .../blockstates/fiery_blossom_sapling.json | 7 + .../blockstates/frosty_blossom_leaves.json | 7 + .../blockstates/frosty_blossom_sapling.json | 7 + .../blockstates/glow_shroom_branch.json | 7 + .../dtquark/blockstates/glow_shroom_cap.json | 116 +++++++ .../blockstates/glow_shroom_cap_center.json | 66 ++++ .../blockstates/glow_shroom_sapling.json | 7 + .../blockstates/serene_blossom_leaves.json | 7 + .../blockstates/serene_blossom_sapling.json | 7 + .../blockstates/stripped_ancient_branch.json | 7 + .../blockstates/stripped_azalea_branch.json | 7 + .../blockstates/stripped_blossom_branch.json | 7 + .../blockstates/sunny_blossom_leaves.json | 7 + .../blockstates/sunny_blossom_sapling.json | 7 + .../blockstates/warm_blossom_leaves.json | 7 + .../blockstates/warm_blossom_sapling.json | 7 + .../dtquark/models/block/ancient_branch.json | 7 + .../dtquark/models/block/azalea_branch.json | 7 + .../dtquark/models/block/blossom_branch.json | 7 + .../block/fruits/ancient_fruit_age0.json | 38 +++ .../block/fruits/ancient_fruit_age1.json | 49 +++ .../block/fruits/ancient_fruit_age2.json | 61 ++++ .../block/fruits/ancient_fruit_age3.json | 61 ++++ .../dtquark/models/block/glow_shroom.json | 35 +++ .../models/block/glow_shroom_branch.json | 7 + .../models/block/glow_shroom_cap_inside.json | 6 + .../models/block/glow_shroom_cap_side.json | 6 + .../mushroom/glow_shroom_cap_center_age0.json | 8 + .../models/block/saplings/ancient.json | 8 + .../models/block/saplings/fiery_blossom.json | 8 + .../models/block/saplings/frosty_blossom.json | 8 + .../models/block/saplings/glow_shroom.json | 8 + .../models/block/saplings/serene_blossom.json | 8 + .../models/block/saplings/sunny_blossom.json | 8 + .../models/block/saplings/warm_blossom.json | 8 + .../models/block/stripped_ancient_branch.json | 7 + .../models/block/stripped_azalea_branch.json | 7 + .../models/block/stripped_blossom_branch.json | 7 + .../dtquark/models/block/tall_slab.json | 18 ++ .../dtquark/models/item/ancient_branch.json | 7 + .../dtquark/models/item/ancient_seed.json | 6 + .../dtquark/models/item/azalea_branch.json | 7 + .../dtquark/models/item/blossom_branch.json | 7 + .../models/item/fiery_blossom_seed.json | 6 + .../models/item/frosty_blossom_seed.json | 6 + .../models/item/glow_shroom_branch.json | 7 + .../dtquark/models/item/glow_shroom_seed.json | 6 + .../models/item/serene_blossom_seed.json | 6 + .../models/item/sunny_blossom_seed.json | 6 + .../models/item/warm_blossom_seed.json | 6 + .../loot_modifiers/replaceancientseed.json | 16 + .../loot_table/blocks/ancient_fruit.json | 30 ++ .../loot_table/blocks/ancient_leaves.json | 184 ++++++++++++ .../loot_table/blocks/azalea_leaves.json | 137 +++++++++ .../blocks/fiery_blossom_leaves.json | 140 +++++++++ .../blocks/frosty_blossom_leaves.json | 140 +++++++++ .../loot_table/blocks/glow_shroom_cap.json | 53 ++++ .../blocks/glow_shroom_cap_center.json | 53 ++++ .../blocks/serene_blossom_leaves.json | 140 +++++++++ .../blocks/sunny_blossom_leaves.json | 140 +++++++++ .../blocks/warm_blossom_leaves.json | 140 +++++++++ .../loot_table/trees/branches/ancient.json | 42 +++ .../loot_table/trees/branches/azalea.json} | 17 +- .../loot_table/trees/branches/blossom.json | 42 +++ .../trees/branches/glow_shroom.json | 28 ++ .../trees/branches/stripped_ancient.json | 42 +++ .../trees/branches/stripped_azalea.json | 42 +++ .../trees/branches/stripped_blossom.json | 42 +++ .../loot_table/trees/leaves/ancient.json | 156 ++++++++++ .../trees/leaves/fiery_blossom.json | 70 +++++ .../trees/leaves/frosty_blossom.json | 70 +++++ .../trees/leaves/serene_blossom.json | 70 +++++ .../trees/leaves/sunny_blossom.json | 70 +++++ .../loot_table/trees/leaves/warm_blossom.json | 70 +++++ .../trees/mushroom_caps/glow_shroom.json | 59 ++++ .../loot_table/trees/voluntary/ancient.json | 45 +++ .../trees/voluntary/fiery_blossom.json} | 10 +- .../trees/voluntary/frosty_blossom.json} | 10 +- .../trees/voluntary/glow_shroom.json | 22 ++ .../trees/voluntary/serene_blossom.json} | 10 +- .../trees/voluntary/sunny_blossom.json} | 10 +- .../trees/voluntary/warm_blossom.json} | 10 +- .../add_glimmering_weald_shrooms.json | 12 + .../data/dtquark/tags/block/stone_like.json | 9 + .../patch_dynamic_glow_shroom.json | 47 +++ .../placed_feature/dynamic_glow_shrooms.json | 50 ++++ .../tags/blocks/branches_that_burn.json | 7 + .../tags/blocks/fungus_branches.json | 8 + .../dynamictrees/tags/blocks/fungus_caps.json | 8 + .../data/dynamictrees/tags/blocks/leaves.json | 6 +- .../dynamictrees/tags/blocks/saplings.json | 6 +- .../blocks/stripped_branches_that_burn.json | 7 + .../tags/items/branches_that_burn.json | 7 + .../tags/items/fungus_branches.json | 8 + .../dynamictrees/tags/items/fungus_caps.json | 8 + .../data/dynamictrees/tags/items/seeds.json | 4 +- .../loot_modifiers/global_loot_modifiers.json | 6 + .../loot_table/blocks/glow_shroom_block.json | 53 ++++ .../dtquark/BlossomLeavesProperties.java | 47 +-- .../dtquark/DTQuarkPlusRegistries.java | 25 ++ .../maxhyper/dtquark/DTQuarkRegistries.java | 68 ++++- .../maxhyper/dtquark/DynamicTreesQuark.java | 99 +++--- .../java/maxhyper/dtquark/PlusRegistries.java | 51 ++++ .../dtquark/blocks/SlabRootyBlock.java | 81 ----- .../dtquark/blocks/SlabSoilProperties.java | 106 ------- .../dtquark/blocks/StairsRootyBlock.java | 52 ---- .../dtquark/cell/AncientLeafCell.java | 47 +++ .../dtquark/cell/DTQuarkCellKits.java | 72 +++++ .../dtquark/growthlogic/AncientLogic.java | 104 +++++++ .../growthlogic/DTQuarkGrowthLogicKits.java | 15 + .../maxhyper/dtquark/loot/LootModifiers.java | 22 ++ .../dtquark/loot/ReplaceItemModifier.java | 44 +++ .../mushroom/GlowShroomCapProperties.java | 38 +++ .../dtquark/mushroom/GlowShroomSpecies.java | 50 ++++ .../{mods.toml => neoforge.mods.toml} | 29 +- .../dtquark/blockstates/blossom_branch.json | 5 - .../blockstates/fiery_blossom_leaves.json | 5 - .../blockstates/fiery_blossom_sapling.json | 5 - .../blockstates/frosty_blossom_leaves.json | 5 - .../blockstates/frosty_blossom_sapling.json | 5 - .../dtquark/blockstates/rooty_glowcelium.json | 6 - .../dtquark/blockstates/rooty_turf.json | 6 - .../dtquark/blockstates/rooty_turf_slab.json | 20 -- .../blockstates/rooty_turf_stairs.json | 37 --- .../blockstates/rooty_turf_vertical_slab.json | 6 - .../blockstates/serene_blossom_leaves.json | 5 - .../blockstates/serene_blossom_sapling.json | 5 - .../blockstates/stripped_blossom_branch.json | 5 - .../blockstates/sunny_blossom_leaves.json | 5 - .../blockstates/sunny_blossom_sapling.json | 5 - .../blockstates/sweet_blossom_leaves.json | 5 - .../blockstates/sweet_blossom_sapling.json | 5 - .../blockstates/warm_blossom_leaves.json | 5 - .../blockstates/warm_blossom_sapling.json | 5 - .../resources/assets/dtquark/lang/en_us.json | 24 +- .../dtquark/models/block/roots_slab.json | 41 --- .../dtquark/models/block/roots_stairs.json | 70 ----- .../dtquark/models/block/saplings/fiery.json | 7 - .../dtquark/models/block/saplings/frosty.json | 7 - .../dtquark/models/block/saplings/serene.json | 7 - .../dtquark/models/block/saplings/sunny.json | 7 - .../dtquark/models/block/saplings/sweet.json | 7 - .../dtquark/models/block/saplings/warm.json | 7 - .../dtquark/models/item/blossom_branch.json | 7 - .../models/item/fiery_blossom_seed.json | 6 - .../models/item/frosty_blossom_seed.json | 6 - .../models/item/serene_blossom_seed.json | 6 - .../models/item/sunny_blossom_seed.json | 6 - .../models/item/sweet_blossom_seed.json | 6 - .../models/item/warm_blossom_seed.json | 6 - .../dtquark/textures/block/ancient_fruit.png | Bin 0 -> 691 bytes .../textures/block/ancient_fruit_stem.png | Bin 0 -> 155 bytes .../textures/block/glow_shroom_cap.png | Bin 0 -> 373 bytes .../dtquark/textures/block/glowshroom.png | Bin 370 -> 0 bytes .../dtquark/textures/item/ancient_seed.png | Bin 0 -> 453 bytes .../textures/item/fiery_blossom_seed.png | Bin 474 -> 429 bytes .../textures/item/frosty_blossom_seed.png | Bin 480 -> 431 bytes .../textures/item/glow_shroom_seed.png | Bin 0 -> 299 bytes .../dtquark/textures/item/glowshroom_seed.png | Bin 316 -> 0 bytes .../textures/item/serene_blossom_seed.png | Bin 484 -> 427 bytes .../textures/item/sunny_blossom_seed.png | Bin 479 -> 435 bytes .../textures/item/sweet_blossom_seed.png | Bin 501 -> 0 bytes .../textures/item/warm_blossom_seed.png | Bin 483 -> 429 bytes .../blocks/fiery_blossom_leaves.json | 66 ---- .../blocks/frosty_blossom_leaves.json | 66 ---- .../blocks/serene_blossom_leaves.json | 66 ---- .../blocks/sunny_blossom_leaves.json | 66 ---- .../blocks/sweet_blossom_leaves.json | 66 ---- .../blocks/warm_blossom_leaves.json | 66 ---- .../trees/leaves/fiery_blossom.json | 31 -- .../trees/leaves/frosty_blossom.json | 31 -- .../trees/leaves/serene_blossom.json | 31 -- .../trees/leaves/sunny_blossom.json | 31 -- .../trees/leaves/sweet_blossom.json | 31 -- .../trees/leaves/warm_blossom.json | 31 -- .../loot_tables/trees/voluntary/sweet.json | 20 -- .../dtquark/patchouli_books/guide/book.json | 3 - .../en_us/entries/trees/blossom_trees.json | 19 -- .../tags/blocks/branches_that_burn.json | 6 - src/main/resources/pack.mcmeta | 5 +- .../dtquark/cap_properties/glow_shroom.json | 18 ++ .../trees/dtquark/families/ancient.json | 14 + .../trees/dtquark/families/azalea.json | 13 + .../trees/dtquark/families/blossom.json | 18 +- .../trees/dtquark/families/glow_shroom.json | 13 + .../trees/dtquark/fruits/ancient_fruit.json | 10 + .../trees/dtquark/jo_codes/ancient.txt | 140 +++++++++ .../trees/dtquark/jo_codes/fiery_blossom.txt | 252 +++++++++------- .../trees/dtquark/jo_codes/frosty_blossom.txt | 252 +++++++++------- .../trees/dtquark/jo_codes/glow_shroom.txt | 56 ++++ .../trees/dtquark/jo_codes/serene_blossom.txt | 252 +++++++++------- .../trees/dtquark/jo_codes/sunny_blossom.txt | 252 +++++++++------- .../trees/dtquark/jo_codes/sweet_blossom.txt | 112 ------- .../trees/dtquark/jo_codes/warm_blossom.txt | 252 +++++++++------- .../dtquark/leaves_properties/ancient.json | 5 + .../leaves_properties/sweet_blossom.json | 4 - .../dtquark/soil_properties/glowcelium.json | 4 - .../trees/dtquark/soil_properties/turf.json | 4 - .../dtquark/soil_properties/turf_slab.json | 6 - .../dtquark/soil_properties/turf_stairs.json | 5 - .../soil_properties/turf_vertical_slab.json | 5 - .../trees/dtquark/species/ancient.json | 36 +++ .../trees/dtquark/species/fiery_blossom.json | 9 +- .../trees/dtquark/species/frosty_blossom.json | 10 +- .../trees/dtquark/species/glow_shroom.json | 35 +++ .../trees/dtquark/species/serene_blossom.json | 10 +- .../trees/dtquark/species/sunny_blossom.json | 11 +- .../trees/dtquark/species/sweet_blossom.json | 21 -- .../trees/dtquark/species/warm_blossom.json | 10 +- .../trees/dtquark/world_gen/default.json | 38 ++- .../dtquark/world_gen/feature_cancellers.json | 19 ++ .../trees/dynamictrees/species/azalea.json | 37 +++ 237 files changed, 5331 insertions(+), 2516 deletions(-) delete mode 100644 .gitattributes delete mode 100644 LICENSE create mode 100644 build.gradle delete mode 100644 build.gradle.kts delete mode 100644 buildSrc/build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 settings.gradle create mode 100644 src/generated/resources/.cache/0e1c6e2993f5d031b19c4124fb324d60b80705ea create mode 100644 src/generated/resources/.cache/23823ddc2382fa6882f3540e9ccede1e362f28c5 create mode 100644 src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d create mode 100644 src/generated/resources/.cache/dcc54e5cfe81a1f6a56ae9d2aa2232d08868920a create mode 100644 src/generated/resources/.cache/df78a35a8ce97e9c08619e9ed581d3037a4665e2 create mode 100644 src/generated/resources/assets/dtquark/blockstates/ancient_branch.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/ancient_fruit.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/ancient_leaves.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/ancient_sapling.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/azalea_branch.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/azalea_leaves.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/blossom_branch.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/glow_shroom_branch.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap_center.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/glow_shroom_sapling.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/serene_blossom_leaves.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/serene_blossom_sapling.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/stripped_ancient_branch.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/stripped_azalea_branch.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/stripped_blossom_branch.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/warm_blossom_leaves.json create mode 100644 src/generated/resources/assets/dtquark/blockstates/warm_blossom_sapling.json create mode 100644 src/generated/resources/assets/dtquark/models/block/ancient_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/block/azalea_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/block/blossom_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age0.json create mode 100644 src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age1.json create mode 100644 src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age2.json create mode 100644 src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age3.json create mode 100644 src/generated/resources/assets/dtquark/models/block/glow_shroom.json create mode 100644 src/generated/resources/assets/dtquark/models/block/glow_shroom_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_inside.json create mode 100644 src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_side.json create mode 100644 src/generated/resources/assets/dtquark/models/block/mushroom/glow_shroom_cap_center_age0.json create mode 100644 src/generated/resources/assets/dtquark/models/block/saplings/ancient.json create mode 100644 src/generated/resources/assets/dtquark/models/block/saplings/fiery_blossom.json create mode 100644 src/generated/resources/assets/dtquark/models/block/saplings/frosty_blossom.json create mode 100644 src/generated/resources/assets/dtquark/models/block/saplings/glow_shroom.json create mode 100644 src/generated/resources/assets/dtquark/models/block/saplings/serene_blossom.json create mode 100644 src/generated/resources/assets/dtquark/models/block/saplings/sunny_blossom.json create mode 100644 src/generated/resources/assets/dtquark/models/block/saplings/warm_blossom.json create mode 100644 src/generated/resources/assets/dtquark/models/block/stripped_ancient_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/block/stripped_azalea_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/block/stripped_blossom_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/block/tall_slab.json create mode 100644 src/generated/resources/assets/dtquark/models/item/ancient_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/item/ancient_seed.json create mode 100644 src/generated/resources/assets/dtquark/models/item/azalea_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/item/blossom_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/item/fiery_blossom_seed.json create mode 100644 src/generated/resources/assets/dtquark/models/item/frosty_blossom_seed.json create mode 100644 src/generated/resources/assets/dtquark/models/item/glow_shroom_branch.json create mode 100644 src/generated/resources/assets/dtquark/models/item/glow_shroom_seed.json create mode 100644 src/generated/resources/assets/dtquark/models/item/serene_blossom_seed.json create mode 100644 src/generated/resources/assets/dtquark/models/item/sunny_blossom_seed.json create mode 100644 src/generated/resources/assets/dtquark/models/item/warm_blossom_seed.json create mode 100644 src/generated/resources/data/dtquark/loot_modifiers/replaceancientseed.json create mode 100644 src/generated/resources/data/dtquark/loot_table/blocks/ancient_fruit.json create mode 100644 src/generated/resources/data/dtquark/loot_table/blocks/ancient_leaves.json create mode 100644 src/generated/resources/data/dtquark/loot_table/blocks/azalea_leaves.json create mode 100644 src/generated/resources/data/dtquark/loot_table/blocks/fiery_blossom_leaves.json create mode 100644 src/generated/resources/data/dtquark/loot_table/blocks/frosty_blossom_leaves.json create mode 100644 src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap.json create mode 100644 src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap_center.json create mode 100644 src/generated/resources/data/dtquark/loot_table/blocks/serene_blossom_leaves.json create mode 100644 src/generated/resources/data/dtquark/loot_table/blocks/sunny_blossom_leaves.json create mode 100644 src/generated/resources/data/dtquark/loot_table/blocks/warm_blossom_leaves.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/branches/ancient.json rename src/{main/resources/data/dtquark/loot_tables/trees/branches/blossom.json => generated/resources/data/dtquark/loot_table/trees/branches/azalea.json} (73%) create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/branches/blossom.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/branches/glow_shroom.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_ancient.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_azalea.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_blossom.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/leaves/ancient.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/leaves/fiery_blossom.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/leaves/frosty_blossom.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/leaves/serene_blossom.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/leaves/sunny_blossom.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/leaves/warm_blossom.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/mushroom_caps/glow_shroom.json create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/voluntary/ancient.json rename src/{main/resources/data/dtquark/loot_tables/trees/voluntary/fiery.json => generated/resources/data/dtquark/loot_table/trees/voluntary/fiery_blossom.json} (67%) rename src/{main/resources/data/dtquark/loot_tables/trees/voluntary/frosty.json => generated/resources/data/dtquark/loot_table/trees/voluntary/frosty_blossom.json} (67%) create mode 100644 src/generated/resources/data/dtquark/loot_table/trees/voluntary/glow_shroom.json rename src/{main/resources/data/dtquark/loot_tables/trees/voluntary/serene.json => generated/resources/data/dtquark/loot_table/trees/voluntary/serene_blossom.json} (67%) rename src/{main/resources/data/dtquark/loot_tables/trees/voluntary/sunny.json => generated/resources/data/dtquark/loot_table/trees/voluntary/sunny_blossom.json} (67%) rename src/{main/resources/data/dtquark/loot_tables/trees/voluntary/warm.json => generated/resources/data/dtquark/loot_table/trees/voluntary/warm_blossom.json} (67%) create mode 100644 src/generated/resources/data/dtquark/neoforge/biome_modifier/add_glimmering_weald_shrooms.json create mode 100644 src/generated/resources/data/dtquark/tags/block/stone_like.json create mode 100644 src/generated/resources/data/dtquark/worldgen/configured_feature/patch_dynamic_glow_shroom.json create mode 100644 src/generated/resources/data/dtquark/worldgen/placed_feature/dynamic_glow_shrooms.json create mode 100644 src/generated/resources/data/dynamictrees/tags/blocks/branches_that_burn.json create mode 100644 src/generated/resources/data/dynamictrees/tags/blocks/fungus_branches.json create mode 100644 src/generated/resources/data/dynamictrees/tags/blocks/fungus_caps.json rename src/{main => generated}/resources/data/dynamictrees/tags/blocks/leaves.json (71%) rename src/{main => generated}/resources/data/dynamictrees/tags/blocks/saplings.json (71%) create mode 100644 src/generated/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json create mode 100644 src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json create mode 100644 src/generated/resources/data/dynamictrees/tags/items/fungus_branches.json create mode 100644 src/generated/resources/data/dynamictrees/tags/items/fungus_caps.json rename src/{main => generated}/resources/data/dynamictrees/tags/items/seeds.json (72%) create mode 100644 src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json create mode 100644 src/generated/resources/data/quark/loot_table/blocks/glow_shroom_block.json create mode 100644 src/main/java/maxhyper/dtquark/DTQuarkPlusRegistries.java create mode 100644 src/main/java/maxhyper/dtquark/PlusRegistries.java delete mode 100644 src/main/java/maxhyper/dtquark/blocks/SlabRootyBlock.java delete mode 100644 src/main/java/maxhyper/dtquark/blocks/SlabSoilProperties.java delete mode 100644 src/main/java/maxhyper/dtquark/blocks/StairsRootyBlock.java create mode 100644 src/main/java/maxhyper/dtquark/cell/AncientLeafCell.java create mode 100644 src/main/java/maxhyper/dtquark/cell/DTQuarkCellKits.java create mode 100644 src/main/java/maxhyper/dtquark/growthlogic/AncientLogic.java create mode 100644 src/main/java/maxhyper/dtquark/growthlogic/DTQuarkGrowthLogicKits.java create mode 100644 src/main/java/maxhyper/dtquark/loot/LootModifiers.java create mode 100644 src/main/java/maxhyper/dtquark/loot/ReplaceItemModifier.java create mode 100644 src/main/java/maxhyper/dtquark/mushroom/GlowShroomCapProperties.java create mode 100644 src/main/java/maxhyper/dtquark/mushroom/GlowShroomSpecies.java rename src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (51%) delete mode 100644 src/main/resources/assets/dtquark/blockstates/blossom_branch.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/rooty_glowcelium.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/rooty_turf.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/rooty_turf_slab.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/rooty_turf_stairs.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/rooty_turf_vertical_slab.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/serene_blossom_leaves.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/serene_blossom_sapling.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/stripped_blossom_branch.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/sweet_blossom_leaves.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/sweet_blossom_sapling.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/warm_blossom_leaves.json delete mode 100644 src/main/resources/assets/dtquark/blockstates/warm_blossom_sapling.json delete mode 100644 src/main/resources/assets/dtquark/models/block/roots_slab.json delete mode 100644 src/main/resources/assets/dtquark/models/block/roots_stairs.json delete mode 100644 src/main/resources/assets/dtquark/models/block/saplings/fiery.json delete mode 100644 src/main/resources/assets/dtquark/models/block/saplings/frosty.json delete mode 100644 src/main/resources/assets/dtquark/models/block/saplings/serene.json delete mode 100644 src/main/resources/assets/dtquark/models/block/saplings/sunny.json delete mode 100644 src/main/resources/assets/dtquark/models/block/saplings/sweet.json delete mode 100644 src/main/resources/assets/dtquark/models/block/saplings/warm.json delete mode 100644 src/main/resources/assets/dtquark/models/item/blossom_branch.json delete mode 100644 src/main/resources/assets/dtquark/models/item/fiery_blossom_seed.json delete mode 100644 src/main/resources/assets/dtquark/models/item/frosty_blossom_seed.json delete mode 100644 src/main/resources/assets/dtquark/models/item/serene_blossom_seed.json delete mode 100644 src/main/resources/assets/dtquark/models/item/sunny_blossom_seed.json delete mode 100644 src/main/resources/assets/dtquark/models/item/sweet_blossom_seed.json delete mode 100644 src/main/resources/assets/dtquark/models/item/warm_blossom_seed.json create mode 100644 src/main/resources/assets/dtquark/textures/block/ancient_fruit.png create mode 100644 src/main/resources/assets/dtquark/textures/block/ancient_fruit_stem.png create mode 100644 src/main/resources/assets/dtquark/textures/block/glow_shroom_cap.png delete mode 100644 src/main/resources/assets/dtquark/textures/block/glowshroom.png create mode 100644 src/main/resources/assets/dtquark/textures/item/ancient_seed.png create mode 100644 src/main/resources/assets/dtquark/textures/item/glow_shroom_seed.png delete mode 100644 src/main/resources/assets/dtquark/textures/item/glowshroom_seed.png delete mode 100644 src/main/resources/assets/dtquark/textures/item/sweet_blossom_seed.png delete mode 100644 src/main/resources/data/dtquark/loot_tables/blocks/fiery_blossom_leaves.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/blocks/frosty_blossom_leaves.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/blocks/serene_blossom_leaves.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/blocks/sunny_blossom_leaves.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/blocks/sweet_blossom_leaves.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/blocks/warm_blossom_leaves.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/trees/leaves/fiery_blossom.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/trees/leaves/frosty_blossom.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/trees/leaves/serene_blossom.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/trees/leaves/sunny_blossom.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/trees/leaves/sweet_blossom.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/trees/leaves/warm_blossom.json delete mode 100644 src/main/resources/data/dtquark/loot_tables/trees/voluntary/sweet.json delete mode 100644 src/main/resources/data/dtquark/patchouli_books/guide/book.json delete mode 100644 src/main/resources/data/dtquark/patchouli_books/guide/en_us/entries/trees/blossom_trees.json delete mode 100644 src/main/resources/data/dynamictrees/tags/blocks/branches_that_burn.json create mode 100644 src/main/resources/trees/dtquark/cap_properties/glow_shroom.json create mode 100644 src/main/resources/trees/dtquark/families/ancient.json create mode 100644 src/main/resources/trees/dtquark/families/azalea.json create mode 100644 src/main/resources/trees/dtquark/families/glow_shroom.json create mode 100644 src/main/resources/trees/dtquark/fruits/ancient_fruit.json create mode 100644 src/main/resources/trees/dtquark/jo_codes/ancient.txt create mode 100644 src/main/resources/trees/dtquark/jo_codes/glow_shroom.txt delete mode 100644 src/main/resources/trees/dtquark/jo_codes/sweet_blossom.txt create mode 100644 src/main/resources/trees/dtquark/leaves_properties/ancient.json delete mode 100644 src/main/resources/trees/dtquark/leaves_properties/sweet_blossom.json delete mode 100644 src/main/resources/trees/dtquark/soil_properties/glowcelium.json delete mode 100644 src/main/resources/trees/dtquark/soil_properties/turf.json delete mode 100644 src/main/resources/trees/dtquark/soil_properties/turf_slab.json delete mode 100644 src/main/resources/trees/dtquark/soil_properties/turf_stairs.json delete mode 100644 src/main/resources/trees/dtquark/soil_properties/turf_vertical_slab.json create mode 100644 src/main/resources/trees/dtquark/species/ancient.json create mode 100644 src/main/resources/trees/dtquark/species/glow_shroom.json delete mode 100644 src/main/resources/trees/dtquark/species/sweet_blossom.json create mode 100644 src/main/resources/trees/dtquark/world_gen/feature_cancellers.json create mode 100644 src/main/resources/trees/dynamictrees/species/azalea.json diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index dfe0770..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto diff --git a/.gitignore b/.gitignore index 45b9159..359bb71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,26 @@ -# eclipse -bin -*.launch -.settings -.metadata -.classpath -.project +# Gradle files +.gradle/ +build/ +out/ +bin/ -# idea -out -*.ipr -*.iws +# IDE files +.idea/ *.iml -.idea +.vscode/ +.settings/ +.classpath +.project +*.launch -# gradle -build -.gradle +# Mod Dev files +run/ +logs/ +crash-reports/ +debug.log +debug.log.gz +latest.log -# other -eclipse -run -libs +# OS files +.DS_Store +Thumbs.db diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 7c9c1b3..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2022 supermassimo - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..01b4ffd --- /dev/null +++ b/build.gradle @@ -0,0 +1,84 @@ +plugins { + id 'java-library' + id 'net.neoforged.moddev' version '2.0.120' +} + +version = project.mod_version +group = project.mod_group_id + +repositories { + mavenLocal() + maven { + url = "https://maven.neoforged.net/releases/" + } + maven { + url = "https://www.cursemaven.com" + } + // Local libs + flatDir { + dirs 'libs' + } +} + +base { + archivesName = project.mod_id +} + + + +java.toolchain.languageVersion = JavaLanguageVersion.of(21) + +sourceSets { + main { + resources { + srcDir 'src/generated/resources' + } + } +} + + + + + +neoForge { + version = project.neoforge_version + + mods { + "${mod_id}" { + sourceSet(sourceSets.main) + } + } + + runs { + configureEach { + systemProperty 'forge.logging.markers', 'REGISTRIES' + systemProperty 'forge.logging.console.level', 'debug' + } + + client { + client() + } + + server { + server() + } + } +} + +dependencies { + // NeoForge provided by plugin + + // Quark (Local) + implementation files("../Quark-master/build/libs/Quark-4.1-472-SNAPSHOT.jar") + implementation files("../Quark-master/localjars/Zeta-1.1-36L.jar") + + // Dynamic Trees (CurseMaven) + implementation "curse.maven:dynamictrees-252818:7259604" + + // Dynamic Trees Plus (CurseMaven) + implementation "curse.maven:dynamictreesplus-478155:7513822" +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' +} diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 6cd6079..0000000 --- a/build.gradle.kts +++ /dev/null @@ -1,186 +0,0 @@ -import com.matthewprenger.cursegradle.CurseArtifact -import com.matthewprenger.cursegradle.CurseExtension -import com.matthewprenger.cursegradle.CurseProject -import com.matthewprenger.cursegradle.CurseRelation -import net.minecraftforge.gradle.common.util.RunConfig -import java.time.Instant -import java.time.format.DateTimeFormatter - -fun property(key: String) = project.findProperty(key).toString() - -plugins { - id("java") - id("net.minecraftforge.gradle") - id("org.parchmentmc.librarian.forgegradle") - id("idea") - id("maven-publish") - id("com.matthewprenger.cursegradle") version "1.4.0" -} - -repositories { - maven("https://ldtteam.jfrog.io/ldtteam/modding/") - maven("https://www.cursemaven.com") { - content { - includeGroup("curse.maven") - } - } - maven("https://harleyoconnor.com/maven") - maven("https://squiddev.cc/maven/") -} - -val modName = property("modName") -val modId = property("modId") -val modVersion = property("modVersion") -val mcVersion = property("mcVersion") - -version = "$mcVersion-$modVersion" -group = property("group") - -minecraft { - mappings("official", mcVersion) - - runs { - create("client") { - applyDefaultConfiguration() - - if (project.hasProperty("mcUuid")) { - args("--uuid", property("mcUuid")) - } - if (project.hasProperty("mcUsername")) { - args("--username", property("mcUsername")) - } - if (project.hasProperty("mcAccessToken")) { - args("--accessToken", property("mcAccessToken")) - } - } - - create("server") { - applyDefaultConfiguration("run-server") - } - - create("data") { - applyDefaultConfiguration() - - args( - "--mod", modId, - "--all", - "--output", file("src/generated/resources/"), - "--existing", file("src/main/resources"), - "--existing-mod", "dynamictrees" - ) - } - } -} - -sourceSets.main.get().resources { - srcDir("src/generated/resources") -} - -dependencies { - minecraft("net.minecraftforge:forge:$mcVersion-${property("forgeVersion")}") - - implementation(fg.deobf("vazkii.autoreglib:AutoRegLib:${property("arlVersion")}")) - implementation(fg.deobf("vazkii.quark:Quark:${property("quarkVersion")}")) - implementation(fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-$mcVersion:${property("dynamicTreesVersion")}")) - - runtimeOnly(fg.deobf("curse.maven:hwyla-253449:3033593")) - runtimeOnly(fg.deobf("vazkii.patchouli:Patchouli:${property("patchouliVersion")}")) - runtimeOnly(fg.deobf("mezz.jei:jei-$mcVersion:${property("jeiVersion")}")) - runtimeOnly(fg.deobf("org.squiddev:cc-tweaked-$mcVersion:${property("ccVersion")}")) - runtimeOnly(fg.deobf("curse.maven:ShutUpExperimentalSettings-407174:3188120")) - runtimeOnly(fg.deobf("com.harleyoconnor.suggestionproviderfix:SuggestionProviderFix:$mcVersion-${property("suggestionProviderFixVersion")}")) -} - -tasks.jar { - manifest.attributes( - "Specification-Title" to project.name, - "Specification-Vendor" to "Max Hyper", - "Specification-Version" to "1", - "Implementation-Title" to project.name, - "Implementation-Version" to project.version, - "Implementation-Vendor" to "Max Hyper", - "Implementation-Timestamp" to DateTimeFormatter.ISO_INSTANT.format(Instant.now()) - ) - - archiveBaseName.set(modName) - finalizedBy("reobfJar") -} - -java { - withSourcesJar() - - toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) - } -} - -curseforge { - if (project.hasProperty("curseApiKey") && project.hasProperty("curseFileType")) { - apiKey = property("curseApiKey") - - project { - id = "386753" - - addGameVersion(mcVersion) - - changelog = "Changelog will be added shortly..." - changelogType = "markdown" - releaseType = property("curseFileType") - - addArtifact(tasks.findByName("sourcesJar")) - - mainArtifact(tasks.findByName("jar")) { - relations { - requiredDependency("dynamictrees") - requiredDependency("quark") - optionalDependency("chunk-saving-fix") - } - } - } - } else { - project.logger.log(LogLevel.WARN, "API Key and file type for CurseForge not detected; uploading will be disabled.") - } -} - -tasks.withType { - enabled = false -} - -publishing { - publications { - create("mavenJava") { - from(components["java"]) - } - } - repositories { - maven("file:///${project.projectDir}/mcmodsrepo") - } -} - -fun RunConfig.applyDefaultConfiguration(runDirectory: String = "run") { - workingDirectory = file(runDirectory).absolutePath - - property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP") - property("forge.logging.console.level", "debug") - - property("mixin.env.remapRefMap", "true") - property("mixin.env.refMapRemappingFile", "${buildDir}/createSrgToMcp/output.srg") - - mods { - create(modId) { - source(sourceSets.main.get()) - } - } -} - -fun CurseExtension.project(action: CurseProject.() -> Unit) { - this.project(closureOf(action)) -} - -fun CurseProject.mainArtifact(artifact: Task?, action: CurseArtifact.() -> Unit) { - this.mainArtifact(artifact, closureOf(action)) -} - -fun CurseArtifact.relations(action: CurseRelation.() -> Unit) { - this.relations(closureOf(action)) -} \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index e92ccf5..0000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - `kotlin-dsl` - `java-library` -} - -repositories { - mavenCentral() - maven("https://files.minecraftforge.net/maven") - maven("https://maven.parchmentmc.org") -} - -dependencies { - implementation("com.google.code.gson:gson:2.8.7") - implementation("net.minecraftforge.gradle:ForgeGradle:5.1.+") - implementation("org.parchmentmc:librarian:1.+") -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 52766ee..541295e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,15 @@ -modName=DynamicTreesQuark -modVersion=2.1.3 -group=com.maxhyper.dtquark - -mcVersion=1.16.5 -forgeVersion=36.2.34 - -dynamicTreesVersion=0.10.0-Beta34 -arlVersion=1.6-49.90 -quarkVersion=r2.4-322.1 -hwylaVersion=1.10.11-B78_1.16.2 -jeiVersion=7.7.1.139 -patchouliVersion=1.16.4-53.2 -ccVersion=1.100.9 -suggestionProviderFixVersion=1.0.0 - -curseFileType=release - -org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false \ No newline at end of file +mod_id=dtquark +mod_name=Dynamic Trees for Quark +mod_license=MIT +mod_version=1.0.0 +mod_group_id=org.violetmoon.dtquark +mod_authors=Vazkii, ThePixelCoder +mod_description=Dynamic Trees compatibility for Quark + +minecraft_version=1.21.1 +neoforge_version=21.1.195 +neoforge_loader_version_range=[4,) +minecraft_version_range=[1.21.1] + +quark_version=4.1-472-SNAPSHOT +dynamictrees_version=1.6.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..41d9927a4d4fb3f96a785543079b8df6723c946b GIT binary patch literal 59821 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37bd63a..e1adfb4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue May 04 17:24:17 UYT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip diff --git a/gradlew b/gradlew index cccdd3d..1b6c787 100644 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..53df4ac --- /dev/null +++ b/settings.gradle @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + maven { url = 'https://maven.neoforged.net/releases' } + } +} +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +} +rootProject.name = 'DynamicTrees-Quark' diff --git a/src/generated/resources/.cache/0e1c6e2993f5d031b19c4124fb324d60b80705ea b/src/generated/resources/.cache/0e1c6e2993f5d031b19c4124fb324d60b80705ea new file mode 100644 index 0000000..6cd1d88 --- /dev/null +++ b/src/generated/resources/.cache/0e1c6e2993f5d031b19c4124fb324d60b80705ea @@ -0,0 +1,12 @@ +// 1.20.1 2024-07-03T23:52:31.6577223 Item Models: dtquark +7681cb90f0af4f2cd0fc6d0bd05d711b6c2b687c assets/dtquark/models/item/ancient_branch.json +aee7ec2ac4f015e4762630686623eee4f5d4a6d1 assets/dtquark/models/item/ancient_seed.json +0fc1e649fab3232526e68969269470d90ec38040 assets/dtquark/models/item/azalea_branch.json +765011753c26ddce05c2030471a492c92cb8a7da assets/dtquark/models/item/blossom_branch.json +ba8a5e43545441397b4d41f0c10f0d0ab1808a06 assets/dtquark/models/item/fiery_blossom_seed.json +cb7aa8061feaabf0184fbc8d6209d36d67025ffb assets/dtquark/models/item/frosty_blossom_seed.json +8e9eadd330d2de15c21ad56b7d96c7c478a179c0 assets/dtquark/models/item/glow_shroom_branch.json +491377172fe2ae9cddcc1f15fee179d0c5fc53dd assets/dtquark/models/item/glow_shroom_seed.json +f9b8a2e734eef2e63b8123add284cda92926eb86 assets/dtquark/models/item/serene_blossom_seed.json +d3b7877f09a18571a6c52232b17a90fd161db6f0 assets/dtquark/models/item/sunny_blossom_seed.json +36e7f5ae666ff55e8d2f8767fe3e6ae11fa483bb assets/dtquark/models/item/warm_blossom_seed.json diff --git a/src/generated/resources/.cache/23823ddc2382fa6882f3540e9ccede1e362f28c5 b/src/generated/resources/.cache/23823ddc2382fa6882f3540e9ccede1e362f28c5 new file mode 100644 index 0000000..47b32f1 --- /dev/null +++ b/src/generated/resources/.cache/23823ddc2382fa6882f3540e9ccede1e362f28c5 @@ -0,0 +1,38 @@ +// 1.20.1 2024-07-06T15:33:30.24455 Block States: dtquark +0f926cd59a8636cf012c456baefb7475813c867e assets/dtquark/blockstates/ancient_branch.json +5909b67c7c522934f53b571c47e7831ae6ae029b assets/dtquark/blockstates/ancient_leaves.json +6a1434881c6aabee16ba8c87ff94063e092ef94b assets/dtquark/blockstates/ancient_sapling.json +5b779ffbf3cbee8c0c1d46a431f7b2563a40f63e assets/dtquark/blockstates/azalea_branch.json +a8dd386807ed552ed30294cd6fafae1ca13cb716 assets/dtquark/blockstates/blossom_branch.json +83b426bc17ece3cf9afaab0a6b732d9d8bd9a014 assets/dtquark/blockstates/fiery_blossom_leaves.json +de6201539c735c5564b9bc0a865964df52195650 assets/dtquark/blockstates/fiery_blossom_sapling.json +72109e5eef387a67eabc8ec8c22fdfbb25a4bfc4 assets/dtquark/blockstates/frosty_blossom_leaves.json +57721f97463259bd2f02a33544de35d72b5c445d assets/dtquark/blockstates/frosty_blossom_sapling.json +086952e407e9a9c371031aa5a1123cea5ea0721b assets/dtquark/blockstates/glow_shroom_branch.json +303f78ab1b06822d73b211d7cadd3246e078a47b assets/dtquark/blockstates/glow_shroom_cap.json +7e498921a1d7ad997e6f244548e8d93aafafd438 assets/dtquark/blockstates/glow_shroom_cap_center.json +f5c3fd2cfacc8b9a380799e7a84bf3e17fcad1b0 assets/dtquark/blockstates/glow_shroom_sapling.json +3d4aef1132819a9c2094339e038a564b2fdb8875 assets/dtquark/blockstates/serene_blossom_leaves.json +3144e2ef59989ebd0846a3ff6ed957d0599f0436 assets/dtquark/blockstates/serene_blossom_sapling.json +c949ef14add0af4cd582259d7e5adbc047c22040 assets/dtquark/blockstates/stripped_ancient_branch.json +a2607d0c19500c6e5a913c624b44f8f76285e168 assets/dtquark/blockstates/stripped_azalea_branch.json +9805de8d33523ada626c07a21cc99364de33889e assets/dtquark/blockstates/stripped_blossom_branch.json +7fa54c332133307364769df1918d781d58c1e72b assets/dtquark/blockstates/sunny_blossom_leaves.json +96d5362e8397b90d40e4c9a4a92119d698df4e85 assets/dtquark/blockstates/sunny_blossom_sapling.json +1d4baa98258d8ae0061df3ffb71dd2abb081f0ea assets/dtquark/blockstates/warm_blossom_leaves.json +741541c4be21010b52b3d61a91c8b00117adc230 assets/dtquark/blockstates/warm_blossom_sapling.json +da60a1bb176d748515c37e02f735792e504a169d assets/dtquark/models/block/ancient_branch.json +1796659ee436190821230a70995c367531c316a3 assets/dtquark/models/block/azalea_branch.json +edf6f4582b53e6a2e3e53b815ba5cbd33b22409e assets/dtquark/models/block/blossom_branch.json +db1f55492f167548b52b9d9aca4185c179420c2e assets/dtquark/models/block/glow_shroom_branch.json +2e176189daaa64ff6d32f061eace9b610220252e assets/dtquark/models/block/mushroom/glow_shroom_cap_center_age0.json +a7ece6731f5c303a39fb0d01cd3e4fb9c8d62047 assets/dtquark/models/block/saplings/ancient.json +065b197b5a5e2e6a14d5a53b37742f09f796e557 assets/dtquark/models/block/saplings/fiery_blossom.json +ab94b9cf6d1b9371ae651e3c221db905deb7f9c3 assets/dtquark/models/block/saplings/frosty_blossom.json +60b2d8a2b48f447b35ddf071c35a1a4b9236c76d assets/dtquark/models/block/saplings/glow_shroom.json +bde1e12ecf2d90d806d8677c07d1bbd4abcc0779 assets/dtquark/models/block/saplings/serene_blossom.json +7e615397242459bf80648688dab053c3255b2bdb assets/dtquark/models/block/saplings/sunny_blossom.json +2d91338696d1b70b683d071441d7eaf44ac7fb24 assets/dtquark/models/block/saplings/warm_blossom.json +921e91e789b60bf9c209514b73185162905748b9 assets/dtquark/models/block/stripped_ancient_branch.json +48d45a91d630c44e358181681374af8503808905 assets/dtquark/models/block/stripped_azalea_branch.json +154e363486dbdda22b00f9064ad76395ef2aeb72 assets/dtquark/models/block/stripped_blossom_branch.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d new file mode 100644 index 0000000..41e6f8e --- /dev/null +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -0,0 +1,30 @@ +// 1.20.1 2024-07-06T15:25:17.6887985 Loot Tables +a96bd6273175931e5710f05d174469dc35613972 data/dtquark/loot_tables/blocks/ancient_fruit.json +883eb30bce4823fc641c705be2f06ba51e74b03a data/dtquark/loot_tables/blocks/ancient_leaves.json +10f697412a3cfe4178ee0c9252d68cba9c4f31dc data/dtquark/loot_tables/blocks/fiery_blossom_leaves.json +411e6d2890e2f602a97674b223f5896565b268ec data/dtquark/loot_tables/blocks/frosty_blossom_leaves.json +357d8bcb33997d079672ee27a5182a161e0d396f data/dtquark/loot_tables/blocks/glow_shroom_cap.json +d91fa139fe78615bb9b031443d4767e03049d50e data/dtquark/loot_tables/blocks/serene_blossom_leaves.json +167d81d7633ac0eb796c82ffb84858cfa9281b3a data/dtquark/loot_tables/blocks/sunny_blossom_leaves.json +5a1c0361478ad774ac5e95c8b6cf76e8eae5c8a0 data/dtquark/loot_tables/blocks/warm_blossom_leaves.json +2fd2e75d0c59819b66666a3040367f5de8158654 data/dtquark/loot_tables/trees/branches/ancient.json +7d72895d67b073dcdfa8e416406a059a40218e0c data/dtquark/loot_tables/trees/branches/azalea.json +0df3af8906c020cdd40af730a0af7c85758559b3 data/dtquark/loot_tables/trees/branches/blossom.json +f02c6ccb19cea35a51aec5ac8eabbcacb834ea00 data/dtquark/loot_tables/trees/branches/glow_shroom.json +02c8a7f1ac19a06c8e2b9f8e53777c80f4a8cd44 data/dtquark/loot_tables/trees/branches/stripped_ancient.json +dbe6fb011ad12c5a1e6ddffa7cb263147924143e data/dtquark/loot_tables/trees/branches/stripped_azalea.json +656c480a11115192ad5fe2c3b59024247b7b9142 data/dtquark/loot_tables/trees/branches/stripped_blossom.json +06828d4bc86d35c60c5a3caaccf984c1574196e6 data/dtquark/loot_tables/trees/leaves/ancient.json +b2649b63ec27ca567e090f6f4fa5439371cbb21a data/dtquark/loot_tables/trees/leaves/fiery_blossom.json +8e8516b9a498f67fe6e0c4043816c011db341c61 data/dtquark/loot_tables/trees/leaves/frosty_blossom.json +9897998360a5dcc3dca59a5ab9481bb2ec6a3d1d data/dtquark/loot_tables/trees/leaves/serene_blossom.json +1b50a3d5b169b7eaf577babead4794bff85de453 data/dtquark/loot_tables/trees/leaves/sunny_blossom.json +2a370d0bd002cf4d191ca2414fdedd43642b2302 data/dtquark/loot_tables/trees/leaves/warm_blossom.json +1376a6b0e019f3065f793821c40c234a075e82bc data/dtquark/loot_tables/trees/mushroom_caps/glow_shroom.json +77bfda9abd9df9bcb4da9a971f7da8a1fa893635 data/dtquark/loot_tables/trees/voluntary/ancient.json +5792f794da2717a1b55666db4cdfcf1a22bcaaa9 data/dtquark/loot_tables/trees/voluntary/fiery_blossom.json +21c98acf06d0b660e93fcc093711e2cbce3dd17b data/dtquark/loot_tables/trees/voluntary/frosty_blossom.json +7b306390b27f7ca9ca87a74c6db9e91666dbc5b2 data/dtquark/loot_tables/trees/voluntary/glow_shroom.json +e98901343fe9cc05d65fffdf6b061818a89610a0 data/dtquark/loot_tables/trees/voluntary/serene_blossom.json +1493bcddea45d19eb9a00a4ae04a2cbc25d2cb2a data/dtquark/loot_tables/trees/voluntary/sunny_blossom.json +b8e889b972b04c9b133db138f0d727d4d10f6b6f data/dtquark/loot_tables/trees/voluntary/warm_blossom.json diff --git a/src/generated/resources/.cache/dcc54e5cfe81a1f6a56ae9d2aa2232d08868920a b/src/generated/resources/.cache/dcc54e5cfe81a1f6a56ae9d2aa2232d08868920a new file mode 100644 index 0000000..5b03cfe --- /dev/null +++ b/src/generated/resources/.cache/dcc54e5cfe81a1f6a56ae9d2aa2232d08868920a @@ -0,0 +1,7 @@ +// 1.20.1 2024-07-03T23:52:31.6557256 dtquark DT Block Tags +1ae719368e82a033b150af0219706387e6a8c857 data/dynamictrees/tags/blocks/branches_that_burn.json +8dfde6cf722ff2ad42f55974691fbcfbd1b99e33 data/dynamictrees/tags/blocks/fungus_branches.json +b8cb057124579f9faa0685e29eb7411414b425ef data/dynamictrees/tags/blocks/fungus_caps.json +47f71657de201907cde63591fb86daebd378f07d data/dynamictrees/tags/blocks/leaves.json +816ff20001b518f929c0b281f11593f3a849ea91 data/dynamictrees/tags/blocks/saplings.json +9ba14a376795df66c049874d9af5e7e6169f5113 data/dynamictrees/tags/blocks/stripped_branches_that_burn.json diff --git a/src/generated/resources/.cache/df78a35a8ce97e9c08619e9ed581d3037a4665e2 b/src/generated/resources/.cache/df78a35a8ce97e9c08619e9ed581d3037a4665e2 new file mode 100644 index 0000000..3d2335c --- /dev/null +++ b/src/generated/resources/.cache/df78a35a8ce97e9c08619e9ed581d3037a4665e2 @@ -0,0 +1,5 @@ +// 1.20.1 2024-07-03T23:52:31.6447274 dtquark DT Item Tags +1ae719368e82a033b150af0219706387e6a8c857 data/dynamictrees/tags/items/branches_that_burn.json +8dfde6cf722ff2ad42f55974691fbcfbd1b99e33 data/dynamictrees/tags/items/fungus_branches.json +80cb723fa59c21e10184978b8c8b15fc371f1478 data/dynamictrees/tags/items/fungus_caps.json +fdf24a42552d79d59a714b945c9e3f995667cee1 data/dynamictrees/tags/items/seeds.json diff --git a/src/generated/resources/assets/dtquark/blockstates/ancient_branch.json b/src/generated/resources/assets/dtquark/blockstates/ancient_branch.json new file mode 100644 index 0000000..daba752 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/ancient_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/ancient_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/ancient_fruit.json b/src/generated/resources/assets/dtquark/blockstates/ancient_fruit.json new file mode 100644 index 0000000..077395f --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/ancient_fruit.json @@ -0,0 +1,16 @@ +{ + "variants":{ + "age=0":{ + "model":"dtquark:block/fruits/ancient_fruit_age0" + }, + "age=1":{ + "model":"dtquark:block/fruits/ancient_fruit_age1" + }, + "age=2":{ + "model":"dtquark:block/fruits/ancient_fruit_age2" + }, + "age=3":{ + "model":"dtquark:block/fruits/ancient_fruit_age3" + } + } +} diff --git a/src/generated/resources/assets/dtquark/blockstates/ancient_leaves.json b/src/generated/resources/assets/dtquark/blockstates/ancient_leaves.json new file mode 100644 index 0000000..9c63e47 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/ancient_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/ancient_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/ancient_sapling.json b/src/generated/resources/assets/dtquark/blockstates/ancient_sapling.json new file mode 100644 index 0000000..78f7848 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/ancient_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/ancient" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/azalea_branch.json b/src/generated/resources/assets/dtquark/blockstates/azalea_branch.json new file mode 100644 index 0000000..024a43d --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/azalea_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/azalea_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/azalea_leaves.json b/src/generated/resources/assets/dtquark/blockstates/azalea_leaves.json new file mode 100644 index 0000000..0aec9a3 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/azalea_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "minecraft:block/azalea_leaves" + } + } +} diff --git a/src/generated/resources/assets/dtquark/blockstates/blossom_branch.json b/src/generated/resources/assets/dtquark/blockstates/blossom_branch.json new file mode 100644 index 0000000..d451e05 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/blossom_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/blossom_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json b/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json new file mode 100644 index 0000000..ce8a475 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/red_blossom_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json new file mode 100644 index 0000000..4acee40 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/fiery_blossom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json b/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json new file mode 100644 index 0000000..04d65e5 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/blue_blossom_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json new file mode 100644 index 0000000..db41e2e --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/frosty_blossom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/glow_shroom_branch.json b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_branch.json new file mode 100644 index 0000000..2ad9056 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/glow_shroom_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap.json b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap.json new file mode 100644 index 0000000..07edebf --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap.json @@ -0,0 +1,116 @@ +{ + "multipart": [ + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside" + }, + "when": { + "north": "false" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "y": 90 + }, + "when": { + "east": "false" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "y": 180 + }, + "when": { + "south": "false" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "y": 270 + }, + "when": { + "west": "false" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "x": 270 + }, + "when": { + "up": "false" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "x": 90 + }, + "when": { + "down": "false" + } + } + ] +} diff --git a/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap_center.json b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap_center.json new file mode 100644 index 0000000..0ff3816 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_cap_center.json @@ -0,0 +1,66 @@ +{ + "multipart": [ + { + "apply": { + "model": "dtquark:block/mushroom/glow_shroom_cap_center_age0" + }, + "when": { + "age": "0" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "uvlock": true, + "x": 270 + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side" + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "y": 90 + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "y": 180 + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_side", + "y": 270 + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + }, + { + "apply": { + "model": "quark:block/glow_shroom_block_inside", + "x": 90 + }, + "when": { + "age": "1|2|3|4|5|6|7|8" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/glow_shroom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_sapling.json new file mode 100644 index 0000000..0af4ed2 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/glow_shroom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/glow_shroom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/serene_blossom_leaves.json b/src/generated/resources/assets/dtquark/blockstates/serene_blossom_leaves.json new file mode 100644 index 0000000..38b662f --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/serene_blossom_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/lavender_blossom_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/serene_blossom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/serene_blossom_sapling.json new file mode 100644 index 0000000..9c40128 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/serene_blossom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/serene_blossom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/stripped_ancient_branch.json b/src/generated/resources/assets/dtquark/blockstates/stripped_ancient_branch.json new file mode 100644 index 0000000..31574bc --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/stripped_ancient_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/stripped_ancient_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/stripped_azalea_branch.json b/src/generated/resources/assets/dtquark/blockstates/stripped_azalea_branch.json new file mode 100644 index 0000000..a1cf04e --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/stripped_azalea_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/stripped_azalea_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/stripped_blossom_branch.json b/src/generated/resources/assets/dtquark/blockstates/stripped_blossom_branch.json new file mode 100644 index 0000000..8fba637 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/stripped_blossom_branch.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/stripped_blossom_branch" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json b/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json new file mode 100644 index 0000000..c8c151d --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/yellow_blossom_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json new file mode 100644 index 0000000..144940f --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/sunny_blossom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/warm_blossom_leaves.json b/src/generated/resources/assets/dtquark/blockstates/warm_blossom_leaves.json new file mode 100644 index 0000000..5bfd584 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/warm_blossom_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quark:block/orange_blossom_leaves" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/blockstates/warm_blossom_sapling.json b/src/generated/resources/assets/dtquark/blockstates/warm_blossom_sapling.json new file mode 100644 index 0000000..ca08753 --- /dev/null +++ b/src/generated/resources/assets/dtquark/blockstates/warm_blossom_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "dtquark:block/saplings/warm_blossom" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/ancient_branch.json b/src/generated/resources/assets/dtquark/models/block/ancient_branch.json new file mode 100644 index 0000000..3d05a41 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/ancient_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/ancient_log", + "rings": "quark:block/ancient_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/azalea_branch.json b/src/generated/resources/assets/dtquark/models/block/azalea_branch.json new file mode 100644 index 0000000..ebdd9da --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/azalea_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "minecraft:block/oak_log", + "rings": "minecraft:block/oak_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/blossom_branch.json b/src/generated/resources/assets/dtquark/models/block/blossom_branch.json new file mode 100644 index 0000000..4c3f5f5 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/blossom_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/blossom_log", + "rings": "quark:block/blossom_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age0.json b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age0.json new file mode 100644 index 0000000..7dd5980 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age0.json @@ -0,0 +1,38 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "1": "dtquark:block/ancient_fruit", + "particle": "dtquark:block/ancient_fruit" + }, + "elements": [ + { + "from": [7, 15, 8], + "to": [9, 16, 8], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 15, 4, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "south": {"uv": [0, 15, 4, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} + } + }, + { + "from": [8, 15, 7], + "to": [8, 16, 9], + "shade": false, + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "east": {"uv": [0, 15, 4, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "west": {"uv": [0, 15, 4, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age1.json b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age1.json new file mode 100644 index 0000000..b9e017c --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age1.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "1": "dtquark:block/ancient_fruit", + "particle": "dtquark:block/ancient_fruit" + }, + "elements": [ + { + "from": [6.8, 11.8, 6.8], + "to": [9.2, 15, 9.2], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 0]}, + "faces": { + "north": {"uv": [0, 3, 3, 7], "texture": "#1", "tintindex": 0}, + "east": {"uv": [0, 3, 3, 7], "texture": "#1", "tintindex": 0}, + "south": {"uv": [0, 3, 3, 7], "texture": "#1", "tintindex": 0}, + "west": {"uv": [0, 3, 3, 7], "texture": "#1", "tintindex": 0}, + "up": {"uv": [0, 0, 3, 3], "texture": "#1", "tintindex": 0}, + "down": {"uv": [0, 7, 3, 10], "texture": "#1", "tintindex": 0} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 90, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#1", "tintindex": 1} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 270, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#1", "tintindex": 1} + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age2.json b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age2.json new file mode 100644 index 0000000..d329c2c --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age2.json @@ -0,0 +1,61 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "1": "dtquark:block/ancient_fruit", + "particle": "dtquark:block/ancient_fruit" + }, + "elements": [ + { + "from": [6.8, 13.4, 6.8], + "to": [9.2, 15, 9.2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.6, 11.6, 9.2]}, + "faces": { + "north": {"uv": [4, 4, 7, 6], "texture": "#1", "tintindex": 0}, + "east": {"uv": [4, 4, 7, 6], "texture": "#1", "tintindex": 0}, + "south": {"uv": [4, 4, 7, 6], "texture": "#1", "tintindex": 0}, + "west": {"uv": [4, 4, 7, 6], "texture": "#1", "tintindex": 0}, + "up": {"uv": [5, 1, 8, 4], "texture": "#1", "tintindex": 0} + } + }, + { + "from": [6.4, 10.2, 6.4], + "to": [9.6, 13.4, 9.6], + "rotation": {"angle": 0, "axis": "y", "origin": [7.4, 5.4, 7.8]}, + "faces": { + "north": {"uv": [4, 6, 8, 10], "texture": "#1", "tintindex": 0}, + "east": {"uv": [4, 6, 8, 10], "texture": "#1", "tintindex": 0}, + "south": {"uv": [4, 6, 8, 10], "texture": "#1", "tintindex": 0}, + "west": {"uv": [4, 6, 8, 10], "texture": "#1", "tintindex": 0}, + "up": {"uv": [4, 0, 8, 4], "texture": "#1", "tintindex": 0}, + "down": {"uv": [4, 10, 8, 14], "texture": "#1", "tintindex": 0} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 270, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#1", "tintindex": 1} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 90, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#1", "tintindex": 1} + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age3.json b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age3.json new file mode 100644 index 0000000..edf4404 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/fruits/ancient_fruit_age3.json @@ -0,0 +1,61 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "1": "dtquark:block/ancient_fruit", + "particle": "dtquark:block/ancient_fruit" + }, + "elements": [ + { + "from": [6.8, 11.6, 6.8], + "to": [9.2, 14, 9.2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.6, 11.6, 9.2]}, + "faces": { + "north": {"uv": [9, 4, 12, 7], "texture": "#1", "tintindex": 0}, + "east": {"uv": [9, 4, 12, 7], "texture": "#1", "tintindex": 0}, + "south": {"uv": [9, 4, 12, 7], "texture": "#1", "tintindex": 0}, + "west": {"uv": [9, 4, 12, 7], "texture": "#1", "tintindex": 0}, + "up": {"uv": [10, 1, 13, 4], "texture": "#1", "tintindex": 0} + } + }, + { + "from": [6.4, 8.4, 6.4], + "to": [9.6, 11.6, 9.6], + "rotation": {"angle": 0, "axis": "y", "origin": [7.4, 5.4, 7.8]}, + "faces": { + "north": {"uv": [9, 7, 13, 11], "texture": "#1", "tintindex": 0}, + "east": {"uv": [9, 7, 13, 11], "texture": "#1", "tintindex": 0}, + "south": {"uv": [9, 7, 13, 11], "texture": "#1", "tintindex": 0}, + "west": {"uv": [9, 7, 13, 11], "texture": "#1", "tintindex": 0}, + "up": {"uv": [9, 0, 13, 4], "texture": "#1", "tintindex": 0}, + "down": {"uv": [9, 11, 13, 15], "texture": "#1", "tintindex": 0} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 270, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 90, "texture": "#1", "tintindex": 1} + } + }, + { + "from": [7.5, 14, 8], + "to": [8.5, 16, 8], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "east": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "south": {"uv": [15, 0, 16, 2], "texture": "#1", "tintindex": 1}, + "west": {"uv": [0, 0, 0, 3], "texture": "#1", "tintindex": 1}, + "up": {"uv": [0, 3, 0, 0], "rotation": 90, "texture": "#1", "tintindex": 1}, + "down": {"uv": [0, 0, 0, 3], "rotation": 270, "texture": "#1", "tintindex": 1} + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/glow_shroom.json b/src/generated/resources/assets/dtquark/models/block/glow_shroom.json new file mode 100644 index 0000000..0d822bf --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/glow_shroom.json @@ -0,0 +1,35 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#cap" + }, + "elements": [ + { + "name": "Cap", + "from": [5, 3, 5], + "to": [11, 7, 11], + "faces": { + "north": {"uv": [1, 6, 7, 10], "texture": "#cap"}, + "east": {"uv": [1, 11, 7, 15], "texture": "#cap"}, + "south": {"uv": [1, 6, 7, 10], "texture": "#cap"}, + "west": {"uv": [1, 11, 7, 15], "texture": "#cap"}, + "up": {"uv": [1, 0, 7, 6], "texture": "#cap"}, + "down": {"uv": [9, 0, 15, 6], "texture": "#cap"} + } + }, + { + "name": "Stem", + "from": [7, 0, 7], + "to": [9, 5, 9], + "faces": { + "north": {"uv": [11, 11, 13, 16], "texture": "#cap"}, + "east": {"uv": [11, 11, 13, 16], "texture": "#cap"}, + "south": {"uv": [11, 11, 13, 16], "texture": "#cap"}, + "west": {"uv": [11, 11, 13, 16], "texture": "#cap"}, + "up": {"uv": [11, 11, 13, 13], "texture": "#cap"}, + "down": {"uv": [11, 14, 13, 16], "texture": "#cap", "cullface": "down"} + } + } + ] +} diff --git a/src/generated/resources/assets/dtquark/models/block/glow_shroom_branch.json b/src/generated/resources/assets/dtquark/models/block/glow_shroom_branch.json new file mode 100644 index 0000000..53b14b9 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/glow_shroom_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/glow_shroom_stem", + "rings": "quark:block/glow_shroom_stem" + } +} diff --git a/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_inside.json b/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_inside.json new file mode 100644 index 0000000..defa7e7 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_inside.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quark:block/glow_shroom_block_inside" + } +} diff --git a/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_side.json b/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_side.json new file mode 100644 index 0000000..5bdf97f --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/glow_shroom_cap_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quark:block/glow_shroom_block" + } +} diff --git a/src/generated/resources/assets/dtquark/models/block/mushroom/glow_shroom_cap_center_age0.json b/src/generated/resources/assets/dtquark/models/block/mushroom/glow_shroom_cap_center_age0.json new file mode 100644 index 0000000..185c4af --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/mushroom/glow_shroom_cap_center_age0.json @@ -0,0 +1,8 @@ +{ + "parent": "dtquark:block/tall_slab", + "textures": { + "bottom": "quark:block/glow_shroom_block_inside", + "side": "quark:block/glow_shroom_block", + "top": "quark:block/glow_shroom_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/ancient.json b/src/generated/resources/assets/dtquark/models/block/saplings/ancient.json new file mode 100644 index 0000000..bfa751e --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/ancient.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/ancient_leaves", + "log": "quark:block/ancient_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/fiery_blossom.json b/src/generated/resources/assets/dtquark/models/block/saplings/fiery_blossom.json new file mode 100644 index 0000000..68a99a4 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/fiery_blossom.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/red_blossom_leaves", + "log": "quark:block/blossom_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/frosty_blossom.json b/src/generated/resources/assets/dtquark/models/block/saplings/frosty_blossom.json new file mode 100644 index 0000000..8a315d1 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/frosty_blossom.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/blue_blossom_leaves", + "log": "quark:block/blossom_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/glow_shroom.json b/src/generated/resources/assets/dtquark/models/block/saplings/glow_shroom.json new file mode 100644 index 0000000..36e03e4 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/glow_shroom.json @@ -0,0 +1,8 @@ +{ + "parent": "dtquark:block/glow_shroom", + "render_type": "minecraft:cutout_mipped", + "textures": { + "cap": "dtquark:block/glow_shroom_cap", + "stem": "quark:block/glow_shroom_stem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/serene_blossom.json b/src/generated/resources/assets/dtquark/models/block/saplings/serene_blossom.json new file mode 100644 index 0000000..8059491 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/serene_blossom.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/lavender_blossom_leaves", + "log": "quark:block/blossom_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/sunny_blossom.json b/src/generated/resources/assets/dtquark/models/block/saplings/sunny_blossom.json new file mode 100644 index 0000000..ad95d72 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/sunny_blossom.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/yellow_blossom_leaves", + "log": "quark:block/blossom_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/saplings/warm_blossom.json b/src/generated/resources/assets/dtquark/models/block/saplings/warm_blossom.json new file mode 100644 index 0000000..87c8c45 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/saplings/warm_blossom.json @@ -0,0 +1,8 @@ +{ + "parent": "dynamictrees:block/smartmodel/sapling", + "render_type": "minecraft:cutout_mipped", + "textures": { + "leaves": "quark:block/orange_blossom_leaves", + "log": "quark:block/blossom_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/stripped_ancient_branch.json b/src/generated/resources/assets/dtquark/models/block/stripped_ancient_branch.json new file mode 100644 index 0000000..12f9692 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/stripped_ancient_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/stripped_ancient_log", + "rings": "quark:block/stripped_ancient_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/stripped_azalea_branch.json b/src/generated/resources/assets/dtquark/models/block/stripped_azalea_branch.json new file mode 100644 index 0000000..5464697 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/stripped_azalea_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "minecraft:block/stripped_oak_log", + "rings": "minecraft:block/stripped_oak_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/stripped_blossom_branch.json b/src/generated/resources/assets/dtquark/models/block/stripped_blossom_branch.json new file mode 100644 index 0000000..f4353bb --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/stripped_blossom_branch.json @@ -0,0 +1,7 @@ +{ + "loader": "dynamictrees:branch", + "textures": { + "bark": "quark:block/stripped_blossom_log", + "rings": "quark:block/stripped_blossom_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/block/tall_slab.json b/src/generated/resources/assets/dtquark/models/block/tall_slab.json new file mode 100644 index 0000000..3c02dd3 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/block/tall_slab.json @@ -0,0 +1,18 @@ +{ "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 12, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/generated/resources/assets/dtquark/models/item/ancient_branch.json b/src/generated/resources/assets/dtquark/models/item/ancient_branch.json new file mode 100644 index 0000000..70443aa --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/ancient_branch.json @@ -0,0 +1,7 @@ +{ + "parent": "dynamictrees:item/branch", + "textures": { + "bark": "quark:block/ancient_log", + "rings": "quark:block/ancient_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/ancient_seed.json b/src/generated/resources/assets/dtquark/models/item/ancient_seed.json new file mode 100644 index 0000000..af214d4 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/ancient_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/ancient_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/azalea_branch.json b/src/generated/resources/assets/dtquark/models/item/azalea_branch.json new file mode 100644 index 0000000..6808ceb --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/azalea_branch.json @@ -0,0 +1,7 @@ +{ + "parent": "dynamictrees:item/branch", + "textures": { + "bark": "quark:block/azalea_log", + "rings": "quark:block/azalea_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/blossom_branch.json b/src/generated/resources/assets/dtquark/models/item/blossom_branch.json new file mode 100644 index 0000000..1ce99c3 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/blossom_branch.json @@ -0,0 +1,7 @@ +{ + "parent": "dynamictrees:item/branch", + "textures": { + "bark": "quark:block/blossom_log", + "rings": "quark:block/blossom_log_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/fiery_blossom_seed.json b/src/generated/resources/assets/dtquark/models/item/fiery_blossom_seed.json new file mode 100644 index 0000000..b71107d --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/fiery_blossom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/fiery_blossom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/frosty_blossom_seed.json b/src/generated/resources/assets/dtquark/models/item/frosty_blossom_seed.json new file mode 100644 index 0000000..84d061c --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/frosty_blossom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/frosty_blossom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/glow_shroom_branch.json b/src/generated/resources/assets/dtquark/models/item/glow_shroom_branch.json new file mode 100644 index 0000000..83570f7 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/glow_shroom_branch.json @@ -0,0 +1,7 @@ +{ + "parent": "dynamictrees:item/branch", + "textures": { + "bark": "quark:block/glow_shroom_stem", + "rings": "quark:block/glow_shroom_block_inside" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/glow_shroom_seed.json b/src/generated/resources/assets/dtquark/models/item/glow_shroom_seed.json new file mode 100644 index 0000000..3315cda --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/glow_shroom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/glow_shroom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/serene_blossom_seed.json b/src/generated/resources/assets/dtquark/models/item/serene_blossom_seed.json new file mode 100644 index 0000000..a2b7349 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/serene_blossom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/serene_blossom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/sunny_blossom_seed.json b/src/generated/resources/assets/dtquark/models/item/sunny_blossom_seed.json new file mode 100644 index 0000000..78adb95 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/sunny_blossom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/sunny_blossom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/dtquark/models/item/warm_blossom_seed.json b/src/generated/resources/assets/dtquark/models/item/warm_blossom_seed.json new file mode 100644 index 0000000..a6da830 --- /dev/null +++ b/src/generated/resources/assets/dtquark/models/item/warm_blossom_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "dynamictrees:item/standard_seed", + "textures": { + "layer0": "dtquark:item/warm_blossom_seed" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_modifiers/replaceancientseed.json b/src/generated/resources/data/dtquark/loot_modifiers/replaceancientseed.json new file mode 100644 index 0000000..d93eba4 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_modifiers/replaceancientseed.json @@ -0,0 +1,16 @@ +{ + "type": "dtquark:replace_item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:gameplay/sniffer_digging" + } + ] + } + ], + "old_item": "quark:ancient_sapling", + "new_item": "dtquark:ancient_seed" +} diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/ancient_fruit.json b/src/generated/resources/data/dtquark/loot_table/blocks/ancient_fruit.json new file mode 100644 index 0000000..f050b52 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/ancient_fruit.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "dtquark:ancient_fruit", + "condition": "minecraft:block_state_property", + "properties": { + "age": "3" + } + } + ], + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:ancient_fruit" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/ancient_fruit" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/ancient_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/ancient_leaves.json new file mode 100644 index 0000000..fd01092 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/ancient_leaves.json @@ -0,0 +1,184 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "block_pool", + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "quark:ancient_leaves" + } + ], + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ] + }, + { + "name": "stick_pool", + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 2.0 + }, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": ["minecraft:shears"] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { "min": 1 } + } + ] + } + } + } + ] + } + } + ] + }, + { + "name": "fruit_pool", + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "quark:ancient_fruit", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.015, + 0.03, + 0.045, + 0.06 + ] + } + ], + "functions": [ + { "function": "minecraft:explosion_decay" } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { "condition": "minecraft:match_tool", "predicate": { "items": ["minecraft:shears"] } }, + { "condition": "minecraft:match_tool", "predicate": { "predicates": { "minecraft:enchantments": [ { "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } } ] } } } + ] + } + } + ] + }, + { + "name": "seed_pool", + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "dtquark:ancient_seed", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.10, + 0.12, + 0.15, + 0.20 + ] + } + ], + "functions": [ + { "function": "minecraft:explosion_decay" } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { "condition": "minecraft:match_tool", "predicate": { "items": ["minecraft:shears"] } }, + { "condition": "minecraft:match_tool", "predicate": { "predicates": { "minecraft:enchantments": [ { "enchantments": "minecraft:silk_touch", "levels": { "min": 1 } } ] } } } + ] + } + } + ] + } + ], + "random_sequence": "dtquark:blocks/ancient_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/azalea_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/azalea_leaves.json new file mode 100644 index 0000000..3de911f --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/azalea_leaves.json @@ -0,0 +1,137 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "minecraft:azalea_leaves" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.05, + 0.0625, + 0.083333336, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "name": "minecraft:azalea" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ] +} diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/fiery_blossom_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/fiery_blossom_leaves.json new file mode 100644 index 0000000..002a7ad --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/fiery_blossom_leaves.json @@ -0,0 +1,140 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "quark:red_blossom_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/fiery_blossom_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/frosty_blossom_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/frosty_blossom_leaves.json new file mode 100644 index 0000000..cfa63bb --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/frosty_blossom_leaves.json @@ -0,0 +1,140 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "quark:blue_blossom_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/frosty_blossom_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap.json b/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap.json new file mode 100644 index 0000000..ddfa7f7 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "quark:glow_shroom_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "type": "minecraft:item", + "name": "dtquark:glow_shroom_seed", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 2.0 + } + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap_center.json b/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap_center.json new file mode 100644 index 0000000..12420ec --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/glow_shroom_cap_center.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "quark:glow_shroom_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "type": "minecraft:item", + "name": "dtquark:glow_shroom_seed", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 2.0 + } + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/serene_blossom_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/serene_blossom_leaves.json new file mode 100644 index 0000000..ee9bee3 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/serene_blossom_leaves.json @@ -0,0 +1,140 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "quark:lavender_blossom_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/serene_blossom_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/sunny_blossom_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/sunny_blossom_leaves.json new file mode 100644 index 0000000..6dc2e80 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/sunny_blossom_leaves.json @@ -0,0 +1,140 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "quark:yellow_blossom_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/sunny_blossom_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/blocks/warm_blossom_leaves.json b/src/generated/resources/data/dtquark/loot_table/blocks/warm_blossom_leaves.json new file mode 100644 index 0000000..c5af080 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/blocks/warm_blossom_leaves.json @@ -0,0 +1,140 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "quark:orange_blossom_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:blocks/warm_blossom_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/ancient.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/ancient.json new file mode 100644 index 0000000..1447089 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/ancient.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_logs_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:ancient_log" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/branches/ancient" +} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/branches/blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/azalea.json similarity index 73% rename from src/main/resources/data/dtquark/loot_tables/trees/branches/blossom.json rename to src/generated/resources/data/dtquark/loot_table/trees/branches/azalea.json index be5ca25..741a8b8 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/branches/blossom.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/azalea.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:branches", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,12 +14,13 @@ "function": "minecraft:explosion_decay" } ], - "name": "minecraft:spruce_log" + "name": "quark:azalea_log" } - ] + ], + "rolls": 1.0 }, { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -33,7 +34,9 @@ ], "name": "minecraft:stick" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/branches/azalea" } \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/blossom.json new file mode 100644 index 0000000..4948d6c --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/blossom.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_logs_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:blossom_log" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/branches/blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/glow_shroom.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/glow_shroom.json new file mode 100644 index 0000000..617706b --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/glow_shroom.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "quark:glow_shroom_stem", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 2.0, + "max": 5.0 + } + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ], + "random_sequence": "dtquark:trees/branches/glow_shroom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_ancient.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_ancient.json new file mode 100644 index 0000000..b3f12fa --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_ancient.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_logs_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:stripped_ancient_log" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/branches/stripped_ancient" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_azalea.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_azalea.json new file mode 100644 index 0000000..b526409 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_azalea.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_logs_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:stripped_azalea_log" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/branches/stripped_azalea" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_blossom.json new file mode 100644 index 0000000..212d2b6 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/branches/stripped_blossom.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_logs_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quark:stripped_blossom_log" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "dynamictrees:multiply_sticks_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/branches/stripped_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/ancient.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/ancient.json new file mode 100644 index 0000000..34f6e67 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/ancient.json @@ -0,0 +1,156 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "seed_pool", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "dtquark:ancient_seed", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.025, + 0.05, + 0.075, + 0.10 + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": ["minecraft:shears"] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { "min": 1 } + } + ] + } + } + } + ] + } + } + ] + }, + { + "name": "fruit_pool", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "quark:ancient_fruit", + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.025, + 0.05, + 0.075, + 0.10 + ] + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": ["minecraft:shears"] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { "min": 1 } + } + ] + } + } + } + ] + } + } + ] + }, + { + "name": "stick_pool", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 2.0 + }, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.075, + 0.10, + 0.125, + 0.15, + 0.175 + ] + } + ] + } + ] + } + ], + "random_sequence": "dtquark:trees/leaves/ancient" +} diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/fiery_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/fiery_blossom.json new file mode 100644 index 0000000..ed315cb --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/fiery_blossom.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/leaves/fiery_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/frosty_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/frosty_blossom.json new file mode 100644 index 0000000..3be8e34 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/frosty_blossom.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/leaves/frosty_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/serene_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/serene_blossom.json new file mode 100644 index 0000000..eb8faeb --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/serene_blossom.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/leaves/serene_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/sunny_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/sunny_blossom.json new file mode 100644 index 0000000..2ec62a7 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/sunny_blossom.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/leaves/sunny_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/leaves/warm_blossom.json b/src/generated/resources/data/dtquark/loot_table/trees/leaves/warm_blossom.json new file mode 100644 index 0000000..24dd85b --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/leaves/warm_blossom.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/leaves/warm_blossom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/mushroom_caps/glow_shroom.json b/src/generated/resources/data/dtquark/loot_table/trees/mushroom_caps/glow_shroom.json new file mode 100644 index 0000000..8e31e26 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/mushroom_caps/glow_shroom.json @@ -0,0 +1,59 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "chances": [ + 0.2, + 0.2333333, + 0.2666666, + 0.3 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "quark:glow_shroom_block" + }, + { + "type": "minecraft:item", + "name": "dtquark:glow_shroom_seed" + } + ] + } + ], + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/mushroom_caps/glow_shroom" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/voluntary/ancient.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/ancient.json new file mode 100644 index 0000000..6a15686 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/ancient.json @@ -0,0 +1,45 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "seed_pool", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "dtquark:ancient_seed", + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.40 + } + ] + } + ] + }, + { + "name": "fruit_pool", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "quark:ancient_fruit", + "functions": [ + { + "function": "minecraft:explosion_decay" + } + ], + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.25 + } + ] + } + ] + } + ], + "random_sequence": "dtquark:trees/voluntary/ancient" +} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/fiery.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/fiery_blossom.json similarity index 67% rename from src/main/resources/data/dtquark/loot_tables/trees/voluntary/fiery.json rename to src/generated/resources/data/dtquark/loot_table/trees/voluntary/fiery_blossom.json index 7fbb2ba..cfb0272 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/fiery.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/fiery_blossom.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:voluntary", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,7 +14,9 @@ ], "name": "dtquark:fiery_blossom_seed" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/voluntary/fiery_blossom" } \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/frosty.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/frosty_blossom.json similarity index 67% rename from src/main/resources/data/dtquark/loot_tables/trees/voluntary/frosty.json rename to src/generated/resources/data/dtquark/loot_table/trees/voluntary/frosty_blossom.json index ad4d034..199b505 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/frosty.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/frosty_blossom.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:voluntary", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,7 +14,9 @@ ], "name": "dtquark:frosty_blossom_seed" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/voluntary/frosty_blossom" } \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/loot_table/trees/voluntary/glow_shroom.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/glow_shroom.json new file mode 100644 index 0000000..2ca0789 --- /dev/null +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/glow_shroom.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "dynamictrees:voluntary_seed_drop_chance", + "rarity": 1.0 + } + ], + "name": "dtquark:glow_shroom_seed" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtquark:trees/voluntary/glow_shroom" +} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/serene.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/serene_blossom.json similarity index 67% rename from src/main/resources/data/dtquark/loot_tables/trees/voluntary/serene.json rename to src/generated/resources/data/dtquark/loot_table/trees/voluntary/serene_blossom.json index 24aa6ef..cd14688 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/serene.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/serene_blossom.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:voluntary", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,7 +14,9 @@ ], "name": "dtquark:serene_blossom_seed" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/voluntary/serene_blossom" } \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/sunny.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/sunny_blossom.json similarity index 67% rename from src/main/resources/data/dtquark/loot_tables/trees/voluntary/sunny.json rename to src/generated/resources/data/dtquark/loot_table/trees/voluntary/sunny_blossom.json index 28a459b..167a8ba 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/sunny.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/sunny_blossom.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:voluntary", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,7 +14,9 @@ ], "name": "dtquark:sunny_blossom_seed" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/voluntary/sunny_blossom" } \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/warm.json b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/warm_blossom.json similarity index 67% rename from src/main/resources/data/dtquark/loot_tables/trees/voluntary/warm.json rename to src/generated/resources/data/dtquark/loot_table/trees/voluntary/warm_blossom.json index d5833c6..1f0a385 100644 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/warm.json +++ b/src/generated/resources/data/dtquark/loot_table/trees/voluntary/warm_blossom.json @@ -1,8 +1,8 @@ { - "type": "dynamictrees:voluntary", + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,7 +14,9 @@ ], "name": "dtquark:warm_blossom_seed" } - ] + ], + "rolls": 1.0 } - ] + ], + "random_sequence": "dtquark:trees/voluntary/warm_blossom" } \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/neoforge/biome_modifier/add_glimmering_weald_shrooms.json b/src/generated/resources/data/dtquark/neoforge/biome_modifier/add_glimmering_weald_shrooms.json new file mode 100644 index 0000000..6847a38 --- /dev/null +++ b/src/generated/resources/data/dtquark/neoforge/biome_modifier/add_glimmering_weald_shrooms.json @@ -0,0 +1,12 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "dynamictreesplus" + } + ], + "type": "neoforge:add_features", + "biomes": "quark:glimmering_weald", + "features": "dtquark:dynamic_glow_shrooms", + "step": "underground_decoration" +} diff --git a/src/generated/resources/data/dtquark/tags/block/stone_like.json b/src/generated/resources/data/dtquark/tags/block/stone_like.json new file mode 100644 index 0000000..6c58dbe --- /dev/null +++ b/src/generated/resources/data/dtquark/tags/block/stone_like.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:deepslate", + "minecraft:cobbled_deepslate", + "minecraft:reinforced_deepslate", + "minecraft:tuff" + ] +} diff --git a/src/generated/resources/data/dtquark/worldgen/configured_feature/patch_dynamic_glow_shroom.json b/src/generated/resources/data/dtquark/worldgen/configured_feature/patch_dynamic_glow_shroom.json new file mode 100644 index 0000000..f3bb908 --- /dev/null +++ b/src/generated/resources/data/dtquark/worldgen/configured_feature/patch_dynamic_glow_shroom.json @@ -0,0 +1,47 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "dynamictreesplus" + } + ], + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "dtquark:glow_shroom_sapling" + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:would_survive", + "state": { + "Name": "dtquark:glow_shroom_sapling" + } + } + ] + } + } + ] + }, + "tries": 60, + "xz_spread": 7, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/dtquark/worldgen/placed_feature/dynamic_glow_shrooms.json b/src/generated/resources/data/dtquark/worldgen/placed_feature/dynamic_glow_shrooms.json new file mode 100644 index 0000000..1512eca --- /dev/null +++ b/src/generated/resources/data/dtquark/worldgen/placed_feature/dynamic_glow_shrooms.json @@ -0,0 +1,50 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "dynamictreesplus" + } + ], + "feature": "dtquark:patch_dynamic_glow_shroom", + "placement": [ + { + "count": 60, + "type": "minecraft:count" + }, + { + "type": "minecraft:in_square" + }, + { + "height": { + "min_inclusive": { + "above_bottom": 0 + }, + "max_inclusive": { + "absolute": 256 + }, + "type": "minecraft:uniform" + }, + "type": "minecraft:height_range" + }, + { + "direction_of_search": "down", + "target_condition": { + "type": "minecraft:solid" + }, + "allowed_search_condition": { + "blocks": "minecraft:air", + "type": "minecraft:matching_blocks" + }, + "max_steps": 12, + "type": "minecraft:environment_scan" + }, + { + "xz_spread": 0, + "y_spread": 1, + "type": "minecraft:random_offset" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/branches_that_burn.json b/src/generated/resources/data/dynamictrees/tags/blocks/branches_that_burn.json new file mode 100644 index 0000000..bdc35e4 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/branches_that_burn.json @@ -0,0 +1,7 @@ +{ + "values": [ + "dtquark:ancient_branch", + "dtquark:azalea_branch", + "dtquark:blossom_branch" + ] +} diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/fungus_branches.json b/src/generated/resources/data/dynamictrees/tags/blocks/fungus_branches.json new file mode 100644 index 0000000..56dfe6d --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/fungus_branches.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "dtquark:glow_shroom_branch", + "required": false + } + ] +} diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/fungus_caps.json b/src/generated/resources/data/dynamictrees/tags/blocks/fungus_caps.json new file mode 100644 index 0000000..1de0943 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/fungus_caps.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "dtquark:glow_shroom_cap", + "required": false + } + ] +} diff --git a/src/main/resources/data/dynamictrees/tags/blocks/leaves.json b/src/generated/resources/data/dynamictrees/tags/blocks/leaves.json similarity index 71% rename from src/main/resources/data/dynamictrees/tags/blocks/leaves.json rename to src/generated/resources/data/dynamictrees/tags/blocks/leaves.json index 6319157..c646f4c 100644 --- a/src/main/resources/data/dynamictrees/tags/blocks/leaves.json +++ b/src/generated/resources/data/dynamictrees/tags/blocks/leaves.json @@ -1,10 +1,10 @@ { - "replace": false, "values": [ + "dtquark:ancient_leaves", "dtquark:fiery_blossom_leaves", "dtquark:frosty_blossom_leaves", "dtquark:serene_blossom_leaves", "dtquark:sunny_blossom_leaves", - "dtquark:sweet_blossom_leaves" + "dtquark:warm_blossom_leaves" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/dynamictrees/tags/blocks/saplings.json b/src/generated/resources/data/dynamictrees/tags/blocks/saplings.json similarity index 71% rename from src/main/resources/data/dynamictrees/tags/blocks/saplings.json rename to src/generated/resources/data/dynamictrees/tags/blocks/saplings.json index e9e143e..e1e0e59 100644 --- a/src/main/resources/data/dynamictrees/tags/blocks/saplings.json +++ b/src/generated/resources/data/dynamictrees/tags/blocks/saplings.json @@ -1,10 +1,10 @@ { - "replace": false, "values": [ + "dtquark:ancient_sapling", "dtquark:fiery_blossom_sapling", "dtquark:frosty_blossom_sapling", "dtquark:serene_blossom_sapling", "dtquark:sunny_blossom_sapling", - "dtquark:sweet_blossom_sapling" + "dtquark:warm_blossom_sapling" ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json b/src/generated/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json new file mode 100644 index 0000000..b20813d --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json @@ -0,0 +1,7 @@ +{ + "values": [ + "dtquark:stripped_ancient_branch", + "dtquark:stripped_azalea_branch", + "dtquark:stripped_blossom_branch" + ] +} 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 new file mode 100644 index 0000000..9291561 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json @@ -0,0 +1,7 @@ +{ + "values": [ + "dtquark:ancient_branch", + "dtquark:azalea_branch", + "dtquark:blossom_branch" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/items/fungus_branches.json b/src/generated/resources/data/dynamictrees/tags/items/fungus_branches.json new file mode 100644 index 0000000..c48b447 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/items/fungus_branches.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "dtquark:glow_shroom_branch", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/items/fungus_caps.json b/src/generated/resources/data/dynamictrees/tags/items/fungus_caps.json new file mode 100644 index 0000000..09c0a5a --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/items/fungus_caps.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "dtquark:glow_shroom_seed", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/dynamictrees/tags/items/seeds.json b/src/generated/resources/data/dynamictrees/tags/items/seeds.json similarity index 72% rename from src/main/resources/data/dynamictrees/tags/items/seeds.json rename to src/generated/resources/data/dynamictrees/tags/items/seeds.json index 507798d..f23033a 100644 --- a/src/main/resources/data/dynamictrees/tags/items/seeds.json +++ b/src/generated/resources/data/dynamictrees/tags/items/seeds.json @@ -1,10 +1,10 @@ { - "replace": false, "values": [ + "dtquark:ancient_seed", "dtquark:fiery_blossom_seed", "dtquark:frosty_blossom_seed", "dtquark:serene_blossom_seed", "dtquark:sunny_blossom_seed", - "dtquark:sweet_blossom_seed" + "dtquark:warm_blossom_seed" ] } \ No newline at end of file diff --git a/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json b/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json new file mode 100644 index 0000000..169d4e7 --- /dev/null +++ b/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "entries": [ + "dtquark:replaceancientseed" + ] +} diff --git a/src/generated/resources/data/quark/loot_table/blocks/glow_shroom_block.json b/src/generated/resources/data/quark/loot_table/blocks/glow_shroom_block.json new file mode 100644 index 0000000..12420ec --- /dev/null +++ b/src/generated/resources/data/quark/loot_table/blocks/glow_shroom_block.json @@ -0,0 +1,53 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "name": "quark:glow_shroom_block", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "type": "minecraft:item", + "name": "dtquark:glow_shroom_seed", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 0.0, + "max": 2.0 + } + }, + { + "function": "minecraft:explosion_decay" + } + ] + } + ] + } + ] + } + ] +} diff --git a/src/main/java/maxhyper/dtquark/BlossomLeavesProperties.java b/src/main/java/maxhyper/dtquark/BlossomLeavesProperties.java index 203f95f..e0baf8e 100644 --- a/src/main/java/maxhyper/dtquark/BlossomLeavesProperties.java +++ b/src/main/java/maxhyper/dtquark/BlossomLeavesProperties.java @@ -1,19 +1,22 @@ package maxhyper.dtquark; -import com.ferreusveritas.dynamictrees.api.registry.TypedRegistry; -import com.ferreusveritas.dynamictrees.blocks.leaves.DynamicLeavesBlock; -import com.ferreusveritas.dynamictrees.blocks.leaves.LeavesProperties; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.BlockState; -import net.minecraft.particles.BlockParticleData; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import com.dtteam.dynamictrees.api.registry.TypedRegistry; +import com.dtteam.dynamictrees.block.leaves.DynamicLeavesBlock; +import com.dtteam.dynamictrees.block.leaves.LeavesProperties; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.BlockParticleOption; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; +import org.jetbrains.annotations.NotNull; +import org.violetmoon.quark.content.world.module.BlossomTreesModule; -import java.util.Random; +import javax.annotation.Nonnull; public class BlossomLeavesProperties extends LeavesProperties { @@ -24,17 +27,19 @@ public BlossomLeavesProperties(ResourceLocation registryName) { } @Override - protected DynamicLeavesBlock createDynamicLeaves(AbstractBlock.Properties properties) { - return new DynamicLeavesBlock(this, properties){ + @Nonnull + protected DynamicLeavesBlock createDynamicLeaves(@Nonnull BlockBehaviour.Properties properties) { + return new DynamicLeavesBlock(this, properties) { @Override @OnlyIn(Dist.CLIENT) - public void animateTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand) { - if (worldIn.isEmptyBlock(pos.below()) && rand.nextInt(5) == 0) { - double windStrength = 5.0D + Math.cos((double)worldIn.getGameTime() / 2000.0D) * 2.0D; - double windX = Math.cos((double)worldIn.getGameTime() / 1200.0D) * windStrength; - double windZ = Math.sin((double)worldIn.getGameTime() / 1000.0D) * windStrength; - worldIn.addParticle(new BlockParticleData(ParticleTypes.BLOCK, stateIn), (double)pos.getX() + 0.5D, (double)pos.getY() + 0.5D, (double)pos.getZ() + 0.5D, windX, -1.0D, windZ); + public void animateTick(@NotNull BlockState stateIn, Level worldIn, BlockPos pos, @NotNull RandomSource rand) { + if (BlossomTreesModule.dropLeafParticles && rand.nextInt(5) == 0 && worldIn.isEmptyBlock(pos.below())) { + double windStrength = 5.0 + Math.cos((double)worldIn.getGameTime() / 2000.0) * 2.0; + double windX = Math.cos((double)worldIn.getGameTime() / 1200.0) * windStrength; + double windZ = Math.sin((double)worldIn.getGameTime() / 1000.0) * windStrength; + worldIn.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, stateIn), (double)pos.getX() + 0.5, pos.getY(), (double)pos.getZ() + 0.5, windX, -1.0, windZ); } + super.animateTick(stateIn, worldIn, pos, rand); } }; } diff --git a/src/main/java/maxhyper/dtquark/DTQuarkPlusRegistries.java b/src/main/java/maxhyper/dtquark/DTQuarkPlusRegistries.java new file mode 100644 index 0000000..b1999a5 --- /dev/null +++ b/src/main/java/maxhyper/dtquark/DTQuarkPlusRegistries.java @@ -0,0 +1,25 @@ +package maxhyper.dtquark; + +import com.dtteam.dynamictrees.event.TypeRegistryEvent; +import net.minecraft.resources.ResourceLocation; +import net.neoforged.bus.api.SubscribeEvent; + + + +public class DTQuarkPlusRegistries { + + @SubscribeEvent + public static void registerCapPropertiesTypes(final TypeRegistryEvent event) { + if (event.isEntryOfType(com.dtteam.dynamictreesplus.block.mushroom.CapProperties.class)) { + event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "glow_shroom"), maxhyper.dtquark.mushroom.GlowShroomCapProperties.TYPE); + } + } + + @SubscribeEvent + public static void registerSpeciesTypes(final TypeRegistryEvent event) { + if (event.isEntryOfType(com.dtteam.dynamictrees.tree.species.Species.class)) { + event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "glow_shroom"), maxhyper.dtquark.mushroom.GlowShroomSpecies.TYPE); + } + } + +} diff --git a/src/main/java/maxhyper/dtquark/DTQuarkRegistries.java b/src/main/java/maxhyper/dtquark/DTQuarkRegistries.java index 55a10ac..9961fa8 100644 --- a/src/main/java/maxhyper/dtquark/DTQuarkRegistries.java +++ b/src/main/java/maxhyper/dtquark/DTQuarkRegistries.java @@ -1,26 +1,64 @@ package maxhyper.dtquark; -import com.ferreusveritas.dynamictrees.api.registry.TypeRegistryEvent; -import com.ferreusveritas.dynamictrees.blocks.leaves.LeavesProperties; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; -import maxhyper.dtquark.blocks.SlabSoilProperties; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD) +import com.dtteam.dynamictrees.api.cell.CellKit; +import com.dtteam.dynamictrees.api.registry.Registry; +import com.dtteam.dynamictrees.event.RegistryEvent; +import com.dtteam.dynamictrees.event.TypeRegistryEvent; +import com.dtteam.dynamictrees.block.leaves.LeavesProperties; +import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; +import com.dtteam.dynamictrees.block.CommonVoxelShapes; +import maxhyper.dtquark.cell.DTQuarkCellKits; +import maxhyper.dtquark.growthlogic.DTQuarkGrowthLogicKits; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.fml.common.Mod; + +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) public class DTQuarkRegistries { + public static final VoxelShape ANCIENT_FRUIT_AGE0 = Block.box(7D, 12D, 7D, 9D, 16D, 9D); + public static final VoxelShape ANCIENT_FRUIT_AGE1 = Block.box(6D, 10D, 6D, 10D, 16D, 10D); + public static final VoxelShape ANCIENT_FRUIT_AGE2 = Block.box(5D, 8D, 5D, 11D, 16D, 11D); + public static final VoxelShape ANCIENT_FRUIT_AGE3 = Block.box(4D, 6D, 4D, 12D, 16D, 12D); + + public static final VoxelShape SHROOM_AGE0 = Shapes.create(0, 0, 0, 1, 0.75, 1); + public static final VoxelShape MUSHROOM_CAP_SHORT_ROUND = Block.box(5D, 3D, 5D, 11D, 7D, 11D); + public static final VoxelShape ROUND_SHORT_MUSHROOM = Shapes.or(CommonVoxelShapes.SAPLING_TRUNK, MUSHROOM_CAP_SHORT_ROUND); + + public static void setup() { + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "ancient_fruit_age0").toString(), ANCIENT_FRUIT_AGE0); + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "ancient_fruit_age1").toString(), ANCIENT_FRUIT_AGE1); + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "ancient_fruit_age2").toString(), ANCIENT_FRUIT_AGE2); + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "ancient_fruit_age3").toString(), ANCIENT_FRUIT_AGE3); + + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "glow_shroom_age0").toString(), SHROOM_AGE0); + CommonVoxelShapes.SHAPES.put(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "round_short_mushroom").toString(), ROUND_SHORT_MUSHROOM); + } + + @SubscribeEvent + public static void registerLeavesPropertiesTypes(final TypeRegistryEvent event) { + if (event.isEntryOfType(LeavesProperties.class)) { + event.registerType(ResourceLocation.fromNamespaceAndPath(DynamicTreesQuark.MOD_ID, "blossom"), BlossomLeavesProperties.TYPE); + } + } + + @SubscribeEvent - public static void registerLeavesPropertiesTypes (final TypeRegistryEvent event) { - event.registerType(new ResourceLocation(DynamicTreesQuark.MOD_ID, "blossom"), BlossomLeavesProperties.TYPE); + public static void registerCellKits(final RegistryEvent event) { + if (event.isEntryOfType(CellKit.class)) { + DTQuarkCellKits.register(event.getRegistry()); + } } @SubscribeEvent - public static void registerSoilPropertiesTypes(final TypeRegistryEvent event) { - event.registerType(new ResourceLocation(DynamicTreesQuark.MOD_ID, "slab"), SlabSoilProperties.TYPE_HOR); - event.registerType(new ResourceLocation(DynamicTreesQuark.MOD_ID, "vertical_slab"), SlabSoilProperties.TYPE_VER); - event.registerType(new ResourceLocation(DynamicTreesQuark.MOD_ID, "stairs"), SlabSoilProperties.TYPE_STA); + public static void registerGrowthLogicKits(final RegistryEvent event) { + if (event.isEntryOfType(GrowthLogicKit.class)) { + DTQuarkGrowthLogicKits.register(event.getRegistry()); + } } } diff --git a/src/main/java/maxhyper/dtquark/DynamicTreesQuark.java b/src/main/java/maxhyper/dtquark/DynamicTreesQuark.java index b4e86a4..9b664d0 100644 --- a/src/main/java/maxhyper/dtquark/DynamicTreesQuark.java +++ b/src/main/java/maxhyper/dtquark/DynamicTreesQuark.java @@ -1,59 +1,84 @@ package maxhyper.dtquark; -import com.ferreusveritas.dynamictrees.api.GatherDataHelper; -import com.ferreusveritas.dynamictrees.api.registry.RegistryHandler; -import com.ferreusveritas.dynamictrees.blocks.leaves.LeavesProperties; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; -import com.ferreusveritas.dynamictrees.resources.Resources; -import com.ferreusveritas.dynamictrees.trees.Family; -import com.ferreusveritas.dynamictrees.trees.Species; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import vazkii.quark.base.module.config.type.CompoundBiomeConfig; -import vazkii.quark.content.world.config.BlossomTreeConfig; -import vazkii.quark.content.world.module.BlossomTreesModule; +import com.dtteam.dynamictrees.data.GatherDataHelper; +import com.dtteam.dynamictrees.api.registry.RegistryHandler; +import com.dtteam.dynamictrees.block.leaves.LeavesProperties; +import com.dtteam.dynamictrees.block.soil.SoilProperties; +import com.dtteam.dynamictrees.block.fruit.Fruit; +import com.dtteam.dynamictrees.tree.family.Family; +import com.dtteam.dynamictrees.tree.species.Species; +import com.dtteam.dynamictreesplus.block.mushroom.CapProperties; +import com.dtteam.dynamictrees.registry.NeoForgeRegistryHandler; +import maxhyper.dtquark.loot.LootModifiers; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.data.event.GatherDataEvent; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModList; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; +import org.violetmoon.zeta.config.type.CompoundBiomeConfig; +import org.violetmoon.quark.content.world.module.BlossomTreesModule; // The value here should match an entry in the META-INF/mods.toml file @Mod(DynamicTreesQuark.MOD_ID) -public class DynamicTreesQuark -{ +public class DynamicTreesQuark { public static final String MOD_ID = "dtquark"; - public DynamicTreesQuark() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + public DynamicTreesQuark(IEventBus modEventBus) { + modEventBus.addListener(this::clientSetup); modEventBus.addListener(this::commonSetup); - //modEventBus.addListener(this::clientSetup); modEventBus.addListener(this::gatherData); - MinecraftForge.EVENT_BUS.register(this); + if (ModList.get().isLoaded("dynamictreesplus")){ + modEventBus.register(DTQuarkPlusRegistries.class); + } + + + LootModifiers.register(modEventBus); + + NeoForgeRegistryHandler.setup(MOD_ID, modEventBus); + DTQuarkRegistries.setup(); + } + + private void clientSetup(final FMLClientSetupEvent event) { - RegistryHandler.setup(MOD_ID); } private void commonSetup(final FMLCommonSetupEvent event) { - for (BlossomTreeConfig config : BlossomTreesModule.trees.values()){ - config.biomeConfig = CompoundBiomeConfig.fromBiomeTypes(false); + // DTQuarkRegistries.setup(); // Removed this line as per instruction + + for (BlossomTreesModule.BlossomTree tree : BlossomTreesModule.blossomTrees) { + tree.quarkConfig.biomeConfig = CompoundBiomeConfig.fromBiomeTags(false); } } + - private void clientSetup(final FMLClientSetupEvent event) { - // do something that can only be done on the client + private void gatherData(final GatherDataEvent event) { + if (ModList.get().isLoaded("dynamictreesplus")) { + GatherDataHelper.gatherAllData(MOD_ID, event, + SoilProperties.REGISTRY, + Family.REGISTRY, + Species.REGISTRY, + Fruit.REGISTRY, + LeavesProperties.REGISTRY, + CapProperties.REGISTRY); + } else { + GatherDataHelper.gatherAllData(MOD_ID, event, + SoilProperties.REGISTRY, + Family.REGISTRY, + Species.REGISTRY, + Fruit.REGISTRY, + LeavesProperties.REGISTRY); + } } - public void gatherData(final GatherDataEvent event) { - GatherDataHelper.gatherAllData( - MOD_ID, - event, - SoilProperties.REGISTRY, - Family.REGISTRY, - Species.REGISTRY, - LeavesProperties.REGISTRY - ); + public static ResourceLocation location(final String path) { + return ResourceLocation.fromNamespaceAndPath(MOD_ID, path); } } diff --git a/src/main/java/maxhyper/dtquark/PlusRegistries.java b/src/main/java/maxhyper/dtquark/PlusRegistries.java new file mode 100644 index 0000000..e88eb5e --- /dev/null +++ b/src/main/java/maxhyper/dtquark/PlusRegistries.java @@ -0,0 +1,51 @@ +package maxhyper.dtquark; + +import com.dtteam.dynamictrees.event.RegistryEvent; +import com.dtteam.dynamictrees.event.TypeRegistryEvent; +import com.dtteam.dynamictrees.api.worldgen.BiomePropertySelectors; +import com.dtteam.dynamictrees.api.worldgen.FeatureCanceller; +import com.dtteam.dynamictrees.tree.species.Species; +import com.dtteam.dynamictrees.worldgen.featurecancellation.MushroomFeatureCanceller; +import com.dtteam.dynamictreesplus.block.mushroom.CapProperties; +import maxhyper.dtquark.mushroom.GlowShroomCapProperties; +import maxhyper.dtquark.mushroom.GlowShroomSpecies; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.neoforged.bus.api.SubscribeEvent; +import net.minecraft.core.registries.BuiltInRegistries; + +public class PlusRegistries { + + public static final FeatureCanceller MUSHROOM_CANCELLER = new MushroomFeatureCanceller<>(DynamicTreesQuark.location("mushroom"), null){ + @Override + public boolean shouldCancel(ConfiguredFeature configuredFeature, BiomePropertySelectors.NormalFeatureCancellation featureCancellations) { + final ResourceLocation featureName = BuiltInRegistries.FEATURE.getKey(configuredFeature.feature()); + if (featureName == null) { + return false; + } + return featureCancellations.shouldCancelNamespace(featureName.getNamespace()) && featureName.getPath().equals("glow_shrooms"); + } + }; + + @SubscribeEvent + public static void onFeatureCancellerRegistry(final RegistryEvent event) { + if (event.isEntryOfType(FeatureCanceller.class)) { + event.getRegistry().registerAll(MUSHROOM_CANCELLER); + } + } + + @SubscribeEvent + public static void registerCapPropertiesType(final TypeRegistryEvent event) { + if (event.isEntryOfType(CapProperties.class)) { + event.registerType(DynamicTreesQuark.location("glow_shroom"), GlowShroomCapProperties.TYPE); + } + } + + @SubscribeEvent + public static void registerSpeciesType(final TypeRegistryEvent event) { + if (event.isEntryOfType(Species.class)) { + event.registerType(DynamicTreesQuark.location("glow_shroom"), GlowShroomSpecies.TYPE); + } + } + +} diff --git a/src/main/java/maxhyper/dtquark/blocks/SlabRootyBlock.java b/src/main/java/maxhyper/dtquark/blocks/SlabRootyBlock.java deleted file mode 100644 index a3c9e6a..0000000 --- a/src/main/java/maxhyper/dtquark/blocks/SlabRootyBlock.java +++ /dev/null @@ -1,81 +0,0 @@ -package maxhyper.dtquark.blocks; - -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.RootyBlock; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.IWaterLoggable; -import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.FluidState; -import net.minecraft.fluid.Fluids; -import net.minecraft.pathfinding.PathType; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.EnumProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.state.properties.SlabType; -import net.minecraft.tags.FluidTags; -import net.minecraft.util.Direction; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; - -public class SlabRootyBlock extends RootyBlock implements IWaterLoggable { - - public enum SlabTypeNoBottom implements IStringSerializable { - TOP("top"), - DOUBLE("double"); - private final String name; - SlabTypeNoBottom(String name) { - this.name = name; - } - public String toString() { - return this.name; - } - public String getSerializedName() { - return this.name; - } - } - public static final EnumProperty TYPE = EnumProperty.create("type", SlabTypeNoBottom.class); - public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; - - public SlabRootyBlock(SoilProperties properties, Properties blockProperties) { - super(properties, blockProperties); - - registerDefaultState(defaultBlockState().setValue(TYPE, SlabTypeNoBottom.TOP).setValue(WATERLOGGED, false)); - } - - @Override - protected void createBlockStateDefinition(StateContainer.Builder builder) { - super.createBlockStateDefinition(builder); - builder.add(TYPE).add(WATERLOGGED); - } - - public FluidState getFluidState(BlockState blockState) { - return blockState.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(blockState); - } - - public boolean placeLiquid(IWorld world, BlockPos pos, BlockState blockState, FluidState fluidState) { - return blockState.getValue(TYPE) != SlabTypeNoBottom.DOUBLE && IWaterLoggable.super.placeLiquid(world, pos, blockState, fluidState); - } - - public boolean canPlaceLiquid(IBlockReader world, BlockPos pos, BlockState blockState, Fluid fluid) { - return blockState.getValue(TYPE) != SlabTypeNoBottom.DOUBLE && IWaterLoggable.super.canPlaceLiquid(world, pos, blockState, fluid); - } - - public BlockState updateShape(BlockState state, Direction from, BlockState fromState, IWorld world, BlockPos pos, BlockPos fromPos) { - if (state.getValue(WATERLOGGED)) { - world.getLiquidTicks().scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); - } - - return super.updateShape(state, from, fromState, world, pos, fromPos); - } - - public boolean isPathfindable(BlockState state, IBlockReader world, BlockPos pos, PathType pathType) { - if (pathType == PathType.WATER) - return world.getFluidState(pos).is(FluidTags.WATER); - return false; - } - -} diff --git a/src/main/java/maxhyper/dtquark/blocks/SlabSoilProperties.java b/src/main/java/maxhyper/dtquark/blocks/SlabSoilProperties.java deleted file mode 100644 index 28f332e..0000000 --- a/src/main/java/maxhyper/dtquark/blocks/SlabSoilProperties.java +++ /dev/null @@ -1,106 +0,0 @@ -package maxhyper.dtquark.blocks; - -import com.ferreusveritas.dynamictrees.api.registry.TypedRegistry; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.RootyBlock; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.BlockState; -import net.minecraft.block.SlabBlock; -import net.minecraft.block.StairsBlock; -import net.minecraft.state.EnumProperty; -import net.minecraft.state.properties.Half; -import net.minecraft.state.properties.SlabType; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.ResourceLocation; -import vazkii.quark.content.building.block.VerticalSlabBlock; - -public class SlabSoilProperties extends SoilProperties { - - public static final TypedRegistry.EntryType TYPE_HOR = TypedRegistry.newType((r)->new SlabSoilProperties(r, BlockType.HORIZONTAL)); - public static final TypedRegistry.EntryType TYPE_VER = TypedRegistry.newType((r)->new SlabSoilProperties(r, BlockType.VERTICAL)); - public static final TypedRegistry.EntryType TYPE_STA = TypedRegistry.newType((r)->new SlabSoilProperties(r, BlockType.STAIRS)); - - private enum BlockType { - VERTICAL, - HORIZONTAL, - STAIRS - } - private final BlockType slabType; - public SlabSoilProperties(final ResourceLocation registryName, BlockType type) { - super(registryName); - this.slabType = type; - } - - protected RootyBlock createBlock(AbstractBlock.Properties blockProperties) { - switch (slabType){ - case HORIZONTAL: - return new SlabRootyBlock(this, blockProperties); - case STAIRS: - return new StairsRootyBlock(this, blockProperties); - default: - case VERTICAL: - return new RootyBlock(this, blockProperties); - } - } - - @Override - public boolean isValidState(BlockState primitiveSoilState) { - switch (slabType){ - default: - case HORIZONTAL: - if (primitiveSoilState.hasProperty(SlabBlock.TYPE)){ - return primitiveSoilState.getValue(SlabBlock.TYPE) == SlabType.TOP || - primitiveSoilState.getValue(SlabBlock.TYPE) == SlabType.DOUBLE; - } - break; - case VERTICAL: - if (primitiveSoilState.hasProperty(VerticalSlabBlock.TYPE)){ - return primitiveSoilState.getValue(VerticalSlabBlock.TYPE) == VerticalSlabBlock.VerticalSlabType.DOUBLE; - } - break; - case STAIRS: - if (primitiveSoilState.hasProperty(StairsBlock.HALF)){ - return primitiveSoilState.getValue(StairsBlock.HALF) == Half.TOP; - } - } - return super.isValidState(primitiveSoilState); - } - - @Override - public BlockState getSoilState(BlockState primitiveSoilState, int fertility, boolean requireTileEntity) { - BlockState state = super.getSoilState(primitiveSoilState, fertility, requireTileEntity); - switch (slabType){ - case HORIZONTAL: - return state.setValue(SlabRootyBlock.TYPE, SlabRootyBlock.SlabTypeNoBottom.valueOf(primitiveSoilState.getValue(SlabBlock.TYPE).toString().toUpperCase())).setValue(SlabRootyBlock.WATERLOGGED, primitiveSoilState.getValue(SlabBlock.WATERLOGGED)); - case STAIRS: - return state.setValue(StairsRootyBlock.FACING, primitiveSoilState.getValue(StairsBlock.FACING)).setValue(StairsRootyBlock.WATERLOGGED, primitiveSoilState.getValue(StairsBlock.WATERLOGGED)); - default: - case VERTICAL: - return state; - } - } - - @Override - public BlockState getPrimitiveSoilState(BlockState currentSoilState) { - BlockState primitiveSoilState = super.getPrimitiveSoilState(currentSoilState); - switch (slabType){ - default: - case HORIZONTAL: - if (primitiveSoilState.hasProperty(SlabBlock.TYPE)){ - return primitiveSoilState.setValue(SlabBlock.TYPE, SlabType.valueOf(currentSoilState.getValue(SlabRootyBlock.TYPE).toString().toUpperCase())).setValue(SlabBlock.WATERLOGGED, currentSoilState.getValue(SlabRootyBlock.WATERLOGGED)); - } - break; - case VERTICAL: - if (primitiveSoilState.hasProperty(VerticalSlabBlock.TYPE)){ - return primitiveSoilState.setValue(VerticalSlabBlock.TYPE, VerticalSlabBlock.VerticalSlabType.DOUBLE); - } - break; - case STAIRS: - if (primitiveSoilState.hasProperty(StairsBlock.HALF) && primitiveSoilState.hasProperty(StairsBlock.FACING)){ - return primitiveSoilState.setValue(StairsBlock.HALF, Half.TOP).setValue(StairsBlock.FACING, currentSoilState.getValue(StairsRootyBlock.FACING)).setValue(StairsBlock.WATERLOGGED, currentSoilState.getValue(StairsRootyBlock.WATERLOGGED)); - } - } - - return primitiveSoilState; - } -} \ No newline at end of file diff --git a/src/main/java/maxhyper/dtquark/blocks/StairsRootyBlock.java b/src/main/java/maxhyper/dtquark/blocks/StairsRootyBlock.java deleted file mode 100644 index 1966c8a..0000000 --- a/src/main/java/maxhyper/dtquark/blocks/StairsRootyBlock.java +++ /dev/null @@ -1,52 +0,0 @@ -package maxhyper.dtquark.blocks; - -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.RootyBlock; -import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalBlock; -import net.minecraft.block.IWaterLoggable; -import net.minecraft.fluid.FluidState; -import net.minecraft.fluid.Fluids; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.EnumProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.Direction; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; - -public class StairsRootyBlock extends RootyBlock implements IWaterLoggable { - - public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; - public static final DirectionProperty FACING = HorizontalBlock.FACING; - - public StairsRootyBlock(SoilProperties properties, Properties blockProperties) { - super(properties, blockProperties); - - registerDefaultState(defaultBlockState().setValue(FACING, Direction.NORTH).setValue(WATERLOGGED, false)); - } - - @Override - protected void createBlockStateDefinition(StateContainer.Builder builder) { - super.createBlockStateDefinition(builder); - builder.add(FACING).add(WATERLOGGED); - } - - @Override - public BlockState updateShape(BlockState state, Direction from, BlockState fromState, IWorld world, BlockPos pos, BlockPos fromPos) { - if (state.getValue(WATERLOGGED)) { - world.getLiquidTicks().scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); - } - - return super.updateShape(state, from, fromState, world, pos, fromPos); - } - - @Override - public FluidState getFluidState(BlockState blockState) { - return blockState.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(blockState); - } - -} diff --git a/src/main/java/maxhyper/dtquark/cell/AncientLeafCell.java b/src/main/java/maxhyper/dtquark/cell/AncientLeafCell.java new file mode 100644 index 0000000..9d9749b --- /dev/null +++ b/src/main/java/maxhyper/dtquark/cell/AncientLeafCell.java @@ -0,0 +1,47 @@ +package maxhyper.dtquark.cell; + +import com.dtteam.dynamictrees.systems.cell.MatrixCell; +import com.dtteam.dynamictrees.api.voxmap.SimpleVoxmap; +import net.minecraft.core.BlockPos; + +public class AncientLeafCell extends MatrixCell { + + public static final SimpleVoxmap LEAF_CLUSTER = new SimpleVoxmap(5, 3, 5, new byte[]{ + + // Layer 0 (Bottom) + 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, + 0, 1, 1, 1, 0, + 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, + + // Layer 1 (Middle) + 0, 0, 1, 0, 0, + 0, 1, 2, 1, 0, + 1, 2, 0, 2, 1, + 0, 1, 2, 1, 0, + 0, 0, 1, 0, 0, + + // Layer 2 (Top) + 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, + 0, 1, 1, 1, 0, + 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0 + + }).setCenter(new BlockPos(2, 1, 2)); + + static final byte[] VAL_MAP = { + 0, 1, 2, 0, 2, 0, 0, 0, //D Maps * -> 0 + 0, 1, 2, 2, 4, 0, 0, 0, //U Maps 3 -> 2, 4 -> 4, * -> * + 0, 1, 2, 0, 2, 0, 0, 0, //N Maps 3 -> 0, 4 -> 2, * -> * + 0, 1, 2, 0, 2, 0, 0, 0, //S Maps 3 -> 0, 4 -> 2, * -> * + 0, 1, 2, 0, 2, 0, 0, 0, //W Maps 3 -> 0, 4 -> 2, * -> * + 0, 1, 2, 0, 2, 0, 0, 0 //E Maps 3 -> 0, 4 -> 2, * -> * + }; + + public AncientLeafCell(int value) { + super(value, VAL_MAP); + } + +} diff --git a/src/main/java/maxhyper/dtquark/cell/DTQuarkCellKits.java b/src/main/java/maxhyper/dtquark/cell/DTQuarkCellKits.java new file mode 100644 index 0000000..df06e83 --- /dev/null +++ b/src/main/java/maxhyper/dtquark/cell/DTQuarkCellKits.java @@ -0,0 +1,72 @@ +package maxhyper.dtquark.cell; + +import com.dtteam.dynamictrees.api.cell.Cell; +import com.dtteam.dynamictrees.api.cell.CellKit; +import com.dtteam.dynamictrees.api.cell.CellNull; +import com.dtteam.dynamictrees.api.cell.CellSolver; +import com.dtteam.dynamictrees.api.registry.Registry; +import com.dtteam.dynamictrees.systems.cell.CellKits; +import com.dtteam.dynamictrees.systems.cell.ConiferBranchCell; +import com.dtteam.dynamictrees.systems.cell.ConiferTopBranchCell; +import com.dtteam.dynamictrees.systems.cell.MetadataCell; +import com.dtteam.dynamictrees.api.voxmap.SimpleVoxmap; +import maxhyper.dtquark.DynamicTreesQuark; + +public class DTQuarkCellKits { + + public static final CellKit ANCIENT = new CellKit(DynamicTreesQuark.location("ancient")) { + + private final Cell branchCell = new ConiferBranchCell(); + private final Cell topBranchCell = new ConiferTopBranchCell(); + + private final Cell[] leafCells = { + CellNull.NULL_CELL, + new AncientLeafCell(1), + new AncientLeafCell(2), + new AncientLeafCell(3), + new AncientLeafCell(4), + new AncientLeafCell(5), + new AncientLeafCell(6), + new AncientLeafCell(7) + }; + + private final CellKits.BasicSolver solver = new com.dtteam.dynamictrees.systems.cell.CellKits.BasicSolver(new short[]{0x0514, 0x0413, 0x0312, 0x0211}); + + @Override + public Cell getCellForLeaves(int hydro) { + return leafCells[hydro]; + } + + @Override + public Cell getCellForBranch(int radius, int meta) { + if (meta == MetadataCell.TOP_BRANCH) { + return topBranchCell; + } else if (radius == 1) { + return branchCell; + } else { + return CellNull.NULL_CELL; + } + } + + @Override + public SimpleVoxmap getLeafCluster() { + return AncientLeafCell.LEAF_CLUSTER; + } + + @Override + public CellSolver getCellSolver() { + return solver; + } + + @Override + public int getDefaultHydration() { + return 4; + } + + }; + + public static void register(Registry registry) { + registry.register(ANCIENT); + } + +} diff --git a/src/main/java/maxhyper/dtquark/growthlogic/AncientLogic.java b/src/main/java/maxhyper/dtquark/growthlogic/AncientLogic.java new file mode 100644 index 0000000..4fcd53e --- /dev/null +++ b/src/main/java/maxhyper/dtquark/growthlogic/AncientLogic.java @@ -0,0 +1,104 @@ +package maxhyper.dtquark.growthlogic; + +import com.dtteam.dynamictrees.api.configuration.ConfigurationProperty; +import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; +import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKitConfiguration; +import com.dtteam.dynamictrees.systems.growthlogic.context.DirectionManipulationContext; +import com.dtteam.dynamictrees.systems.growthlogic.context.DirectionSelectionContext; +import com.dtteam.dynamictrees.systems.growthlogic.context.PositionalSpeciesContext; +import com.dtteam.dynamictrees.systems.GrowSignal; +import com.dtteam.dynamictrees.utility.CoordUtils; +import net.minecraft.core.Direction; +import net.minecraft.resources.ResourceLocation; + +public class AncientLogic extends GrowthLogicKit { + + public static final ConfigurationProperty MIN_BRANCH_GAP = ConfigurationProperty.integer("min_branch_gap"); + public static final ConfigurationProperty MAX_BRANCH_GAP = ConfigurationProperty.integer("max_branch_gap"); + public static final ConfigurationProperty BRANCH_HEIGHT_VARIATION = + ConfigurationProperty.integer("branch_height_variation"); + public AncientLogic(ResourceLocation registryName) { + super(registryName); + } + public static final ConfigurationProperty SIDE_BRANCH_ENERGY = ConfigurationProperty.integer("side_branch_energy"); + + @Override + protected GrowthLogicKitConfiguration createDefaultConfiguration() { + return super.createDefaultConfiguration() + .with(MIN_BRANCH_GAP, 4) + .with(MAX_BRANCH_GAP, 6) + .with(BRANCH_HEIGHT_VARIATION, 3) + .with(HEIGHT_VARIATION, 10) + .with(SIDE_BRANCH_ENERGY, 4); + } + + @Override + protected void registerProperties() { + register(MIN_BRANCH_GAP, MAX_BRANCH_GAP, BRANCH_HEIGHT_VARIATION, GrowthLogicKit.HEIGHT_VARIATION, SIDE_BRANCH_ENERGY); + } + + @Override + public Direction selectNewDirection(GrowthLogicKitConfiguration configuration, DirectionSelectionContext context) { + Direction newDir = super.selectNewDirection(configuration, context); + GrowSignal signal = context.signal(); + if (signal.isInTrunk() && newDir != Direction.UP) { + signal.energy = Math.min(configuration.get(SIDE_BRANCH_ENERGY), signal.energy); + } + return newDir; + } + + @Override + public int[] populateDirectionProbabilityMap(GrowthLogicKitConfiguration configuration, DirectionManipulationContext context) { + int[] probMap = super.populateDirectionProbabilityMap(configuration, context); + GrowSignal signal = context.signal(); + Direction travelDir = signal.dir; + + if (signal.isInTrunk()) { + // Vertical gap between branches, unique for each tree in range + int minGap = configuration.get(MIN_BRANCH_GAP); + int maxGap = configuration.get(MAX_BRANCH_GAP); + int gap = minGap + (CoordUtils.coordHashCode(signal.rootPos, 0) % (maxGap - minGap + 1)); + // Disable/enable horizontal movement if we're not currently in a gap + probMap[2] = probMap[3] = probMap[4] = probMap[5] = ((int)signal.energy) % gap == 0 ? 3 : 0; + } else { + probMap[0] = probMap[1] = 0; + int deltaXAbs = Math.abs(signal.delta.getX()); + int deltaZAbs = Math.abs(signal.delta.getZ()); + //Disable going straight when we are just turning out so the other branches don't get blocked + if (deltaXAbs == 1 ^ deltaZAbs == 1){ // ^ is XOR + probMap[2] = probMap[3] = probMap[4] = probMap[5] = 0; + probMap[travelDir.ordinal()] = 2; + } + //Disable forward after a bit so the canopy isnt too pointy +// if (deltaXAbs == 2 ^ deltaZAbs == 2){ +// probMap[travelDir.ordinal()] = 0; +// } + } + + // Down always disabled for ancient trees + probMap[Direction.DOWN.get3DDataValue()] = 0; + // Direction we came from always disabled + probMap[travelDir.getOpposite().ordinal()] = 0; + + return probMap; + } + + @Override + public float getEnergy(GrowthLogicKitConfiguration configuration, PositionalSpeciesContext context) { + return super.getEnergy(configuration, context) * context.species().biomeSuitability(context.level(), context.pos()) + + getHashVariation(configuration, context); // Vary the height energy by a psuedorandom hash function + } + + @Override + public int getLowestBranchHeight(GrowthLogicKitConfiguration configuration, PositionalSpeciesContext context) { + return (int)(super.getLowestBranchHeight(configuration, context) + + getHashVariation(configuration, context) % configuration.get(BRANCH_HEIGHT_VARIATION)); + } + + protected float getHashVariation (GrowthLogicKitConfiguration configuration, PositionalSpeciesContext context){ + long day = context.level().getGameTime() / 24000L; + int month = (int) day / 30;//Change the hashs every in-game month + + return (CoordUtils.coordHashCode(context.pos().above(month), 2) % configuration.get(GrowthLogicKit.HEIGHT_VARIATION)); + } +} diff --git a/src/main/java/maxhyper/dtquark/growthlogic/DTQuarkGrowthLogicKits.java b/src/main/java/maxhyper/dtquark/growthlogic/DTQuarkGrowthLogicKits.java new file mode 100644 index 0000000..d33cd30 --- /dev/null +++ b/src/main/java/maxhyper/dtquark/growthlogic/DTQuarkGrowthLogicKits.java @@ -0,0 +1,15 @@ +package maxhyper.dtquark.growthlogic; + +import com.dtteam.dynamictrees.api.registry.Registry; +import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; +import maxhyper.dtquark.DynamicTreesQuark; + +public class DTQuarkGrowthLogicKits { + + public static final GrowthLogicKit ANCIENT = new AncientLogic(DynamicTreesQuark.location("ancient")); + + public static void register(Registry registry) { + registry.register(ANCIENT); + } + +} diff --git a/src/main/java/maxhyper/dtquark/loot/LootModifiers.java b/src/main/java/maxhyper/dtquark/loot/LootModifiers.java new file mode 100644 index 0000000..48f5094 --- /dev/null +++ b/src/main/java/maxhyper/dtquark/loot/LootModifiers.java @@ -0,0 +1,22 @@ +package maxhyper.dtquark.loot; + +import com.mojang.serialization.MapCodec; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; +import net.neoforged.neoforge.common.loot.IGlobalLootModifier; +import net.neoforged.neoforge.registries.NeoForgeRegistries; +import net.neoforged.neoforge.registries.DeferredHolder; + +import static maxhyper.dtquark.DynamicTreesQuark.MOD_ID; + +public class LootModifiers { + public static final DeferredRegister> LOOT_MODIFIER_SERIALIZERS = + DeferredRegister.create(NeoForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, MOD_ID); + + public static final DeferredHolder, MapCodec> REPLACE_ITEM = + LOOT_MODIFIER_SERIALIZERS.register("replace_item", ReplaceItemModifier.CODEC); + + public static void register(IEventBus bus) { + LOOT_MODIFIER_SERIALIZERS.register(bus); + } +} \ No newline at end of file diff --git a/src/main/java/maxhyper/dtquark/loot/ReplaceItemModifier.java b/src/main/java/maxhyper/dtquark/loot/ReplaceItemModifier.java new file mode 100644 index 0000000..1fb543d --- /dev/null +++ b/src/main/java/maxhyper/dtquark/loot/ReplaceItemModifier.java @@ -0,0 +1,44 @@ +package maxhyper.dtquark.loot; + +import com.google.common.base.Suppliers; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import net.neoforged.neoforge.common.loot.IGlobalLootModifier; +import net.neoforged.neoforge.common.loot.LootModifier; +import net.minecraft.core.registries.BuiltInRegistries; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Supplier; + +public class ReplaceItemModifier extends LootModifier { + public static final Supplier> CODEC = Suppliers.memoize(() + -> RecordCodecBuilder.mapCodec(inst -> codecStart(inst) + .and(BuiltInRegistries.ITEM.byNameCodec().fieldOf("old_item").forGetter(m -> m.old_item)) + .and(BuiltInRegistries.ITEM.byNameCodec().fieldOf("new_item").forGetter(m -> m.new_item)) + .apply(inst, ReplaceItemModifier::new))); + private final Item old_item; + private final Item new_item; + + protected ReplaceItemModifier(LootItemCondition[] conditionsIn, Item oldItem, Item newItem) { + super(conditionsIn); + this.old_item = oldItem; + this.new_item = newItem; + } + + @Override + protected @NotNull ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { + generatedLoot.replaceAll(itemStack -> itemStack.getItem().equals(old_item) ? new ItemStack(new_item) : itemStack); + return generatedLoot; + } + + @Override + public MapCodec codec() { + return CODEC.get(); + } +} diff --git a/src/main/java/maxhyper/dtquark/mushroom/GlowShroomCapProperties.java b/src/main/java/maxhyper/dtquark/mushroom/GlowShroomCapProperties.java new file mode 100644 index 0000000..7738afb --- /dev/null +++ b/src/main/java/maxhyper/dtquark/mushroom/GlowShroomCapProperties.java @@ -0,0 +1,38 @@ +package maxhyper.dtquark.mushroom; + +import com.dtteam.dynamictrees.api.registry.TypedRegistry; +import com.dtteam.dynamictreesplus.block.mushroom.CapProperties; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.phys.Vec3; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; + +import java.util.Random; + +public class GlowShroomCapProperties extends CapProperties { + + public static final TypedRegistry.EntryType TYPE = TypedRegistry.newType(GlowShroomCapProperties::new); + + public GlowShroomCapProperties(ResourceLocation registryName) { + super(registryName); + } + + public ParticleOptions sporeParticleType(BlockState state, Level level, BlockPos pos, RandomSource random) { + return ParticleTypes.END_ROD; + } + + public Vec3 sporeParticleSpeed(BlockState state, Level level, BlockPos pos, RandomSource random) { + return new Vec3(0, -0.05 - random.nextDouble() * 0.05, 0); + } + + @Override + public BlockBehaviour.Properties getDefaultBlockProperties() { + return super.getDefaultBlockProperties().emissiveRendering((a,b,c)->true).hasPostProcess((a,b,c)->true); + } +} diff --git a/src/main/java/maxhyper/dtquark/mushroom/GlowShroomSpecies.java b/src/main/java/maxhyper/dtquark/mushroom/GlowShroomSpecies.java new file mode 100644 index 0000000..da1ecf5 --- /dev/null +++ b/src/main/java/maxhyper/dtquark/mushroom/GlowShroomSpecies.java @@ -0,0 +1,50 @@ +package maxhyper.dtquark.mushroom; + +import com.dtteam.dynamictrees.api.registry.RegistryHandler; +import com.dtteam.dynamictrees.api.registry.TypedRegistry; +import com.dtteam.dynamictrees.block.sapling.DynamicSaplingBlock; +import com.dtteam.dynamictrees.tree.family.Family; +import com.dtteam.dynamictrees.tree.species.Species; +import com.dtteam.dynamictreesplus.block.mushroom.CapProperties; +import com.dtteam.dynamictreesplus.tree.HugeMushroomSpecies; +import maxhyper.dtquark.DynamicTreesQuark; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.NotNull; + +public class GlowShroomSpecies extends HugeMushroomSpecies { + + public static final TypedRegistry.EntryType TYPE = createDefaultMushroomType(GlowShroomSpecies::new); + + public GlowShroomSpecies(ResourceLocation name, Family family, CapProperties capProperties) { + super(name, family, capProperties); + } + + public Species generateSapling() { + return !this.shouldGenerateSapling() || this.saplingBlock != null ? this : + this.setSapling(RegistryHandler.addBlock(this.getSaplingRegName(), () -> new DynamicSaplingBlock(this){ + @Override + public int getLightEmission(BlockState state, BlockGetter level, BlockPos pos) { + return 10; + } + @Override + public void animateTick(@NotNull BlockState stateIn, @NotNull Level worldIn, @NotNull BlockPos pos, @NotNull RandomSource rand) { + super.animateTick(stateIn, worldIn, pos, rand); + if (rand.nextInt(12) == 0 && worldIn.getBlockState(pos.above()).isAir()) { + worldIn.addParticle(ParticleTypes.END_ROD, (double)pos.getX() + 0.4 + rand.nextDouble() * 0.2, (double)pos.getY() + 0.5 + rand.nextDouble() * 0.1, (double)pos.getZ() + 0.4 + rand.nextDouble() * 0.2, (rand.nextDouble() - 0.5) * 0.04, (1.0 + rand.nextDouble()) * 0.02, (rand.nextDouble() - 0.5) * 0.04); + } + } + })); + } + + @Override + public ResourceLocation getSaplingSmartModelLocation() { + return DynamicTreesQuark.location("block/glow_shroom"); + } + +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/neoforge.mods.toml similarity index 51% rename from src/main/resources/META-INF/mods.toml rename to src/main/resources/META-INF/neoforge.mods.toml index 49ac4ac..1aff557 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[36,37)" +loaderVersion="[4,)" license="MIT" issueTrackerURL="https://github.com/DynamicTreesTeam/DynamicTrees-Quark/issues" @@ -7,45 +7,36 @@ issueTrackerURL="https://github.com/DynamicTreesTeam/DynamicTrees-Quark/issues" modId="dtquark" version="${file.jarVersion}" displayName="Dynamic Trees for Quark" - -updateJSONURL="https://github.com/DynamicTreesTeam/DynamicTreesVersionInfo/blob/master/Add-ons/Quark.json?raw=true" -displayURL="https://www.curseforge.com/minecraft/mc-mods/dynamic-trees-quark" - -authors="Max Hyper" #optional +logoFile="dtquark_logo.png" +authors="Max Hyper, Violet Moon" description=''' -Compatibility Mod between Dynamic trees and Quark +Compatibility Mod between Dynamic Trees and Quark for NeoForge 1.21.1 ''' + [[dependencies.dtquark]] - modId="forge" + modId="neoforge" mandatory=true - versionRange="[36,37)" + versionRange="[21.1,)" ordering="NONE" side="BOTH" [[dependencies.dtquark]] modId="minecraft" mandatory=true - versionRange="[1.16.4,1.17)" + versionRange="[1.21.1]" ordering="NONE" side="BOTH" [[dependencies.dtquark]] modId="dynamictrees" mandatory=true - versionRange="[0.10.0,)" - ordering="AFTER" - side="BOTH" - -[[dependencies.dtquark]] - modId="dynamictreesplus" - mandatory=false - versionRange="[0.1.0,)" + versionRange="[1.1.0,)" ordering="AFTER" side="BOTH" [[dependencies.dtquark]] modId="quark" mandatory=true - versionRange="[r2.4-312,)" + versionRange="[4.1,)" ordering="AFTER" side="BOTH" diff --git a/src/main/resources/assets/dtquark/blockstates/blossom_branch.json b/src/main/resources/assets/dtquark/blockstates/blossom_branch.json deleted file mode 100644 index 8a1893c..0000000 --- a/src/main/resources/assets/dtquark/blockstates/blossom_branch.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dynamictrees:block/spruce_branch" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json deleted file mode 100644 index 8a94b34..0000000 --- a/src/main/resources/assets/dtquark/blockstates/fiery_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/red_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json deleted file mode 100644 index 29b247a..0000000 --- a/src/main/resources/assets/dtquark/blockstates/fiery_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/fiery" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json deleted file mode 100644 index 2abbaf2..0000000 --- a/src/main/resources/assets/dtquark/blockstates/frosty_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/blue_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json deleted file mode 100644 index 58bcc34..0000000 --- a/src/main/resources/assets/dtquark/blockstates/frosty_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/frosty" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/rooty_glowcelium.json b/src/main/resources/assets/dtquark/blockstates/rooty_glowcelium.json deleted file mode 100644 index 7c12d5b..0000000 --- a/src/main/resources/assets/dtquark/blockstates/rooty_glowcelium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "quark:block/glowcelium" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} diff --git a/src/main/resources/assets/dtquark/blockstates/rooty_turf.json b/src/main/resources/assets/dtquark/blockstates/rooty_turf.json deleted file mode 100644 index 5597da2..0000000 --- a/src/main/resources/assets/dtquark/blockstates/rooty_turf.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "quark:block/turf" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} diff --git a/src/main/resources/assets/dtquark/blockstates/rooty_turf_slab.json b/src/main/resources/assets/dtquark/blockstates/rooty_turf_slab.json deleted file mode 100644 index 7e49334..0000000 --- a/src/main/resources/assets/dtquark/blockstates/rooty_turf_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "multipart": [ - { - "when": { "type": "top" }, - "apply": { "model": "quark:block/turf_slab_top" } - }, - { - "when": { "type": "top" }, - "apply": { "model": "dtquark:block/roots_slab" } - }, - { - "when": { "type": "double" }, - "apply": { "model": "quark:block/turf" } - }, - { - "when": { "type": "double" }, - "apply": { "model": "dynamictrees:block/roots" } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/rooty_turf_stairs.json b/src/main/resources/assets/dtquark/blockstates/rooty_turf_stairs.json deleted file mode 100644 index b3329c3..0000000 --- a/src/main/resources/assets/dtquark/blockstates/rooty_turf_stairs.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "multipart": [ - { - "when": { "facing": "east" }, - "apply": { "model": "quark:block/turf_stairs", "x": 180, "uvlock": true } - }, - { - "when": { "facing": "west" }, - "apply": { "model": "quark:block/turf_stairs", "x": 180, "y": 180, "uvlock": true } - }, - { - "when": { "facing": "south" }, - "apply": { "model": "quark:block/turf_stairs", "x": 180, "y": 90, "uvlock": true } - }, - { - "when": { "facing": "north" }, - "apply": { "model": "quark:block/turf_stairs", "x": 180, "y": 270, "uvlock": true } - }, - - { - "when": { "facing": "east" }, - "apply": { "model": "dtquark:block/roots_stairs", "uvlock": true } - }, - { - "when": { "facing": "west" }, - "apply": { "model": "dtquark:block/roots_stairs", "y": 180, "uvlock": true } - }, - { - "when": { "facing": "south" }, - "apply": { "model": "dtquark:block/roots_stairs", "y": 90, "uvlock": true } - }, - { - "when": { "facing": "north" }, - "apply": { "model": "dtquark:block/roots_stairs", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/dtquark/blockstates/rooty_turf_vertical_slab.json b/src/main/resources/assets/dtquark/blockstates/rooty_turf_vertical_slab.json deleted file mode 100644 index 5597da2..0000000 --- a/src/main/resources/assets/dtquark/blockstates/rooty_turf_vertical_slab.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "quark:block/turf" }}, - { "apply": { "model": "dynamictrees:block/roots" }} - ] -} diff --git a/src/main/resources/assets/dtquark/blockstates/serene_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/serene_blossom_leaves.json deleted file mode 100644 index ad0964c..0000000 --- a/src/main/resources/assets/dtquark/blockstates/serene_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/lavender_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/serene_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/serene_blossom_sapling.json deleted file mode 100644 index f8b0027..0000000 --- a/src/main/resources/assets/dtquark/blockstates/serene_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/serene" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/stripped_blossom_branch.json b/src/main/resources/assets/dtquark/blockstates/stripped_blossom_branch.json deleted file mode 100644 index 09d1eae..0000000 --- a/src/main/resources/assets/dtquark/blockstates/stripped_blossom_branch.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dynamictrees:block/spruce_branch_stripped" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json deleted file mode 100644 index b0bb0aa..0000000 --- a/src/main/resources/assets/dtquark/blockstates/sunny_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/yellow_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json deleted file mode 100644 index 4e03bc8..0000000 --- a/src/main/resources/assets/dtquark/blockstates/sunny_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/sunny" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/sweet_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/sweet_blossom_leaves.json deleted file mode 100644 index 4d145df..0000000 --- a/src/main/resources/assets/dtquark/blockstates/sweet_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/pink_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/sweet_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/sweet_blossom_sapling.json deleted file mode 100644 index 8c0081e..0000000 --- a/src/main/resources/assets/dtquark/blockstates/sweet_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/sweet" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/blockstates/warm_blossom_leaves.json b/src/main/resources/assets/dtquark/blockstates/warm_blossom_leaves.json deleted file mode 100644 index e0863f9..0000000 --- a/src/main/resources/assets/dtquark/blockstates/warm_blossom_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "quark:block/orange_blossom_leaves" } - } -} diff --git a/src/main/resources/assets/dtquark/blockstates/warm_blossom_sapling.json b/src/main/resources/assets/dtquark/blockstates/warm_blossom_sapling.json deleted file mode 100644 index a7cce9b..0000000 --- a/src/main/resources/assets/dtquark/blockstates/warm_blossom_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "dtquark:block/saplings/warm" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/lang/en_us.json b/src/main/resources/assets/dtquark/lang/en_us.json index cda9190..e500e6c 100644 --- a/src/main/resources/assets/dtquark/lang/en_us.json +++ b/src/main/resources/assets/dtquark/lang/en_us.json @@ -1,17 +1,23 @@ { - "block.dtquark.blossom_branch":"Blossom Tree", + "block.dtquark.blossom_branch":"Trumpet Tree", + "block.dtquark.azalea_branch":"Azalea Tree", + "block.dtquark.glow_shroom_branch":"Glow Shroom", + "block.dtquark.ancient_branch":"Ashen Tree", "species.dtquark.fiery_blossom":"Fiery", "species.dtquark.frosty_blossom":"Frosty", "species.dtquark.serene_blossom":"Serene", "species.dtquark.sunny_blossom":"Sunny", - "species.dtquark.sweet_blossom":"Sweet", "species.dtquark.warm_blossom":"Warm", + "species.dtquark.glow_shroom":"Glow Shroom", + "species.dtquark.ancient":"Ashen", - "item.dtquark.fiery_blossom_seed":"Fiery Blossom Pit", - "item.dtquark.frosty_blossom_seed":"Frosty Blossom Pit", - "item.dtquark.serene_blossom_seed":"Serene Blossom Pit", - "item.dtquark.sunny_blossom_seed":"Sunny Blossom Pit", - "item.dtquark.sweet_blossom_seed":"Sweet Blossom Pit", - "item.dtquark.warm_blossom_seed":"Warm Blossom Pit" -} \ No newline at end of file + "item.dtquark.fiery_blossom_seed":"Fiery Trumpet Pit", + "item.dtquark.frosty_blossom_seed":"Frosty Trumpet Pit", + "item.dtquark.serene_blossom_seed":"Serene Trumpet Pit", + "item.dtquark.sunny_blossom_seed":"Sunny Trumpet Pit", + "item.dtquark.warm_blossom_seed":"Warm Trumpet Pit", + "item.dtquark.glow_shroom_seed":"Glow Shroom Cap", + "item.dtquark.ancient_seed":"Ashen Seeds", + "item.dtquark.azalea_seed": "Azalea Seed" +} diff --git a/src/main/resources/assets/dtquark/models/block/roots_slab.json b/src/main/resources/assets/dtquark/models/block/roots_slab.json deleted file mode 100644 index 6089b80..0000000 --- a/src/main/resources/assets/dtquark/models/block/roots_slab.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "roots": "dynamictrees:block/roots", - "roots_bottom": "dynamictrees:block/roots_bottom", - "particle": "dtquark:block/dirt" - }, - "elements": [ - { - "from": [-0.005, 8, -0.005], - "to": [16.005, 15, 16.005], - "faces": { - "north": {"uv": [0, 9, 16, 16], "texture": "#roots", "cullface": "north", "tintindex": 1}, - "east": {"uv": [0, 9, 16, 16], "texture": "#roots", "cullface": "east", "tintindex": 1}, - "south": {"uv": [0, 9, 16, 16], "texture": "#roots", "cullface": "south", "tintindex": 1}, - "west": {"uv": [0, 9, 16, 16], "texture": "#roots", "cullface": "west", "tintindex": 1} - } - }, - { - "from": [0.8, -8, 8], - "to": [15.2, 8, 8], - "shade": false, - "rotation": {"angle": 45, "axis": "y", "origin": [8, 16, 8], "rescale": true}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1}, - "south": {"uv": [0, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1} - } - }, - { - "from": [8, -8, 0.8], - "to": [8, 8, 15.2], - "shade": false, - "rotation": {"angle": 45, "axis": "y", "origin": [8, 16, 8], "rescale": true}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1}, - "west": {"uv": [0, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/block/roots_stairs.json b/src/main/resources/assets/dtquark/models/block/roots_stairs.json deleted file mode 100644 index c86f0aa..0000000 --- a/src/main/resources/assets/dtquark/models/block/roots_stairs.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "roots": "dynamictrees:block/roots", - "roots_bottom": "dynamictrees:block/roots_bottom", - "particle": "dtquark:block/dirt" - }, - "elements": [ - { - "from": [7.995, 0, -0.005], - "to": [16.005, 15, 16.005], - "faces": { - "north": {"uv": [0, 0, 8, 16], "texture": "#roots", "cullface": "west", "tintindex": 1}, - "east": {"uv": [0, 0, 16, 16], "texture": "#roots", "cullface": "north", "tintindex": 1}, - "south": {"uv": [8, 0, 16, 16], "texture": "#roots", "cullface": "east", "tintindex": 1}, - "west": {"uv": [0, 0, 16, 16], "texture": "#roots", "cullface": "south", "tintindex": 1} - } - }, - { - "from": [-0.005, 8, -0.005], - "to": [8, 15, 16.005], - "faces": { - "north": {"uv": [8, 9, 16, 16], "texture": "#roots", "cullface": "west", "tintindex": 1}, - "south": {"uv": [0, 9, 8, 16], "texture": "#roots", "cullface": "east", "tintindex": 1}, - "west": {"uv": [0, 9, 16, 16], "texture": "#roots", "cullface": "south", "tintindex": 1} - } - }, - { - "from": [8, -8, 8], - "to": [8, 8, 15.2], - "shade": false, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 16, 8], "rescale": true}, - "faces": { - "east": {"uv": [0, 0, 8, 16], "texture": "#roots_bottom", "tintindex": 1}, - "west": {"uv": [8, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1} - } - }, - { - "from": [8, -16, 0.8], - "to": [8, 0, 8], - "shade": false, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, - "faces": { - "east": {"uv": [8, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1}, - "west": {"uv": [0, 0, 8, 16], "texture": "#roots_bottom", "tintindex": 1} - } - }, - { - "from": [0.8, -8, 8], - "to": [8, 8, 8], - "shade": false, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 16, 8], "rescale": true}, - "faces": { - "north": {"uv": [8, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1}, - "south": {"uv": [0, 0, 8, 16], "texture": "#roots_bottom", "tintindex": 1} - } - }, - { - "from": [8, -16, 8], - "to": [15.2, 0, 8], - "shade": false, - "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8], "rescale": true}, - "faces": { - "north": {"uv": [0, 0, 8, 16], "texture": "#roots_bottom", "tintindex": 1}, - "south": {"uv": [8, 0, 16, 16], "texture": "#roots_bottom", "tintindex": 1} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/block/saplings/fiery.json b/src/main/resources/assets/dtquark/models/block/saplings/fiery.json deleted file mode 100644 index 5b6e4ca..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/fiery.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/red_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/red_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/block/saplings/frosty.json b/src/main/resources/assets/dtquark/models/block/saplings/frosty.json deleted file mode 100644 index 2cc2b68..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/frosty.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/blue_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/blue_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/block/saplings/serene.json b/src/main/resources/assets/dtquark/models/block/saplings/serene.json deleted file mode 100644 index a9509a9..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/serene.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/lavender_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/lavender_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/block/saplings/sunny.json b/src/main/resources/assets/dtquark/models/block/saplings/sunny.json deleted file mode 100644 index c2c7946..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/sunny.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/yellow_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/yellow_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/block/saplings/sweet.json b/src/main/resources/assets/dtquark/models/block/saplings/sweet.json deleted file mode 100644 index 8cf7328..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/sweet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/pink_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/pink_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/block/saplings/warm.json b/src/main/resources/assets/dtquark/models/block/saplings/warm.json deleted file mode 100644 index 095f56e..0000000 --- a/src/main/resources/assets/dtquark/models/block/saplings/warm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "dynamictrees:block/smartmodel/sapling", - "textures": { - "particle": "quark:block/orange_blossom_leaves", - "log": "block/spruce_log", - "leaves": "quark:block/orange_blossom_leaves" - } -} diff --git a/src/main/resources/assets/dtquark/models/item/blossom_branch.json b/src/main/resources/assets/dtquark/models/item/blossom_branch.json deleted file mode 100644 index 4678c37..0000000 --- a/src/main/resources/assets/dtquark/models/item/blossom_branch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "dynamictrees:item/branch", - "textures": { - "bark": "block/spruce_log", - "rings": "block/spruce_log_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/fiery_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/fiery_blossom_seed.json deleted file mode 100644 index 613300a..0000000 --- a/src/main/resources/assets/dtquark/models/item/fiery_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/fiery_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/frosty_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/frosty_blossom_seed.json deleted file mode 100644 index e0fe063..0000000 --- a/src/main/resources/assets/dtquark/models/item/frosty_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/frosty_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/serene_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/serene_blossom_seed.json deleted file mode 100644 index b9cc1a2..0000000 --- a/src/main/resources/assets/dtquark/models/item/serene_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/serene_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/sunny_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/sunny_blossom_seed.json deleted file mode 100644 index ad392a6..0000000 --- a/src/main/resources/assets/dtquark/models/item/sunny_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/sunny_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/sweet_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/sweet_blossom_seed.json deleted file mode 100644 index 0d90131..0000000 --- a/src/main/resources/assets/dtquark/models/item/sweet_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/sweet_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/models/item/warm_blossom_seed.json b/src/main/resources/assets/dtquark/models/item/warm_blossom_seed.json deleted file mode 100644 index 9ee9a9d..0000000 --- a/src/main/resources/assets/dtquark/models/item/warm_blossom_seed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent":"dynamictrees:item/standard_seed", - "textures": { - "layer0":"dtquark:item/warm_blossom_seed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/dtquark/textures/block/ancient_fruit.png b/src/main/resources/assets/dtquark/textures/block/ancient_fruit.png new file mode 100644 index 0000000000000000000000000000000000000000..50adaed8de0416644e78f3236241a042a7d4fc2f GIT binary patch literal 691 zcmV;k0!;mhP)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;IY~r8RCwBqkv~imVHn1LU!k-G>76at1OG%5hH6p_k!Wyn!VpKI4h*htE{4U; zm4(g46`~FdBqU-J(Ab(tj4?)H2oRG}(0W%|t}TDAkoI#p?r4copYi>k_xYaZdBv-5 z;}XEyU1#*#Q?alflF{%m09!w53?*j8W~N)}dK&;MUwi=K`Rsiei75C0(o+>&M8m@* z)JZOMJfQ1r3jn&_hCh_TA9zH(zfQcrP9&mGES4OBzL6q!sR}@$oTPG?W_|Y=g>n*r zl$nS642RVT4C8=Cv;x?rDnTXS4L|4Z03a(v0K}!j!p39bQo+gv(e*lGV`Boq_v_~> zK_%chh=zx8I}n}o!i{h zrUXDGUw41?92Ck)2?#3}#L9u%<18g^WIO?1*F}X>r-PhCLY?%4)E=97f1RUK%0`~g z&EBawxlF@(f0vE1y!N_D)E`Q@BF6$d+cvq?JuiaRev3jmiD^g{=QIG)rjvRzGsyIk z$%~K2j$0qzn-YzRYnk_`F^Oe{xHPZ>KwqsJ!>~!47K?KlgSYd?4)_BW=QIkN8ft9c zxlG}ZjV$z-QAP&p%@Iy6tFe7FJw)_e9?J}Q^OtY^d|fUQ2-g_BZvWju@6{}7Y@f`h z2mpa_jo$Vxu3U~#Ew?mrg_M$i;X|t1Bh9?&VEoB4Fivb9KD9iui Z_W+LT-rF$3^}YZA002ovPDHLkV1m6iG8+H@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dtquark/textures/block/ancient_fruit_stem.png b/src/main/resources/assets/dtquark/textures/block/ancient_fruit_stem.png new file mode 100644 index 0000000000000000000000000000000000000000..e36711b91cc902672db9165b481b2494c4f43b75 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK?6@0#}EtulGW$`f}TJFF1LdXOl)int^!=Hwi(RbK)no}u6{1-oD!M<$cQW} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dtquark/textures/block/glow_shroom_cap.png b/src/main/resources/assets/dtquark/textures/block/glow_shroom_cap.png new file mode 100644 index 0000000000000000000000000000000000000000..983f0fa2f8b36a6f1323934604ec8369f782b1a0 GIT binary patch literal 373 zcmV-*0gC>KP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ+`$+!jGBRB>-fzz-Ga`uSGTs0FX(JOmeVUpkJK<5Gi2ZS1iYd<=6^D0X7SK3}9w3 zGkgp!K!1L`o>-0z^1e3!lN^{Cw`nQ>byxsBqzCvIikNwHAn$t@-d7ZXnDGU<=6&*-ogOT?DM{&o__+=CF=YQaGNIlU80_H4fqTIrf#Az T;BA@800000NkvXXu0mjfIZ=&Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dtquark/textures/block/glowshroom.png b/src/main/resources/assets/dtquark/textures/block/glowshroom.png deleted file mode 100644 index ddebe54111f964cfef4afc74ef055e786ed5ed3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP*5S+ zBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~gN8NyGe|Wk$hE&|@nXJfn zL_xq+J@o31d5gqjwsSGMzp!WCly#|~b5++~XV%yV*70fl2>=J)4kVk>$qI zoyXs56j^@UqF3VmeNFoE(nLYUpaVN(ZQiK!|Bh7PDzG$U_-44Fzmf3@!(N;EbzDiZ zKO}y9?PGmVw2D!82`hufC&Mp%w>Y*jOFPDf@ZA#f4P?ErswiRY?l~3zVscrS92ia< zcd%odb**)m(AQ0FlHWEnxGV``4|u(;{W!zfD}0xd4{Xs}vq`o0_D371=qGO%F})CA z{J|U0@e;_=DPj06o-?tZan|3uYO@1;AFAB{MK4+x-O#s*wT7L+o-=6AoiFCAfMLMk M>FVdQ&MBb@0D&@!?f?J) diff --git a/src/main/resources/assets/dtquark/textures/item/ancient_seed.png b/src/main/resources/assets/dtquark/textures/item/ancient_seed.png new file mode 100644 index 0000000000000000000000000000000000000000..496da6cea93a1f0d753cbb34748da33362d06521 GIT binary patch literal 453 zcmV;$0XqJPP)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-OG!jQRCwCNlRZnrP!xurD^BguK$=1clunZAwupjN&`A*8{4I5`;L=~AApU}a zSZL{z!NCu3F9HEqA9c{3tHshjRudni6 z0i;qXQLR@0OrS0=ZaF``qu(E>8G=Pd!zfazNbVm>c)mjrxU3qW_ICHl<+FT${QwY# z(fmJ%Wf;XtJsfrcCg!J?$E8zHp7)-ZYcv`YjmEsbJ)`RyLD0iA3t}FDvbIWSnKZ3V zTUl0F0K)Sf6=MfM4=JUXZX-dUWzyvGS51N9bhpk%%00000NkvXXu0mjf-?_ST literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/dtquark/textures/item/fiery_blossom_seed.png b/src/main/resources/assets/dtquark/textures/item/fiery_blossom_seed.png index 1fc9ab3668cbb53a6a80583e90be90ee06350797..3a6890673c4c0a9fdd849e7e204966ff45aabb82 100644 GIT binary patch delta 337 zcmV-X0j~bq1FZv)Wq&hCL_t(|+Pss$O2beThrgSugM-+DE~&}VF4ljGI#_T}2&IEa zAHkuZ#Yb@veFSkV4q6n!MTCkVX~7P4X>1n@_5nh29kj8HH7x`@%jKMVf8V{odpJT$ zNtjRw8KD7Vy~*+Rnt$K(XWD}0aVY=}ZyyH({Nnw5-b*UQ5`U+yH`#>@vmguE433_} z(UT}mi>2KR2kKnktNsGWLNkx zR(-*ZYo55bl}dqtPC`XbE%2-rBLV(>m_7#pDZO-rfVmUi00000NkvXXu0mjfb-$W5 delta 382 zcmV-^0fGLl1KII(TU)DD4a`W;g^&7onjcsv#nr z`YN?V1bz;OAUHHQL{nRIQE(7Wr$OpuE(Ll#ylu+ca8NvX3mkfu_s0MCJpAA1QKXbi z5>reVzTU&};g09AErc{|hj`GBVLK$k^9sQE)y-f4K;|O=z<*`1CX)e;>~;(Q{m~?6 zm1PGq6wnc8H`1^ef%mElUUfk^t1JO!s0SW#z2RP}DhNSlIZQn0|D%a_4DT;>H(RrQucq_*$Rnk0!;Y)mQ#d6Rl{7gPA!}`-yI5!*rF8uUVJ|@G9j2qLb%gl#IHju7eOWJV?*{|^ cWg3450CmNUka>kOKmY&$07*qoM6N<$f+a<;!T{zXz%O-&^7IF|9@aF)-_#4zqkq`NFpFI zudHv;l0^W{uAf;|T5%2#5&@CpxZd5nHQp{Rgq&-RHY=eHRB03bdc-^I7B zWI#o3hP8T?ui%a4g};{_-=$H`(~+h0DFEa|iJ{j6QNnoY!F-91ETQQt-HGxOTZkae z=Wi8}d32PifJ~v+qp(zB@xvW6E1eA?wFTd{xCd(WDt9+ptN~Na0K()lwYQJQgzv$l l@ZvmRnL0B8{(YH#1^~+ZjiqE07nA@1002ovPDHLkV1mkVoP+=X delta 388 zcmV-~0ek+h1K`8N49kX)!Xdi|4G|3qL1cY| zh+6y#4Sj`Xm)fE|Y!PgT5EAsNgCG|d^>PjW4iIRzQ2X|{MMn~>K zm6kcP3(~EGc+m^kyn;&0q~7dNX_>g37Ebn;Fm#QX88~E@Y_Y`7<_49r$=b4&jMk-* z%g_D?ZDAkmvwg)9Hm|_tw9xp(enTWN*k$+G1hYNhvV!7a%j$(!5XEp8=F+b!L{8K!UTesP@f`Dxkfx0(N1m@pm+Xyt0Dn-jis z4b$8BN8a;Wd|0&v_I!Ua@AIlMLErNyIHvCtd@b`Q{2%uRNrwJQcLbD0ORoTZ!{F)a K=d#Wzp$PyFQg+V( diff --git a/src/main/resources/assets/dtquark/textures/item/serene_blossom_seed.png b/src/main/resources/assets/dtquark/textures/item/serene_blossom_seed.png index b2f46076a5271eb920e25d8c2e09ad166bb5789a..8881aa639b2d27767e5d61c6229034f562a65bbb 100644 GIT binary patch delta 335 zcmV-V0kHn$1FHj&Wq&bAL_t(|+PsrJOT$nUhM&ZbE2x8%;1KAb;vfiOhuWby6jX3? z?LTlVrRYEK7jzQ`H-$_tX6?`-v%JgNPkSD%Dq*VKIAWeEaZzU zCcodlS3fyA%K%VsS0tcB%|I6NMOHI&47-wHS0Z#3*YP+^r{fQ?eKWvyJb>Wr*&{lG zW+XtSwz8NH7V73l@N>@|A#{~wPDHx^;Jz&*v_8*|4jhBFutqW`FpVnpb|qd5KE!)n zLFj5A9=9^m1xTUw+1cNw)o5TF{3`wd@CTIAvfSQXPt>M~0hI7Eo$Q@X6cUMb<)zo+ h$*K_x@bAm?H30Decg5QIHsAmN002ovPDHLkV1n@Bor3@X delta 393 zcmV;40e1eY1LOmcWq)c(L_t(|+QgGTOF~f?#(y_d1RYWkbdZLWpc|D04Gj)m2*RNH z0u8qG34)-$LbC+9wPr#tfej8yK`Ejw>U4)IC|3uCi(WV_DdL|D9D0{?4u|J?UY_@T zBq0Qg)DjDpW%Lm}Iv@WRRjoq67v$%Z0OHU0(+L1%uL3~1o_`jySK<2X27ts%mSjFA z1|%~H2H?xXD;%44xguqzvc<{%`cS#5Rk(}BrC&F(s#U=EfQ-W9+byzJA(@W>a2&djQu+4@F=;eR;hiwR nc)BK3Gas4h1pku8?*Rals*zY8K6{t|0000d^JA0L(l!8}uNM@Gw#orw<_wg1<%rRs#%NF@ls4MXVW;qiA?mFYw4no_UfJ*A zdU7_vF!U&AoA{lOhhAD$mi-=~v_R*Ly9~Rd|VhgS(xhy}EvrWo(O{KwfGl2MhOuKs< p6Tk1Bw@{iE*z01Gog0DscQTH-O2P;>(TtC%H` z%u5sUBcLhX-C4%dKf!Cg1VAVnV><(eG1i@NIYh8cbP${VHy<+amzF+7RvDB8<|Jj&hH&mC4gh+S`hD0i2Cyx zrSq-d|G}X8aC~S&l;P*bz9pU2e4RoEz^CpRR1Q^n4@=|;tC%I7)gA43eL~QTFcw*C zIcwYDpFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-dr3q=RCwCNlfO#>VHn3h*IDEsNI0ZPks%z_l0!eXhN3B2gh=R52qdT=n%csl z$e}SPxRw@&hNz*j9BdWjP7<#Z5xX#u?5=B&$}%fx=-J-)<@4LD4lPf|3BRb#(YO0APM_7JztCwwFdDNZ}9w>Ejg9M9hAL zv;@40cUL!P5BBktxdA{5huC3-Xd-3>eZ8DPNM^E(r(r`K2| z<4p`;s^#yuP<*J^OQR9;at>U6Otp+vGBDLLqQ{MMW&}mo_|b!^&!ljcrh8h#RP#6j zT|6dLvN_}Df8e}*XBN)V;PNAS++=eG@ubY>Ei?f-i*-oVXVxz&dD6!z;z_w_{FWwG zeJ1@w!}ue;Z=Drg<79hJ_!gk(8k@BP0G9XH$y}&J6EPHBV`pwf$XuvR&4k7JY`IuIE>mUjzOnjV}WLL0g_3QHX-|00000NkvXXu0mjfPZria diff --git a/src/main/resources/assets/dtquark/textures/item/warm_blossom_seed.png b/src/main/resources/assets/dtquark/textures/item/warm_blossom_seed.png index bbbc6d9fd8ed57c6a50f03383f3651efb8600b85..b81dd00000da62248ad2dcf63c703fd184cd125d 100644 GIT binary patch delta 337 zcmV-X0j~bz1FZv)Wq&hCL_t(|+Pss$O2beThrcW7BDDUAI@n~8f~bQ^7YQObv_&65 zCQL|re1?vKPvBG|f(Q~E4OpzDIHX+)Ez%4QDO`uzkk*fD%kDkGF>JeSdaSu(>1!z{S(q#KYINf|itDhqyFPgnryq(auG91RbBbyO zyD35e(pb@Wy}6??yXL?hz%qdx%ZuQpGgu`P>!S{c@fP}! zzB5<`XSTQg7_Ed~(7%XD1bM1X%^rtbj&Tz7O=7RCRP00000NkvXXu0mjfBk7=d delta 392 zcmV;30eAkb1LFgbWq)Z&L_t(|+QgH;OF~f`#XmQm4Z#CL$V}cOktjsjP*8)BMngke z?F~&qe?qO%5H>|)ORcp$(#W9*AxuO?kz5`kLJy<|2_@W?6!Av}4Skn;FPC%9m-GD| zA*JLmHN+oFX@Bf)EqDIQoMGbA9DJVw;N;@2Hvz!runmCAkAF`Y^1C?N+W=QOa=u*241uMD&aVL|+fu!M3*-02-=>Vi~M2OyJWTzcXqtBG>UPQ5gVi|~HfrhH_9^4^km<;rwraCF5k}wm%UCbjVr?4es z=w@Q@9@wpF>wjKKB`MpzG*pdiQze$I&^d)Jg3*2cB{9c%JSO6YXJIS)2yw mOjnoc?L)dZ!M~*OYXFM-i}TVHWa|I`002ovPDHLkU;%=XGO^hJ diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/fiery_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/fiery_blossom_leaves.json deleted file mode 100644 index a200106..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/fiery_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "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": "quark:red_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/frosty_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/frosty_blossom_leaves.json deleted file mode 100644 index ae0587b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/frosty_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "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": "quark:blue_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/serene_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/serene_blossom_leaves.json deleted file mode 100644 index e9dd6d4..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/serene_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "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": "quark:lavender_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/sunny_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/sunny_blossom_leaves.json deleted file mode 100644 index ecd222e..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/sunny_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "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": "quark:yellow_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/sweet_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/sweet_blossom_leaves.json deleted file mode 100644 index 83062b5..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/sweet_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "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": "quark:pink_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/blocks/warm_blossom_leaves.json b/src/main/resources/data/dtquark/loot_tables/blocks/warm_blossom_leaves.json deleted file mode 100644 index 150574c..0000000 --- a/src/main/resources/data/dtquark/loot_tables/blocks/warm_blossom_leaves.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "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": "quark:orange_blossom_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/fiery_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/fiery_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/fiery_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/frosty_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/frosty_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/frosty_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/serene_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/serene_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/serene_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/sunny_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/sunny_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/sunny_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/sweet_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/sweet_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/sweet_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/leaves/warm_blossom.json b/src/main/resources/data/dtquark/loot_tables/trees/leaves/warm_blossom.json deleted file mode 100644 index 7b3e90b..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/leaves/warm_blossom.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "dynamictrees:leaves", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ] - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/sweet.json b/src/main/resources/data/dtquark/loot_tables/trees/voluntary/sweet.json deleted file mode 100644 index a232c50..0000000 --- a/src/main/resources/data/dtquark/loot_tables/trees/voluntary/sweet.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "dynamictrees:voluntary", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "dynamictrees:voluntary_seed_drop_chance", - "rarity": 1.0 - } - ], - "name": "dtquark:sweet_blossom_seed" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/patchouli_books/guide/book.json b/src/main/resources/data/dtquark/patchouli_books/guide/book.json deleted file mode 100644 index a62d8e8..0000000 --- a/src/main/resources/data/dtquark/patchouli_books/guide/book.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extend": "dynamictrees:guide" -} \ No newline at end of file diff --git a/src/main/resources/data/dtquark/patchouli_books/guide/en_us/entries/trees/blossom_trees.json b/src/main/resources/data/dtquark/patchouli_books/guide/en_us/entries/trees/blossom_trees.json deleted file mode 100644 index 952918f..0000000 --- a/src/main/resources/data/dtquark/patchouli_books/guide/en_us/entries/trees/blossom_trees.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "Blossom Trees", - "icon": "dtquark:sweet_blossom_seed", - "category": "trees", - "sortnum": "6", - "pages": [ - { - "type": "text", - "title": "Blossom Trees", - "text": "Blossom trees are an elusive tree species that can be found in many variants across the world. By default, you will find blossom trees in the following locations:$(br)- Frosty in cold biomes$(br)- Serene in swamp biomes$(br)- Warm in savanna biomes$(br)- Sweet in mountain biomes$(br)- Sunny in plains biomes$(br)- Fiery in mesa biomes" - }, - { - "type": "image", - "images": ["dtquark:textures/patchouli/images/blossom_1.png","dtquark:textures/patchouli/images/blossom_2.png", "dtquark:textures/patchouli/images/blossom_3.png"], - "text": "Examples of blossom trees", - "border": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/dynamictrees/tags/blocks/branches_that_burn.json b/src/main/resources/data/dynamictrees/tags/blocks/branches_that_burn.json deleted file mode 100644 index 76dcdc6..0000000 --- a/src/main/resources/data/dynamictrees/tags/blocks/branches_that_burn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "dtquark:blossom_branch" - ] -} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index c79a362..7830cd4 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,6 @@ { "pack": { - "description": "examplemod resources", - "pack_format": 6, - "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods." + "description": "Datapack of Dynamic Trees for Quark", + "pack_format": 34 } } diff --git a/src/main/resources/trees/dtquark/cap_properties/glow_shroom.json b/src/main/resources/trees/dtquark/cap_properties/glow_shroom.json new file mode 100644 index 0000000..fcb1e45 --- /dev/null +++ b/src/main/resources/trees/dtquark/cap_properties/glow_shroom.json @@ -0,0 +1,18 @@ +{ + "only_if_loaded": "dynamictreesplus", + "type": "dtquark:glow_shroom", + "primitive_cap": "quark:glow_shroom_block", + "age_zero_shape": "dtquark:glow_shroom_age0", + "material_color": "DIRT", + "light": 12, + "mushroom_item": "quark:glow_shroom", + "model_overrides": { + "outside_face": "quark:block/glow_shroom_block_side", + "inside_face": "quark:block/glow_shroom_block_inside", + "cap_center_age_0_parent": "dtquark:block/tall_slab" + }, + "texture_overrides": { + "outside_face": "quark:block/glow_shroom_block", + "inside_face": "quark:block/glow_shroom_block_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/families/ancient.json b/src/main/resources/trees/dtquark/families/ancient.json new file mode 100644 index 0000000..0f38f80 --- /dev/null +++ b/src/main/resources/trees/dtquark/families/ancient.json @@ -0,0 +1,14 @@ +{ + "common_leaves": "dtquark:ancient", + "common_species": "dtquark:ancient", + "primitive_log": "quark:ancient_log", + "primitive_stripped_log": "quark:stripped_ancient_log", + "max_branch_radius": 8, + "max_signal_depth": 40, + "texture_overrides": { + "branch": "quark:block/ancient_log", + "branch_top": "quark:block/ancient_log_top", + "stripped_branch": "quark:block/stripped_ancient_log", + "stripped_branch_top": "quark:block/stripped_ancient_log_top" + } +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/families/azalea.json b/src/main/resources/trees/dtquark/families/azalea.json new file mode 100644 index 0000000..df86b1c --- /dev/null +++ b/src/main/resources/trees/dtquark/families/azalea.json @@ -0,0 +1,13 @@ +{ + "common_leaves": "azalea", + "common_species": "dynamictrees:azalea", + "primitive_log": "quark:azalea_log", + "primitive_stripped_log": "quark:stripped_azalea_log", + "max_branch_radius": 8, + "texture_overrides": { + "branch": "quark:block/azalea_log", + "branch_top": "quark:block/azalea_log_top", + "stripped_branch": "quark:block/stripped_azalea_log", + "stripped_branch_top": "quark:block/stripped_azalea_log_top" + } +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/families/blossom.json b/src/main/resources/trees/dtquark/families/blossom.json index e2627ae..0c1939a 100644 --- a/src/main/resources/trees/dtquark/families/blossom.json +++ b/src/main/resources/trees/dtquark/families/blossom.json @@ -1,8 +1,14 @@ { - "common_leaves": "dtquark:sweet_blossom", - "common_species": "dtquark:sweet_blossom", - "primitive_log": "spruce_log", - "primitive_stripped_log": "stripped_spruce_log", + "common_species": "dtquark:frosty_blossom", + "common_leaves": "dtquark:frosty_blossom", + "primitive_log": "quark:blossom_log", + "primitive_stripped_log": "quark:stripped_blossom_log", "stick": "stick", - "max_branch_radius": 8 -} \ No newline at end of file + "max_branch_radius": 8, + "texture_overrides": { + "branch": "quark:block/blossom_log", + "branch_top": "quark:block/blossom_log_top", + "stripped_branch": "quark:block/stripped_blossom_log", + "stripped_branch_top": "quark:block/stripped_blossom_log_top" + } +} diff --git a/src/main/resources/trees/dtquark/families/glow_shroom.json b/src/main/resources/trees/dtquark/families/glow_shroom.json new file mode 100644 index 0000000..41c0ddf --- /dev/null +++ b/src/main/resources/trees/dtquark/families/glow_shroom.json @@ -0,0 +1,13 @@ +{ + "only_if_loaded": "dynamictreesplus", + "type": "dynamictreesplus:mushroom", + "common_cap": "dtquark:glow_shroom", + "common_species": "dtquark:glow_shroom", + "primitive_log": "quark:glow_shroom_stem", + "stick": "air", + "generate_stripped_branch": false, + "texture_overrides": { + "branch": "quark:block/glow_shroom_stem", + "branch_top": "quark:block/glow_shroom_block_inside" + } +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/fruits/ancient_fruit.json b/src/main/resources/trees/dtquark/fruits/ancient_fruit.json new file mode 100644 index 0000000..00f33cc --- /dev/null +++ b/src/main/resources/trees/dtquark/fruits/ancient_fruit.json @@ -0,0 +1,10 @@ +{ + "block_registry_name": "ancient_fruit", + "item_stack": "quark:ancient_fruit", + "block_shapes": [ + "dtquark:ancient_fruit_age0", + "dtquark:ancient_fruit_age1", + "dtquark:ancient_fruit_age2", + "dtquark:ancient_fruit_age3" + ] +} diff --git a/src/main/resources/trees/dtquark/jo_codes/ancient.txt b/src/main/resources/trees/dtquark/jo_codes/ancient.txt new file mode 100644 index 0000000..c0c9b55 --- /dev/null +++ b/src/main/resources/trees/dtquark/jo_codes/ancient.txt @@ -0,0 +1,140 @@ +8:JJOJJxJOJJxJJPz8+fyWXv1q8mfy8+bz9+Sy+vn1ufXky8+bz8+Sy+vn1r8mfn +8:JJJJxJJxJJxJJ+bnyWXv1q8i+bvyWXv1ufy98j+bz+vnyWX18+tz+Xvkz+Xn +8:JJOJJJxJJOJJPy+tz68+bz9+Sy+vntz9+bz+vnyWXn1ufy98mfy8 +8:JJOJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+XnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +8:JJJJJxJJxJJxJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz68mfy8 +8:JJJJOJJJxJJOJJJ+bz+vny+t8mXnzefvyWX18+tz98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJOJJxJOJJxJOPzfvzfyS+tz68k+bz9+Sv1ufy98mXnzef18+Sy+vn1ufvkz+Xnzef18+Sy+vn1ufy98mfy8 +8:JJJOJJOJJOJJOJJPzef18+Sy+vn1ufvkz+XnyWX18+tz+Xvkz+Xnzef18+Sy9+tz+Xvkz8+bz+vnyWX18+ty98mfy8 +8:JJJJxJJxJJxJJ+bz8+Sy+vn1t8mXnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJOJJxJOJJxJPzefnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +8:JJJJxJJxJJxJJxJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mXnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJJJxJJxJJxJJ+bvyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +8:JJxJOJJxJOJJ+bfyWXn1ufvkz+Xnzef18+Sy+vn1ufvkz+Xnzef18+Sy9+tz+Xvkz8+bz+vnyWX18+tz+Xvkz+Xn +8:JJJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +8:JJJJxJJxJJxJJxJJ+b9vzd+Sy8+t8nzef18+S18+t8mfy8+bz+vnyWX18+tz+Xvky8 +8:JJJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJJJOJJJxJJOJJJ+b+SXtfzefnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfn +8:JJxJOJJxJOJJ+bz8+SX1q8mfnz+tz98nzefvyWXn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +8:JJJJxJOJJxJOPzb+X18nzefv1vky8+bz+vnyWX18+tz98mfy8+bz+vnyWX18+tz+Xvkz+Xn +7:JJxJJxJJxJJxJJxPzfyV8+fyX1vk+bfyX1q8mXnzef18+Sy9+tz98mfnzef18+Sy+vn1ufy98mfy8 +7:JJOJJxJOJJxJOJPzfyU+tz98ny+vky8+bvyWXv1r8mXnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+vkz+Xn +7:JJJOJJxJOJJxJJ+fy+vnzef18+S+tz68j+bz8+Sn1r8mfnzef18+Sy+vn1ufy98mfy8 +7:JJJJxJOJJxJOJJyU9+fyV9vz+Sy+vn1ufy98mXnzef18+Sy+vn1ufy98mXnzef18+Sy+vn1ufy98mfy8 +7:JJxJOJJxJOJJ+bny+t8mfXzefn1q8mfy8+bz+vnyWX18+tz+Xvky8+bz+vnyWX18+tz+Xvkz+Xn +7:JJJxJJOJJJxJJPzef18+S18+tfkz8+bz+vnyWX18+ty98mfy8+bnyWXv1ufy98mfy8 +7:JJJJJxJJOJJJ+b+S+tfk+bz+vnyWX18+ty98mfy8 +7:JJJOJJxJOJJxJPzfyV8k+b+SX1ufXkz8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98k +7:JJJxJJOJJJxJJPzefvyWXv1ufvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWXn1ufy98mfy8 +7:JJJOJJOJJOJJOJJPy8j+bz+vnyWX18+ty98mfnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz8 +7:JJJOJJxJOJJxJPzef18+Sy8+tz+Xvkz6+bnyWX18+ty98mfnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +7:JJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +7:JJJJOJJOJJOJJPzef18+Sy+vn1uXvkz6+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +7:JJOJJxJOJJxP18nzb+Sy+vn1uXvk+bz9+Sy9+ty98mfnzef18+Sy8+tz98mfn +7:JJJxJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +7:JJJJxJJxJJxJJxJJ+b+SX1vnzef18+S+tz+Xvknzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz98mfy8 +7:JJJxJJxJJxJJxJJ+bnyS+tfkz6+bntz9+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +7:JJJJOJJJxJJOJJJ+Sy8+t8nzd+S+tz68i+bz+vnyWX18+tz+Xvkz+Xn +7:JJJOJJJxJJOPz+Svnzd+Sy8+tXkz8+bz8+Sy+vn1ufy98mfy8 +7:JJJxJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz8+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +6:JJJJxJJxJJxJJ+bz+vnyWXn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +6:JJJJJxJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy9+tz+Xvkz+Xn +6:JJJJOJJOJJOJJPzb+Sy9+tz68mfnzefvyWXv1ufy98mfy8+b18+Sy+vn1ufy98mfy8 +6:JJJOJJOJJOJJPzevnyWXv1q8mfnzevnyX1uXvkz+Xnzef18+Sy+vn1ufy98mfy8 +6:JJJJJxJJxJJxJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +6:JJJJOJJOJJOJJPzefvyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tXkz+Xn +6:JJJJOJJOJJOJJPzfyS+tz+Xvk+bfyWX18+tz68mfnzef18+Sy+vn1ufy98mfy8 +6:JJJJJxJJOJJJxJJPzfyS+t8nzef18+S18+tz+Xvky8+bz+vnyU+tz98mfy8 +6:JJJJJxJJxJJxJJ+b18+Sy8+tz98mfnzef18+Sy8+tz98mfy8+bz8+Sy+vn1ufy98mfy8 +6:JJJJxJOJJxJOJJ+b+S+t8nzb+Sv1q8mXnzef18+Sy+vn1ufy98mfnzef18+Sy+vn1ufy98mfy8 +6:JJJJxJJxJJxJJ+bvyWXnt+bz8+Sy9+tz+Xvkz8+bz+vnyWX18+tz98mfy8 +6:JJJJJxJJxJJxJJ+fvzfyU+tz98i+bz+vnyWX18+ty98mfn +6:JJJOJJxJOJJxJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+XnzefnyWX18+ty98mfy8+bz+vnyWX18+tz+Xvkz+Xn +6:JJxJOJJxJOJJ+bz9+Sy8+tz98mfy8+Sy+vn1ufvkz8+bz+vnyWXv1ufy98mfnzef18+Sy+vn1ufy98mfn +6:JJJxJJxJJxJJxJJ+bz9+Sn1vk+bz+vnyV+tz+Xvky8+SX1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +6:JJOJJJxJJOJJJxPz9+bz8+SX1uXvkfzefvyWXv1uXvkz+Xnzef18+Sy9+tz+Xvkz+Xn +6:JJJxJJxJJxJPbfzefnyWvn1vkz8+bz+vnyWX18+tz+Xvkz+Xn +6:JJJJxJJxJJxJJ+bfyX1uXvkfzef18+Sy+vn1uXvknzef18+Sy+vn1ufy98mfy8 +6:JJJJOJJOJJOJJPz+XvzevnyWvn1r8mfy8+bz+vnyWXn1uXvkz+Xn +6:JJOJJOJJOJJPzevnyWXv1ufy98mXnzefnyWX18+tz+Xvkz+Xnzef18+Sy8+tz+Xvkz+Xn +5:JJOJJxJOJJxJOJJ+b8nz+X18+bvyWX18+ty98mXnzefnyWX189ufXzef18+Sy+vn1ufy98mfy8 +5:JJJJxJJOJJJxJJPzb+SX1ufXky8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJJJxJOJJxJOJJ+bz+vnyWX18+tz98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +5:JJJJOJJJxJJPzef18+Sy8+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJJJxJOJJxJOJJ+fyX18i+bnyWX18+tz+XvknzefvyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJJJJxJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy9+tz+Xvkz+Xn +5:JJJxJJOJJJxJJPzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz8+bz+vnyWX18+tz+Xvkz+Xn +5:JJJJJxJJxJJxJ9+bz+vnyWXv1t8mfnzef18+Sy+vn1ufy98mfy8 +5:JJJJxJOJJxJOJJxJPzef18+Sy+vn1ufy98mXnzef18+Sy+vn1ufvkz+Xnzef18+Sy+vn1ufvknzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +5:JJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJJJxJJxJJxJJxJ8nzc+X1ufvkXzc+Sy+vn1ufvky8+bz8+Sy+vn1ufy98mfn +5:JJJJJxJJOJJJ+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJOJJxJOJJxJOJ9+X18nzd+Svtvzef18+Sy8+tXkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJOJJOJJOJPz9+bz8+S18+tfnzef18+Sy+vn1ufy98mfy8 +5:JJxJJxJJxJJxPfzfyX1q8mfy8+bfyWX18+tz+XvkXzef18+Sy+vn1ufy98mfn +5:JJJxJJOJJJxJJPzefvyWX18+tvkz8+bz+vnyWXntz9+bz+vnyWX18+tz+Xvkz+Xn +5:JJJJOJJxJOJJxJPyU+vk+b+SXknzef18+Sy+vn1uXvkz+Xnzef18+Sy+vn1ufy98mfy8 +5:JJOJJOJJOJJPzefvyWXv1ufvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +5:JJOJJOJJOJJPzefvyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8+bz+vnyWX18+tz+Xvkz+Xn +5:JJJJxJOJJxJOJJ+fyX1vkfzefnyWXn1uXvkz6+bz+vnyWX18+tz+Xvkz+Xnzef18+Sy+vn1ufy98mfy8 +4:JJJJxJOJJxJPz+Xvy+vnzd+Sy+vn1ufy98mfy8 +4:JJJJJJJOJJJxJJPzefvyX1uXvkXzb+Snky8 +4:JJJJOJJOJJOJJPyWXv1vnzc+S18+tz68mfnzefntf +4:JJOJJxJOJJ+fy8+bz8+Sy9+tvkz8+bz9+Sy+vn1ufy98mfy8 +4:JJJJJJJJxJPzef18+Sy9+ty98mfy8 +4:JJJJJJJJOJJJ+bz+vnyWX18+tz+Xvkz+Xn +4:JJJJJOJJOJJPzfyX1r8+bz9+Sy9+tXkz+Xn +4:JJOJJxJOJJy9+X18nzb+Sy99ufy9+bz8+Sy9+t8mfy8 +4:JJJJJJJJJOJJPzef18+Sy9+tz+Xvkz+Xn +4:JJJJJxJJxJJ+bz+vnyX1uXvkz6+bz99ufy9 +4:JJOJJxJOJJxPfzb+Sn1vnzb+Sy8+tfkz8+Sy+vntz+Xv +4:JJOJJJxJJOJJJzfyX18mfnzefvyV+tvkz8+bz+vnyWX18+tz98j+fyX1q8n +4:JJJJJJOJJxJPz+X1q8j+bz+vnyWvn1ufXk +4:JJJJJJJxJJPzef18+Sy+vn1ufy98mfy8 +4:JJJJJJJJJJxJJ+bz+vnyWX18+tz+Xvkz+Xn +4:JJJJJJJJJJxJJ+bz+vnyWX18+tz+Xvkz+Xn +4:JJJxJJxJJxJJxJ+fS+fy8+bz+vnyS+tXknzd9ufy9 +4:JJJJJJJJxJOJJ+bz9+Sn1vkz+Xnzc+Sy+vnty9 +4:JJJJJOJJJxJJPzef18+Sy9+tz+XvknyWXnkz6 +4:JJJJxJJxJJxJPzft+bz9+Sy+vn1ufXkfkn +3:JJJJOJJJxJJOJJJ+bnyV+t8mfXz+S18+tXnf +3:JJJJJJOJJJxJJPz+S+tfkXy9 +3:JJJJJJJJJOJJPzevnyWvn1ufXkz6 +3:JJJxJJOJJJxJJPzfyWvn1ufXkfyV8j8n +3:JJJJJOJJOJJPzc+Sv1ufXkz6+b189 +3:JJJJJJxJJOJJJ+b+S18+vkXz+tfn +3:JJJJJOJJJxJJOfy9vzfyV+tz68nzd+X18n +3:JJJJJJJOJJOJJ+bv1r8j+Sn18mfX +3:JJJJJJJJxJJPzd+S18+tz68mfX +3:JJJJJJJOJJJxJJPzd+Sn1r8nz+S+t8 +3:JJJJJJJJJOJJ+fyWvn18mfX +3:JJJOJJJxJJOJJ+bnyU8nz6+Xt +3:JJJJJOJJxJOJ+X1vny8i7evn +3:JJJJJJJJJJOJJPzevnyV+t8 +3:JJOJJxJOJJPzd+Snvzf18j+Sv1q8j +3:JJJJxJJOJJJxPSvzd+Sv1ufXkz66 +3:JJJJxJOJJxJPvzd+Sv18i+bnkf +3:JJJJJJxJJxJJx+f18nzfyV9vyWvnkX +3:JJJJJOJJOJJOPz8nzevn18nyU8 +3:JJJJJJJJJJJxJJPy+vn +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJJJJP +2:JJJJJJJJJJJJJJ +2:JJJJxJOJJxJOJJXfz+Xnz+Xvz+X18 +2:JJJJJJJJJJJ +2:JJJJJJJJJx+X18 +2:JJJJJJJJJJJJJ +2:JJJJJJJJJOJ+fv +2:JJJJJJJJJJJP +2:JJJJJJJJJJJxJ+fv +2:JJJJJJJJJJ +2:JJJJJJJJJJP +2:JJJJJJJJJJP +2:JJJJJJJJJJJJJJP +2:JJJJJJJJJJJJ +2:JJJJJJJJJJOJPz+Xn +2:JJJJJJJJJJJJJJ +2:JJJJJJJJJJJJJ +2:JJJJJJJJJJ \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/jo_codes/fiery_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/fiery_blossom.txt index f82b005..6981652 100644 --- a/src/main/resources/trees/dtquark/jo_codes/fiery_blossom.txt +++ b/src/main/resources/trees/dtquark/jo_codes/fiery_blossom.txt @@ -1,112 +1,140 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file +8:JJJxxOOOOOPz86+f18j6yxnXnz9pzPy98yPjz8+bxOf18+f18+SxPWSyxnvn1JyXvmJ8XtzJ9pxPzZ9 +8:JJJxxxx1xOfynvyR9q8OOPk77zOJncx89ueJPfvSWOOPnvyXnkxMmOPnXmR8z8PtzxrvbfyxvXv +8:JJJxxxxxxxx7+SX187+vnznSR9uNPS+bx+eeOPnfk98mJyKx88xOPnfmR8Ptzx7Z9yx69Jv +8:JJJxxxOOONfz+Xnq+eZfvy8hc8yM89yOSx69J9uJPyS9vzeeeJPfuJtftfkx88ySx68mPyHmfh +8:JJJxxzJxx7fmXn1xxxx6vvXufXiPWWOPq6R9+bxtzxPfvczPn1vkmZPyWPy88xx68n +8:JJJxxOOOOOOfXvnz68+dPSx87ePb1x78+X1uOJxN+XrfXtxPXkxzOOJ6+b86M8y8h +8:JJJOOMOJOJ+Xvkx+fy8+bOJx+vnefnSxJxxx969XWS+p8h9uOOOOPnXufy9+fXufy9 +8:JJJxxxxxxpvzvk6+fny9uOJ+fXtx7+eePmbx98xfk9vkxWPXmXkPSxpxN+SvvSx+Xn +8:JJJzxxxOOON6nc+uXr8Xz9ufvmfmJ8mPz+Xk7ePbx76xxqN6yxPSx+Xnh9uK9yR9 +8:JJJxxxxxxx9+XnzftXWR8Pz+qt86+bx+fn1uLxPvyRXvmXmKPz8mb+R8n +8:JJJxxxxxzz98xXmfg+SPvmXntx9z+Rx69x97eJzx78PbvyWMxR8yXnWRx+XvtPrrxPzfv +8:JJJxxOJxOJ+fy+vnzefnnz1NzJ98zfknWWJPX1Phi8Uy8J+beOLxM787z89puJvy9 +8:JJJxOJxxxxx+vnXqvnubxfvXtxXvzeJzJ87zx79x9+Sxyxx6nq8JPtzPt8hzx7nmJM8 +8:JJJxxxxxxxy+vnfS+f1uR98XV+bx+r8f1vmSxhPXmLnmXnS7bx+bfv +8:JJJxxzxp7eL9+Rynp8JxxPXz+vnub9xxvz6XvyRWOvnWXnkzfyUPkx+fi +8:JJJxxxxxxxx+Xnz96iPt+dz96yx+Xnt+t8y8OOLPXz87zeOOPk7+vnvv +8:JJJxyxOJxxxM6+q86+SvvWuPXmPmXh8OJx+fixXni+eeJxxxxxPvz69+bPnr7Z8hzx78h9uOJxRXz9y9L+fuXvS +8:JJJOOZxOPr7zc+vmJ8+RxJxK+Xrvq8xOJOM788yx6y8PmPz89y9xzN6vufuOPvWWPXv +8:JJJxWOOOOJ+Xnz9vnuWPXviPzeJxxPnfzeP188hP1y9zLPuOOPz96vvkxOJx7z9+Xny8w+Z8OWPXn +8:JJJxxzxOL8ffyOPy89xOOOPfSx699y9wXxXz9Xmb8OOJN8y87nSWpWXvn +7:JJJxxxOOOPXz+vk6nyWNx6+XnjOZPnzbxJZ+fvtxb+SPtxxN678mPy8mfy8 +7:JJJxxxxxxx78z6+fuR9xPvXeuLPvh8mJx6nmXkz8+beeL9fhx861WRPuJx998Sx6 +7:JJJxOJxxxx868+ft+bx9+WWOJ68nuPvkxPi+bw7x7+Xv +7:JJJxxOOOOOJ7+vnfviM+bzmZxPz88k9xxx9z97efvv1uJWJ99vkxhfU6WOOOJS9XyR89Xy8n +7:JJJxxxxxxxxvXep88+WWN68h97fub6Xefhz8P1z+S9OXuOPfq8yxORXk6XkxmPi7 +7:JJJ1xeJxxN7z9+XvdPyWJxxxxOPvXvXvyXvuFpy97rvmOOJxxx+X18ned896WROX18fnkxxmfR687zeeJxx87+b8h9JPkn +7:JJJxxxxxxxPz98y8+bw56v18Xz6WPyvnmXmOZx+fnXkxM8+bx+bxPr+vkx7+SntxK+ftx+Xv +7:JJJxxxxxxPzc+S98z6XtuJvz66q8mOPnfzzxxL87zh9xPvtuPvSx6WQ+vk +7:JJJxOJxMz6+fy9t+SOXvrN+bxxL79+SSx6yPn1uWN69p8mJOJ6vmePfyS8 +7:JJJxJxxxxOP18nfyRXvmS8z8OPntxZ9vzeOOZ9JfkPbzx7nmPnyWSPtKP1ufoz98mSxJ6WPXkxOPnz+SPn +7:JJJxxxxxxxxJ+fXvfSJXzbwfvvjftxWPvuePfp+SKx68mOb6xJXXkxLPyXn +7:JJJzeOJxx8+b9tvfmbx8nhn1xxxOZN+ROPvp9p6yxPWXvvvmRxOPXXhxOJvnkx+Xn +7:JJJzxmJPjOPfbxpOPvbPyWJxxx89+Xnyqynp8+uOJOOJM+fk96qPtJxfy9vkyOJXXmJff +7:JJJxxxxOJxJ+c+XvzZ+XnSxy989pOPy9z96SORXk+bZxxx8z8x89uOPt77rP1txtPSy9PkJmJ8n +7:JJJxxxxzOJ+vnWJx969uJ+fo7jJc6WN+XnzbzxLPfpxPt+uSy9PuPzfvmXmJxxx8788y8 +7:JJJzOJNOOPnbnbxLf18+WJy9JxxXvS6WPyR+vn1NxJ9uONvfufXhOOJxPzf18XSx6XkxjPz6 +7:JJJxxxyOOOM768XuLx79r7zb9v18zb8mJi+b+XnWWJ61xJPXmR89uJ7 +7:JJJxxxxxOOJ+Xvf1R8k7zJh+vnyyxxJ6U9y9Phntx9y9HbzOfuJ98x8nWSx68kmJ6 +7:JJJxOOOJx+fy8+XnzntxXz9vy8+bxL7Z+Syynp8KP1ubz99p8mPz+Xk +7:JJJxxxOOOMz8+Xvz8nyyNfnufuHx9b+WSK898zx78xLzc8+XnuePfuPt +6:JJJxeJzJx+d6+txePftXkM7ePzfnyWJxxxMPuXvSRJ86WRhfn1pRN8mJR8mJx7+Xn +6:JJJxOJxL+b+Syx69+vkXz8+bx7+txVx69zxx979y9Pkx+Xj +6:JJJOOJxxxZ+Xvd9+eeOPndJ9PyWJV6h8mMxPi7b9ySyPp9xPz9y9P +6:JJJxOOOOJx6+f1861pSXn1vkxj+fWXnbONPefnyRxxX186n1uN6vkMxbx8+Xn +6:JJJxOOJxOOPzfS9vdPvzzzxPz98PvmRM8xnfyWJOJPWRvvkxPy89pxSvz9uHxXv +6:JJJxxxxxxx+fq8fy9+fmXmPnvzzxmfneb996yxKXy89uJ9+vkmZPyJnh +6:JJJxOOOeJvc+pyMXvmOM68zPkfWqPiPtx9fzeeJPzzPp8kJ9xN9+SyJxxPXn1PkiPkkR +6:JJJxOOOOM+SPrPf1zZ9L8k7zfkk+ceM7+SyJxK68xOJ889uRKx+XvuJ+fv +6:JJJxxxxOON+efvX1t8y8+XneZL+pPkX1uJvy9wXz9uPfnzzzPp86WOP186y8n +6:JJJxOOOMOJ+fnzzxOPfY868kxOXnz86RyWPX1vkXzePz8EftzJxJXfpOJp6S +6:JJJxxyNJPmJOOXh+fvz8mJ89uJOJ79yxJ69xN+fq+bxJxOfpPfkw7nSMxKJ+SPkx6 +6:JJJxOJxxxPzz9L8k6WXpvfyWPy8n1uJxxPvXuePfyPpPkxyPhz87+bxOPz+vnb8yU8mKPz8 +6:JJJxxxxxz+R9PjfrPWRK+tx+Xt8PzeJZ7h8kxx6+fi+WSxh+WXnvkR9uNzx796X +6:JJJxxOOOR98z6+fy9+SxyPpK8XvzeJzPvz+vk8mJy8OPnX +6:JJJOOOOJx1z68xfnzzxPfnSy89uZ+RPvkxL8z+R8nbeeJ7vh6WJyPpP1uPvkOK8 +6:JJJxxOOJxxxxPy89+bx+fvXmXjP1uPufvnWWOt8PWRXntvbzeJ9p8mZPk+SSx+XnkJx8yPmPf +6:JJJxOOOOOP1869uC58yx68xOfni6+b1zZ9x98eJvz8nyyx9WPy9t8x89ttx6 +6:JJJxxxxxxLfufvz+VV89z9Xzzxh9fnV9uePb+Xty9HzbwnxzPnrz9+WWOWXhj9898mOOPmR8x8ffj +6:JJJxxxOJxXz+q8+dx96+qN8zPmKx68z8+bONfc6WJXy9vtuZPuPy9 +6:JJJxOOOOOOJPXf18+fWWJ6XnufWXt7ePjfyWJy8PUP1uD+Jb9yx6XtxPfkxOZPyPmJ8nyRnn +5:JJJJxOOJxM+fynvzePfmXhnX1yx6SPuJJ9WPvmWPXh +5:JJJxOJxxxPt8nXtOZ9+bLxJJPvyWNJxvXSxPnkxzJz86Rx68hOJ6 +5:JJJxxhOOOOfWPv18Xd6Sx6+bLJxx79z99pJOPy9+SJxS9uR9p8kOWJJfXjJ +5:JJJxxxOOOfyy9PmK8Z9z9J86RRPeZJPkxJ7eJ79txJxvff +5:JJJxzJeJ7Z8OOOZxJL8+WPy89xOJ+Xt9ZvkxPix66SWP189VJxOPvX +5:JJJzzJOOOJ+fvj78MmPfyxJJxM6+SJ1J8PkJxPkXuJJOOJ79ftpJJx6 +5:JJJxONxxxU96+fvzZOL+vnkJx+fnyWpJyvnhRJ9tKq +5:JJJxxOJxxxL+XvfyWPt+vnkOXh+SOPntzJNfROPvbMZJx7 +5:JJJOOOOOOOfX186+fnvzebxP18+pPmPnyWM+XvkxXmHXtx+S9pOPX +5:JJJOJxOJxnvzZ+Sv18+bkPtuOXvfyyyJx1XnU9pJ8MOXnt +5:JJJxyJKxJvWXknmJOOOPz8+Xufp77ZL9uRJJPpOJxx9ffbmPf +5:JJJxxxxxOPzb+X186US8cnbZ+SKPkx+Xk9pJOOd69y9 +5:JJJzJxxz+WJ98x89uPfcLPySROvn1pxuPr6WXuPvkRJxN+S8 +5:JJJxxWOOZ861OS989uPq+bzJxx+XvfhPtzPtPySOOvk6k8hJxxU8+ch+UyXnv +5:JJJJxOOOOOL9+fnSPfy+rfnzcLOPfyWPypJ8+txWXvub9xPXkx+Xmfn +5:JJJxOOOOOOJvz6+t87eM79zd6PSJS7Z+tNxJPSRPkzObJ86JOJ7 +5:JJJxOOOOOOOR9+fnuXr8jx76WPq9tS7ZOZPp+SKyJJx88k8hhxh6X +5:JJJxxOJxxM+vnz18fSvkyK8x79pNx9z6+dbJPSJyOK8Xpv +5:JJJzJJZxy9xPt7ZPyJJJxuPz+XvyXn1qSRJJ8hJOOOOPfnXi +5:JJJxxxxxxx+S89q8gnzzxJ786nnzfWSOJ6ntJvkx+fk +4:JJJJxOJxxzxnvyPnvzeN7+XnSxtXWvmPnkyWPnhx6 +4:JJJzJJxxxPvbvy+tpXjj+WJxpPy8h6R9pJv +4:JJJOOZxOJxR9+bx8+X189uPr8xOR8M8mPSPSJJOK+fv +4:JJJxJxxyxPX1xJ+fvjx87ePd9WK9+SOJ88hxPX +4:JJJxJxOJxOOXnz976Rx68hJz89tJJJx6 +4:JJJxRJJyN8J+bJOJJxOPXnntJJJx9 +4:JJJxyJMOOMPzfq6RPpJOJx+fy+t89dPbOLJJOOPvnk +4:JJJOJJOOPXzb+uXvmS8z8+SRJJPtpJWJ6 +4:JJJJJxOOOJxx96+vmZ6PbOL9v1pXkx8fSRJ +4:JJJzxJvbJxx89+WJxJ66R+tJOOP186y98JxOOPnfkJf +4:JJJxOJxxxOPzf1vnXvWRntXkJxPnbZJJJ +4:JJJzJJJxOufvnzfkPyJJOJ+Sx98k9tJJOOPfSJP +4:JJJxxxxxxOPvy89zfXbfrtPXkJzJPhJX +4:JJJJxOOJxx7z968hJ9pzPvSyJnpJxvX +4:JJJxOJxOePd+Sn18x8ntvbNL6WNpz96 +4:JJJJJOOOePzZi86OK8h9pJx78kJP +4:JJJJxOJOJ+ch+S9p6kJ7ZJOZPv +4:JJJxOOOJxxxx6+vk6vfiOPXbJfrdxPvkbJJ +4:JJJJxOOeJ9Z6xy9Pn1pxx96vmbxxfnfhh+bNZ+SRJ1pPhnkiRJP +4:JJJxOOeJxP187ZpPyJx88MPuSOPXpzN+R98hiJf +3:JJJJJJJJOOM98 +3:JJJJOZJJxx6nnpRJP +3:JJJJzJJp+RRLN8JJOOPy8+fv +3:JJJxxxxOJJJxS+f18nz+Xnzz98y86y9+ufpJ8nznWXn +3:JJJJJZJJOOPXjP +3:JJJJJJOJOJxfvny8 +3:JJJzJJxpPiPpJKJxx68 +3:JJJJJJJJxPy8 +3:JJJJJJJzJv1PmOPnX +3:JJJJJJRxx98 +3:JJJRJJJJxx+Xvzfn +3:JJJJJpJJJxxx67nkz6 +3:JJJJJJLJJ +3:JJJOJZJRxxN968Z +3:JJJJOZhPyJ9JOPz6 +3:JJJJJJJMOOPz96 +3:JJJJJJJxx186nz8 +3:JJJJJLJJZKP +3:JJJNJJyk9JOOfXn +3:JJJJJJzJx7+pxPXhOPX +2:JJJJJJJJJOOPfv +2:JJJJOOJJJJN78 +2:JJJRJJJJzJ9JOPz8 +2:JJJNJRJJxOJnnf +2:JJJJJJLJJOWPX1Pn +2:JJJJJJzJJPyJJxPr8JJJx7 +2:JJJJJJxJOMXz+XvUJP +2:JJJJJJJOZPyN8P +2:JJJJJJJJOLPy+vn +2:JJJJJxOJOJOJnU6+fvd +2:JJJ1JJJJJx+XnhJZJJJ +2:JJJxeNOJ68+Xn +2:JJJZJJJJJOOvnX +2:JJJJzJJMK+pJJxfXhJK +2:JJJJJJyJJJPpLJJx6 +2:JJJJ1LJxPXiJJzx79 +2:JJJzJJJpJ6JJhJJJOPv +2:JJJJJJJOOP1fnf +2:JJJJJJJJJJx+X18 +2:JJJJJJJJxPy+r8Z diff --git a/src/main/resources/trees/dtquark/jo_codes/frosty_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/frosty_blossom.txt index f82b005..6981652 100644 --- a/src/main/resources/trees/dtquark/jo_codes/frosty_blossom.txt +++ b/src/main/resources/trees/dtquark/jo_codes/frosty_blossom.txt @@ -1,112 +1,140 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file +8:JJJxxOOOOOPz86+f18j6yxnXnz9pzPy98yPjz8+bxOf18+f18+SxPWSyxnvn1JyXvmJ8XtzJ9pxPzZ9 +8:JJJxxxx1xOfynvyR9q8OOPk77zOJncx89ueJPfvSWOOPnvyXnkxMmOPnXmR8z8PtzxrvbfyxvXv +8:JJJxxxxxxxx7+SX187+vnznSR9uNPS+bx+eeOPnfk98mJyKx88xOPnfmR8Ptzx7Z9yx69Jv +8:JJJxxxOOONfz+Xnq+eZfvy8hc8yM89yOSx69J9uJPyS9vzeeeJPfuJtftfkx88ySx68mPyHmfh +8:JJJxxzJxx7fmXn1xxxx6vvXufXiPWWOPq6R9+bxtzxPfvczPn1vkmZPyWPy88xx68n +8:JJJxxOOOOOOfXvnz68+dPSx87ePb1x78+X1uOJxN+XrfXtxPXkxzOOJ6+b86M8y8h +8:JJJOOMOJOJ+Xvkx+fy8+bOJx+vnefnSxJxxx969XWS+p8h9uOOOOPnXufy9+fXufy9 +8:JJJxxxxxxpvzvk6+fny9uOJ+fXtx7+eePmbx98xfk9vkxWPXmXkPSxpxN+SvvSx+Xn +8:JJJzxxxOOON6nc+uXr8Xz9ufvmfmJ8mPz+Xk7ePbx76xxqN6yxPSx+Xnh9uK9yR9 +8:JJJxxxxxxx9+XnzftXWR8Pz+qt86+bx+fn1uLxPvyRXvmXmKPz8mb+R8n +8:JJJxxxxxzz98xXmfg+SPvmXntx9z+Rx69x97eJzx78PbvyWMxR8yXnWRx+XvtPrrxPzfv +8:JJJxxOJxOJ+fy+vnzefnnz1NzJ98zfknWWJPX1Phi8Uy8J+beOLxM787z89puJvy9 +8:JJJxOJxxxxx+vnXqvnubxfvXtxXvzeJzJ87zx79x9+Sxyxx6nq8JPtzPt8hzx7nmJM8 +8:JJJxxxxxxxy+vnfS+f1uR98XV+bx+r8f1vmSxhPXmLnmXnS7bx+bfv +8:JJJxxzxp7eL9+Rynp8JxxPXz+vnub9xxvz6XvyRWOvnWXnkzfyUPkx+fi +8:JJJxxxxxxxx+Xnz96iPt+dz96yx+Xnt+t8y8OOLPXz87zeOOPk7+vnvv +8:JJJxyxOJxxxM6+q86+SvvWuPXmPmXh8OJx+fixXni+eeJxxxxxPvz69+bPnr7Z8hzx78h9uOJxRXz9y9L+fuXvS +8:JJJOOZxOPr7zc+vmJ8+RxJxK+Xrvq8xOJOM788yx6y8PmPz89y9xzN6vufuOPvWWPXv +8:JJJxWOOOOJ+Xnz9vnuWPXviPzeJxxPnfzeP188hP1y9zLPuOOPz96vvkxOJx7z9+Xny8w+Z8OWPXn +8:JJJxxzxOL8ffyOPy89xOOOPfSx699y9wXxXz9Xmb8OOJN8y87nSWpWXvn +7:JJJxxxOOOPXz+vk6nyWNx6+XnjOZPnzbxJZ+fvtxb+SPtxxN678mPy8mfy8 +7:JJJxxxxxxx78z6+fuR9xPvXeuLPvh8mJx6nmXkz8+beeL9fhx861WRPuJx998Sx6 +7:JJJxOJxxxx868+ft+bx9+WWOJ68nuPvkxPi+bw7x7+Xv +7:JJJxxOOOOOJ7+vnfviM+bzmZxPz88k9xxx9z97efvv1uJWJ99vkxhfU6WOOOJS9XyR89Xy8n +7:JJJxxxxxxxxvXep88+WWN68h97fub6Xefhz8P1z+S9OXuOPfq8yxORXk6XkxmPi7 +7:JJJ1xeJxxN7z9+XvdPyWJxxxxOPvXvXvyXvuFpy97rvmOOJxxx+X18ned896WROX18fnkxxmfR687zeeJxx87+b8h9JPkn +7:JJJxxxxxxxPz98y8+bw56v18Xz6WPyvnmXmOZx+fnXkxM8+bx+bxPr+vkx7+SntxK+ftx+Xv +7:JJJxxxxxxPzc+S98z6XtuJvz66q8mOPnfzzxxL87zh9xPvtuPvSx6WQ+vk +7:JJJxOJxMz6+fy9t+SOXvrN+bxxL79+SSx6yPn1uWN69p8mJOJ6vmePfyS8 +7:JJJxJxxxxOP18nfyRXvmS8z8OPntxZ9vzeOOZ9JfkPbzx7nmPnyWSPtKP1ufoz98mSxJ6WPXkxOPnz+SPn +7:JJJxxxxxxxxJ+fXvfSJXzbwfvvjftxWPvuePfp+SKx68mOb6xJXXkxLPyXn +7:JJJzeOJxx8+b9tvfmbx8nhn1xxxOZN+ROPvp9p6yxPWXvvvmRxOPXXhxOJvnkx+Xn +7:JJJzxmJPjOPfbxpOPvbPyWJxxx89+Xnyqynp8+uOJOOJM+fk96qPtJxfy9vkyOJXXmJff +7:JJJxxxxOJxJ+c+XvzZ+XnSxy989pOPy9z96SORXk+bZxxx8z8x89uOPt77rP1txtPSy9PkJmJ8n +7:JJJxxxxzOJ+vnWJx969uJ+fo7jJc6WN+XnzbzxLPfpxPt+uSy9PuPzfvmXmJxxx8788y8 +7:JJJzOJNOOPnbnbxLf18+WJy9JxxXvS6WPyR+vn1NxJ9uONvfufXhOOJxPzf18XSx6XkxjPz6 +7:JJJxxxyOOOM768XuLx79r7zb9v18zb8mJi+b+XnWWJ61xJPXmR89uJ7 +7:JJJxxxxxOOJ+Xvf1R8k7zJh+vnyyxxJ6U9y9Phntx9y9HbzOfuJ98x8nWSx68kmJ6 +7:JJJxOOOJx+fy8+XnzntxXz9vy8+bxL7Z+Syynp8KP1ubz99p8mPz+Xk +7:JJJxxxOOOMz8+Xvz8nyyNfnufuHx9b+WSK898zx78xLzc8+XnuePfuPt +6:JJJxeJzJx+d6+txePftXkM7ePzfnyWJxxxMPuXvSRJ86WRhfn1pRN8mJR8mJx7+Xn +6:JJJxOJxL+b+Syx69+vkXz8+bx7+txVx69zxx979y9Pkx+Xj +6:JJJOOJxxxZ+Xvd9+eeOPndJ9PyWJV6h8mMxPi7b9ySyPp9xPz9y9P +6:JJJxOOOOJx6+f1861pSXn1vkxj+fWXnbONPefnyRxxX186n1uN6vkMxbx8+Xn +6:JJJxOOJxOOPzfS9vdPvzzzxPz98PvmRM8xnfyWJOJPWRvvkxPy89pxSvz9uHxXv +6:JJJxxxxxxx+fq8fy9+fmXmPnvzzxmfneb996yxKXy89uJ9+vkmZPyJnh +6:JJJxOOOeJvc+pyMXvmOM68zPkfWqPiPtx9fzeeJPzzPp8kJ9xN9+SyJxxPXn1PkiPkkR +6:JJJxOOOOM+SPrPf1zZ9L8k7zfkk+ceM7+SyJxK68xOJ889uRKx+XvuJ+fv +6:JJJxxxxOON+efvX1t8y8+XneZL+pPkX1uJvy9wXz9uPfnzzzPp86WOP186y8n +6:JJJxOOOMOJ+fnzzxOPfY868kxOXnz86RyWPX1vkXzePz8EftzJxJXfpOJp6S +6:JJJxxyNJPmJOOXh+fvz8mJ89uJOJ79yxJ69xN+fq+bxJxOfpPfkw7nSMxKJ+SPkx6 +6:JJJxOJxxxPzz9L8k6WXpvfyWPy8n1uJxxPvXuePfyPpPkxyPhz87+bxOPz+vnb8yU8mKPz8 +6:JJJxxxxxz+R9PjfrPWRK+tx+Xt8PzeJZ7h8kxx6+fi+WSxh+WXnvkR9uNzx796X +6:JJJxxOOOR98z6+fy9+SxyPpK8XvzeJzPvz+vk8mJy8OPnX +6:JJJOOOOJx1z68xfnzzxPfnSy89uZ+RPvkxL8z+R8nbeeJ7vh6WJyPpP1uPvkOK8 +6:JJJxxOOJxxxxPy89+bx+fvXmXjP1uPufvnWWOt8PWRXntvbzeJ9p8mZPk+SSx+XnkJx8yPmPf +6:JJJxOOOOOP1869uC58yx68xOfni6+b1zZ9x98eJvz8nyyx9WPy9t8x89ttx6 +6:JJJxxxxxxLfufvz+VV89z9Xzzxh9fnV9uePb+Xty9HzbwnxzPnrz9+WWOWXhj9898mOOPmR8x8ffj +6:JJJxxxOJxXz+q8+dx96+qN8zPmKx68z8+bONfc6WJXy9vtuZPuPy9 +6:JJJxOOOOOOJPXf18+fWWJ6XnufWXt7ePjfyWJy8PUP1uD+Jb9yx6XtxPfkxOZPyPmJ8nyRnn +5:JJJJxOOJxM+fynvzePfmXhnX1yx6SPuJJ9WPvmWPXh +5:JJJxOJxxxPt8nXtOZ9+bLxJJPvyWNJxvXSxPnkxzJz86Rx68hOJ6 +5:JJJxxhOOOOfWPv18Xd6Sx6+bLJxx79z99pJOPy9+SJxS9uR9p8kOWJJfXjJ +5:JJJxxxOOOfyy9PmK8Z9z9J86RRPeZJPkxJ7eJ79txJxvff +5:JJJxzJeJ7Z8OOOZxJL8+WPy89xOJ+Xt9ZvkxPix66SWP189VJxOPvX +5:JJJzzJOOOJ+fvj78MmPfyxJJxM6+SJ1J8PkJxPkXuJJOOJ79ftpJJx6 +5:JJJxONxxxU96+fvzZOL+vnkJx+fnyWpJyvnhRJ9tKq +5:JJJxxOJxxxL+XvfyWPt+vnkOXh+SOPntzJNfROPvbMZJx7 +5:JJJOOOOOOOfX186+fnvzebxP18+pPmPnyWM+XvkxXmHXtx+S9pOPX +5:JJJOJxOJxnvzZ+Sv18+bkPtuOXvfyyyJx1XnU9pJ8MOXnt +5:JJJxyJKxJvWXknmJOOOPz8+Xufp77ZL9uRJJPpOJxx9ffbmPf +5:JJJxxxxxOPzb+X186US8cnbZ+SKPkx+Xk9pJOOd69y9 +5:JJJzJxxz+WJ98x89uPfcLPySROvn1pxuPr6WXuPvkRJxN+S8 +5:JJJxxWOOZ861OS989uPq+bzJxx+XvfhPtzPtPySOOvk6k8hJxxU8+ch+UyXnv +5:JJJJxOOOOOL9+fnSPfy+rfnzcLOPfyWPypJ8+txWXvub9xPXkx+Xmfn +5:JJJxOOOOOOJvz6+t87eM79zd6PSJS7Z+tNxJPSRPkzObJ86JOJ7 +5:JJJxOOOOOOOR9+fnuXr8jx76WPq9tS7ZOZPp+SKyJJx88k8hhxh6X +5:JJJxxOJxxM+vnz18fSvkyK8x79pNx9z6+dbJPSJyOK8Xpv +5:JJJzJJZxy9xPt7ZPyJJJxuPz+XvyXn1qSRJJ8hJOOOOPfnXi +5:JJJxxxxxxx+S89q8gnzzxJ786nnzfWSOJ6ntJvkx+fk +4:JJJJxOJxxzxnvyPnvzeN7+XnSxtXWvmPnkyWPnhx6 +4:JJJzJJxxxPvbvy+tpXjj+WJxpPy8h6R9pJv +4:JJJOOZxOJxR9+bx8+X189uPr8xOR8M8mPSPSJJOK+fv +4:JJJxJxxyxPX1xJ+fvjx87ePd9WK9+SOJ88hxPX +4:JJJxJxOJxOOXnz976Rx68hJz89tJJJx6 +4:JJJxRJJyN8J+bJOJJxOPXnntJJJx9 +4:JJJxyJMOOMPzfq6RPpJOJx+fy+t89dPbOLJJOOPvnk +4:JJJOJJOOPXzb+uXvmS8z8+SRJJPtpJWJ6 +4:JJJJJxOOOJxx96+vmZ6PbOL9v1pXkx8fSRJ +4:JJJzxJvbJxx89+WJxJ66R+tJOOP186y98JxOOPnfkJf +4:JJJxOJxxxOPzf1vnXvWRntXkJxPnbZJJJ +4:JJJzJJJxOufvnzfkPyJJOJ+Sx98k9tJJOOPfSJP +4:JJJxxxxxxOPvy89zfXbfrtPXkJzJPhJX +4:JJJJxOOJxx7z968hJ9pzPvSyJnpJxvX +4:JJJxOJxOePd+Sn18x8ntvbNL6WNpz96 +4:JJJJJOOOePzZi86OK8h9pJx78kJP +4:JJJJxOJOJ+ch+S9p6kJ7ZJOZPv +4:JJJxOOOJxxxx6+vk6vfiOPXbJfrdxPvkbJJ +4:JJJJxOOeJ9Z6xy9Pn1pxx96vmbxxfnfhh+bNZ+SRJ1pPhnkiRJP +4:JJJxOOeJxP187ZpPyJx88MPuSOPXpzN+R98hiJf +3:JJJJJJJJOOM98 +3:JJJJOZJJxx6nnpRJP +3:JJJJzJJp+RRLN8JJOOPy8+fv +3:JJJxxxxOJJJxS+f18nz+Xnzz98y86y9+ufpJ8nznWXn +3:JJJJJZJJOOPXjP +3:JJJJJJOJOJxfvny8 +3:JJJzJJxpPiPpJKJxx68 +3:JJJJJJJJxPy8 +3:JJJJJJJzJv1PmOPnX +3:JJJJJJRxx98 +3:JJJRJJJJxx+Xvzfn +3:JJJJJpJJJxxx67nkz6 +3:JJJJJJLJJ +3:JJJOJZJRxxN968Z +3:JJJJOZhPyJ9JOPz6 +3:JJJJJJJMOOPz96 +3:JJJJJJJxx186nz8 +3:JJJJJLJJZKP +3:JJJNJJyk9JOOfXn +3:JJJJJJzJx7+pxPXhOPX +2:JJJJJJJJJOOPfv +2:JJJJOOJJJJN78 +2:JJJRJJJJzJ9JOPz8 +2:JJJNJRJJxOJnnf +2:JJJJJJLJJOWPX1Pn +2:JJJJJJzJJPyJJxPr8JJJx7 +2:JJJJJJxJOMXz+XvUJP +2:JJJJJJJOZPyN8P +2:JJJJJJJJOLPy+vn +2:JJJJJxOJOJOJnU6+fvd +2:JJJ1JJJJJx+XnhJZJJJ +2:JJJxeNOJ68+Xn +2:JJJZJJJJJOOvnX +2:JJJJzJJMK+pJJxfXhJK +2:JJJJJJyJJJPpLJJx6 +2:JJJJ1LJxPXiJJzx79 +2:JJJzJJJpJ6JJhJJJOPv +2:JJJJJJJOOP1fnf +2:JJJJJJJJJJx+X18 +2:JJJJJJJJxPy+r8Z diff --git a/src/main/resources/trees/dtquark/jo_codes/glow_shroom.txt b/src/main/resources/trees/dtquark/jo_codes/glow_shroom.txt new file mode 100644 index 0000000..6dc661f --- /dev/null +++ b/src/main/resources/trees/dtquark/jo_codes/glow_shroom.txt @@ -0,0 +1,56 @@ +2:JJ +2:JJJ +2:JJP +2:JP +2:JhP +2:JMJ +2:JNP +2:JJh +3:JJ +3:JJJ +3:JJP +3:JP +3:JhP +3:JMJ +3:JNP +3:JJh +4:JJ +4:JJJ +4:JJP +4:JP +4:JhP +4:JMJ +4:JNP +4:JJh +5:JJ +5:JJJ +5:JJP +5:JP +5:JhP +5:JMJ +5:JNP +5:JJh +6:JJ +6:JJJ +6:JJP +6:JP +6:JhP +6:JMJ +6:JNP +6:JJh +7:JJ +7:JJJ +7:JJP +7:JP +7:JhP +7:JMJ +7:JNP +7:JJh +8:JJ +8:JJJ +8:JJP +8:JP +8:JhP +8:JMJ +8:JNP +8:JJh \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/jo_codes/serene_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/serene_blossom.txt index f82b005..6981652 100644 --- a/src/main/resources/trees/dtquark/jo_codes/serene_blossom.txt +++ b/src/main/resources/trees/dtquark/jo_codes/serene_blossom.txt @@ -1,112 +1,140 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file +8:JJJxxOOOOOPz86+f18j6yxnXnz9pzPy98yPjz8+bxOf18+f18+SxPWSyxnvn1JyXvmJ8XtzJ9pxPzZ9 +8:JJJxxxx1xOfynvyR9q8OOPk77zOJncx89ueJPfvSWOOPnvyXnkxMmOPnXmR8z8PtzxrvbfyxvXv +8:JJJxxxxxxxx7+SX187+vnznSR9uNPS+bx+eeOPnfk98mJyKx88xOPnfmR8Ptzx7Z9yx69Jv +8:JJJxxxOOONfz+Xnq+eZfvy8hc8yM89yOSx69J9uJPyS9vzeeeJPfuJtftfkx88ySx68mPyHmfh +8:JJJxxzJxx7fmXn1xxxx6vvXufXiPWWOPq6R9+bxtzxPfvczPn1vkmZPyWPy88xx68n +8:JJJxxOOOOOOfXvnz68+dPSx87ePb1x78+X1uOJxN+XrfXtxPXkxzOOJ6+b86M8y8h +8:JJJOOMOJOJ+Xvkx+fy8+bOJx+vnefnSxJxxx969XWS+p8h9uOOOOPnXufy9+fXufy9 +8:JJJxxxxxxpvzvk6+fny9uOJ+fXtx7+eePmbx98xfk9vkxWPXmXkPSxpxN+SvvSx+Xn +8:JJJzxxxOOON6nc+uXr8Xz9ufvmfmJ8mPz+Xk7ePbx76xxqN6yxPSx+Xnh9uK9yR9 +8:JJJxxxxxxx9+XnzftXWR8Pz+qt86+bx+fn1uLxPvyRXvmXmKPz8mb+R8n +8:JJJxxxxxzz98xXmfg+SPvmXntx9z+Rx69x97eJzx78PbvyWMxR8yXnWRx+XvtPrrxPzfv +8:JJJxxOJxOJ+fy+vnzefnnz1NzJ98zfknWWJPX1Phi8Uy8J+beOLxM787z89puJvy9 +8:JJJxOJxxxxx+vnXqvnubxfvXtxXvzeJzJ87zx79x9+Sxyxx6nq8JPtzPt8hzx7nmJM8 +8:JJJxxxxxxxy+vnfS+f1uR98XV+bx+r8f1vmSxhPXmLnmXnS7bx+bfv +8:JJJxxzxp7eL9+Rynp8JxxPXz+vnub9xxvz6XvyRWOvnWXnkzfyUPkx+fi +8:JJJxxxxxxxx+Xnz96iPt+dz96yx+Xnt+t8y8OOLPXz87zeOOPk7+vnvv +8:JJJxyxOJxxxM6+q86+SvvWuPXmPmXh8OJx+fixXni+eeJxxxxxPvz69+bPnr7Z8hzx78h9uOJxRXz9y9L+fuXvS +8:JJJOOZxOPr7zc+vmJ8+RxJxK+Xrvq8xOJOM788yx6y8PmPz89y9xzN6vufuOPvWWPXv +8:JJJxWOOOOJ+Xnz9vnuWPXviPzeJxxPnfzeP188hP1y9zLPuOOPz96vvkxOJx7z9+Xny8w+Z8OWPXn +8:JJJxxzxOL8ffyOPy89xOOOPfSx699y9wXxXz9Xmb8OOJN8y87nSWpWXvn +7:JJJxxxOOOPXz+vk6nyWNx6+XnjOZPnzbxJZ+fvtxb+SPtxxN678mPy8mfy8 +7:JJJxxxxxxx78z6+fuR9xPvXeuLPvh8mJx6nmXkz8+beeL9fhx861WRPuJx998Sx6 +7:JJJxOJxxxx868+ft+bx9+WWOJ68nuPvkxPi+bw7x7+Xv +7:JJJxxOOOOOJ7+vnfviM+bzmZxPz88k9xxx9z97efvv1uJWJ99vkxhfU6WOOOJS9XyR89Xy8n +7:JJJxxxxxxxxvXep88+WWN68h97fub6Xefhz8P1z+S9OXuOPfq8yxORXk6XkxmPi7 +7:JJJ1xeJxxN7z9+XvdPyWJxxxxOPvXvXvyXvuFpy97rvmOOJxxx+X18ned896WROX18fnkxxmfR687zeeJxx87+b8h9JPkn +7:JJJxxxxxxxPz98y8+bw56v18Xz6WPyvnmXmOZx+fnXkxM8+bx+bxPr+vkx7+SntxK+ftx+Xv +7:JJJxxxxxxPzc+S98z6XtuJvz66q8mOPnfzzxxL87zh9xPvtuPvSx6WQ+vk +7:JJJxOJxMz6+fy9t+SOXvrN+bxxL79+SSx6yPn1uWN69p8mJOJ6vmePfyS8 +7:JJJxJxxxxOP18nfyRXvmS8z8OPntxZ9vzeOOZ9JfkPbzx7nmPnyWSPtKP1ufoz98mSxJ6WPXkxOPnz+SPn +7:JJJxxxxxxxxJ+fXvfSJXzbwfvvjftxWPvuePfp+SKx68mOb6xJXXkxLPyXn +7:JJJzeOJxx8+b9tvfmbx8nhn1xxxOZN+ROPvp9p6yxPWXvvvmRxOPXXhxOJvnkx+Xn +7:JJJzxmJPjOPfbxpOPvbPyWJxxx89+Xnyqynp8+uOJOOJM+fk96qPtJxfy9vkyOJXXmJff +7:JJJxxxxOJxJ+c+XvzZ+XnSxy989pOPy9z96SORXk+bZxxx8z8x89uOPt77rP1txtPSy9PkJmJ8n +7:JJJxxxxzOJ+vnWJx969uJ+fo7jJc6WN+XnzbzxLPfpxPt+uSy9PuPzfvmXmJxxx8788y8 +7:JJJzOJNOOPnbnbxLf18+WJy9JxxXvS6WPyR+vn1NxJ9uONvfufXhOOJxPzf18XSx6XkxjPz6 +7:JJJxxxyOOOM768XuLx79r7zb9v18zb8mJi+b+XnWWJ61xJPXmR89uJ7 +7:JJJxxxxxOOJ+Xvf1R8k7zJh+vnyyxxJ6U9y9Phntx9y9HbzOfuJ98x8nWSx68kmJ6 +7:JJJxOOOJx+fy8+XnzntxXz9vy8+bxL7Z+Syynp8KP1ubz99p8mPz+Xk +7:JJJxxxOOOMz8+Xvz8nyyNfnufuHx9b+WSK898zx78xLzc8+XnuePfuPt +6:JJJxeJzJx+d6+txePftXkM7ePzfnyWJxxxMPuXvSRJ86WRhfn1pRN8mJR8mJx7+Xn +6:JJJxOJxL+b+Syx69+vkXz8+bx7+txVx69zxx979y9Pkx+Xj +6:JJJOOJxxxZ+Xvd9+eeOPndJ9PyWJV6h8mMxPi7b9ySyPp9xPz9y9P +6:JJJxOOOOJx6+f1861pSXn1vkxj+fWXnbONPefnyRxxX186n1uN6vkMxbx8+Xn +6:JJJxOOJxOOPzfS9vdPvzzzxPz98PvmRM8xnfyWJOJPWRvvkxPy89pxSvz9uHxXv +6:JJJxxxxxxx+fq8fy9+fmXmPnvzzxmfneb996yxKXy89uJ9+vkmZPyJnh +6:JJJxOOOeJvc+pyMXvmOM68zPkfWqPiPtx9fzeeJPzzPp8kJ9xN9+SyJxxPXn1PkiPkkR +6:JJJxOOOOM+SPrPf1zZ9L8k7zfkk+ceM7+SyJxK68xOJ889uRKx+XvuJ+fv +6:JJJxxxxOON+efvX1t8y8+XneZL+pPkX1uJvy9wXz9uPfnzzzPp86WOP186y8n +6:JJJxOOOMOJ+fnzzxOPfY868kxOXnz86RyWPX1vkXzePz8EftzJxJXfpOJp6S +6:JJJxxyNJPmJOOXh+fvz8mJ89uJOJ79yxJ69xN+fq+bxJxOfpPfkw7nSMxKJ+SPkx6 +6:JJJxOJxxxPzz9L8k6WXpvfyWPy8n1uJxxPvXuePfyPpPkxyPhz87+bxOPz+vnb8yU8mKPz8 +6:JJJxxxxxz+R9PjfrPWRK+tx+Xt8PzeJZ7h8kxx6+fi+WSxh+WXnvkR9uNzx796X +6:JJJxxOOOR98z6+fy9+SxyPpK8XvzeJzPvz+vk8mJy8OPnX +6:JJJOOOOJx1z68xfnzzxPfnSy89uZ+RPvkxL8z+R8nbeeJ7vh6WJyPpP1uPvkOK8 +6:JJJxxOOJxxxxPy89+bx+fvXmXjP1uPufvnWWOt8PWRXntvbzeJ9p8mZPk+SSx+XnkJx8yPmPf +6:JJJxOOOOOP1869uC58yx68xOfni6+b1zZ9x98eJvz8nyyx9WPy9t8x89ttx6 +6:JJJxxxxxxLfufvz+VV89z9Xzzxh9fnV9uePb+Xty9HzbwnxzPnrz9+WWOWXhj9898mOOPmR8x8ffj +6:JJJxxxOJxXz+q8+dx96+qN8zPmKx68z8+bONfc6WJXy9vtuZPuPy9 +6:JJJxOOOOOOJPXf18+fWWJ6XnufWXt7ePjfyWJy8PUP1uD+Jb9yx6XtxPfkxOZPyPmJ8nyRnn +5:JJJJxOOJxM+fynvzePfmXhnX1yx6SPuJJ9WPvmWPXh +5:JJJxOJxxxPt8nXtOZ9+bLxJJPvyWNJxvXSxPnkxzJz86Rx68hOJ6 +5:JJJxxhOOOOfWPv18Xd6Sx6+bLJxx79z99pJOPy9+SJxS9uR9p8kOWJJfXjJ +5:JJJxxxOOOfyy9PmK8Z9z9J86RRPeZJPkxJ7eJ79txJxvff +5:JJJxzJeJ7Z8OOOZxJL8+WPy89xOJ+Xt9ZvkxPix66SWP189VJxOPvX +5:JJJzzJOOOJ+fvj78MmPfyxJJxM6+SJ1J8PkJxPkXuJJOOJ79ftpJJx6 +5:JJJxONxxxU96+fvzZOL+vnkJx+fnyWpJyvnhRJ9tKq +5:JJJxxOJxxxL+XvfyWPt+vnkOXh+SOPntzJNfROPvbMZJx7 +5:JJJOOOOOOOfX186+fnvzebxP18+pPmPnyWM+XvkxXmHXtx+S9pOPX +5:JJJOJxOJxnvzZ+Sv18+bkPtuOXvfyyyJx1XnU9pJ8MOXnt +5:JJJxyJKxJvWXknmJOOOPz8+Xufp77ZL9uRJJPpOJxx9ffbmPf +5:JJJxxxxxOPzb+X186US8cnbZ+SKPkx+Xk9pJOOd69y9 +5:JJJzJxxz+WJ98x89uPfcLPySROvn1pxuPr6WXuPvkRJxN+S8 +5:JJJxxWOOZ861OS989uPq+bzJxx+XvfhPtzPtPySOOvk6k8hJxxU8+ch+UyXnv +5:JJJJxOOOOOL9+fnSPfy+rfnzcLOPfyWPypJ8+txWXvub9xPXkx+Xmfn +5:JJJxOOOOOOJvz6+t87eM79zd6PSJS7Z+tNxJPSRPkzObJ86JOJ7 +5:JJJxOOOOOOOR9+fnuXr8jx76WPq9tS7ZOZPp+SKyJJx88k8hhxh6X +5:JJJxxOJxxM+vnz18fSvkyK8x79pNx9z6+dbJPSJyOK8Xpv +5:JJJzJJZxy9xPt7ZPyJJJxuPz+XvyXn1qSRJJ8hJOOOOPfnXi +5:JJJxxxxxxx+S89q8gnzzxJ786nnzfWSOJ6ntJvkx+fk +4:JJJJxOJxxzxnvyPnvzeN7+XnSxtXWvmPnkyWPnhx6 +4:JJJzJJxxxPvbvy+tpXjj+WJxpPy8h6R9pJv +4:JJJOOZxOJxR9+bx8+X189uPr8xOR8M8mPSPSJJOK+fv +4:JJJxJxxyxPX1xJ+fvjx87ePd9WK9+SOJ88hxPX +4:JJJxJxOJxOOXnz976Rx68hJz89tJJJx6 +4:JJJxRJJyN8J+bJOJJxOPXnntJJJx9 +4:JJJxyJMOOMPzfq6RPpJOJx+fy+t89dPbOLJJOOPvnk +4:JJJOJJOOPXzb+uXvmS8z8+SRJJPtpJWJ6 +4:JJJJJxOOOJxx96+vmZ6PbOL9v1pXkx8fSRJ +4:JJJzxJvbJxx89+WJxJ66R+tJOOP186y98JxOOPnfkJf +4:JJJxOJxxxOPzf1vnXvWRntXkJxPnbZJJJ +4:JJJzJJJxOufvnzfkPyJJOJ+Sx98k9tJJOOPfSJP +4:JJJxxxxxxOPvy89zfXbfrtPXkJzJPhJX +4:JJJJxOOJxx7z968hJ9pzPvSyJnpJxvX +4:JJJxOJxOePd+Sn18x8ntvbNL6WNpz96 +4:JJJJJOOOePzZi86OK8h9pJx78kJP +4:JJJJxOJOJ+ch+S9p6kJ7ZJOZPv +4:JJJxOOOJxxxx6+vk6vfiOPXbJfrdxPvkbJJ +4:JJJJxOOeJ9Z6xy9Pn1pxx96vmbxxfnfhh+bNZ+SRJ1pPhnkiRJP +4:JJJxOOeJxP187ZpPyJx88MPuSOPXpzN+R98hiJf +3:JJJJJJJJOOM98 +3:JJJJOZJJxx6nnpRJP +3:JJJJzJJp+RRLN8JJOOPy8+fv +3:JJJxxxxOJJJxS+f18nz+Xnzz98y86y9+ufpJ8nznWXn +3:JJJJJZJJOOPXjP +3:JJJJJJOJOJxfvny8 +3:JJJzJJxpPiPpJKJxx68 +3:JJJJJJJJxPy8 +3:JJJJJJJzJv1PmOPnX +3:JJJJJJRxx98 +3:JJJRJJJJxx+Xvzfn +3:JJJJJpJJJxxx67nkz6 +3:JJJJJJLJJ +3:JJJOJZJRxxN968Z +3:JJJJOZhPyJ9JOPz6 +3:JJJJJJJMOOPz96 +3:JJJJJJJxx186nz8 +3:JJJJJLJJZKP +3:JJJNJJyk9JOOfXn +3:JJJJJJzJx7+pxPXhOPX +2:JJJJJJJJJOOPfv +2:JJJJOOJJJJN78 +2:JJJRJJJJzJ9JOPz8 +2:JJJNJRJJxOJnnf +2:JJJJJJLJJOWPX1Pn +2:JJJJJJzJJPyJJxPr8JJJx7 +2:JJJJJJxJOMXz+XvUJP +2:JJJJJJJOZPyN8P +2:JJJJJJJJOLPy+vn +2:JJJJJxOJOJOJnU6+fvd +2:JJJ1JJJJJx+XnhJZJJJ +2:JJJxeNOJ68+Xn +2:JJJZJJJJJOOvnX +2:JJJJzJJMK+pJJxfXhJK +2:JJJJJJyJJJPpLJJx6 +2:JJJJ1LJxPXiJJzx79 +2:JJJzJJJpJ6JJhJJJOPv +2:JJJJJJJOOP1fnf +2:JJJJJJJJJJx+X18 +2:JJJJJJJJxPy+r8Z diff --git a/src/main/resources/trees/dtquark/jo_codes/sunny_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/sunny_blossom.txt index f82b005..6981652 100644 --- a/src/main/resources/trees/dtquark/jo_codes/sunny_blossom.txt +++ b/src/main/resources/trees/dtquark/jo_codes/sunny_blossom.txt @@ -1,112 +1,140 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file +8:JJJxxOOOOOPz86+f18j6yxnXnz9pzPy98yPjz8+bxOf18+f18+SxPWSyxnvn1JyXvmJ8XtzJ9pxPzZ9 +8:JJJxxxx1xOfynvyR9q8OOPk77zOJncx89ueJPfvSWOOPnvyXnkxMmOPnXmR8z8PtzxrvbfyxvXv +8:JJJxxxxxxxx7+SX187+vnznSR9uNPS+bx+eeOPnfk98mJyKx88xOPnfmR8Ptzx7Z9yx69Jv +8:JJJxxxOOONfz+Xnq+eZfvy8hc8yM89yOSx69J9uJPyS9vzeeeJPfuJtftfkx88ySx68mPyHmfh +8:JJJxxzJxx7fmXn1xxxx6vvXufXiPWWOPq6R9+bxtzxPfvczPn1vkmZPyWPy88xx68n +8:JJJxxOOOOOOfXvnz68+dPSx87ePb1x78+X1uOJxN+XrfXtxPXkxzOOJ6+b86M8y8h +8:JJJOOMOJOJ+Xvkx+fy8+bOJx+vnefnSxJxxx969XWS+p8h9uOOOOPnXufy9+fXufy9 +8:JJJxxxxxxpvzvk6+fny9uOJ+fXtx7+eePmbx98xfk9vkxWPXmXkPSxpxN+SvvSx+Xn +8:JJJzxxxOOON6nc+uXr8Xz9ufvmfmJ8mPz+Xk7ePbx76xxqN6yxPSx+Xnh9uK9yR9 +8:JJJxxxxxxx9+XnzftXWR8Pz+qt86+bx+fn1uLxPvyRXvmXmKPz8mb+R8n +8:JJJxxxxxzz98xXmfg+SPvmXntx9z+Rx69x97eJzx78PbvyWMxR8yXnWRx+XvtPrrxPzfv +8:JJJxxOJxOJ+fy+vnzefnnz1NzJ98zfknWWJPX1Phi8Uy8J+beOLxM787z89puJvy9 +8:JJJxOJxxxxx+vnXqvnubxfvXtxXvzeJzJ87zx79x9+Sxyxx6nq8JPtzPt8hzx7nmJM8 +8:JJJxxxxxxxy+vnfS+f1uR98XV+bx+r8f1vmSxhPXmLnmXnS7bx+bfv +8:JJJxxzxp7eL9+Rynp8JxxPXz+vnub9xxvz6XvyRWOvnWXnkzfyUPkx+fi +8:JJJxxxxxxxx+Xnz96iPt+dz96yx+Xnt+t8y8OOLPXz87zeOOPk7+vnvv +8:JJJxyxOJxxxM6+q86+SvvWuPXmPmXh8OJx+fixXni+eeJxxxxxPvz69+bPnr7Z8hzx78h9uOJxRXz9y9L+fuXvS +8:JJJOOZxOPr7zc+vmJ8+RxJxK+Xrvq8xOJOM788yx6y8PmPz89y9xzN6vufuOPvWWPXv +8:JJJxWOOOOJ+Xnz9vnuWPXviPzeJxxPnfzeP188hP1y9zLPuOOPz96vvkxOJx7z9+Xny8w+Z8OWPXn +8:JJJxxzxOL8ffyOPy89xOOOPfSx699y9wXxXz9Xmb8OOJN8y87nSWpWXvn +7:JJJxxxOOOPXz+vk6nyWNx6+XnjOZPnzbxJZ+fvtxb+SPtxxN678mPy8mfy8 +7:JJJxxxxxxx78z6+fuR9xPvXeuLPvh8mJx6nmXkz8+beeL9fhx861WRPuJx998Sx6 +7:JJJxOJxxxx868+ft+bx9+WWOJ68nuPvkxPi+bw7x7+Xv +7:JJJxxOOOOOJ7+vnfviM+bzmZxPz88k9xxx9z97efvv1uJWJ99vkxhfU6WOOOJS9XyR89Xy8n +7:JJJxxxxxxxxvXep88+WWN68h97fub6Xefhz8P1z+S9OXuOPfq8yxORXk6XkxmPi7 +7:JJJ1xeJxxN7z9+XvdPyWJxxxxOPvXvXvyXvuFpy97rvmOOJxxx+X18ned896WROX18fnkxxmfR687zeeJxx87+b8h9JPkn +7:JJJxxxxxxxPz98y8+bw56v18Xz6WPyvnmXmOZx+fnXkxM8+bx+bxPr+vkx7+SntxK+ftx+Xv +7:JJJxxxxxxPzc+S98z6XtuJvz66q8mOPnfzzxxL87zh9xPvtuPvSx6WQ+vk +7:JJJxOJxMz6+fy9t+SOXvrN+bxxL79+SSx6yPn1uWN69p8mJOJ6vmePfyS8 +7:JJJxJxxxxOP18nfyRXvmS8z8OPntxZ9vzeOOZ9JfkPbzx7nmPnyWSPtKP1ufoz98mSxJ6WPXkxOPnz+SPn +7:JJJxxxxxxxxJ+fXvfSJXzbwfvvjftxWPvuePfp+SKx68mOb6xJXXkxLPyXn +7:JJJzeOJxx8+b9tvfmbx8nhn1xxxOZN+ROPvp9p6yxPWXvvvmRxOPXXhxOJvnkx+Xn +7:JJJzxmJPjOPfbxpOPvbPyWJxxx89+Xnyqynp8+uOJOOJM+fk96qPtJxfy9vkyOJXXmJff +7:JJJxxxxOJxJ+c+XvzZ+XnSxy989pOPy9z96SORXk+bZxxx8z8x89uOPt77rP1txtPSy9PkJmJ8n +7:JJJxxxxzOJ+vnWJx969uJ+fo7jJc6WN+XnzbzxLPfpxPt+uSy9PuPzfvmXmJxxx8788y8 +7:JJJzOJNOOPnbnbxLf18+WJy9JxxXvS6WPyR+vn1NxJ9uONvfufXhOOJxPzf18XSx6XkxjPz6 +7:JJJxxxyOOOM768XuLx79r7zb9v18zb8mJi+b+XnWWJ61xJPXmR89uJ7 +7:JJJxxxxxOOJ+Xvf1R8k7zJh+vnyyxxJ6U9y9Phntx9y9HbzOfuJ98x8nWSx68kmJ6 +7:JJJxOOOJx+fy8+XnzntxXz9vy8+bxL7Z+Syynp8KP1ubz99p8mPz+Xk +7:JJJxxxOOOMz8+Xvz8nyyNfnufuHx9b+WSK898zx78xLzc8+XnuePfuPt +6:JJJxeJzJx+d6+txePftXkM7ePzfnyWJxxxMPuXvSRJ86WRhfn1pRN8mJR8mJx7+Xn +6:JJJxOJxL+b+Syx69+vkXz8+bx7+txVx69zxx979y9Pkx+Xj +6:JJJOOJxxxZ+Xvd9+eeOPndJ9PyWJV6h8mMxPi7b9ySyPp9xPz9y9P +6:JJJxOOOOJx6+f1861pSXn1vkxj+fWXnbONPefnyRxxX186n1uN6vkMxbx8+Xn +6:JJJxOOJxOOPzfS9vdPvzzzxPz98PvmRM8xnfyWJOJPWRvvkxPy89pxSvz9uHxXv +6:JJJxxxxxxx+fq8fy9+fmXmPnvzzxmfneb996yxKXy89uJ9+vkmZPyJnh +6:JJJxOOOeJvc+pyMXvmOM68zPkfWqPiPtx9fzeeJPzzPp8kJ9xN9+SyJxxPXn1PkiPkkR +6:JJJxOOOOM+SPrPf1zZ9L8k7zfkk+ceM7+SyJxK68xOJ889uRKx+XvuJ+fv +6:JJJxxxxOON+efvX1t8y8+XneZL+pPkX1uJvy9wXz9uPfnzzzPp86WOP186y8n +6:JJJxOOOMOJ+fnzzxOPfY868kxOXnz86RyWPX1vkXzePz8EftzJxJXfpOJp6S +6:JJJxxyNJPmJOOXh+fvz8mJ89uJOJ79yxJ69xN+fq+bxJxOfpPfkw7nSMxKJ+SPkx6 +6:JJJxOJxxxPzz9L8k6WXpvfyWPy8n1uJxxPvXuePfyPpPkxyPhz87+bxOPz+vnb8yU8mKPz8 +6:JJJxxxxxz+R9PjfrPWRK+tx+Xt8PzeJZ7h8kxx6+fi+WSxh+WXnvkR9uNzx796X +6:JJJxxOOOR98z6+fy9+SxyPpK8XvzeJzPvz+vk8mJy8OPnX +6:JJJOOOOJx1z68xfnzzxPfnSy89uZ+RPvkxL8z+R8nbeeJ7vh6WJyPpP1uPvkOK8 +6:JJJxxOOJxxxxPy89+bx+fvXmXjP1uPufvnWWOt8PWRXntvbzeJ9p8mZPk+SSx+XnkJx8yPmPf +6:JJJxOOOOOP1869uC58yx68xOfni6+b1zZ9x98eJvz8nyyx9WPy9t8x89ttx6 +6:JJJxxxxxxLfufvz+VV89z9Xzzxh9fnV9uePb+Xty9HzbwnxzPnrz9+WWOWXhj9898mOOPmR8x8ffj +6:JJJxxxOJxXz+q8+dx96+qN8zPmKx68z8+bONfc6WJXy9vtuZPuPy9 +6:JJJxOOOOOOJPXf18+fWWJ6XnufWXt7ePjfyWJy8PUP1uD+Jb9yx6XtxPfkxOZPyPmJ8nyRnn +5:JJJJxOOJxM+fynvzePfmXhnX1yx6SPuJJ9WPvmWPXh +5:JJJxOJxxxPt8nXtOZ9+bLxJJPvyWNJxvXSxPnkxzJz86Rx68hOJ6 +5:JJJxxhOOOOfWPv18Xd6Sx6+bLJxx79z99pJOPy9+SJxS9uR9p8kOWJJfXjJ +5:JJJxxxOOOfyy9PmK8Z9z9J86RRPeZJPkxJ7eJ79txJxvff +5:JJJxzJeJ7Z8OOOZxJL8+WPy89xOJ+Xt9ZvkxPix66SWP189VJxOPvX +5:JJJzzJOOOJ+fvj78MmPfyxJJxM6+SJ1J8PkJxPkXuJJOOJ79ftpJJx6 +5:JJJxONxxxU96+fvzZOL+vnkJx+fnyWpJyvnhRJ9tKq +5:JJJxxOJxxxL+XvfyWPt+vnkOXh+SOPntzJNfROPvbMZJx7 +5:JJJOOOOOOOfX186+fnvzebxP18+pPmPnyWM+XvkxXmHXtx+S9pOPX +5:JJJOJxOJxnvzZ+Sv18+bkPtuOXvfyyyJx1XnU9pJ8MOXnt +5:JJJxyJKxJvWXknmJOOOPz8+Xufp77ZL9uRJJPpOJxx9ffbmPf +5:JJJxxxxxOPzb+X186US8cnbZ+SKPkx+Xk9pJOOd69y9 +5:JJJzJxxz+WJ98x89uPfcLPySROvn1pxuPr6WXuPvkRJxN+S8 +5:JJJxxWOOZ861OS989uPq+bzJxx+XvfhPtzPtPySOOvk6k8hJxxU8+ch+UyXnv +5:JJJJxOOOOOL9+fnSPfy+rfnzcLOPfyWPypJ8+txWXvub9xPXkx+Xmfn +5:JJJxOOOOOOJvz6+t87eM79zd6PSJS7Z+tNxJPSRPkzObJ86JOJ7 +5:JJJxOOOOOOOR9+fnuXr8jx76WPq9tS7ZOZPp+SKyJJx88k8hhxh6X +5:JJJxxOJxxM+vnz18fSvkyK8x79pNx9z6+dbJPSJyOK8Xpv +5:JJJzJJZxy9xPt7ZPyJJJxuPz+XvyXn1qSRJJ8hJOOOOPfnXi +5:JJJxxxxxxx+S89q8gnzzxJ786nnzfWSOJ6ntJvkx+fk +4:JJJJxOJxxzxnvyPnvzeN7+XnSxtXWvmPnkyWPnhx6 +4:JJJzJJxxxPvbvy+tpXjj+WJxpPy8h6R9pJv +4:JJJOOZxOJxR9+bx8+X189uPr8xOR8M8mPSPSJJOK+fv +4:JJJxJxxyxPX1xJ+fvjx87ePd9WK9+SOJ88hxPX +4:JJJxJxOJxOOXnz976Rx68hJz89tJJJx6 +4:JJJxRJJyN8J+bJOJJxOPXnntJJJx9 +4:JJJxyJMOOMPzfq6RPpJOJx+fy+t89dPbOLJJOOPvnk +4:JJJOJJOOPXzb+uXvmS8z8+SRJJPtpJWJ6 +4:JJJJJxOOOJxx96+vmZ6PbOL9v1pXkx8fSRJ +4:JJJzxJvbJxx89+WJxJ66R+tJOOP186y98JxOOPnfkJf +4:JJJxOJxxxOPzf1vnXvWRntXkJxPnbZJJJ +4:JJJzJJJxOufvnzfkPyJJOJ+Sx98k9tJJOOPfSJP +4:JJJxxxxxxOPvy89zfXbfrtPXkJzJPhJX +4:JJJJxOOJxx7z968hJ9pzPvSyJnpJxvX +4:JJJxOJxOePd+Sn18x8ntvbNL6WNpz96 +4:JJJJJOOOePzZi86OK8h9pJx78kJP +4:JJJJxOJOJ+ch+S9p6kJ7ZJOZPv +4:JJJxOOOJxxxx6+vk6vfiOPXbJfrdxPvkbJJ +4:JJJJxOOeJ9Z6xy9Pn1pxx96vmbxxfnfhh+bNZ+SRJ1pPhnkiRJP +4:JJJxOOeJxP187ZpPyJx88MPuSOPXpzN+R98hiJf +3:JJJJJJJJOOM98 +3:JJJJOZJJxx6nnpRJP +3:JJJJzJJp+RRLN8JJOOPy8+fv +3:JJJxxxxOJJJxS+f18nz+Xnzz98y86y9+ufpJ8nznWXn +3:JJJJJZJJOOPXjP +3:JJJJJJOJOJxfvny8 +3:JJJzJJxpPiPpJKJxx68 +3:JJJJJJJJxPy8 +3:JJJJJJJzJv1PmOPnX +3:JJJJJJRxx98 +3:JJJRJJJJxx+Xvzfn +3:JJJJJpJJJxxx67nkz6 +3:JJJJJJLJJ +3:JJJOJZJRxxN968Z +3:JJJJOZhPyJ9JOPz6 +3:JJJJJJJMOOPz96 +3:JJJJJJJxx186nz8 +3:JJJJJLJJZKP +3:JJJNJJyk9JOOfXn +3:JJJJJJzJx7+pxPXhOPX +2:JJJJJJJJJOOPfv +2:JJJJOOJJJJN78 +2:JJJRJJJJzJ9JOPz8 +2:JJJNJRJJxOJnnf +2:JJJJJJLJJOWPX1Pn +2:JJJJJJzJJPyJJxPr8JJJx7 +2:JJJJJJxJOMXz+XvUJP +2:JJJJJJJOZPyN8P +2:JJJJJJJJOLPy+vn +2:JJJJJxOJOJOJnU6+fvd +2:JJJ1JJJJJx+XnhJZJJJ +2:JJJxeNOJ68+Xn +2:JJJZJJJJJOOvnX +2:JJJJzJJMK+pJJxfXhJK +2:JJJJJJyJJJPpLJJx6 +2:JJJJ1LJxPXiJJzx79 +2:JJJzJJJpJ6JJhJJJOPv +2:JJJJJJJOOP1fnf +2:JJJJJJJJJJx+X18 +2:JJJJJJJJxPy+r8Z diff --git a/src/main/resources/trees/dtquark/jo_codes/sweet_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/sweet_blossom.txt deleted file mode 100644 index f82b005..0000000 --- a/src/main/resources/trees/dtquark/jo_codes/sweet_blossom.txt +++ /dev/null @@ -1,112 +0,0 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/jo_codes/warm_blossom.txt b/src/main/resources/trees/dtquark/jo_codes/warm_blossom.txt index f82b005..6981652 100644 --- a/src/main/resources/trees/dtquark/jo_codes/warm_blossom.txt +++ b/src/main/resources/trees/dtquark/jo_codes/warm_blossom.txt @@ -1,112 +1,140 @@ -2:JJJ0JR7Jxx+nXv -2:JJJ0Jxx769JxPX -2:JJJJJx+Xz+nv -2:JJJJOOP07+vU -2:JJJJOOP17+j6v -2:JJJJOR+Z+h9P -2:JJJJOR+mPfuPf -2:JJJJxOP0+vz69Z -2:JJJJxxx+X187+Xj -2:JJJJxxx+Xvz86 -2:JJJJxxx+Xz98+fqP -2:JJJORxx987Jx+nv -2:JJORJOP097JJx+nv -2:JJOROOZ8PvhLJ -2:JJRJOOP178 -2:JJRJOOP18707 -3:JJJOJxx6+uvX0nb6UP -3:JJJOOOOP0+fXuvfSPbh -3:JJJOOOOP07+uvfWnXnbJ -3:JJJOOWJ68xPz8+bOPvtOPf -3:JJJOWPXzP0OOPy+fvj9uOPXb -3:JJOJOOWPXuPz9+bx88XkJzPX -3:JJxJJOP1+fXtJJx+fX -3:JJxJOOOP0+vfS+mh6XbvtJJP -3:JJxJOOOP069vb8hJOPX -3:JJxxJxWPv00x76+vb9pLx86RJN -3:JOJOJOOP0+vXb9pJ8hJOePfS -3:JOOOJxOOXz896RPtJPeZJOPvhJJ8hJOJ6 -3:JOORJXZJxR+fn0hOJPSJ9pJOJ8 -3:JOORLJx+XvtJOXePfkJJxx67f -3:JORJJxx+XvnZJJOPz+nv -3:JORJxxxx+XfvV9pfmMJJPbJJP -4:JJJOJxx+Xz89v0hPtuPf -4:JJOJxxxx6+f1vnWR89+bmE5L9uKJ7efv -4:JJOOWOOL986WPveOPvefv0hxxx97fSPtpJ -4:JJxxJOOP0+Xfuvy76RWJ8nbJOJ+k7 -4:JJxxOOOPXzfntx98mJ6nyRPzbJntZN -4:JOJJxx0x+nXeP1761PR+txPXkmPfSpJK -4:JOJJxxOP0+vz68h7ZPSKJJ -4:JOJOJxxx+Xf0z89vbPSJntJpOPX -4:JOJOOOOK+f186t86WPnkxOPy88 -4:JOJx0xP076xJnS+qpx16779ZZ17 -4:JOKOJxOP166+mhJ7xPc9pOPv1tLL7eNx+vff -4:JOOJOOOOP0+vfXq60x86K7ZLJ9tJJP -4:JOOOOOOP0nvz6i9+fU8mbPU7v -4:JOOOROJx+fy+vnSPtJx+fvbJOOPvz88hJxxz687b -4:JOOORyJx6+pJ8OPz89ZOM97ZOPkntrZJ -4:JOOWJy9PSOnv0xOOWXnzx79PnkKx69OZx9vuS97bpOJ+nv -5:JJxxxxxOJx6+v06X1pv0hnXbOM79bfkxXn1uLt+vSK+SKxq67 -5:JOJ0hx69xxZ69y9x7+SxOOOf09686ytPkxx867eJOJnb9 -5:JOJxJOR+Z+h9x96RRPSWWJ9XhM -5:JOJxxOOOPXfy+vj+SM+tx68mPmXnbeZP1N8nWSRJx89tJ -5:JOKJOOWPXp7z9+bpxx+bHnv1tJxp78mJOJx6+fnf -5:JOOJOOOPV9+Ux67zOPz9+hPvyRKXkxJ6yPnzchJ9pNxx76 -5:JOOJxxOXny8zfndxx797eLx7h9p+WWKx+X188hM9uSvp8khJx6 -5:JOOJxxxx6+efvi6WPy9+kntyXtfkzM8nySRJ+bxNPbx89tpX -5:JOOJxxxxP067nr80OP0nXXtxL+tQ7+bZOJ7k6WKxP0nvtxP16 -5:JOOOJx0+WPQ79fbeJ79uJ169pX0hxRn076SOOPvX -5:JOOOOJx609+U9Zxx977zPhOPftNJ+WRxnU9qxPS8hOOJ8nX -5:JOOOOOOOJ68fyy87zPp89pJPbeZPp+SxPWROJ89x98mJh8R -5:JOOOWNJ69eJPt+bJxJ7fkxxx+X18nbPSK9uXtx6 -5:JOOWMx6nSx+Xtx6+ZxOPc+fnuJxPy99pvkJJx+Xf -5:JORKxR9uJ9+hJxxxnvyXneZz899xxOOfuPvXbJftNK -5:JOSyJOPy89tx6+hJOOX0x+fnp7zfvuJxORPp9Z7bOPz9 -6:JOJOOOJx+XfbPyy9xPvj+b0np9uZ9p+beePz98MP0yOJXU8xOPnkj9WJvWWJXWXvtv -6:JOJxxOOOXvi+Xznvtpx98mOOPj68+SxKOPnmR8xPk+bzxJ+bM98MxPk9uNyPff -6:JOJxxxOXzx7+mPnuPvrx9vjzx787dfyyJWOJ69vkhxPXtuPyRJ7efp -6:JOJxxxxxx6+d86vz9viPyWXkx87Znzf0kxOfnzZ89uLxOfvbfufuPv -6:JOKxx1+eNf0768nWnX0kxx6Xb+uuJx791PZ6XbxL+n1pff -6:JOOJxRx9+eft8+tx9p8yPmL8XzbOPz96WJK+WXt8hJ -6:JOOJxx1xx79XcPkOPX17eN7f1uLJ+uvfXb0Lnp+kxMxk78WMPSXSxxx0J9S6nvVR -6:JOOOOJ17+mh6PvftOuPr6x6+ekxx87neOnp7Z6Wk066x+vX -6:JOOOOJx+X1Z8nzzfvk6n1uJPuWPXvkXzzZz9vkzPkxPz66WMU+Xv -6:JOOOOOOOOPX09vXmnfz68fbxvevbn0mkPzfRxPn1tx+tS+bvSXSxOvXX -6:JOOOOOOOOPXvzfky+fnWRP09PvXuXp+SKJ+bOZ+hJ9OJ9fkxePnyWMPXkP -6:JOOOOOOOPV7+mmK+nfXt+bOvfXiR7bM9zdxfuHvWuK9XUP -6:JOOOSyxPy89p9xxxxPXvd9uNffzzOZxx898mPnt8yUM8z8OL86q -6:JOOOeOOOPnenZ870+p76OM+vUXkxOPXmkPzPR+txxJPup7PzbOPvSJPSxnWn1J6JP -6:JOWJOOOePnuPXyWXnkXtN6SJR+bxOOJx979fbxPv0xZMM8z8xOK8+SM8h9uSxWPvtS7uJPz9r -6:JOWJxxPvnVPzxxOOPvb87zPn0hOfmPy89xN9yPzOb99t -7:JOJxxxOOP0+vfX0k07+tJ7ep7PSxOnv06WPX1uuPuuPfXSXbh+mmMx87ZZ6SxPnbeuPvceN7 -7:JOOJOOR+ePc9xPt8neeLfufvkx8+SOJKXyR8+kyOJ8nkw+fh9uKxxPvWHy99y7z9P -7:JOOJxOOJ+S7+mXh9uPXzeJz+nvvkWPntxRvuePefvuK9XyWJWON696yxt6R8x88hy8P -7:JOOJxOOc6x+vXtf0mh69Z+bxOJ7717M6Rxx168X1uP166WPntOLeJ991x96 -7:JOOJxxxOPX06uPX1uJ+vXbx+k78R+kx0677benePc+tzupPfWJ9vSWmJniXWOJXXt -7:JOOJxxxx+U9vc6R+fi+txJ9z98+eeONZ87eJ886yyiPuON6Xvkxy8nf -7:JOOOJxxxXvnz9r8mRx68z87eJffyWJyPvSxmPk6+kjbx79uKxvXuXzPuK9 -7:JOOOJxxxx7+r6Xb960xxj689WJ+vX0mkx8h7bPbxxePvvevf1uJdK91xNPbPRPSxUPn -7:JOOOOOOWJ6y8+uJ+b9vmOPfncz86WWS988kxM+Xnbxxd87eM+efk98Uin -7:JOOOOeOOOP097fveh+vb6xxx+vXnvkxfUJ+tOJx6169pfSWP06167Z -7:JOOOWJxx6+f096yx69vePzePz98nnyyWVPmPnkxJ89uOOOL+X097vtPbOfv -7:JOROJyx6+nvVS+mJxeNPj8+bOPfkxzPh6WM69uJuJ9vzeefpfhPv -7:JORx+SOPy99uPy9p+eJz9x9vzZ9r8xOOOOM7ny8+b98i8mfmPn -7:JOSxOJL6nWWPXn1xOJx6t+bx+c999qyXvmJxxxPnz68+bzPk8yPmLj8 -7:JOSxOOOPz986vix8+uOJxOfnz+Xnftxxxx79p7fqPmZzx78J8mJnn -7:JOWJWJOPXy86yRn0h9tJ+mJxOOL8688zd8OeJPfnuJxOJ+VXcPq+bxxx97b99uN7v -8:JOJxOOKPz+vnSx8nSR+beJnzzz89x98+txuJXvzePt6WJ9y98mOOJ67+SPkxJ+fy8 -8:JOJxxxOP0+vz6+jPXbxPf00w+h6S76R+t1xJ179uLPXRV6SOpPWP0nX -8:JOJxxxx6+mnXdJ9+nz61pXWk6X00x+nfR+uuP17fXbLx+nv -8:JOJxxxxx69f0j616Ptxf1176XjP0mmJ+mmPfR7fRJ+SxhPWmHk6wvxx8nV7eJOOP1fj7c71tPeM7 -8:JOOJOLx+j9+kJ+txP1vXSxvU6SRx6+mmhxx67nbLfSn1VxPup67ZJZ -8:JOOJxx0XuPS+S7z+nv09+Sx0PtR6yPnkxXmXmPnzeeeJ7h8i9uPvtxNzfqXtf -8:JOOOOOOOK+fnyU98WHnfyWRx6+pPk8bPbzxLz97vpJx+fn1pzxJx99vWJt+SJ98yx68xfmEyXnbn -8:JOOOOOOOOP07616+i79p71r7xr70nePfS0J6OJ6XkxxOnXncf1uJpvuutvZPRR7beP1p7 -8:JOOOOOOOOXvmfy8989uPt8bJPbzxL7c9pPyyxxWJ+vk96yxnVXvtOKPr8mKJx88zLnkH -8:JOOOOOOOPU+tHfny1KvkPfjh+SOk6xPXbxp7+txOp7Pvmkkx87f -8:JOOOOOOXzvmPntx6+WR9+bPk9+SR8mWPSXmM7c+bzOM7fpPtyyJ9PZxPv -8:JOOOOOWPy8nuPvzfntS8zLnmK8+fWRWWHS9PtyXtf -8:JOOOOS+uOPXfmJfneZM89pvzzzx78hPtrfyqXkyXmJnz8 -8:JOOOWOOPnU9XhzPh7zxndP1JPnyWKx8+vn1pxPuZ9x68mML6n -8:JOOWOOOJ+fuXvU96WOXnvzxuOL9ffeePfmPk8xLPix89yp7uPz9pf -8:JOSyOWJPyyPnvhJ9xOPy79vzzZxxx79t7zP099OJxOPfz99XmOOOOLPmWPXj78z8mfi7Z8URP \ No newline at end of file +8:JJJxxOOOOOPz86+f18j6yxnXnz9pzPy98yPjz8+bxOf18+f18+SxPWSyxnvn1JyXvmJ8XtzJ9pxPzZ9 +8:JJJxxxx1xOfynvyR9q8OOPk77zOJncx89ueJPfvSWOOPnvyXnkxMmOPnXmR8z8PtzxrvbfyxvXv +8:JJJxxxxxxxx7+SX187+vnznSR9uNPS+bx+eeOPnfk98mJyKx88xOPnfmR8Ptzx7Z9yx69Jv +8:JJJxxxOOONfz+Xnq+eZfvy8hc8yM89yOSx69J9uJPyS9vzeeeJPfuJtftfkx88ySx68mPyHmfh +8:JJJxxzJxx7fmXn1xxxx6vvXufXiPWWOPq6R9+bxtzxPfvczPn1vkmZPyWPy88xx68n +8:JJJxxOOOOOOfXvnz68+dPSx87ePb1x78+X1uOJxN+XrfXtxPXkxzOOJ6+b86M8y8h +8:JJJOOMOJOJ+Xvkx+fy8+bOJx+vnefnSxJxxx969XWS+p8h9uOOOOPnXufy9+fXufy9 +8:JJJxxxxxxpvzvk6+fny9uOJ+fXtx7+eePmbx98xfk9vkxWPXmXkPSxpxN+SvvSx+Xn +8:JJJzxxxOOON6nc+uXr8Xz9ufvmfmJ8mPz+Xk7ePbx76xxqN6yxPSx+Xnh9uK9yR9 +8:JJJxxxxxxx9+XnzftXWR8Pz+qt86+bx+fn1uLxPvyRXvmXmKPz8mb+R8n +8:JJJxxxxxzz98xXmfg+SPvmXntx9z+Rx69x97eJzx78PbvyWMxR8yXnWRx+XvtPrrxPzfv +8:JJJxxOJxOJ+fy+vnzefnnz1NzJ98zfknWWJPX1Phi8Uy8J+beOLxM787z89puJvy9 +8:JJJxOJxxxxx+vnXqvnubxfvXtxXvzeJzJ87zx79x9+Sxyxx6nq8JPtzPt8hzx7nmJM8 +8:JJJxxxxxxxy+vnfS+f1uR98XV+bx+r8f1vmSxhPXmLnmXnS7bx+bfv +8:JJJxxzxp7eL9+Rynp8JxxPXz+vnub9xxvz6XvyRWOvnWXnkzfyUPkx+fi +8:JJJxxxxxxxx+Xnz96iPt+dz96yx+Xnt+t8y8OOLPXz87zeOOPk7+vnvv +8:JJJxyxOJxxxM6+q86+SvvWuPXmPmXh8OJx+fixXni+eeJxxxxxPvz69+bPnr7Z8hzx78h9uOJxRXz9y9L+fuXvS +8:JJJOOZxOPr7zc+vmJ8+RxJxK+Xrvq8xOJOM788yx6y8PmPz89y9xzN6vufuOPvWWPXv +8:JJJxWOOOOJ+Xnz9vnuWPXviPzeJxxPnfzeP188hP1y9zLPuOOPz96vvkxOJx7z9+Xny8w+Z8OWPXn +8:JJJxxzxOL8ffyOPy89xOOOPfSx699y9wXxXz9Xmb8OOJN8y87nSWpWXvn +7:JJJxxxOOOPXz+vk6nyWNx6+XnjOZPnzbxJZ+fvtxb+SPtxxN678mPy8mfy8 +7:JJJxxxxxxx78z6+fuR9xPvXeuLPvh8mJx6nmXkz8+beeL9fhx861WRPuJx998Sx6 +7:JJJxOJxxxx868+ft+bx9+WWOJ68nuPvkxPi+bw7x7+Xv +7:JJJxxOOOOOJ7+vnfviM+bzmZxPz88k9xxx9z97efvv1uJWJ99vkxhfU6WOOOJS9XyR89Xy8n +7:JJJxxxxxxxxvXep88+WWN68h97fub6Xefhz8P1z+S9OXuOPfq8yxORXk6XkxmPi7 +7:JJJ1xeJxxN7z9+XvdPyWJxxxxOPvXvXvyXvuFpy97rvmOOJxxx+X18ned896WROX18fnkxxmfR687zeeJxx87+b8h9JPkn +7:JJJxxxxxxxPz98y8+bw56v18Xz6WPyvnmXmOZx+fnXkxM8+bx+bxPr+vkx7+SntxK+ftx+Xv +7:JJJxxxxxxPzc+S98z6XtuJvz66q8mOPnfzzxxL87zh9xPvtuPvSx6WQ+vk +7:JJJxOJxMz6+fy9t+SOXvrN+bxxL79+SSx6yPn1uWN69p8mJOJ6vmePfyS8 +7:JJJxJxxxxOP18nfyRXvmS8z8OPntxZ9vzeOOZ9JfkPbzx7nmPnyWSPtKP1ufoz98mSxJ6WPXkxOPnz+SPn +7:JJJxxxxxxxxJ+fXvfSJXzbwfvvjftxWPvuePfp+SKx68mOb6xJXXkxLPyXn +7:JJJzeOJxx8+b9tvfmbx8nhn1xxxOZN+ROPvp9p6yxPWXvvvmRxOPXXhxOJvnkx+Xn +7:JJJzxmJPjOPfbxpOPvbPyWJxxx89+Xnyqynp8+uOJOOJM+fk96qPtJxfy9vkyOJXXmJff +7:JJJxxxxOJxJ+c+XvzZ+XnSxy989pOPy9z96SORXk+bZxxx8z8x89uOPt77rP1txtPSy9PkJmJ8n +7:JJJxxxxzOJ+vnWJx969uJ+fo7jJc6WN+XnzbzxLPfpxPt+uSy9PuPzfvmXmJxxx8788y8 +7:JJJzOJNOOPnbnbxLf18+WJy9JxxXvS6WPyR+vn1NxJ9uONvfufXhOOJxPzf18XSx6XkxjPz6 +7:JJJxxxyOOOM768XuLx79r7zb9v18zb8mJi+b+XnWWJ61xJPXmR89uJ7 +7:JJJxxxxxOOJ+Xvf1R8k7zJh+vnyyxxJ6U9y9Phntx9y9HbzOfuJ98x8nWSx68kmJ6 +7:JJJxOOOJx+fy8+XnzntxXz9vy8+bxL7Z+Syynp8KP1ubz99p8mPz+Xk +7:JJJxxxOOOMz8+Xvz8nyyNfnufuHx9b+WSK898zx78xLzc8+XnuePfuPt +6:JJJxeJzJx+d6+txePftXkM7ePzfnyWJxxxMPuXvSRJ86WRhfn1pRN8mJR8mJx7+Xn +6:JJJxOJxL+b+Syx69+vkXz8+bx7+txVx69zxx979y9Pkx+Xj +6:JJJOOJxxxZ+Xvd9+eeOPndJ9PyWJV6h8mMxPi7b9ySyPp9xPz9y9P +6:JJJxOOOOJx6+f1861pSXn1vkxj+fWXnbONPefnyRxxX186n1uN6vkMxbx8+Xn +6:JJJxOOJxOOPzfS9vdPvzzzxPz98PvmRM8xnfyWJOJPWRvvkxPy89pxSvz9uHxXv +6:JJJxxxxxxx+fq8fy9+fmXmPnvzzxmfneb996yxKXy89uJ9+vkmZPyJnh +6:JJJxOOOeJvc+pyMXvmOM68zPkfWqPiPtx9fzeeJPzzPp8kJ9xN9+SyJxxPXn1PkiPkkR +6:JJJxOOOOM+SPrPf1zZ9L8k7zfkk+ceM7+SyJxK68xOJ889uRKx+XvuJ+fv +6:JJJxxxxOON+efvX1t8y8+XneZL+pPkX1uJvy9wXz9uPfnzzzPp86WOP186y8n +6:JJJxOOOMOJ+fnzzxOPfY868kxOXnz86RyWPX1vkXzePz8EftzJxJXfpOJp6S +6:JJJxxyNJPmJOOXh+fvz8mJ89uJOJ79yxJ69xN+fq+bxJxOfpPfkw7nSMxKJ+SPkx6 +6:JJJxOJxxxPzz9L8k6WXpvfyWPy8n1uJxxPvXuePfyPpPkxyPhz87+bxOPz+vnb8yU8mKPz8 +6:JJJxxxxxz+R9PjfrPWRK+tx+Xt8PzeJZ7h8kxx6+fi+WSxh+WXnvkR9uNzx796X +6:JJJxxOOOR98z6+fy9+SxyPpK8XvzeJzPvz+vk8mJy8OPnX +6:JJJOOOOJx1z68xfnzzxPfnSy89uZ+RPvkxL8z+R8nbeeJ7vh6WJyPpP1uPvkOK8 +6:JJJxxOOJxxxxPy89+bx+fvXmXjP1uPufvnWWOt8PWRXntvbzeJ9p8mZPk+SSx+XnkJx8yPmPf +6:JJJxOOOOOP1869uC58yx68xOfni6+b1zZ9x98eJvz8nyyx9WPy9t8x89ttx6 +6:JJJxxxxxxLfufvz+VV89z9Xzzxh9fnV9uePb+Xty9HzbwnxzPnrz9+WWOWXhj9898mOOPmR8x8ffj +6:JJJxxxOJxXz+q8+dx96+qN8zPmKx68z8+bONfc6WJXy9vtuZPuPy9 +6:JJJxOOOOOOJPXf18+fWWJ6XnufWXt7ePjfyWJy8PUP1uD+Jb9yx6XtxPfkxOZPyPmJ8nyRnn +5:JJJJxOOJxM+fynvzePfmXhnX1yx6SPuJJ9WPvmWPXh +5:JJJxOJxxxPt8nXtOZ9+bLxJJPvyWNJxvXSxPnkxzJz86Rx68hOJ6 +5:JJJxxhOOOOfWPv18Xd6Sx6+bLJxx79z99pJOPy9+SJxS9uR9p8kOWJJfXjJ +5:JJJxxxOOOfyy9PmK8Z9z9J86RRPeZJPkxJ7eJ79txJxvff +5:JJJxzJeJ7Z8OOOZxJL8+WPy89xOJ+Xt9ZvkxPix66SWP189VJxOPvX +5:JJJzzJOOOJ+fvj78MmPfyxJJxM6+SJ1J8PkJxPkXuJJOOJ79ftpJJx6 +5:JJJxONxxxU96+fvzZOL+vnkJx+fnyWpJyvnhRJ9tKq +5:JJJxxOJxxxL+XvfyWPt+vnkOXh+SOPntzJNfROPvbMZJx7 +5:JJJOOOOOOOfX186+fnvzebxP18+pPmPnyWM+XvkxXmHXtx+S9pOPX +5:JJJOJxOJxnvzZ+Sv18+bkPtuOXvfyyyJx1XnU9pJ8MOXnt +5:JJJxyJKxJvWXknmJOOOPz8+Xufp77ZL9uRJJPpOJxx9ffbmPf +5:JJJxxxxxOPzb+X186US8cnbZ+SKPkx+Xk9pJOOd69y9 +5:JJJzJxxz+WJ98x89uPfcLPySROvn1pxuPr6WXuPvkRJxN+S8 +5:JJJxxWOOZ861OS989uPq+bzJxx+XvfhPtzPtPySOOvk6k8hJxxU8+ch+UyXnv +5:JJJJxOOOOOL9+fnSPfy+rfnzcLOPfyWPypJ8+txWXvub9xPXkx+Xmfn +5:JJJxOOOOOOJvz6+t87eM79zd6PSJS7Z+tNxJPSRPkzObJ86JOJ7 +5:JJJxOOOOOOOR9+fnuXr8jx76WPq9tS7ZOZPp+SKyJJx88k8hhxh6X +5:JJJxxOJxxM+vnz18fSvkyK8x79pNx9z6+dbJPSJyOK8Xpv +5:JJJzJJZxy9xPt7ZPyJJJxuPz+XvyXn1qSRJJ8hJOOOOPfnXi +5:JJJxxxxxxx+S89q8gnzzxJ786nnzfWSOJ6ntJvkx+fk +4:JJJJxOJxxzxnvyPnvzeN7+XnSxtXWvmPnkyWPnhx6 +4:JJJzJJxxxPvbvy+tpXjj+WJxpPy8h6R9pJv +4:JJJOOZxOJxR9+bx8+X189uPr8xOR8M8mPSPSJJOK+fv +4:JJJxJxxyxPX1xJ+fvjx87ePd9WK9+SOJ88hxPX +4:JJJxJxOJxOOXnz976Rx68hJz89tJJJx6 +4:JJJxRJJyN8J+bJOJJxOPXnntJJJx9 +4:JJJxyJMOOMPzfq6RPpJOJx+fy+t89dPbOLJJOOPvnk +4:JJJOJJOOPXzb+uXvmS8z8+SRJJPtpJWJ6 +4:JJJJJxOOOJxx96+vmZ6PbOL9v1pXkx8fSRJ +4:JJJzxJvbJxx89+WJxJ66R+tJOOP186y98JxOOPnfkJf +4:JJJxOJxxxOPzf1vnXvWRntXkJxPnbZJJJ +4:JJJzJJJxOufvnzfkPyJJOJ+Sx98k9tJJOOPfSJP +4:JJJxxxxxxOPvy89zfXbfrtPXkJzJPhJX +4:JJJJxOOJxx7z968hJ9pzPvSyJnpJxvX +4:JJJxOJxOePd+Sn18x8ntvbNL6WNpz96 +4:JJJJJOOOePzZi86OK8h9pJx78kJP +4:JJJJxOJOJ+ch+S9p6kJ7ZJOZPv +4:JJJxOOOJxxxx6+vk6vfiOPXbJfrdxPvkbJJ +4:JJJJxOOeJ9Z6xy9Pn1pxx96vmbxxfnfhh+bNZ+SRJ1pPhnkiRJP +4:JJJxOOeJxP187ZpPyJx88MPuSOPXpzN+R98hiJf +3:JJJJJJJJOOM98 +3:JJJJOZJJxx6nnpRJP +3:JJJJzJJp+RRLN8JJOOPy8+fv +3:JJJxxxxOJJJxS+f18nz+Xnzz98y86y9+ufpJ8nznWXn +3:JJJJJZJJOOPXjP +3:JJJJJJOJOJxfvny8 +3:JJJzJJxpPiPpJKJxx68 +3:JJJJJJJJxPy8 +3:JJJJJJJzJv1PmOPnX +3:JJJJJJRxx98 +3:JJJRJJJJxx+Xvzfn +3:JJJJJpJJJxxx67nkz6 +3:JJJJJJLJJ +3:JJJOJZJRxxN968Z +3:JJJJOZhPyJ9JOPz6 +3:JJJJJJJMOOPz96 +3:JJJJJJJxx186nz8 +3:JJJJJLJJZKP +3:JJJNJJyk9JOOfXn +3:JJJJJJzJx7+pxPXhOPX +2:JJJJJJJJJOOPfv +2:JJJJOOJJJJN78 +2:JJJRJJJJzJ9JOPz8 +2:JJJNJRJJxOJnnf +2:JJJJJJLJJOWPX1Pn +2:JJJJJJzJJPyJJxPr8JJJx7 +2:JJJJJJxJOMXz+XvUJP +2:JJJJJJJOZPyN8P +2:JJJJJJJJOLPy+vn +2:JJJJJxOJOJOJnU6+fvd +2:JJJ1JJJJJx+XnhJZJJJ +2:JJJxeNOJ68+Xn +2:JJJZJJJJJOOvnX +2:JJJJzJJMK+pJJxfXhJK +2:JJJJJJyJJJPpLJJx6 +2:JJJJ1LJxPXiJJzx79 +2:JJJzJJJpJ6JJhJJJOPv +2:JJJJJJJOOP1fnf +2:JJJJJJJJJJx+X18 +2:JJJJJJJJxPy+r8Z diff --git a/src/main/resources/trees/dtquark/leaves_properties/ancient.json b/src/main/resources/trees/dtquark/leaves_properties/ancient.json new file mode 100644 index 0000000..caf0453 --- /dev/null +++ b/src/main/resources/trees/dtquark/leaves_properties/ancient.json @@ -0,0 +1,5 @@ +{ + "primitive_leaves": "quark:ancient_leaves", + "smother": 3, + "cell_kit": "dtquark:ancient" +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/leaves_properties/sweet_blossom.json b/src/main/resources/trees/dtquark/leaves_properties/sweet_blossom.json deleted file mode 100644 index 7cf6db6..0000000 --- a/src/main/resources/trees/dtquark/leaves_properties/sweet_blossom.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "dtquark:blossom", - "primitive_leaves": "quark:pink_blossom_leaves" -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/soil_properties/glowcelium.json b/src/main/resources/trees/dtquark/soil_properties/glowcelium.json deleted file mode 100644 index 2a3c7d9..0000000 --- a/src/main/resources/trees/dtquark/soil_properties/glowcelium.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "primitive_soil": "quark:glowcelium", - "acceptable_soils": [ "dirt_like", "fungus_like" ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/soil_properties/turf.json b/src/main/resources/trees/dtquark/soil_properties/turf.json deleted file mode 100644 index f114a1f..0000000 --- a/src/main/resources/trees/dtquark/soil_properties/turf.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "primitive_soil": "quark:turf", - "acceptable_soils": [ "dirt_like" ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/soil_properties/turf_slab.json b/src/main/resources/trees/dtquark/soil_properties/turf_slab.json deleted file mode 100644 index ea9282d..0000000 --- a/src/main/resources/trees/dtquark/soil_properties/turf_slab.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "dtquark:slab", - "slab_type": "horizontal", - "primitive_soil": "quark:turf_slab", - "acceptable_soils": [ "dirt_like" ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/soil_properties/turf_stairs.json b/src/main/resources/trees/dtquark/soil_properties/turf_stairs.json deleted file mode 100644 index a7aa414..0000000 --- a/src/main/resources/trees/dtquark/soil_properties/turf_stairs.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "dtquark:stairs", - "primitive_soil": "quark:turf_stairs", - "acceptable_soils": [ "dirt_like" ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/soil_properties/turf_vertical_slab.json b/src/main/resources/trees/dtquark/soil_properties/turf_vertical_slab.json deleted file mode 100644 index 10e52e6..0000000 --- a/src/main/resources/trees/dtquark/soil_properties/turf_vertical_slab.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "dtquark:vertical_slab", - "primitive_soil": "quark:turf_vertical_slab", - "acceptable_soils": [ "dirt_like" ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/species/ancient.json b/src/main/resources/trees/dtquark/species/ancient.json new file mode 100644 index 0000000..bd51ca7 --- /dev/null +++ b/src/main/resources/trees/dtquark/species/ancient.json @@ -0,0 +1,36 @@ +{ + "family": "dtquark:ancient", + "tapering": 0.3, + "signal_energy": 24.0, + "up_probability": 5, + "lowest_branch_height": 4, + "growth_rate": 0.5, + "soil_longevity": 8, + "world_gen_leaf_map_height": 40, + "generate_seed": true, + "generate_sapling": true, + "growth_logic_kit": "dtquark:ancient", + "leaves_properties": "dtquark:ancient", + "perfect_biomes": { "tag": "#c:is_rare" }, + "drop_creators": [ "log", "voluntary", "harvest" ], + "primitive_saplings": [ + { "sapling_block": "quark:ancient_sapling" }, + { + "sapling_item": "quark:ancient_fruit", + "can_craft_seed_to_sapling": false + } + ], + "seasonal_fruiting_offset": null, + "inherit_fruiting_offset_to_fruits": true, + "fruits": [ + "dtquark:ancient_fruit" + ], + "features": [ + { + "name": "fruit", + "properties": { + "fruit": "dtquark:ancient_fruit" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/species/fiery_blossom.json b/src/main/resources/trees/dtquark/species/fiery_blossom.json index e723d91..cba86d2 100644 --- a/src/main/resources/trees/dtquark/species/fiery_blossom.json +++ b/src/main/resources/trees/dtquark/species/fiery_blossom.json @@ -1,17 +1,16 @@ { "family": "dtquark:blossom", "tapering": 0.3, - "signal_energy": 14.0, + "signal_energy": 22.0, "growth_rate": 0.8, + "lowest_branch_height": 6, + "soil_longevity": 12, "leaves_properties": "dtquark:fiery_blossom", "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 + "#c:is_cold": 0.75 }, "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:red_blossom_sapling", diff --git a/src/main/resources/trees/dtquark/species/frosty_blossom.json b/src/main/resources/trees/dtquark/species/frosty_blossom.json index 06e24e8..135f0e1 100644 --- a/src/main/resources/trees/dtquark/species/frosty_blossom.json +++ b/src/main/resources/trees/dtquark/species/frosty_blossom.json @@ -1,19 +1,19 @@ { "family": "dtquark:blossom", "tapering": 0.3, - "signal_energy": 14.0, + "signal_energy": 22.0, "growth_rate": 0.8, + "lowest_branch_height": 6, + "soil_longevity": 12, "leaves_properties": "dtquark:frosty_blossom", "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 + "#c:is_hot": 0.75 }, "perfect_biomes": { "types": [ "forest", "overworld" ] }, + "world_gen_acceptable_soils": ["snow_like"], "primitive_sapling": "quark:blue_blossom_sapling", "features" : [ "bee_nest" diff --git a/src/main/resources/trees/dtquark/species/glow_shroom.json b/src/main/resources/trees/dtquark/species/glow_shroom.json new file mode 100644 index 0000000..d620ba9 --- /dev/null +++ b/src/main/resources/trees/dtquark/species/glow_shroom.json @@ -0,0 +1,35 @@ +{ + "only_if_loaded": "dynamictreesplus", + "type": "dtquark:glow_shroom", + "family": "dtquark:glow_shroom", + "tapering": 0, + "signal_energy": 4, + "growth_rate": 1.2, + "soil_longevity": 1, + "generate_seed": true, + "generate_sapling": true, + "cap_properties": "dtquark:glow_shroom", + "max_light_for_planting": 16, + "growth_logic_kit": { + "name": "dynamictreesplus:straight", + "properties": { + "height_variation": 4 + } + }, + "mushroom_shape_kit": { + "name": "dynamictreesplus:bell", + "properties": { + "max_age_curve_factor": 0.5, + "min_age_curve_factor": 0.4, + "curve_factor_variation": 0.1, + "pointed_tip_max_age": 1, + "chance_to_age": 0.1, + "max_cap_age": 2 + } + }, + "primitive_sapling": "quark:glow_shroom", + "sapling_shape": "dtquark:round_short_mushroom", + "acceptable_soils": ["fungus_like", "stone_like", "deepslate_like"], + "features" : [ + ] +} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/species/serene_blossom.json b/src/main/resources/trees/dtquark/species/serene_blossom.json index d96211f..32f9f37 100644 --- a/src/main/resources/trees/dtquark/species/serene_blossom.json +++ b/src/main/resources/trees/dtquark/species/serene_blossom.json @@ -1,17 +1,17 @@ { "family": "dtquark:blossom", "tapering": 0.3, - "signal_energy": 14.0, + "signal_energy": 22.0, "growth_rate": 0.8, + "lowest_branch_height": 6, + "soil_longevity": 12, "leaves_properties": "dtquark:serene_blossom", "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, + "world_gen_acceptable_soils": ["sand_like", "snow_like"], "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 + "#c:is_dry": 0.75 }, "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:lavender_blossom_sapling", diff --git a/src/main/resources/trees/dtquark/species/sunny_blossom.json b/src/main/resources/trees/dtquark/species/sunny_blossom.json index 5f1099a..0a0188e 100644 --- a/src/main/resources/trees/dtquark/species/sunny_blossom.json +++ b/src/main/resources/trees/dtquark/species/sunny_blossom.json @@ -1,17 +1,18 @@ { "family": "dtquark:blossom", "tapering": 0.3, - "signal_energy": 14.0, + "signal_energy": 22.0, "growth_rate": 0.8, + "lowest_branch_height": 6, + "soil_longevity": 12, "leaves_properties": "dtquark:sunny_blossom", "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, + "world_gen_acceptable_soils": ["sand_like", "snow_like"], "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 + "#c:is_cold": 0.8, + "#c:is_wet": 0.8 }, "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:yellow_blossom_sapling", diff --git a/src/main/resources/trees/dtquark/species/sweet_blossom.json b/src/main/resources/trees/dtquark/species/sweet_blossom.json deleted file mode 100644 index 04d8d76..0000000 --- a/src/main/resources/trees/dtquark/species/sweet_blossom.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "family": "dtquark:blossom", - "tapering": 0.3, - "signal_energy": 14.0, - "growth_rate": 0.8, - "leaves_properties": "dtquark:sweet_blossom", - "always_show_on_waila": true, - "generate_seed": true, - "generate_sapling": true, - "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 - }, - "perfect_biomes": { "types": [ "forest", "overworld" ] }, - "primitive_sapling": "quark:pink_blossom_sapling", - "features" : [ - "bee_nest" - ] -} \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/species/warm_blossom.json b/src/main/resources/trees/dtquark/species/warm_blossom.json index d59c054..75cee45 100644 --- a/src/main/resources/trees/dtquark/species/warm_blossom.json +++ b/src/main/resources/trees/dtquark/species/warm_blossom.json @@ -1,17 +1,17 @@ { "family": "dtquark:blossom", "tapering": 0.3, - "signal_energy": 14.0, + "signal_energy": 22.0, "growth_rate": 0.8, + "lowest_branch_height": 6, + "soil_longevity": 12, "leaves_properties": "dtquark:warm_blossom", "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, + "world_gen_acceptable_soils": ["sand_like", "snow_like"], "environment_factors" : { - "cold": 1, - "hot": 1, - "dry": 1, - "forest": 1 + "#c:is_wet": 0.75 }, "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:orange_blossom_sapling", diff --git a/src/main/resources/trees/dtquark/world_gen/default.json b/src/main/resources/trees/dtquark/world_gen/default.json index a3a848e..338516a 100644 --- a/src/main/resources/trees/dtquark/world_gen/default.json +++ b/src/main/resources/trees/dtquark/world_gen/default.json @@ -1,30 +1,30 @@ [ { - "select": { "type" : "cold" }, + "select": { "tag" : "#c:is_snowy" }, "apply": { "species" : { "method" : "splice_before", "random" : { "dtquark:frosty_blossom" : 1, - "..." : 500 + "..." : 150 } } } }, { - "select": { "type" : "swamp" }, + "select": { "tag" : "#c:is_swamp" }, "apply": { "species" : { "method" : "splice_before", "random" : { "dtquark:serene_blossom" : 1, - "..." : 300 + "..." : 100 } } } }, { - "select": { "type" : "savanna" }, + "select": { "tag" : "#minecraft:is_savanna" }, "apply": { "species" : { "method" : "splice_before", @@ -36,39 +36,37 @@ } }, { - "select": { "type" : "mountain" }, + "select": { "tag" : "#c:is_plains" }, "apply": { "species" : { "method" : "splice_before", "random" : { - "dtquark:sweet_blossom" : 1, - "..." : 100 + "dtquark:sunny_blossom" : 1, + "..." : 25 } } } }, { - "select": { "types" : ["plains", "!savanna"] }, + "select": { "tag" : "#minecraft:is_badlands" }, "apply": { "species" : { "method" : "splice_before", "random" : { - "dtquark:sunny_blossom" : 1, - "..." : 50 + "dtquark:fiery_blossom" : 1, + "..." : 40 } } } }, + { - "select": { "types" : [ "mesa", "sparse" ] }, + "only_if_loaded": "dynamictreesplus", + "select": { "name": "quark:glimmering_weald" }, "apply": { - "species" : { - "method" : "splice_before", - "random" : { - "dtquark:fiery_blossom" : 1, - "..." : 40 - } - } + "species" : "dtquark:glow_shroom", + "density": [ 2 ], + "chance": 0.8 } } -] \ No newline at end of file +] diff --git a/src/main/resources/trees/dtquark/world_gen/feature_cancellers.json b/src/main/resources/trees/dtquark/world_gen/feature_cancellers.json new file mode 100644 index 0000000..fe75c61 --- /dev/null +++ b/src/main/resources/trees/dtquark/world_gen/feature_cancellers.json @@ -0,0 +1,19 @@ +[ + { + "only_if_loaded": "dynamictreesplus", + "select": { "name": "quark:glimmering_weald" }, + "cancellers": { + "type": "dtquark:mushroom", + "namespaces": ["minecraft", "quark"], + "stage": "UNDERGROUND_DECORATION" + } + }, + { + "select": { "name": "__ANY__" }, + "cancellers": { + "type": "tree", + "namespaces": ["minecraft", "quark"], + "trees": ["azalea_tree"] + } + } +] \ No newline at end of file diff --git a/src/main/resources/trees/dynamictrees/species/azalea.json b/src/main/resources/trees/dynamictrees/species/azalea.json new file mode 100644 index 0000000..a024001 --- /dev/null +++ b/src/main/resources/trees/dynamictrees/species/azalea.json @@ -0,0 +1,37 @@ +{ + "family": "dtquark:azalea", + "tapering": 0.4, + "up_probability": 2, + "lowest_branch_height": 0, + "signal_energy": 8.0, + "growth_rate": 0.7, + "soil_longevity": 2, + "generate_seed": true, + "generate_sapling": true, + "growth_logic_kit": "azalea", + "perfect_biomes": { "name": "minecraft:lush_caves" }, + "primitive_saplings": [ + {"sapling_block": "minecraft:azalea", "replace_sapling_when_placed": false}, + {"sapling_block": "minecraft:flowering_azalea", "replace_sapling_when_placed": false} + ], + "force_soil": "rooted_dirt", + "acceptable_soils": ["dirt_like"], + "world_gen_acceptable_soils": ["sand_like", "snow_like", "terracotta_like"], + "features": [ + { + "name": "rot_soil", + "properties": { + "rotten_soil": "podzol" + } + }, + { + "name": "alt_leaves", + "properties": { + "alternative_leaves": "flowering_azalea", + "place_chance": 0.35 + } + }, + "mushroom_rot", + "root_system" + ] +} \ No newline at end of file From 00ff55eb4731986f3f8d9b7da5eee3abed5f34ac Mon Sep 17 00:00:00 2001 From: Nacolla Date: Fri, 30 Jan 2026 15:33:48 -0300 Subject: [PATCH 2/6] Bump version to 2.5.4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 541295e..8625f9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ mod_id=dtquark mod_name=Dynamic Trees for Quark mod_license=MIT -mod_version=1.0.0 +mod_version=2.5.4 mod_group_id=org.violetmoon.dtquark mod_authors=Vazkii, ThePixelCoder mod_description=Dynamic Trees compatibility for Quark From ea726b53ea731ac1ce0cfd2bfd43c3458cb533d4 Mon Sep 17 00:00:00 2001 From: Nacolla Date: Fri, 30 Jan 2026 15:38:27 -0300 Subject: [PATCH 3/6] Fix Azalea Branch Texture (Use Quark textures) --- .../resources/assets/dtquark/models/block/azalea_branch.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generated/resources/assets/dtquark/models/block/azalea_branch.json b/src/generated/resources/assets/dtquark/models/block/azalea_branch.json index ebdd9da..b301fa1 100644 --- a/src/generated/resources/assets/dtquark/models/block/azalea_branch.json +++ b/src/generated/resources/assets/dtquark/models/block/azalea_branch.json @@ -1,7 +1,7 @@ { "loader": "dynamictrees:branch", "textures": { - "bark": "minecraft:block/oak_log", - "rings": "minecraft:block/oak_log_top" + "bark": "quark:block/azalea_log", + "rings": "quark:block/azalea_log_top" } } \ No newline at end of file From 373b4bd7b9f84546c0cabd72104e3485875c7943 Mon Sep 17 00:00:00 2001 From: Nacolla Date: Fri, 30 Jan 2026 15:49:03 -0300 Subject: [PATCH 4/6] Fix log warnings: Update deprecated JSON keys and add missing tags --- .../data/dynamictrees/tags/blocks/deepslate_like.json | 6 ++++++ src/main/resources/trees/dtquark/species/ancient.json | 2 +- src/main/resources/trees/dtquark/species/warm_blossom.json | 2 +- .../trees/dtquark/world_gen/feature_cancellers.json | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/data/dynamictrees/tags/blocks/deepslate_like.json diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/deepslate_like.json b/src/generated/resources/data/dynamictrees/tags/blocks/deepslate_like.json new file mode 100644 index 0000000..ae575e4 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/deepslate_like.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#c:deepslate_ores", + "minecraft:deepslate" + ] +} diff --git a/src/main/resources/trees/dtquark/species/ancient.json b/src/main/resources/trees/dtquark/species/ancient.json index bd51ca7..5d6d08b 100644 --- a/src/main/resources/trees/dtquark/species/ancient.json +++ b/src/main/resources/trees/dtquark/species/ancient.json @@ -20,7 +20,7 @@ "can_craft_seed_to_sapling": false } ], - "seasonal_fruiting_offset": null, + "seasonal_offsets": 0, "inherit_fruiting_offset_to_fruits": true, "fruits": [ "dtquark:ancient_fruit" diff --git a/src/main/resources/trees/dtquark/species/warm_blossom.json b/src/main/resources/trees/dtquark/species/warm_blossom.json index 75cee45..9938041 100644 --- a/src/main/resources/trees/dtquark/species/warm_blossom.json +++ b/src/main/resources/trees/dtquark/species/warm_blossom.json @@ -10,7 +10,7 @@ "generate_seed": true, "generate_sapling": true, "world_gen_acceptable_soils": ["sand_like", "snow_like"], - "environment_factors" : { + "preferred_climate" : { "#c:is_wet": 0.75 }, "perfect_biomes": { "types": [ "forest", "overworld" ] }, diff --git a/src/main/resources/trees/dtquark/world_gen/feature_cancellers.json b/src/main/resources/trees/dtquark/world_gen/feature_cancellers.json index fe75c61..bf6e1a2 100644 --- a/src/main/resources/trees/dtquark/world_gen/feature_cancellers.json +++ b/src/main/resources/trees/dtquark/world_gen/feature_cancellers.json @@ -3,7 +3,7 @@ "only_if_loaded": "dynamictreesplus", "select": { "name": "quark:glimmering_weald" }, "cancellers": { - "type": "dtquark:mushroom", + "type": "dynamictrees:fungus", "namespaces": ["minecraft", "quark"], "stage": "UNDERGROUND_DECORATION" } From 052fb3bc7a6e91953ef63f102d37cf73e027f19c Mon Sep 17 00:00:00 2001 From: Nacolla Date: Fri, 30 Jan 2026 15:54:03 -0300 Subject: [PATCH 5/6] Fix JSON errors: preferred_climate (String), remove seasonal_offsets, fix soils --- .../data/dynamictrees/tags/blocks/stone_like.json | 9 +++++++++ src/main/resources/trees/dtquark/species/ancient.json | 2 +- .../resources/trees/dtquark/species/fiery_blossom.json | 4 +--- .../resources/trees/dtquark/species/frosty_blossom.json | 4 +--- .../resources/trees/dtquark/species/glow_shroom.json | 2 +- .../resources/trees/dtquark/species/serene_blossom.json | 4 +--- .../resources/trees/dtquark/species/sunny_blossom.json | 5 +---- .../resources/trees/dtquark/species/warm_blossom.json | 4 +--- 8 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 src/generated/resources/data/dynamictrees/tags/blocks/stone_like.json diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/stone_like.json b/src/generated/resources/data/dynamictrees/tags/blocks/stone_like.json new file mode 100644 index 0000000..ffffd33 --- /dev/null +++ b/src/generated/resources/data/dynamictrees/tags/blocks/stone_like.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:stone", + "minecraft:andesite", + "minecraft:granite", + "minecraft:diorite", + "minecraft:deepslate" + ] +} diff --git a/src/main/resources/trees/dtquark/species/ancient.json b/src/main/resources/trees/dtquark/species/ancient.json index 5d6d08b..d10addc 100644 --- a/src/main/resources/trees/dtquark/species/ancient.json +++ b/src/main/resources/trees/dtquark/species/ancient.json @@ -20,7 +20,7 @@ "can_craft_seed_to_sapling": false } ], - "seasonal_offsets": 0, + "inherit_fruiting_offset_to_fruits": true, "fruits": [ "dtquark:ancient_fruit" diff --git a/src/main/resources/trees/dtquark/species/fiery_blossom.json b/src/main/resources/trees/dtquark/species/fiery_blossom.json index cba86d2..7cd8fc4 100644 --- a/src/main/resources/trees/dtquark/species/fiery_blossom.json +++ b/src/main/resources/trees/dtquark/species/fiery_blossom.json @@ -9,9 +9,7 @@ "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, - "environment_factors" : { - "#c:is_cold": 0.75 - }, + "preferred_climate": "hot", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:red_blossom_sapling", "features" : [ diff --git a/src/main/resources/trees/dtquark/species/frosty_blossom.json b/src/main/resources/trees/dtquark/species/frosty_blossom.json index 135f0e1..1261ba7 100644 --- a/src/main/resources/trees/dtquark/species/frosty_blossom.json +++ b/src/main/resources/trees/dtquark/species/frosty_blossom.json @@ -9,9 +9,7 @@ "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, - "environment_factors" : { - "#c:is_hot": 0.75 - }, + "preferred_climate": "cold", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "world_gen_acceptable_soils": ["snow_like"], "primitive_sapling": "quark:blue_blossom_sapling", diff --git a/src/main/resources/trees/dtquark/species/glow_shroom.json b/src/main/resources/trees/dtquark/species/glow_shroom.json index d620ba9..8b99afd 100644 --- a/src/main/resources/trees/dtquark/species/glow_shroom.json +++ b/src/main/resources/trees/dtquark/species/glow_shroom.json @@ -29,7 +29,7 @@ }, "primitive_sapling": "quark:glow_shroom", "sapling_shape": "dtquark:round_short_mushroom", - "acceptable_soils": ["fungus_like", "stone_like", "deepslate_like"], + "acceptable_soils": ["fungus_like", "stone_like"], "features" : [ ] } \ No newline at end of file diff --git a/src/main/resources/trees/dtquark/species/serene_blossom.json b/src/main/resources/trees/dtquark/species/serene_blossom.json index 32f9f37..b72fab1 100644 --- a/src/main/resources/trees/dtquark/species/serene_blossom.json +++ b/src/main/resources/trees/dtquark/species/serene_blossom.json @@ -10,9 +10,7 @@ "generate_seed": true, "generate_sapling": true, "world_gen_acceptable_soils": ["sand_like", "snow_like"], - "environment_factors" : { - "#c:is_dry": 0.75 - }, + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:lavender_blossom_sapling", "features" : [ diff --git a/src/main/resources/trees/dtquark/species/sunny_blossom.json b/src/main/resources/trees/dtquark/species/sunny_blossom.json index 0a0188e..39de6a0 100644 --- a/src/main/resources/trees/dtquark/species/sunny_blossom.json +++ b/src/main/resources/trees/dtquark/species/sunny_blossom.json @@ -10,10 +10,7 @@ "generate_seed": true, "generate_sapling": true, "world_gen_acceptable_soils": ["sand_like", "snow_like"], - "environment_factors" : { - "#c:is_cold": 0.8, - "#c:is_wet": 0.8 - }, + "preferred_climate": "hot", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:yellow_blossom_sapling", "features" : [ diff --git a/src/main/resources/trees/dtquark/species/warm_blossom.json b/src/main/resources/trees/dtquark/species/warm_blossom.json index 9938041..751c599 100644 --- a/src/main/resources/trees/dtquark/species/warm_blossom.json +++ b/src/main/resources/trees/dtquark/species/warm_blossom.json @@ -10,9 +10,7 @@ "generate_seed": true, "generate_sapling": true, "world_gen_acceptable_soils": ["sand_like", "snow_like"], - "preferred_climate" : { - "#c:is_wet": 0.75 - }, + "preferred_climate": "temperate", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:orange_blossom_sapling", "features" : [ From b5925323cd7a9954a3d42b31064c2ddd0b121491 Mon Sep 17 00:00:00 2001 From: Nacolla Date: Fri, 30 Jan 2026 16:02:05 -0300 Subject: [PATCH 6/6] Fix Crash: Change invalid preferred_climate 'hot' to 'tropical' --- src/main/resources/trees/dtquark/species/fiery_blossom.json | 2 +- src/main/resources/trees/dtquark/species/sunny_blossom.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/trees/dtquark/species/fiery_blossom.json b/src/main/resources/trees/dtquark/species/fiery_blossom.json index 7cd8fc4..17303ab 100644 --- a/src/main/resources/trees/dtquark/species/fiery_blossom.json +++ b/src/main/resources/trees/dtquark/species/fiery_blossom.json @@ -9,7 +9,7 @@ "always_show_on_waila": true, "generate_seed": true, "generate_sapling": true, - "preferred_climate": "hot", + "preferred_climate": "tropical", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:red_blossom_sapling", "features" : [ diff --git a/src/main/resources/trees/dtquark/species/sunny_blossom.json b/src/main/resources/trees/dtquark/species/sunny_blossom.json index 39de6a0..4f3f535 100644 --- a/src/main/resources/trees/dtquark/species/sunny_blossom.json +++ b/src/main/resources/trees/dtquark/species/sunny_blossom.json @@ -10,7 +10,7 @@ "generate_seed": true, "generate_sapling": true, "world_gen_acceptable_soils": ["sand_like", "snow_like"], - "preferred_climate": "hot", + "preferred_climate": "tropical", "perfect_biomes": { "types": [ "forest", "overworld" ] }, "primitive_sapling": "quark:yellow_blossom_sapling", "features" : [