From 0a69c1f6bdd97ef03893d32beb1ad628406b5c23 Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:02:09 -0700 Subject: [PATCH] Ex Deorum 1.5 --- build.gradle | 10 +- changelog.md | 11 ++ gradle.properties | 4 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 32 +++- .../93943142017732f21fbc4fa325d116c728b69767 | 4 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 159 ++++++++++++++---- .../fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd | 34 +++- .../fc41039380e20c0de816b178c0dd0b68eb0f1d50 | 62 ++++++- .../exdeorum/blockstates/dead_barrel.json | 7 + .../exdeorum/blockstates/dead_crucible.json | 7 + .../exdeorum/blockstates/dead_sieve.json | 7 + .../exdeorum/blockstates/fir_barrel.json | 7 + .../exdeorum/blockstates/fir_crucible.json | 7 + .../exdeorum/blockstates/fir_sieve.json | 7 + .../exdeorum/blockstates/hellbark_barrel.json | 7 + .../blockstates/hellbark_crucible.json | 7 + .../exdeorum/blockstates/hellbark_sieve.json | 7 + .../blockstates/jacaranda_barrel.json | 7 + .../blockstates/jacaranda_crucible.json | 7 + .../exdeorum/blockstates/jacaranda_sieve.json | 7 + .../exdeorum/blockstates/magic_barrel.json | 7 + .../exdeorum/blockstates/magic_crucible.json | 7 + .../exdeorum/blockstates/magic_sieve.json | 7 + .../exdeorum/blockstates/mahogany_barrel.json | 7 + .../blockstates/mahogany_crucible.json | 7 + .../exdeorum/blockstates/mahogany_sieve.json | 7 + .../exdeorum/blockstates/palm_barrel.json | 7 + .../exdeorum/blockstates/palm_crucible.json | 7 + .../exdeorum/blockstates/palm_sieve.json | 7 + .../exdeorum/blockstates/redwood_barrel.json | 7 + .../blockstates/redwood_crucible.json | 7 + .../exdeorum/blockstates/redwood_sieve.json | 7 + .../exdeorum/blockstates/umbran_barrel.json | 7 + .../exdeorum/blockstates/umbran_crucible.json | 7 + .../exdeorum/blockstates/umbran_sieve.json | 7 + .../exdeorum/blockstates/willow_barrel.json | 7 + .../exdeorum/blockstates/willow_crucible.json | 7 + .../exdeorum/blockstates/willow_sieve.json | 7 + .../resources/assets/exdeorum/lang/en_us.json | 32 ++++ .../exdeorum/models/block/dead_barrel.json | 6 + .../exdeorum/models/block/dead_crucible.json | 9 + .../exdeorum/models/block/dead_sieve.json | 6 + .../exdeorum/models/block/fir_barrel.json | 6 + .../exdeorum/models/block/fir_crucible.json | 9 + .../exdeorum/models/block/fir_sieve.json | 6 + .../models/block/hellbark_barrel.json | 6 + .../models/block/hellbark_crucible.json | 9 + .../exdeorum/models/block/hellbark_sieve.json | 6 + .../models/block/jacaranda_barrel.json | 6 + .../models/block/jacaranda_crucible.json | 9 + .../models/block/jacaranda_sieve.json | 6 + .../exdeorum/models/block/magic_barrel.json | 6 + .../exdeorum/models/block/magic_crucible.json | 9 + .../exdeorum/models/block/magic_sieve.json | 6 + .../models/block/mahogany_barrel.json | 6 + .../models/block/mahogany_crucible.json | 9 + .../exdeorum/models/block/mahogany_sieve.json | 6 + .../exdeorum/models/block/palm_barrel.json | 6 + .../exdeorum/models/block/palm_crucible.json | 9 + .../exdeorum/models/block/palm_sieve.json | 6 + .../exdeorum/models/block/redwood_barrel.json | 6 + .../models/block/redwood_crucible.json | 9 + .../exdeorum/models/block/redwood_sieve.json | 6 + .../exdeorum/models/block/umbran_barrel.json | 6 + .../models/block/umbran_crucible.json | 9 + .../exdeorum/models/block/umbran_sieve.json | 6 + .../exdeorum/models/block/willow_barrel.json | 6 + .../models/block/willow_crucible.json | 9 + .../exdeorum/models/block/willow_sieve.json | 6 + .../exdeorum/models/item/dead_barrel.json | 3 + .../exdeorum/models/item/dead_crucible.json | 3 + .../exdeorum/models/item/dead_sieve.json | 3 + .../exdeorum/models/item/fir_barrel.json | 3 + .../exdeorum/models/item/fir_crucible.json | 3 + .../exdeorum/models/item/fir_sieve.json | 3 + .../exdeorum/models/item/hellbark_barrel.json | 3 + .../models/item/hellbark_crucible.json | 3 + .../exdeorum/models/item/hellbark_sieve.json | 3 + .../models/item/jacaranda_barrel.json | 3 + .../models/item/jacaranda_crucible.json | 3 + .../exdeorum/models/item/jacaranda_sieve.json | 3 + .../exdeorum/models/item/magic_barrel.json | 3 + .../exdeorum/models/item/magic_crucible.json | 3 + .../exdeorum/models/item/magic_sieve.json | 3 + .../exdeorum/models/item/mahogany_barrel.json | 3 + .../models/item/mahogany_crucible.json | 3 + .../exdeorum/models/item/mahogany_sieve.json | 3 + .../exdeorum/models/item/palm_barrel.json | 3 + .../exdeorum/models/item/palm_crucible.json | 3 + .../exdeorum/models/item/palm_sieve.json | 3 + .../models/item/random_armor_trim.json | 6 + .../models/item/random_pottery_sherd.json | 6 + .../exdeorum/models/item/redwood_barrel.json | 3 + .../models/item/redwood_crucible.json | 3 + .../exdeorum/models/item/redwood_sieve.json | 3 + .../exdeorum/models/item/umbran_barrel.json | 3 + .../exdeorum/models/item/umbran_crucible.json | 3 + .../exdeorum/models/item/umbran_sieve.json | 3 + .../exdeorum/models/item/willow_barrel.json | 3 + .../exdeorum/models/item/willow_crucible.json | 3 + .../exdeorum/models/item/willow_sieve.json | 3 + .../loot_tables/blocks/dead_barrel.json | 21 +++ .../loot_tables/blocks/dead_crucible.json | 21 +++ .../loot_tables/blocks/dead_sieve.json | 21 +++ .../loot_tables/blocks/fir_barrel.json | 21 +++ .../loot_tables/blocks/fir_crucible.json | 21 +++ .../loot_tables/blocks/fir_sieve.json | 21 +++ .../loot_tables/blocks/hellbark_barrel.json | 21 +++ .../loot_tables/blocks/hellbark_crucible.json | 21 +++ .../loot_tables/blocks/hellbark_sieve.json | 21 +++ .../loot_tables/blocks/jacaranda_barrel.json | 21 +++ .../blocks/jacaranda_crucible.json | 21 +++ .../loot_tables/blocks/jacaranda_sieve.json | 21 +++ .../loot_tables/blocks/magic_barrel.json | 21 +++ .../loot_tables/blocks/magic_crucible.json | 21 +++ .../loot_tables/blocks/magic_sieve.json | 21 +++ .../loot_tables/blocks/mahogany_barrel.json | 21 +++ .../loot_tables/blocks/mahogany_crucible.json | 21 +++ .../loot_tables/blocks/mahogany_sieve.json | 21 +++ .../loot_tables/blocks/palm_barrel.json | 21 +++ .../loot_tables/blocks/palm_crucible.json | 21 +++ .../loot_tables/blocks/palm_sieve.json | 21 +++ .../loot_tables/blocks/redwood_barrel.json | 21 +++ .../loot_tables/blocks/redwood_crucible.json | 21 +++ .../loot_tables/blocks/redwood_sieve.json | 21 +++ .../loot_tables/blocks/umbran_barrel.json | 21 +++ .../loot_tables/blocks/umbran_crucible.json | 21 +++ .../loot_tables/blocks/umbran_sieve.json | 21 +++ .../loot_tables/blocks/willow_barrel.json | 21 +++ .../loot_tables/blocks/willow_crucible.json | 21 +++ .../loot_tables/blocks/willow_sieve.json | 21 +++ .../exdeorum/recipes/hammer/red_sand.json | 8 + .../sieve/dust/diamond/yellorium_dust.json | 26 +++ .../sieve/dust/flint/yellorium_dust.json | 26 +++ .../sieve/dust/golden/yellorium_dust.json | 26 +++ .../sieve/dust/iron/yellorium_dust.json | 26 +++ .../sieve/dust/netherite/yellorium_dust.json | 26 +++ .../sieve/dust/string/yellorium_dust.json | 26 +++ .../sieve/gravel/flint/iron_ore_chunk.json | 2 +- .../sieve/gravel/string/iron_ore_chunk.json | 2 +- .../moss_block/diamond/dead_sapling.json | 26 +++ .../sieve/moss_block/diamond/fir_sapling.json | 26 +++ .../diamond/flowering_oak_sapling.json | 26 +++ .../moss_block/diamond/hellbark_sapling.json | 26 +++ .../moss_block/diamond/jacaranda_sapling.json | 26 +++ .../moss_block/diamond/magic_sapling.json | 26 +++ .../moss_block/diamond/mahogany_sapling.json | 26 +++ .../moss_block/diamond/maple_sapling.json | 26 +++ .../diamond/orange_autumn_sapling.json | 26 +++ .../moss_block/diamond/origin_sapling.json | 26 +++ .../moss_block/diamond/palm_sapling.json | 26 +++ .../diamond/rainbow_birch_sapling.json | 26 +++ .../moss_block/diamond/redwood_sapling.json | 26 +++ .../diamond/snowblossom_sapling.json | 26 +++ .../moss_block/diamond/umbran_sapling.json | 26 +++ .../moss_block/diamond/willow_sapling.json | 26 +++ .../diamond/yellow_autumn_sapling.json | 26 +++ .../sieve/moss_block/flint/dead_sapling.json | 26 +++ .../sieve/moss_block/flint/fir_sapling.json | 26 +++ .../flint/flowering_oak_sapling.json | 26 +++ .../moss_block/flint/hellbark_sapling.json | 26 +++ .../moss_block/flint/jacaranda_sapling.json | 26 +++ .../sieve/moss_block/flint/magic_sapling.json | 26 +++ .../moss_block/flint/mahogany_sapling.json | 26 +++ .../sieve/moss_block/flint/maple_sapling.json | 26 +++ .../flint/orange_autumn_sapling.json | 26 +++ .../moss_block/flint/origin_sapling.json | 26 +++ .../sieve/moss_block/flint/palm_sapling.json | 26 +++ .../flint/rainbow_birch_sapling.json | 26 +++ .../moss_block/flint/redwood_sapling.json | 26 +++ .../moss_block/flint/snowblossom_sapling.json | 26 +++ .../moss_block/flint/umbran_sapling.json | 26 +++ .../moss_block/flint/willow_sapling.json | 26 +++ .../flint/yellow_autumn_sapling.json | 26 +++ .../sieve/moss_block/golden/dead_sapling.json | 26 +++ .../sieve/moss_block/golden/fir_sapling.json | 26 +++ .../golden/flowering_oak_sapling.json | 26 +++ .../moss_block/golden/hellbark_sapling.json | 26 +++ .../moss_block/golden/jacaranda_sapling.json | 26 +++ .../moss_block/golden/magic_sapling.json | 26 +++ .../moss_block/golden/mahogany_sapling.json | 26 +++ .../moss_block/golden/maple_sapling.json | 26 +++ .../golden/orange_autumn_sapling.json | 26 +++ .../moss_block/golden/origin_sapling.json | 26 +++ .../sieve/moss_block/golden/palm_sapling.json | 26 +++ .../golden/rainbow_birch_sapling.json | 26 +++ .../moss_block/golden/redwood_sapling.json | 26 +++ .../golden/snowblossom_sapling.json | 26 +++ .../moss_block/golden/umbran_sapling.json | 26 +++ .../moss_block/golden/willow_sapling.json | 26 +++ .../golden/yellow_autumn_sapling.json | 26 +++ .../sieve/moss_block/iron/dead_sapling.json | 26 +++ .../sieve/moss_block/iron/fir_sapling.json | 26 +++ .../iron/flowering_oak_sapling.json | 26 +++ .../moss_block/iron/hellbark_sapling.json | 26 +++ .../moss_block/iron/jacaranda_sapling.json | 26 +++ .../sieve/moss_block/iron/magic_sapling.json | 26 +++ .../moss_block/iron/mahogany_sapling.json | 26 +++ .../sieve/moss_block/iron/maple_sapling.json | 26 +++ .../iron/orange_autumn_sapling.json | 26 +++ .../sieve/moss_block/iron/origin_sapling.json | 26 +++ .../sieve/moss_block/iron/palm_sapling.json | 26 +++ .../iron/rainbow_birch_sapling.json | 26 +++ .../moss_block/iron/redwood_sapling.json | 26 +++ .../moss_block/iron/snowblossom_sapling.json | 26 +++ .../sieve/moss_block/iron/umbran_sapling.json | 26 +++ .../sieve/moss_block/iron/willow_sapling.json | 26 +++ .../iron/yellow_autumn_sapling.json | 26 +++ .../moss_block/netherite/dead_sapling.json | 26 +++ .../moss_block/netherite/fir_sapling.json | 26 +++ .../netherite/flowering_oak_sapling.json | 26 +++ .../netherite/hellbark_sapling.json | 26 +++ .../netherite/jacaranda_sapling.json | 26 +++ .../moss_block/netherite/magic_sapling.json | 26 +++ .../netherite/mahogany_sapling.json | 26 +++ .../moss_block/netherite/maple_sapling.json | 26 +++ .../netherite/orange_autumn_sapling.json | 26 +++ .../moss_block/netherite/origin_sapling.json | 26 +++ .../moss_block/netherite/palm_sapling.json | 26 +++ .../netherite/rainbow_birch_sapling.json | 26 +++ .../moss_block/netherite/redwood_sapling.json | 26 +++ .../netherite/snowblossom_sapling.json | 26 +++ .../moss_block/netherite/umbran_sapling.json | 26 +++ .../moss_block/netherite/willow_sapling.json | 26 +++ .../netherite/yellow_autumn_sapling.json | 26 +++ .../sieve/moss_block/string/dead_sapling.json | 26 +++ .../sieve/moss_block/string/fir_sapling.json | 26 +++ .../string/flowering_oak_sapling.json | 26 +++ .../moss_block/string/hellbark_sapling.json | 26 +++ .../moss_block/string/jacaranda_sapling.json | 26 +++ .../moss_block/string/magic_sapling.json | 26 +++ .../moss_block/string/mahogany_sapling.json | 26 +++ .../moss_block/string/maple_sapling.json | 26 +++ .../string/orange_autumn_sapling.json | 26 +++ .../moss_block/string/origin_sapling.json | 26 +++ .../sieve/moss_block/string/palm_sapling.json | 26 +++ .../string/rainbow_birch_sapling.json | 26 +++ .../moss_block/string/redwood_sapling.json | 26 +++ .../string/snowblossom_sapling.json | 26 +++ .../moss_block/string/umbran_sapling.json | 26 +++ .../moss_block/string/willow_sapling.json | 26 +++ .../string/yellow_autumn_sapling.json | 26 +++ .../sieve/red_sand/diamond/cactus.json | 13 ++ .../sieve/red_sand/diamond/dead_bush.json | 13 ++ .../sieve/red_sand/diamond/gold_nugget.json | 13 ++ .../sieve/red_sand/diamond/raw_gold.json | 13 ++ .../sieve/red_sand/diamond/redstone.json | 13 ++ .../flint/cactus.json} | 6 +- .../flint/dead_bush.json} | 6 +- .../flint/gold_nugget.json} | 6 +- .../sieve/red_sand/flint/raw_gold.json | 13 ++ .../sieve/red_sand/flint/redstone.json | 13 ++ .../golden/cactus.json} | 6 +- .../golden/dead_bush.json} | 6 +- .../golden/gold_nugget.json} | 6 +- .../sieve/red_sand/golden/raw_gold.json | 13 ++ .../sieve/red_sand/golden/redstone.json | 13 ++ .../recipes/sieve/red_sand/iron/cactus.json | 13 ++ .../sieve/red_sand/iron/dead_bush.json | 13 ++ .../sieve/red_sand/iron/gold_nugget.json | 13 ++ .../recipes/sieve/red_sand/iron/raw_gold.json | 13 ++ .../recipes/sieve/red_sand/iron/redstone.json | 13 ++ .../sieve/red_sand/netherite/cactus.json | 13 ++ .../sieve/red_sand/netherite/gold_nugget.json | 13 ++ .../sieve/red_sand/netherite/raw_gold.json | 13 ++ .../sieve/red_sand/netherite/redstone.json | 13 ++ .../recipes/sieve/red_sand/string/cactus.json | 13 ++ .../sieve/red_sand/string/dead_bush.json | 13 ++ .../sieve/red_sand/string/gold_nugget.json | 13 ++ .../sieve/red_sand/string/raw_gold.json | 13 ++ .../sieve/red_sand/string/redstone.json | 13 ++ .../sand/diamond/certus_quartz_crystal.json | 26 +++ .../charged_certus_quartz_crystal.json | 26 +++ .../sand/flint/angler_pottery_sherd.json | 13 -- .../sand/flint/archer_pottery_sherd.json | 13 -- .../sand/flint/arms_up_pottery_sherd.json | 13 -- .../sand/flint/brewer_pottery_sherd.json | 13 -- .../sand/flint/certus_quartz_crystal.json | 26 +++ .../flint/charged_certus_quartz_crystal.json | 26 +++ .../sand/flint/danger_pottery_sherd.json | 13 -- .../sand/flint/explorer_pottery_sherd.json | 13 -- .../sand/flint/friend_pottery_sherd.json | 13 -- .../sand/flint/heartbreak_pottery_sherd.json | 13 -- .../sieve/sand/flint/miner_pottery_sherd.json | 13 -- .../sand/flint/mourner_pottery_sherd.json | 13 -- .../sand/flint/plenty_pottery_sherd.json | 13 -- .../sieve/sand/flint/prize_pottery_sherd.json | 13 -- ...y_sherd.json => random_pottery_sherd.json} | 4 +- .../sieve/sand/flint/sheaf_pottery_sherd.json | 13 -- .../sand/flint/shelter_pottery_sherd.json | 13 -- .../sieve/sand/flint/skull_pottery_sherd.json | 13 -- .../sieve/sand/flint/snort_pottery_sherd.json | 13 -- .../sand/golden/certus_quartz_crystal.json | 26 +++ .../golden/charged_certus_quartz_crystal.json | 26 +++ ...g_template.json => random_armor_trim.json} | 4 +- ...ayfinder_armor_trim_smithing_template.json | 13 -- .../sand/iron/certus_quartz_crystal.json | 26 +++ .../iron/charged_certus_quartz_crystal.json | 26 +++ .../sand/netherite/certus_quartz_crystal.json | 26 +++ .../charged_certus_quartz_crystal.json | 26 +++ .../sand/string/certus_quartz_crystal.json | 26 +++ .../string/charged_certus_quartz_crystal.json | 26 +++ .../exdeorum/block/AbstractCrucibleBlock.java | 4 +- .../AbstractCrucibleBlockEntity.java | 39 +++-- .../blockentity/LavaCrucibleBlockEntity.java | 17 +- .../blockentity/WaterCrucibleBlockEntity.java | 4 +- .../exdeorum/blockentity/package-info.java | 27 +++ .../thedarkcolour/exdeorum/compat/ModIds.java | 2 + .../exdeorum/compat/ModdedTags.java | 18 ++ .../compat/jei/ExDeorumJeiPlugin.java | 143 +++++++++++----- .../compat/kubejs/ExDeorumKubeJsBindings.java | 35 ++++ .../compat/kubejs/ExDeorumKubeJsPlugin.java | 37 ++++ .../exdeorum/config/EConfig.java | 8 + .../exdeorum/data/BlockModels.java | 39 +++++ .../exdeorum/data/ModCompatData.java | 134 +++++++++++++-- .../exdeorum/data/recipe/SieveRecipes.java | 103 ++++++++---- .../exdeorum/event/EventHandler.java | 63 +++++-- .../exdeorum/item/RandomResultItem.java | 103 ++++++++++++ .../exdeorum/recipe/TagResultRecipe.java | 18 ++ .../exdeorum/registry/EBlockEntities.java | 42 ++++- .../exdeorum/registry/EBlocks.java | 46 ++++- .../exdeorum/registry/EItems.java | 95 +++++++++-- .../exdeorum/tag/EBiomeTags.java | 68 ++++++++ .../textures/item/random_armor_trim.png | Bin 0 -> 268 bytes .../textures/item/random_pottery_sherd.png | Bin 0 -> 271 bytes src/main/resources/kubejs.plugins.txt | 1 + 326 files changed, 5801 insertions(+), 441 deletions(-) create mode 100644 src/generated/resources/assets/exdeorum/blockstates/dead_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/dead_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/dead_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/fir_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/fir_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/fir_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/hellbark_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/hellbark_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/hellbark_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/jacaranda_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/jacaranda_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/jacaranda_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/magic_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/magic_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/magic_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/mahogany_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/mahogany_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/mahogany_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/palm_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/palm_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/palm_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/redwood_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/redwood_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/redwood_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/umbran_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/umbran_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/umbran_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/willow_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/willow_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/willow_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/dead_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/dead_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/dead_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/fir_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/fir_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/fir_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/hellbark_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/hellbark_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/hellbark_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/jacaranda_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/jacaranda_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/jacaranda_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/magic_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/magic_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/magic_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/mahogany_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/mahogany_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/mahogany_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/palm_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/palm_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/palm_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/redwood_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/redwood_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/redwood_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/umbran_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/umbran_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/umbran_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/willow_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/willow_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/willow_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/dead_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/dead_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/dead_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/fir_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/fir_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/fir_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/hellbark_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/hellbark_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/hellbark_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/jacaranda_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/jacaranda_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/jacaranda_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/magic_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/magic_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/magic_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/mahogany_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/mahogany_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/mahogany_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/palm_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/palm_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/palm_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/random_armor_trim.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/random_pottery_sherd.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/redwood_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/redwood_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/redwood_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/umbran_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/umbran_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/umbran_sieve.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/willow_barrel.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/willow_crucible.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/willow_sieve.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/dead_barrel.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/dead_crucible.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/dead_sieve.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/fir_barrel.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/fir_crucible.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/fir_sieve.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_barrel.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_crucible.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_sieve.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_barrel.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_crucible.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_sieve.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/magic_barrel.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/magic_crucible.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/magic_sieve.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_barrel.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_crucible.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_sieve.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/palm_barrel.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/palm_crucible.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/palm_sieve.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_barrel.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_crucible.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_sieve.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_barrel.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_crucible.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_sieve.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/willow_barrel.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/willow_crucible.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/willow_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/hammer/red_sand.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/dust/diamond/yellorium_dust.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/dust/flint/yellorium_dust.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/dust/golden/yellorium_dust.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/dust/iron/yellorium_dust.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/dust/netherite/yellorium_dust.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/dust/string/yellorium_dust.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/dead_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/fir_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/flowering_oak_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/hellbark_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/jacaranda_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/magic_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/mahogany_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/maple_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/orange_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/origin_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/palm_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/rainbow_birch_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/redwood_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/snowblossom_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/umbran_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/willow_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/yellow_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/dead_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/fir_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/flowering_oak_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/hellbark_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/jacaranda_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/magic_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/mahogany_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/maple_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/orange_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/origin_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/palm_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/rainbow_birch_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/redwood_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/snowblossom_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/umbran_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/willow_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/yellow_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/dead_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/fir_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/flowering_oak_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/hellbark_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/jacaranda_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/magic_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/mahogany_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/maple_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/orange_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/origin_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/palm_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/rainbow_birch_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/redwood_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/snowblossom_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/umbran_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/willow_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/yellow_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/dead_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/fir_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/flowering_oak_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/hellbark_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/jacaranda_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/magic_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/mahogany_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/maple_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/orange_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/origin_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/palm_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/rainbow_birch_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/redwood_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/snowblossom_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/umbran_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/willow_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/yellow_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/dead_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/fir_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/flowering_oak_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/hellbark_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/jacaranda_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/magic_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/mahogany_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/maple_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/orange_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/origin_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/palm_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/rainbow_birch_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/redwood_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/snowblossom_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/umbran_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/willow_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/yellow_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/dead_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/fir_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/flowering_oak_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/hellbark_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/jacaranda_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/magic_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/mahogany_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/maple_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/orange_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/origin_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/palm_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/rainbow_birch_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/redwood_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/snowblossom_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/umbran_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/willow_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/yellow_autumn_sapling.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/cactus.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/dead_bush.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/gold_nugget.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/raw_gold.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/redstone.json rename src/generated/resources/data/exdeorum/recipes/sieve/{sand/flint/howl_pottery_sherd.json => red_sand/flint/cactus.json} (64%) rename src/generated/resources/data/exdeorum/recipes/sieve/{sand/flint/heart_pottery_sherd.json => red_sand/flint/dead_bush.json} (64%) rename src/generated/resources/data/exdeorum/recipes/sieve/{sand/flint/blade_pottery_sherd.json => red_sand/flint/gold_nugget.json} (64%) create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/raw_gold.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/redstone.json rename src/generated/resources/data/exdeorum/recipes/sieve/{sand/golden/coast_armor_trim_smithing_template.json => red_sand/golden/cactus.json} (60%) rename src/generated/resources/data/exdeorum/recipes/sieve/{sand/golden/raiser_armor_trim_smithing_template.json => red_sand/golden/dead_bush.json} (60%) rename src/generated/resources/data/exdeorum/recipes/sieve/{sand/golden/shaper_armor_trim_smithing_template.json => red_sand/golden/gold_nugget.json} (60%) create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/raw_gold.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/redstone.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/cactus.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/dead_bush.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/gold_nugget.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/raw_gold.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/redstone.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/cactus.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/gold_nugget.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/raw_gold.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/redstone.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/cactus.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/dead_bush.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/gold_nugget.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/raw_gold.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/redstone.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/diamond/certus_quartz_crystal.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/diamond/charged_certus_quartz_crystal.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/angler_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/archer_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/arms_up_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/brewer_pottery_sherd.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/certus_quartz_crystal.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/charged_certus_quartz_crystal.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/danger_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/explorer_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/friend_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/heartbreak_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/miner_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/mourner_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/plenty_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/prize_pottery_sherd.json rename src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/{burn_pottery_sherd.json => random_pottery_sherd.json} (75%) delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/sheaf_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/shelter_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/skull_pottery_sherd.json delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/snort_pottery_sherd.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/certus_quartz_crystal.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/charged_certus_quartz_crystal.json rename src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/{host_armor_trim_smithing_template.json => random_armor_trim.json} (71%) delete mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/wayfinder_armor_trim_smithing_template.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/iron/certus_quartz_crystal.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/iron/charged_certus_quartz_crystal.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/netherite/certus_quartz_crystal.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/netherite/charged_certus_quartz_crystal.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/string/certus_quartz_crystal.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/sand/string/charged_certus_quartz_crystal.json create mode 100644 src/main/java/thedarkcolour/exdeorum/blockentity/package-info.java create mode 100644 src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsBindings.java create mode 100644 src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsPlugin.java create mode 100644 src/main/java/thedarkcolour/exdeorum/item/RandomResultItem.java create mode 100644 src/main/java/thedarkcolour/exdeorum/tag/EBiomeTags.java create mode 100644 src/main/resources/assets/exdeorum/textures/item/random_armor_trim.png create mode 100644 src/main/resources/assets/exdeorum/textures/item/random_pottery_sherd.png create mode 100644 src/main/resources/kubejs.plugins.txt diff --git a/build.gradle b/build.gradle index dde2c1ee..de91a193 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'org.spongepowered.mixin' version '0.7.+' } -version = '1.4' +version = '1.5' group = 'thedarkcolour.exdeorum' base { archivesName = 'exdeorum' @@ -78,7 +78,7 @@ minecraft { } testmodServer { - workingDirectory project.file('run') + workingDirectory project.file('run/server') property 'forge.logging.console.level', 'debug' @@ -144,9 +144,9 @@ dependencies { compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")) runtimeOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")) // KubeJS OPTIONAL - //implementation fg.deobf("dev.latvian.mods:kubejs-forge:${kubejs_version}") - //implementation fg.deobf("dev.latvian.mods:rhino-forge:${rhino_version}") - //implementation fg.deobf("dev.architectury:architectury-forge:${architectury_version}") + implementation fg.deobf("dev.architectury:architectury-forge:${architectury_version}") + implementation fg.deobf("dev.latvian.mods:rhino-forge:${rhino_version}") + implementation fg.deobf("dev.latvian.mods:kubejs-forge:${kubejs_version}") // ModKit DEV ONLY implementation fg.deobf('com.github.thedarkcolour:ModKit:78f393bfac') diff --git a/changelog.md b/changelog.md index ded15600..3bfd3441 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,14 @@ +## Ex Deorum 1.5 +- Added Random Pottery Sherd and Random Armor Trim items to replace the bloated sand loot tables for obtaining pottery sherds and armor trims. +- Added compatibility with Biomes O' Plenty (sieves, barrels, crucibles, saplings obtainable from sifting moss like other saplings) +- Added compatibility with Extreme Reactors +- Added WIP compatibility with Applied Energistics 2 +- Added compatibility with KubeJS for Crucibles, with methods called `exdeorum.setCrucibleHeatValue(BlockState, int)` and `exdeorum.setCrucibleHeatValueForBlock(Block, int)` +- Fixed an incorrect error message saying "Unable to grant player the Void World advancement" when the player already has it +- Fixed a bug with the crucible filling up too quickly. +- Added a config option to change which configured_feature to use when generating the spawn island +- Added a config option to use a different spawn tree based on the biome the player spawns in + ## Ex Deorum 1.4 - Red Sand is now obtainable by hammering crushed netherrack. - Sieves can no longer be automated by machines (can be re-enabled in the server config.) diff --git a/gradle.properties b/gradle.properties index 201c7e3f..05772665 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,6 @@ jei_version=15.2.0.23 curios_version=5.2.0-beta.3 top_version=10.0.1-3 -kubejs_version=1902.6.1-build.349 -rhino_version=1902.2.2-build.269 +kubejs_version=2001.6.3-build.47 +rhino_version=2001.2.2-build.6 architectury_version=9.1.12 \ No newline at end of file diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index dc93771c..bd3d1219 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.20.1 2023-08-07T23:41:30.8347002 Loot Tables +// 1.20.1 2023-09-18T11:17:35.1916779 Loot Tables 105d8a61ea7145d7798146d385d4aad24fd1588d data/exdeorum/loot_tables/blocks/acacia_barrel.json 1e77127a82cbba0937bb02694f65cf1893aeffcb data/exdeorum/loot_tables/blocks/acacia_crucible.json fcc00910a8cc94bed6339d6833fcec53c501a0d7 data/exdeorum/loot_tables/blocks/acacia_sieve.json @@ -21,24 +21,54 @@ cb1d2e4511ad98f974192f5a60161a30472808aa data/exdeorum/loot_tables/blocks/crushe cc2ff4d4632fcffee0d3e06529670a102c280410 data/exdeorum/loot_tables/blocks/dark_oak_barrel.json 74dbd2298667036228a3b0b1a9ef895fb6a0bf5a data/exdeorum/loot_tables/blocks/dark_oak_crucible.json 912b85cbf5d89a043dc232e6e08119d3e4b9b357 data/exdeorum/loot_tables/blocks/dark_oak_sieve.json +cbc4c95f7813751d2b47c8a72448c78387649d7f data/exdeorum/loot_tables/blocks/dead_barrel.json +a727ae35bc208071cde56afda963b6cbb3af6c1b data/exdeorum/loot_tables/blocks/dead_crucible.json +868376d65d39785f28a2ad9ca3ae97b6cda9c849 data/exdeorum/loot_tables/blocks/dead_sieve.json 23cfb51730f2ecd873d7d5277ac8521a249e8320 data/exdeorum/loot_tables/blocks/dust.json +1f9a667e154b676a635a194828ae09e2e779c8c9 data/exdeorum/loot_tables/blocks/fir_barrel.json +e12d3c54b56b3793aff26b85c1d5c406df4bd416 data/exdeorum/loot_tables/blocks/fir_crucible.json +21e8d264aecd401cd2633c1b577677b5ab2cd710 data/exdeorum/loot_tables/blocks/fir_sieve.json +32602e363024f1bbd0a174a19c61b4cb0e4f3b2c data/exdeorum/loot_tables/blocks/hellbark_barrel.json +cbf36cffd7f38d618435ca03142ded5e74f217aa data/exdeorum/loot_tables/blocks/hellbark_crucible.json +bf41c8c33133269ddde2c6b098aca056acd7e4ea data/exdeorum/loot_tables/blocks/hellbark_sieve.json 0834fe6d98295ca2ced32a3a50a04de3ae6204e9 data/exdeorum/loot_tables/blocks/infested_leaves.json +ce4254c53a4ce6c2712775708415f14e63f21b67 data/exdeorum/loot_tables/blocks/jacaranda_barrel.json +b23b0494ef9f535744f7390f74a35527442aee6f data/exdeorum/loot_tables/blocks/jacaranda_crucible.json +1817eb94fb9656a3ad853f2cca138c1cd012bd26 data/exdeorum/loot_tables/blocks/jacaranda_sieve.json 58a121ab7b39913271784b018fc6c55532917f21 data/exdeorum/loot_tables/blocks/jungle_barrel.json a652a1374c1cd710e26d28c015b83beb9f5e378c data/exdeorum/loot_tables/blocks/jungle_crucible.json b60904a4c6286bea6c91ac40ace12c63f3d049cc data/exdeorum/loot_tables/blocks/jungle_sieve.json +45bce99894bcee0308320c4826ad23403108fe80 data/exdeorum/loot_tables/blocks/magic_barrel.json +0e2867614ca43b236f697b928fa3e08ddd97deab data/exdeorum/loot_tables/blocks/magic_crucible.json +a87b179ee0ac3d65310268b7d40b864195f233c4 data/exdeorum/loot_tables/blocks/magic_sieve.json +5334f1a419c2b042c98db7736baebebf7fda5634 data/exdeorum/loot_tables/blocks/mahogany_barrel.json +a28006f6bd3de601f7430b6de9ed46cca242fee1 data/exdeorum/loot_tables/blocks/mahogany_crucible.json +f2fd2b243936f3bf2e4cc07e8be0adf607b5af89 data/exdeorum/loot_tables/blocks/mahogany_sieve.json 88749902dcd90e63d874dc2c3f9c606e480469ab data/exdeorum/loot_tables/blocks/mangrove_barrel.json b38104ee25127d9c65ad9e323ed879f76df7a048 data/exdeorum/loot_tables/blocks/mangrove_crucible.json 70c03b4d38a62da4d2eeb1ff525bd0f5e62e0e8e data/exdeorum/loot_tables/blocks/mangrove_sieve.json cad973c873a2e50ccfac91e88eadb3c2462d39d1 data/exdeorum/loot_tables/blocks/oak_barrel.json f94bc97efbfd26ccf7dba32d414fb5e33decd5f6 data/exdeorum/loot_tables/blocks/oak_crucible.json 8d69a87e09fc8a179d5a1bc8eba5faab66e77a6c data/exdeorum/loot_tables/blocks/oak_sieve.json +8b02ade5c505b239d953d9080fec34d2d9c812de data/exdeorum/loot_tables/blocks/palm_barrel.json +843ba3f8cca4445dab6e0be2e3b3af48c3603489 data/exdeorum/loot_tables/blocks/palm_crucible.json +22eea9897215772fadb19906b7de0ad72ac9d612 data/exdeorum/loot_tables/blocks/palm_sieve.json 2181c4797d779008be89e420aefe5e84d3cf7e37 data/exdeorum/loot_tables/blocks/porcelain_crucible.json +b75af3bb5693488a1373235a0dcb0627aa6d049a data/exdeorum/loot_tables/blocks/redwood_barrel.json +bb9dcf7d5d4ce85b394ce0ae7181eef2f6fbbd79 data/exdeorum/loot_tables/blocks/redwood_crucible.json +8185531f6adfa5244f5dc0a4c9a6f85a0a0b58e2 data/exdeorum/loot_tables/blocks/redwood_sieve.json 6bbfa8c3c8630c356f206312728e73d21f00fa0c data/exdeorum/loot_tables/blocks/spruce_barrel.json 7e243b44eb3d9f15b983807225da7cb2839dee01 data/exdeorum/loot_tables/blocks/spruce_crucible.json 091d26076d526bff6bdc730f8a45297996ac6f56 data/exdeorum/loot_tables/blocks/spruce_sieve.json 82063725ffe92af96bb2502547ba8cc9d3fd411e data/exdeorum/loot_tables/blocks/stone_barrel.json +49ca31b6acd08c4e78bb7e90a4a6fad396f7a515 data/exdeorum/loot_tables/blocks/umbran_barrel.json +cb088dd4c735b2b59c361134623167386c5d4d67 data/exdeorum/loot_tables/blocks/umbran_crucible.json +266433381f0beec1fcdbf2d086b87c7d53805e30 data/exdeorum/loot_tables/blocks/umbran_sieve.json fcd9e1fa1e8ec5c5fe7bb25f300284de6dd8b880 data/exdeorum/loot_tables/blocks/unfired_porcelain_crucible.json 7433a7a398f38a949f9ef3231f87853505f797da data/exdeorum/loot_tables/blocks/warped_barrel.json fe639e82446330279c3ab3d66a576931a62516e5 data/exdeorum/loot_tables/blocks/warped_crucible.json c3db3b96077eba364cb012f49e25fa98b98a71ab data/exdeorum/loot_tables/blocks/warped_sieve.json +67588965ad0bba9eede3fd3a2378d59fdd6b5fdf data/exdeorum/loot_tables/blocks/willow_barrel.json +87f488263c98db70e1c4c4f608f028ed65a362e5 data/exdeorum/loot_tables/blocks/willow_crucible.json +5fcc50ca6590bfb56587959d2611eb5d9052505d data/exdeorum/loot_tables/blocks/willow_sieve.json a51ad59e35021e2254b07f1fd437544b2e463534 data/exdeorum/loot_tables/blocks/witch_water.json diff --git a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 index c3faf900..d9bec175 100644 --- a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 +++ b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 @@ -1,2 +1,2 @@ -// 1.20.1 2023-08-23T14:30:35.0791121 ModKit Language: en_us for mod 'exdeorum' -17dd92c4151093a40f1f496e82735d93ef38168d assets/exdeorum/lang/en_us.json +// 1.20.1 2023-09-23T11:56:49.5751742 ModKit Language: en_us for mod 'exdeorum' +b60575371ffc1cc7ce8073c5ff22de01e7cd5549 assets/exdeorum/lang/en_us.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 4cb1149f..1709a4b7 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2023-09-09T11:37:17.5523493 Recipes +// 1.20.1 2023-09-23T17:16:17.6613223 Recipes 5ad481a0c376c1a1785a5d3b992064d0ec0bf3b0 data/exdeorum/advancements/recipes/food/end_cake.json 25dd027e844a72b03c95dbe5e3c3dd8c738ceb00 data/exdeorum/advancements/recipes/misc/acacia_barrel.json 376be94a64c9ca97a9ea2346547b6e617f13a815 data/exdeorum/advancements/recipes/misc/acacia_crucible.json @@ -565,14 +565,14 @@ da3556d43a22a00cfba29419879f8bb1c24f76e0 data/exdeorum/recipes/sieve/dust/diamon 0087b10cc106dc6cb22a9574567faf8096fa797e data/exdeorum/recipes/sieve/dust/diamond/grains_of_infinity.json aacdbedc91e09191a6fc335ed82ca481d934ebc3 data/exdeorum/recipes/sieve/dust/diamond/gunpowder.json 00907e701451521c3ca793ec337b0b2f0166e895 data/exdeorum/recipes/sieve/dust/diamond/redstone.json -64de5902f0aaee9c844ba1316a796e10cb0aed34 data/exdeorum/recipes/sieve/dust/diamond/yellorium_dust.json +e071b7083dd1f122a6008d773d80e29b0939dce7 data/exdeorum/recipes/sieve/dust/diamond/yellorium_dust.json 7eba59b03b5affdc11c937060e99949db301086a data/exdeorum/recipes/sieve/dust/flint/blaze_powder.json 7af226b5661b96e0b8ddcb8ec902d37f429b0b48 data/exdeorum/recipes/sieve/dust/flint/bone_meal.json 0a7d44bdff5a9b7040f702cb5ff756ce231c9a60 data/exdeorum/recipes/sieve/dust/flint/glowstone_dust.json c418797b65a0c67841c5e99d8fec95d1ee780065 data/exdeorum/recipes/sieve/dust/flint/grains_of_infinity.json 52c65219279d46fe5474a8a01d69a1362cb3a2ea data/exdeorum/recipes/sieve/dust/flint/gunpowder.json 7ecd5ae5d7f6783ff7535978352190a9af1b0ab4 data/exdeorum/recipes/sieve/dust/flint/redstone.json -34cf976c49dbd139da48e9896d700587e0ae75e1 data/exdeorum/recipes/sieve/dust/flint/yellorium_dust.json +b9f030c35edfd7cf832cd2d026eb7526681d8ebf data/exdeorum/recipes/sieve/dust/flint/yellorium_dust.json bdbe4b3434ff67299b47d65eab0c442b235dc654 data/exdeorum/recipes/sieve/dust/golden/blaze_powder.json fab2426618c3f527ed401f1ef2cee3fa81de1969 data/exdeorum/recipes/sieve/dust/golden/bone_meal.json 9a9eb3cc996de392e75dd9c6613af1ff382615d5 data/exdeorum/recipes/sieve/dust/golden/glowstone_dust.json @@ -581,7 +581,7 @@ c087c3ba3bd7bda74aac13435f61a998060d4872 data/exdeorum/recipes/sieve/dust/golden 4d28a3acd946fd55c3982e5ff9bb8876b8b0baef data/exdeorum/recipes/sieve/dust/golden/gunpowder.json a9c9258b74162f5132b8b47f3981b071ec6b60bf data/exdeorum/recipes/sieve/dust/golden/raw_gold.json 65c99881294536c0f59d66d0e7429d85bbec0b9b data/exdeorum/recipes/sieve/dust/golden/redstone.json -f5e23ee85134101ff76f64b301e7cc3d86fb87e6 data/exdeorum/recipes/sieve/dust/golden/yellorium_dust.json +45bf0f375561c5d4ede6e90611c4cc60ac704705 data/exdeorum/recipes/sieve/dust/golden/yellorium_dust.json 4b304a265794186e3c1fbd23acfcfde57322d615 data/exdeorum/recipes/sieve/dust/iron/blaze_powder.json 758573f460a7f2ff2104a1bbfde2fa8392d002a4 data/exdeorum/recipes/sieve/dust/iron/bone_meal.json e3f7f74c6e84a149282b23f0388e25c7ae5f4352 data/exdeorum/recipes/sieve/dust/iron/glowstone_dust.json @@ -589,7 +589,7 @@ f5c25b6ee05890bdc41ddc45a14b2015665388fe data/exdeorum/recipes/sieve/dust/iron/g 5ffc2f95fc5a52aad02e7b063ba64c4cd41836f3 data/exdeorum/recipes/sieve/dust/iron/gunpowder.json eeb2ec19599044971eeff5929e7238fa398f1f08 data/exdeorum/recipes/sieve/dust/iron/iron_nugget.json 9dc82b4a79edf9561566137af39399b1621b89a0 data/exdeorum/recipes/sieve/dust/iron/redstone.json -9fd60c04e81943398e45a95f8f301fe4ee1f6efd data/exdeorum/recipes/sieve/dust/iron/yellorium_dust.json +e059dbdb19633d8c07823d472fe4109fe5f482b8 data/exdeorum/recipes/sieve/dust/iron/yellorium_dust.json 55bf627cf6c3a8eca57328cb482a6f86326a8e68 data/exdeorum/recipes/sieve/dust/netherite/blaze_powder.json 33e35a1af71274a675498234b8dcd9834368c717 data/exdeorum/recipes/sieve/dust/netherite/bone_meal.json 0472c65dad0e35df7397dfb2a7b53c5408f5fffc data/exdeorum/recipes/sieve/dust/netherite/glowstone_dust.json @@ -598,14 +598,14 @@ a776c6d6946a02fea8bb346860f525bde2c835de data/exdeorum/recipes/sieve/dust/nether 2fb062f8d8be004bd5e54a43a089c579a374abb1 data/exdeorum/recipes/sieve/dust/netherite/gunpowder.json c6a8996009ae3e712a2895001e96c74bb35b224c data/exdeorum/recipes/sieve/dust/netherite/iron_nugget.json 44e98c8ce40d6f72596b009398943cb3ac6ef1b5 data/exdeorum/recipes/sieve/dust/netherite/redstone.json -20f154dc498320be8037e23b3bdc7b1c483d2f95 data/exdeorum/recipes/sieve/dust/netherite/yellorium_dust.json +74dc5a0f222df29970a3d70a1cb89f3525044568 data/exdeorum/recipes/sieve/dust/netherite/yellorium_dust.json 7bed9653a0d40436bd15531ffb15eb84563cfc4d data/exdeorum/recipes/sieve/dust/string/blaze_powder.json 74dc1675b4dc9c0d1d96bc22db0b844f322082b8 data/exdeorum/recipes/sieve/dust/string/bone_meal.json e4ead3b21ece1d4470c2000017586c1730acd1bb data/exdeorum/recipes/sieve/dust/string/glowstone_dust.json 91428deb05889718e458b8cd9f6d610f1e652330 data/exdeorum/recipes/sieve/dust/string/grains_of_infinity.json 3272a1f8b4534dd8800b07b7ec826d8f7a4fae65 data/exdeorum/recipes/sieve/dust/string/gunpowder.json e1a8558df8270d57cbcdf7255b93b40d0c05d33b data/exdeorum/recipes/sieve/dust/string/redstone.json -9b5162b466041d395a2428c2c944b0a450c135b6 data/exdeorum/recipes/sieve/dust/string/yellorium_dust.json +bde922cc7bd1eec8a2479169dcfa9b5c5d69a27e data/exdeorum/recipes/sieve/dust/string/yellorium_dust.json 9df7ca0a604ab01b33dfe0b342441b9705c9ac9e data/exdeorum/recipes/sieve/gravel/diamond/aluminum_ore_chunk.json b1b1c231670f2622dc2227fac65aff0ebbd2ea19 data/exdeorum/recipes/sieve/gravel/diamond/amethyst_shard.json 2284efd2a38ecb63f694ba0586c478b26207adce data/exdeorum/recipes/sieve/gravel/diamond/coal.json @@ -636,7 +636,7 @@ d2e86dc8b2f2465ac26e95e7d38916fc14e2dae5 data/exdeorum/recipes/sieve/gravel/flin d988d062013ae4d6afcb8e5e13065518a012d126 data/exdeorum/recipes/sieve/gravel/flint/gold_ore_chunk.json a3f7e6269846b25acbd994b0e564020f7a22cd0f data/exdeorum/recipes/sieve/gravel/flint/granite_pebble.json cb1601e4e798f148a352d0910a028f594a944d4c data/exdeorum/recipes/sieve/gravel/flint/iridium_ore_chunk.json -57d60dd6b13ad4c45238da601a37ee2ab964052b data/exdeorum/recipes/sieve/gravel/flint/iron_ore_chunk.json +1526d58887ae5ca553fb5d6de0edbb4ce85dc916 data/exdeorum/recipes/sieve/gravel/flint/iron_ore_chunk.json 702f85e882f2b10a6613f41074ccfc9b759c42b9 data/exdeorum/recipes/sieve/gravel/flint/lapis_lazuli.json 91d01d076b8a72827d270de34fe03022a44c9291 data/exdeorum/recipes/sieve/gravel/flint/lead_ore_chunk.json 391add009436b8206ae851ce82efe1be208266b0 data/exdeorum/recipes/sieve/gravel/flint/nickel_ore_chunk.json @@ -714,7 +714,7 @@ bd1ce763ae605e9a0d82e4afa58c4811516bc6bf data/exdeorum/recipes/sieve/gravel/stri b298e2f51255b88beea1394e2f609768fbb36921 data/exdeorum/recipes/sieve/gravel/string/flint.json 0c0e184928b7371b1cabaca16b51d137a52fc77b data/exdeorum/recipes/sieve/gravel/string/gold_ore_chunk.json 1a3a7eba846fb34fa5391dc7fb29509011a7f88c data/exdeorum/recipes/sieve/gravel/string/iridium_ore_chunk.json -14c1eb7582d996fb2dccedd0f51d3b731cba5e73 data/exdeorum/recipes/sieve/gravel/string/iron_ore_chunk.json +8006ea24e8d9c89a1886e806659ab1bb733da534 data/exdeorum/recipes/sieve/gravel/string/iron_ore_chunk.json 19ddad521fcb43ea69e4aeda92f8ea841630c530 data/exdeorum/recipes/sieve/gravel/string/lapis_lazuli.json f245cf69e06874c43bc2bdaabb7806c59d274c93 data/exdeorum/recipes/sieve/gravel/string/lead_ore_chunk.json b89e33d919dbd61f41f9d0eed39cd188fb1289ff data/exdeorum/recipes/sieve/gravel/string/nickel_ore_chunk.json @@ -729,82 +729,184 @@ b774a52785ba81cf8c589b9962abce624862a6ec data/exdeorum/recipes/sieve/moss_block/ 6de849670ed1d3f4d9566549ae50bad2b16447bf data/exdeorum/recipes/sieve/moss_block/diamond/birch_sapling.json bd431da682073ba56016352f1f6c9d35fa0211dd data/exdeorum/recipes/sieve/moss_block/diamond/cherry_sapling.json 622227a5568ef316c27d51e7d505f171d545eb05 data/exdeorum/recipes/sieve/moss_block/diamond/dark_oak_sapling.json +6da2af867e69aa403f735fa7043f08489730d797 data/exdeorum/recipes/sieve/moss_block/diamond/dead_sapling.json +b49d697ed4a318e46642d43a03b3047960853eb2 data/exdeorum/recipes/sieve/moss_block/diamond/fir_sapling.json +12ef9b8b0158abefade557f9a7c7e335189b8f36 data/exdeorum/recipes/sieve/moss_block/diamond/flowering_oak_sapling.json 82bc526b187cdfdf0b2147a68f858ae5d3ddc331 data/exdeorum/recipes/sieve/moss_block/diamond/glow_berries.json +a88e7819fa79b168cd14cdaa04fc41bb33d7418b data/exdeorum/recipes/sieve/moss_block/diamond/hellbark_sapling.json +b048ab18517179bc6cd759b0a014d84ebc6edfc1 data/exdeorum/recipes/sieve/moss_block/diamond/jacaranda_sapling.json e31b10ea506eb9a2d94aa9efdd7db4cdd8d78237 data/exdeorum/recipes/sieve/moss_block/diamond/jungle_sapling.json +7c0a3ba97700f3ffe814f870340c2c9ad907649a data/exdeorum/recipes/sieve/moss_block/diamond/magic_sapling.json +aa7f4c3c73093123cf8d7de07e721db44e776ea3 data/exdeorum/recipes/sieve/moss_block/diamond/mahogany_sapling.json c3cb1b7c924b35323e3d7cb1ffdff46cff7bb849 data/exdeorum/recipes/sieve/moss_block/diamond/mangrove_propagule.json +0eb60cef90701a6b85762167ca0762b61206fe3b data/exdeorum/recipes/sieve/moss_block/diamond/maple_sapling.json 9cd8e7df8913168eb5f3176e07bb02620025165e data/exdeorum/recipes/sieve/moss_block/diamond/oak_sapling.json +46569bddd3fc31de4c4c2b3c162bee454c296b0d data/exdeorum/recipes/sieve/moss_block/diamond/orange_autumn_sapling.json +5148ad776d91cabcfc82cf4de9eb760f9c3fc88d data/exdeorum/recipes/sieve/moss_block/diamond/origin_sapling.json +5ab55ca67aa4798d0fc7605a05aba7dacb361833 data/exdeorum/recipes/sieve/moss_block/diamond/palm_sapling.json +50c0e0f4cb83433c88bf4a620237f4b06b8031c8 data/exdeorum/recipes/sieve/moss_block/diamond/rainbow_birch_sapling.json +c2b42f3af5e74ad8092f623cc25657430740938f data/exdeorum/recipes/sieve/moss_block/diamond/redwood_sapling.json 46372d4865910944bc43ef67b7e9f83987bcd591 data/exdeorum/recipes/sieve/moss_block/diamond/small_dripleaf.json +46bca76101f3ee2a9aef354580df5aaa411b4961 data/exdeorum/recipes/sieve/moss_block/diamond/snowblossom_sapling.json ab9c7574d8d2ca3343f170e8cb9d78737873ee2f data/exdeorum/recipes/sieve/moss_block/diamond/spore_blossom.json f41a1dd1c6a62bc8b34baa677a53e18150185e5a data/exdeorum/recipes/sieve/moss_block/diamond/spruce_sapling.json +2887fc42b2cfd09a523a5a1883439ef20b28b543 data/exdeorum/recipes/sieve/moss_block/diamond/umbran_sapling.json +0af5df13b12f2f43d53cb11aeaec849d4ea27fb3 data/exdeorum/recipes/sieve/moss_block/diamond/willow_sapling.json +84bb0d6857a88f89c44772049f2368aaa2215979 data/exdeorum/recipes/sieve/moss_block/diamond/yellow_autumn_sapling.json f81c5c7b83ff1dd7ded1b46cb3b602ce56ae3ba7 data/exdeorum/recipes/sieve/moss_block/flint/acacia_sapling.json 4315fd16c0bd230e052d5308ee9c30b8fa6b4ed3 data/exdeorum/recipes/sieve/moss_block/flint/azalea.json c1687b96d45092b8fa43d15caf049dabaf1aa648 data/exdeorum/recipes/sieve/moss_block/flint/big_dripleaf.json 7bf07dd791534b61b15fcbbae56f80e2dbbc24c7 data/exdeorum/recipes/sieve/moss_block/flint/birch_sapling.json 521c7e763b7bb79e397e49f5066db5e644b56f25 data/exdeorum/recipes/sieve/moss_block/flint/cherry_sapling.json dba7cb3c95e17438407fd9126e6dcd8a8ac05709 data/exdeorum/recipes/sieve/moss_block/flint/dark_oak_sapling.json +5037a4f91da48e80c7029b02c15fd4c5cc8a8790 data/exdeorum/recipes/sieve/moss_block/flint/dead_sapling.json +a22d5512b2c2a760672555098fe97048fbde9247 data/exdeorum/recipes/sieve/moss_block/flint/fir_sapling.json 9e043da9b384c7f23581ffcd9fa34a18d08d6ba3 data/exdeorum/recipes/sieve/moss_block/flint/flowering_azalea.json +87441998d217e152e9a8347102eef3058d9050fa data/exdeorum/recipes/sieve/moss_block/flint/flowering_oak_sapling.json 3ac630dca6305e377a994b883446e8f2229be505 data/exdeorum/recipes/sieve/moss_block/flint/glow_berries.json cbd39e058b88538e00884c336289d08a45122d58 data/exdeorum/recipes/sieve/moss_block/flint/glow_lichen.json +1c748961df840422d302c8fb74daa71973c633ee data/exdeorum/recipes/sieve/moss_block/flint/hellbark_sapling.json +4ad8438f2574efd6288c6c6a48ca8ee3e4717c6f data/exdeorum/recipes/sieve/moss_block/flint/jacaranda_sapling.json 6bd5c11cfc79ee76e42a3f6a488229f39515f0fe data/exdeorum/recipes/sieve/moss_block/flint/jungle_sapling.json 034245905bbf9795f24a6e931d6568f82e70a4b7 data/exdeorum/recipes/sieve/moss_block/flint/lily_pad.json +73bcea23bd87c6208cd59005d5763b0e6db7d160 data/exdeorum/recipes/sieve/moss_block/flint/magic_sapling.json +d95c5a8d9b7c848706e4b4241b74bbf71c73356e data/exdeorum/recipes/sieve/moss_block/flint/mahogany_sapling.json c63138cd4e3095885913923bee0685064442871a data/exdeorum/recipes/sieve/moss_block/flint/mangrove_propagule.json +58e7ed7d7e87110f0c7b3d5ef2b885d9875c8386 data/exdeorum/recipes/sieve/moss_block/flint/maple_sapling.json 6f1e11d47cd47a4607ba7da396f1802e2ff3266f data/exdeorum/recipes/sieve/moss_block/flint/oak_sapling.json +acbe3da066535af69ba731418b5f1fc72eaa00d2 data/exdeorum/recipes/sieve/moss_block/flint/orange_autumn_sapling.json +94a5173e6ef275bdb9b0194272780d619cc968b9 data/exdeorum/recipes/sieve/moss_block/flint/origin_sapling.json +b03b8fea3cb4504c0732143d2311b458d66f970c data/exdeorum/recipes/sieve/moss_block/flint/palm_sapling.json +540c46386fe29e8d68f6f17c30a97c7b1d1041b3 data/exdeorum/recipes/sieve/moss_block/flint/rainbow_birch_sapling.json +8d4cb6072dd641654767f66faa2ca5419ce8a0e4 data/exdeorum/recipes/sieve/moss_block/flint/redwood_sapling.json 01e4ada58ba8c4a5ea450f62e752f9324cfda6d3 data/exdeorum/recipes/sieve/moss_block/flint/small_dripleaf.json +470530683d21d2480c5de7b71a0c3a500d0c3080 data/exdeorum/recipes/sieve/moss_block/flint/snowblossom_sapling.json 366055d40ffa8bb5df3aa4a173df789ca7387e18 data/exdeorum/recipes/sieve/moss_block/flint/spore_blossom.json 0f9eb10e52f5800d0543fbbff9c13559095d2e5f data/exdeorum/recipes/sieve/moss_block/flint/spruce_sapling.json 4ac5ebd110597a27940d6d6c8ca5858b5a09d153 data/exdeorum/recipes/sieve/moss_block/flint/sweet_berries.json +4c3996b21b6e5ab4e408e1c29e8e9213c007baba data/exdeorum/recipes/sieve/moss_block/flint/umbran_sapling.json +239739d37643ee2b6f30821120df3e8279df701b data/exdeorum/recipes/sieve/moss_block/flint/willow_sapling.json +26e2e24895fcac9174d782af3ab1f82fb15c08bd data/exdeorum/recipes/sieve/moss_block/flint/yellow_autumn_sapling.json 862a8042232a5b063cf8fdb30142100a32a04372 data/exdeorum/recipes/sieve/moss_block/golden/acacia_sapling.json a215703df06f023c6b7f44d377c0a29c5fb2d6d6 data/exdeorum/recipes/sieve/moss_block/golden/azalea.json 3e2c070b67e51500187df91e5a910dbb786bb932 data/exdeorum/recipes/sieve/moss_block/golden/big_dripleaf.json a595eed6b517c0eaca5a37b88dd18372f8f24db5 data/exdeorum/recipes/sieve/moss_block/golden/birch_sapling.json c9aed5b2b7e641177e6cd08968d6a658de5a3779 data/exdeorum/recipes/sieve/moss_block/golden/cherry_sapling.json 63a815065ecf0ed35c44cbaaaae2ee3b0ecacbc4 data/exdeorum/recipes/sieve/moss_block/golden/dark_oak_sapling.json +c3509c1cb04f33f2b21643252cea16995210cce9 data/exdeorum/recipes/sieve/moss_block/golden/dead_sapling.json +6a6f80599d352cb6d1e7bb25c45fa44813bd2355 data/exdeorum/recipes/sieve/moss_block/golden/fir_sapling.json +32ef3ccf79ff056ebadef521456a22d2c5e5bb7a data/exdeorum/recipes/sieve/moss_block/golden/flowering_oak_sapling.json 5f34a0005a0f953a175bbf4dbfa745756e7d126e data/exdeorum/recipes/sieve/moss_block/golden/glow_berries.json +fe9f42194d81091a6d46da1e965671f54538c72b data/exdeorum/recipes/sieve/moss_block/golden/hellbark_sapling.json +f7e6cb7c1b3c1919b1fe4e467fae61df046ca64e data/exdeorum/recipes/sieve/moss_block/golden/jacaranda_sapling.json 2c1623f1cd2c679d797ee4b0fd900d04ff09dfbe data/exdeorum/recipes/sieve/moss_block/golden/jungle_sapling.json +636f824bc1f3618cc03a45ed7dcecd4117c6080b data/exdeorum/recipes/sieve/moss_block/golden/magic_sapling.json +b29c1c97da3e60ac0529599c328f7491d13730d3 data/exdeorum/recipes/sieve/moss_block/golden/mahogany_sapling.json 0ad8b7d2ac32bdc810249f9039a355096beca263 data/exdeorum/recipes/sieve/moss_block/golden/mangrove_propagule.json +de0723761b6b52a2d06e19d2870ede102a499d2e data/exdeorum/recipes/sieve/moss_block/golden/maple_sapling.json 74979d3b2db6d6fe305c63ee717542a06188d133 data/exdeorum/recipes/sieve/moss_block/golden/oak_sapling.json +bfcbfee1a4307a2655f6c49c0504dd611e8249a2 data/exdeorum/recipes/sieve/moss_block/golden/orange_autumn_sapling.json +ca77be044c36f277c69b39beb431f3358b8908b5 data/exdeorum/recipes/sieve/moss_block/golden/origin_sapling.json +3999e28b259276aa72847383089fc5bb9995aa7b data/exdeorum/recipes/sieve/moss_block/golden/palm_sapling.json +6aa80bf22b9047f1225b811218071bcf8043315b data/exdeorum/recipes/sieve/moss_block/golden/rainbow_birch_sapling.json +bb900c6bd2588da74b3ca4145b2b82c302406268 data/exdeorum/recipes/sieve/moss_block/golden/redwood_sapling.json ab5ae026900f1d6c82f93d8beb2955695ace87fa data/exdeorum/recipes/sieve/moss_block/golden/small_dripleaf.json +1d56ffa4077e1567590c30513c7b5c9f09735ea0 data/exdeorum/recipes/sieve/moss_block/golden/snowblossom_sapling.json 47a1c47daea852999f58845e542a7e2a7f43b04a data/exdeorum/recipes/sieve/moss_block/golden/spore_blossom.json 9ed8aaa5555765dacc2df79e05e8799cf7bc6e5b data/exdeorum/recipes/sieve/moss_block/golden/spruce_sapling.json +62a2710898a61c30d849b58652b8892b7441db15 data/exdeorum/recipes/sieve/moss_block/golden/umbran_sapling.json +46968256967b51a1a5103abb7fb8c993b593cefa data/exdeorum/recipes/sieve/moss_block/golden/willow_sapling.json +3c2483d7001ff7aa1462774420c843ff22e222cc data/exdeorum/recipes/sieve/moss_block/golden/yellow_autumn_sapling.json aa77cca261f061b6c67d7b76cfbee948eb6a3e8d data/exdeorum/recipes/sieve/moss_block/iron/acacia_sapling.json 687f696562d11b5a8f3f029f31cd903cacca5314 data/exdeorum/recipes/sieve/moss_block/iron/azalea.json dab4403fa7e1cf72c062422421e609f4f27407be data/exdeorum/recipes/sieve/moss_block/iron/big_dripleaf.json 0319fa66a72967c39e5b5d2c92bb4fb34d722098 data/exdeorum/recipes/sieve/moss_block/iron/birch_sapling.json 41ac46391e6dd459c9772fc5804929da572c9d31 data/exdeorum/recipes/sieve/moss_block/iron/cherry_sapling.json 12d0bce19552a1acd6ba187bc49026cb66d8c881 data/exdeorum/recipes/sieve/moss_block/iron/dark_oak_sapling.json +a5468b249371fdb37eb057acba5a38aefa74fc9c data/exdeorum/recipes/sieve/moss_block/iron/dead_sapling.json +1970ed7ba14fc02acf83821e7ae8bd28d7377774 data/exdeorum/recipes/sieve/moss_block/iron/fir_sapling.json +1357a70fdb53aa432a98d57591fee867b622d69f data/exdeorum/recipes/sieve/moss_block/iron/flowering_oak_sapling.json 15c737cf692119413df2e0ac4c6abdc1a6d1eb1a data/exdeorum/recipes/sieve/moss_block/iron/glow_berries.json +abfb7f930546914a53431660f4b9f50b593f0515 data/exdeorum/recipes/sieve/moss_block/iron/hellbark_sapling.json +1a2fdc1d401da18407a141dc9c2c21a01a8ce500 data/exdeorum/recipes/sieve/moss_block/iron/jacaranda_sapling.json 97d245c7e4a30a45921bf35a6bcc1cadb8c472fc data/exdeorum/recipes/sieve/moss_block/iron/jungle_sapling.json +0babc943f54e45db87a49752982bf8cc2ac838cf data/exdeorum/recipes/sieve/moss_block/iron/magic_sapling.json +9d0132bb593b921c8179cfac336eb283c7c4eb79 data/exdeorum/recipes/sieve/moss_block/iron/mahogany_sapling.json 5f508e67c7944764f807b0b55436b33f5e97699b data/exdeorum/recipes/sieve/moss_block/iron/mangrove_propagule.json +5173795e17a2ea49d869f4378660d8feb5b704a3 data/exdeorum/recipes/sieve/moss_block/iron/maple_sapling.json 6621371034fb0c5ddcaf54fa2d89bf614d84f41e data/exdeorum/recipes/sieve/moss_block/iron/oak_sapling.json +6410af7734245e7242fa229ddf57a2dd2e92b940 data/exdeorum/recipes/sieve/moss_block/iron/orange_autumn_sapling.json +db79e83d80c8dcd69dfec351a739f1f114d0a27b data/exdeorum/recipes/sieve/moss_block/iron/origin_sapling.json +bcedd42ac5e47b835da37aa5eac84288b1c0674f data/exdeorum/recipes/sieve/moss_block/iron/palm_sapling.json +7c284061c2e88c33aeac6f940b44fae910869146 data/exdeorum/recipes/sieve/moss_block/iron/rainbow_birch_sapling.json +a4cb449eee625c9f6e62c96afc46183f5ad401fd data/exdeorum/recipes/sieve/moss_block/iron/redwood_sapling.json e46a4beb26c5f1572354e87bfe4553e0a4122576 data/exdeorum/recipes/sieve/moss_block/iron/small_dripleaf.json +4af66292689471615ada08edea2e5cf0760d769d data/exdeorum/recipes/sieve/moss_block/iron/snowblossom_sapling.json 0075db25f4650ba9dc172f15814725754d9f97e5 data/exdeorum/recipes/sieve/moss_block/iron/spore_blossom.json 93cb208475c16ebfdb286a2704a54b1594354c7f data/exdeorum/recipes/sieve/moss_block/iron/spruce_sapling.json +d33ba365d4f374589fa849c6abf96b0471f12216 data/exdeorum/recipes/sieve/moss_block/iron/umbran_sapling.json +cb84204594b8b498b9ea8ffc362b4bb1490bb526 data/exdeorum/recipes/sieve/moss_block/iron/willow_sapling.json +b8ec4da2789fb1da1e1885b1e0ca598230915bb6 data/exdeorum/recipes/sieve/moss_block/iron/yellow_autumn_sapling.json 64ef5a4f025effef3ac4a2b90488c4b910729bec data/exdeorum/recipes/sieve/moss_block/netherite/acacia_sapling.json c026c50780e9df816f2a1536d5bd1bd245d3a785 data/exdeorum/recipes/sieve/moss_block/netherite/azalea.json 415b6baad54d477f2182ff7c2c5f009e85ae9deb data/exdeorum/recipes/sieve/moss_block/netherite/big_dripleaf.json 3a1cf97e22c7e65b04727cb00da7946acd859b4e data/exdeorum/recipes/sieve/moss_block/netherite/birch_sapling.json a3fd022037cb8eb21330c4757b8c268369a19a10 data/exdeorum/recipes/sieve/moss_block/netherite/cherry_sapling.json 088eae3e8ce04c17b4c21490e52aff416b0e22f9 data/exdeorum/recipes/sieve/moss_block/netherite/dark_oak_sapling.json +af3c12951b0f130c6f141fac7332f34896ff8716 data/exdeorum/recipes/sieve/moss_block/netherite/dead_sapling.json +b8656cd29ba0bf5b800c8dad624041ad73151334 data/exdeorum/recipes/sieve/moss_block/netherite/fir_sapling.json +61e1309bffaf341a1b2d41354aea1824f87db1c9 data/exdeorum/recipes/sieve/moss_block/netherite/flowering_oak_sapling.json a216466ec9cace1bd1de0c0c19469e41c49205f9 data/exdeorum/recipes/sieve/moss_block/netherite/glow_berries.json +d1eae4db43f70c880c9c627eee3d8bf56ab9ed38 data/exdeorum/recipes/sieve/moss_block/netherite/hellbark_sapling.json +b8be943a3532c86f4bedfe4e4045e0ef5d6c2114 data/exdeorum/recipes/sieve/moss_block/netherite/jacaranda_sapling.json 1d2332257d5bdaebb487bc52e7e6ff21c053504b data/exdeorum/recipes/sieve/moss_block/netherite/jungle_sapling.json +de9cbe4e072444610d4fd2ae05db2d1aa391032d data/exdeorum/recipes/sieve/moss_block/netherite/magic_sapling.json +fdf4badc95f3b6183302ef96652aa7201f3af87f data/exdeorum/recipes/sieve/moss_block/netherite/mahogany_sapling.json e19bd9157fd5fb35ce43953b9ea27e9102945574 data/exdeorum/recipes/sieve/moss_block/netherite/mangrove_propagule.json +177836aa76233b85f4427583c6a937ad0a0ea17b data/exdeorum/recipes/sieve/moss_block/netherite/maple_sapling.json 21d5202805e1da22beb0c1caee7f721dd937615c data/exdeorum/recipes/sieve/moss_block/netherite/oak_sapling.json +d9f6b596ff8e3b8d49f217bbd94f92bd04c37215 data/exdeorum/recipes/sieve/moss_block/netherite/orange_autumn_sapling.json +1ad95fe796e330a03ad82a2044b2a4641f79793b data/exdeorum/recipes/sieve/moss_block/netherite/origin_sapling.json +d5822b3238b31e4624b47abf2b983ef2618cb801 data/exdeorum/recipes/sieve/moss_block/netherite/palm_sapling.json +1adde3a653591fe3b701b8829903a31b0ed5790e data/exdeorum/recipes/sieve/moss_block/netherite/rainbow_birch_sapling.json +90485e7cbbbb4ca7d968fe2647a698b256d67f3b data/exdeorum/recipes/sieve/moss_block/netherite/redwood_sapling.json 253817ef4f1a350d988df5e122a32fa8fd576819 data/exdeorum/recipes/sieve/moss_block/netherite/small_dripleaf.json +72bf022c6311a1d51daebfebfa174b30d1eb80c6 data/exdeorum/recipes/sieve/moss_block/netherite/snowblossom_sapling.json 913767318dab8eda863e2816e06164f8b2b7d049 data/exdeorum/recipes/sieve/moss_block/netherite/spore_blossom.json 7b16289fd38e015d5b5f6bfe70314d8a507ca4b0 data/exdeorum/recipes/sieve/moss_block/netherite/spruce_sapling.json +8eb5ecc6afeaa657a88e480ba392ff1586ec3de5 data/exdeorum/recipes/sieve/moss_block/netherite/umbran_sapling.json +a2e30ef2775b54057a199e19e7995c771e7ee5ad data/exdeorum/recipes/sieve/moss_block/netherite/willow_sapling.json +4a28289fedba93b2d55e0e2fdd1a98df54b78f31 data/exdeorum/recipes/sieve/moss_block/netherite/yellow_autumn_sapling.json 959d21cfb914761dac53844cea56de55f6260a27 data/exdeorum/recipes/sieve/moss_block/string/acacia_sapling.json bbf31b2f84618308a60b93d2f298de682a0a69b4 data/exdeorum/recipes/sieve/moss_block/string/azalea.json 6232ad4b9611b1d7276ad22924f878b83df668c0 data/exdeorum/recipes/sieve/moss_block/string/big_dripleaf.json 3c17107151c6f0a2b65c505b26d46abfebe37c1c data/exdeorum/recipes/sieve/moss_block/string/birch_sapling.json 40bf75ee165f0e09e9b6859ed4ef2aed21f3b76d data/exdeorum/recipes/sieve/moss_block/string/cherry_sapling.json 26bd4abc5eb68be6d263d6fd7d4113e4ca44bf8c data/exdeorum/recipes/sieve/moss_block/string/dark_oak_sapling.json +7c41f0971a9fe890a0086c48f77d6b18ca75da6c data/exdeorum/recipes/sieve/moss_block/string/dead_sapling.json +fe61102ccfb39c8159186a3f263427fb0e48b528 data/exdeorum/recipes/sieve/moss_block/string/fir_sapling.json +874a7febae3c96d89b7dd80262f4c5907935e422 data/exdeorum/recipes/sieve/moss_block/string/flowering_oak_sapling.json d11877114c6d062021f178c55c05666c87cd31ab data/exdeorum/recipes/sieve/moss_block/string/glow_berries.json +772f38538d49ead6389f155d9d1d193c003d0d88 data/exdeorum/recipes/sieve/moss_block/string/hellbark_sapling.json +acb10a1fb1560fac09d39b01e7df0cb8f050d2ea data/exdeorum/recipes/sieve/moss_block/string/jacaranda_sapling.json ee240ebb80802c83d48985d9e431bc12410589a4 data/exdeorum/recipes/sieve/moss_block/string/jungle_sapling.json +3a344e268adb9f87a3b139c7a7a94a23e68f1441 data/exdeorum/recipes/sieve/moss_block/string/magic_sapling.json +51cb631f5dc044900706267d0fbf983ec50e1106 data/exdeorum/recipes/sieve/moss_block/string/mahogany_sapling.json 621c67156656594f50ee49456f4cc58dbd540752 data/exdeorum/recipes/sieve/moss_block/string/mangrove_propagule.json +1da80ab68a7565bdde6e72f508b3f671bb5b10c9 data/exdeorum/recipes/sieve/moss_block/string/maple_sapling.json 98bc0e4cd532316a91814bf618588c7cfa389a44 data/exdeorum/recipes/sieve/moss_block/string/oak_sapling.json +5cd857910f20a2097fb269457efc23cc68cb2642 data/exdeorum/recipes/sieve/moss_block/string/orange_autumn_sapling.json +b25938a0adaeb90b4d7efd1af267f0bb142688ee data/exdeorum/recipes/sieve/moss_block/string/origin_sapling.json +433ef6235746ced6d172c309920efe18d5761c65 data/exdeorum/recipes/sieve/moss_block/string/palm_sapling.json +975a569a757ea77ddd363549388397793315672f data/exdeorum/recipes/sieve/moss_block/string/rainbow_birch_sapling.json +c39411c2fb276936b0d5fa44d16336326135653a data/exdeorum/recipes/sieve/moss_block/string/redwood_sapling.json e5351932ff3700bf95f2ec770cd051f08debee9c data/exdeorum/recipes/sieve/moss_block/string/small_dripleaf.json +820b584992f51dd5a1c6dffd37db75043b2bd047 data/exdeorum/recipes/sieve/moss_block/string/snowblossom_sapling.json 64280db27eca51b0aa8fddc970756c1e3a25db08 data/exdeorum/recipes/sieve/moss_block/string/spore_blossom.json fec8737e1aba9773807c7cd582c685e4532f488d data/exdeorum/recipes/sieve/moss_block/string/spruce_sapling.json +a69c433ef11539f6c8987536b8d99c4a2071a861 data/exdeorum/recipes/sieve/moss_block/string/umbran_sapling.json +7d41fbb72bcec2b789d75854eaa424ff9e28a977 data/exdeorum/recipes/sieve/moss_block/string/willow_sapling.json +d616629d637ee3cd0cd2a56a2248108727bf9a8c data/exdeorum/recipes/sieve/moss_block/string/yellow_autumn_sapling.json 156f165c67999ede3087cb52cb701f0d265a4aed data/exdeorum/recipes/sieve/red_sand/diamond/cactus.json c96dd108668d448619c27dafa1770b8473de904f data/exdeorum/recipes/sieve/red_sand/diamond/dead_bush.json cb16aa3c76c75a47abdad3a42dfdb13676525851 data/exdeorum/recipes/sieve/red_sand/diamond/gold_nugget.json @@ -834,51 +936,36 @@ f31cb4bb77b550f1239f7853ebc95f9671c0a356 data/exdeorum/recipes/sieve/red_sand/ne b443cbaf342f0fa3a6a88d7205644792bcb47093 data/exdeorum/recipes/sieve/red_sand/string/gold_nugget.json e1c550f09fcddcc09da0f76458f2d2ef429bcc44 data/exdeorum/recipes/sieve/red_sand/string/raw_gold.json 5c3788fbc13f9a25dd7e42b27210f258ec337c02 data/exdeorum/recipes/sieve/red_sand/string/redstone.json +b3fe8245bd2a0d42156b082ea579dbea674c27c9 data/exdeorum/recipes/sieve/sand/diamond/certus_quartz_crystal.json +21db0710afca48c327978d1578627afe121f2082 data/exdeorum/recipes/sieve/sand/diamond/charged_certus_quartz_crystal.json c63500f17bbac4d47caac5a48f3cedfe750916a5 data/exdeorum/recipes/sieve/sand/diamond/flint.json 3b0c8920c2c19e3731e0258bd005b4d2cc2bd5ab data/exdeorum/recipes/sieve/sand/diamond/gold_nugget.json 286085cb6ec9ed4d3fb2e84fc19887019dbe2d02 data/exdeorum/recipes/sieve/sand/diamond/iron_nugget.json 4ab0e55bfc2afec50293584a41bdc32cb6b76e1b data/exdeorum/recipes/sieve/sand/diamond/prismarine_crystals.json 345abd60d7f9f1745d7a7c62578b09f044e48224 data/exdeorum/recipes/sieve/sand/diamond/prismarine_shard.json -8ed0a686cc7898c53fdff4097dd0a9d6de2fa2f6 data/exdeorum/recipes/sieve/sand/flint/angler_pottery_sherd.json -7845dcd4e0002af2cfb6cbac9fd8bed1dd965bba data/exdeorum/recipes/sieve/sand/flint/archer_pottery_sherd.json -b1ba6a626415a18c920923bb2dbbe2a32c49ead5 data/exdeorum/recipes/sieve/sand/flint/arms_up_pottery_sherd.json -cb3a8e2071395447592815eb317444595c8428a6 data/exdeorum/recipes/sieve/sand/flint/blade_pottery_sherd.json -669cb86ece635a765c5e5964c466b169ac9c2b29 data/exdeorum/recipes/sieve/sand/flint/brewer_pottery_sherd.json -48474c4015a50030de23e9dac2f37cd6b8fc5ca7 data/exdeorum/recipes/sieve/sand/flint/burn_pottery_sherd.json -04ca08fa8ca62638cd61c90d4d57f134a1e198bc data/exdeorum/recipes/sieve/sand/flint/danger_pottery_sherd.json +e77cb3e66c9ed93bbad992f4efaae11cf952320a data/exdeorum/recipes/sieve/sand/flint/certus_quartz_crystal.json +31d391ca8e490efd060917b13eb260515d59b9da data/exdeorum/recipes/sieve/sand/flint/charged_certus_quartz_crystal.json 6b7bdd40a14dc92b2748be10131149ac46298841 data/exdeorum/recipes/sieve/sand/flint/dead_bush.json -4520eb80400b1d486e4fe982469953cd79952e64 data/exdeorum/recipes/sieve/sand/flint/explorer_pottery_sherd.json 996325cd1ff3eeef737792ac961cb57efe1d451e data/exdeorum/recipes/sieve/sand/flint/flint.json -35178a22433570f173930e93965b0de82b63aca2 data/exdeorum/recipes/sieve/sand/flint/friend_pottery_sherd.json acc6cced9b2183dc5342dee5010b764c5acbc096 data/exdeorum/recipes/sieve/sand/flint/gold_nugget.json -1852e315711767fbd03ff35c233710b7a9751c0d data/exdeorum/recipes/sieve/sand/flint/heartbreak_pottery_sherd.json -5dcf05b51ed87454410f13a06d6b7cc4b889ca5a data/exdeorum/recipes/sieve/sand/flint/heart_pottery_sherd.json -16166a661f71c8d30e40786755fe3c2a5d80b948 data/exdeorum/recipes/sieve/sand/flint/howl_pottery_sherd.json d41066ba7db804c9bb313a543578dca50fe535eb data/exdeorum/recipes/sieve/sand/flint/iron_nugget.json -0776bbf07938a63b253c48f560c507b9fe7cc95b data/exdeorum/recipes/sieve/sand/flint/miner_pottery_sherd.json -ada754cd814c28d4b392371ec64ec3fa00489f7f data/exdeorum/recipes/sieve/sand/flint/mourner_pottery_sherd.json -3775c8082a66ef378a30f211b04886c3dc583280 data/exdeorum/recipes/sieve/sand/flint/plenty_pottery_sherd.json -57a8a6c8c2d8dfb292d9e37851c690cebb1d2b9c data/exdeorum/recipes/sieve/sand/flint/prize_pottery_sherd.json -a710f4d1a2427f26af9ddb2edd3599cb959c3b4a data/exdeorum/recipes/sieve/sand/flint/sheaf_pottery_sherd.json -1b9cab76c425c761d4a0d75c84179e5ef63e8d8f data/exdeorum/recipes/sieve/sand/flint/shelter_pottery_sherd.json -f7a622c178b6d06826dfaa2f7c6c6d90d7d7fdc3 data/exdeorum/recipes/sieve/sand/flint/skull_pottery_sherd.json -73ca11719ca5e2ae3103dade94c3ef277db1c120 data/exdeorum/recipes/sieve/sand/flint/snort_pottery_sherd.json +8590a37352ef46d16632a4d622ecd5ae8178b4a6 data/exdeorum/recipes/sieve/sand/flint/random_pottery_sherd.json a0a64c48c09faf9a8530b0d2b9ed56a1b19404a9 data/exdeorum/recipes/sieve/sand/golden/cactus.json -9a291837a57f636a171b9c77cdcf9d13607b3a2f data/exdeorum/recipes/sieve/sand/golden/coast_armor_trim_smithing_template.json +c5fbdf057b3d329dd206baf3b27438c46cd35bdd data/exdeorum/recipes/sieve/sand/golden/certus_quartz_crystal.json +413d6aad7914cb2987a7f83d0ba6f9f3af0e6498 data/exdeorum/recipes/sieve/sand/golden/charged_certus_quartz_crystal.json 51254a10ce57d6e1638a814bb7c33eae772b74ae data/exdeorum/recipes/sieve/sand/golden/dead_bush.json 5f96d9d25104db61ab32ef70ae34357e46f0cf60 data/exdeorum/recipes/sieve/sand/golden/flint.json 48befc50bcea773e6211345f3240b1da36ab7042 data/exdeorum/recipes/sieve/sand/golden/gold_nugget.json -54a69fd743c8f03848936c1b68dbca74e683dc11 data/exdeorum/recipes/sieve/sand/golden/host_armor_trim_smithing_template.json ac3a8a7662b49ba6302d1b84bfea5cf47f96d349 data/exdeorum/recipes/sieve/sand/golden/iron_nugget.json 16ef57b24307c1c0cd5562f0dac3de77f3c7adb9 data/exdeorum/recipes/sieve/sand/golden/kelp.json 325c2354628d0326186f7c72c954b40a83c1d387 data/exdeorum/recipes/sieve/sand/golden/prismarine_crystals.json 036f26f12153cb65c8bfb903069d78ca3d075ee8 data/exdeorum/recipes/sieve/sand/golden/prismarine_shard.json -a6054908db2a64a85698f7efa8b95702dc749767 data/exdeorum/recipes/sieve/sand/golden/raiser_armor_trim_smithing_template.json +eb87f35cfd1668f7bc9283ead71197fbf6f550ac data/exdeorum/recipes/sieve/sand/golden/random_armor_trim.json 481714481b49e0a4c1a0a879d14f7c1ae6745da7 data/exdeorum/recipes/sieve/sand/golden/raw_gold.json 16efbb8520e3f75f34545b764ecd56895fa8c4fb data/exdeorum/recipes/sieve/sand/golden/sea_pickle.json -6efb62c0b66ede564e726599e08667396c7032b5 data/exdeorum/recipes/sieve/sand/golden/shaper_armor_trim_smithing_template.json -d2f33dce4cd3c27b0885ca17a1850cc1147f216c data/exdeorum/recipes/sieve/sand/golden/wayfinder_armor_trim_smithing_template.json 3c460263a141f27130f6e6e9872d19fa5e292fcc data/exdeorum/recipes/sieve/sand/iron/cactus.json +0fa491d4733ff481dc8d3ca0cd5a6c8e595f0364 data/exdeorum/recipes/sieve/sand/iron/certus_quartz_crystal.json +846bf27e51dd05358b6dc64a6ab7e800aaa51918 data/exdeorum/recipes/sieve/sand/iron/charged_certus_quartz_crystal.json c25fb31d20e416667c025b8c1c6af6a8e187905c data/exdeorum/recipes/sieve/sand/iron/dead_bush.json 82bc05339f351e02fe7f059cc7ab1af5a401dd7d data/exdeorum/recipes/sieve/sand/iron/flint.json 5a723867a1edd63893496c6dd66a82cc52c2e358 data/exdeorum/recipes/sieve/sand/iron/gold_nugget.json @@ -888,6 +975,8 @@ c25fb31d20e416667c025b8c1c6af6a8e187905c data/exdeorum/recipes/sieve/sand/iron/d 753404266e7ae1e3a3df66783bfb33a1acee3c7c data/exdeorum/recipes/sieve/sand/iron/prismarine_shard.json 07cd450d5cc1eeabce3598b78aeefd0e8d24bb14 data/exdeorum/recipes/sieve/sand/iron/sea_pickle.json e56d672a7a5cd4d843527b3bd0bd541c6b3b1146 data/exdeorum/recipes/sieve/sand/netherite/cactus.json +5efe354325abebff676136aea2241982dc61437f data/exdeorum/recipes/sieve/sand/netherite/certus_quartz_crystal.json +d5c42a4e2bc6cd38a3a83a808a2e602d07f52cf0 data/exdeorum/recipes/sieve/sand/netherite/charged_certus_quartz_crystal.json 58cd51de0cc46927b2fa9623b0de5b01fd6e329e data/exdeorum/recipes/sieve/sand/netherite/flint.json 647af3f79d2eb1e97b0bba295818f688a985aab9 data/exdeorum/recipes/sieve/sand/netherite/gold_nugget.json 0417a820d418832027c463185288d8bca372f8bd data/exdeorum/recipes/sieve/sand/netherite/iron_nugget.json @@ -896,6 +985,8 @@ b8389d2c3c554581a944d4135e61794699d6a9ed data/exdeorum/recipes/sieve/sand/nether 5cb577188035abfc41191676b6ab0d64de5fcc73 data/exdeorum/recipes/sieve/sand/netherite/prismarine_shard.json 7bc4277d9571604ba28539faf902acd14818247f data/exdeorum/recipes/sieve/sand/netherite/sea_pickle.json 6b29b44e6fa1da0c13c9693313fb76b8bfbfe53f data/exdeorum/recipes/sieve/sand/string/cactus.json +133520cdd47fa563e55d3e456d601fa8980c3665 data/exdeorum/recipes/sieve/sand/string/certus_quartz_crystal.json +464377550425079d0ae5b0cdd45353c58be3426a data/exdeorum/recipes/sieve/sand/string/charged_certus_quartz_crystal.json 2faba7a0d7593a82262560291ebbcfb70d643e62 data/exdeorum/recipes/sieve/sand/string/dead_bush.json ddf66ea0e3b7fc2d686904888505eb1d45c25fd8 data/exdeorum/recipes/sieve/sand/string/flint.json 60f3193df86359ef09eda538f959dd5b829a5f16 data/exdeorum/recipes/sieve/sand/string/gold_nugget.json diff --git a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd index 35c372da..0ed0d49e 100644 --- a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd +++ b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd @@ -1,4 +1,4 @@ -// 1.20.1 2023-08-23T14:30:35.0821114 ModKit Item Models for mod 'exdeorum' +// 1.20.1 2023-09-23T11:56:49.5786879 ModKit Item Models for mod 'exdeorum' 4ba3bb2c6174ac3728a4b85e34681f118ec8eb34 assets/exdeorum/models/item/acacia_barrel.json c03ce41f7c071498fcbd5f5225e91dcb2f365fbb assets/exdeorum/models/item/acacia_crucible.json 3b4f1d45c0d9c4cd1d9a5cdf6ddc8d2c9791bca5 assets/exdeorum/models/item/acacia_sieve.json @@ -32,6 +32,9 @@ a81914d35e6d1027d348e54608245ff90cee2793 assets/exdeorum/models/item/crushed_net fd9b0ecdfacc39df90a9f80e1ed813cf07f7294b assets/exdeorum/models/item/dark_oak_barrel.json 927f88a29eeb6eed779ddbe38ba6d21b1c38939e assets/exdeorum/models/item/dark_oak_crucible.json 8ce9c480e9daa9a7644fea4bcacd51d77fa237df assets/exdeorum/models/item/dark_oak_sieve.json +7dcb8c047e4cd025e869a594c667c2bfd630a1ba assets/exdeorum/models/item/dead_barrel.json +ba892eac1ddb4bb255c05015d926c794bf4f475e assets/exdeorum/models/item/dead_crucible.json +b4104cc571bb62de4ec205f1ef1750a1b0217a0f assets/exdeorum/models/item/dead_sieve.json 942f39509950ee77df5b5e5ba87afaacec06194e assets/exdeorum/models/item/deepslate_pebble.json 6b9e499551ee33d1e5a9dd3e82c7258c5b25d219 assets/exdeorum/models/item/diamond_hammer.json db9d0dbe1ad45be2a238c6e5f6f9d102b436340c assets/exdeorum/models/item/diamond_mesh.json @@ -39,6 +42,9 @@ db9d0dbe1ad45be2a238c6e5f6f9d102b436340c assets/exdeorum/models/item/diamond_mes ab6a64efa0d9ddcce071a5a1996e46877ebbfff2 assets/exdeorum/models/item/diorite_pebble.json 8edca3e9c453345a5c6c5752096926d943b73ff3 assets/exdeorum/models/item/dust.json 2ba0fb3dcca0337d100198f00996eed6b4f0efa5 assets/exdeorum/models/item/end_cake.json +ddcd1d34048c1aa0462fd7481d664acaf94b6b0e assets/exdeorum/models/item/fir_barrel.json +dc27dff26c3f0853fbbbd763dcda36f43a333361 assets/exdeorum/models/item/fir_crucible.json +073c2854a0fa5840c52c6769f9483e7af17b4022 assets/exdeorum/models/item/fir_sieve.json d445d763388c9fb9ae4f8e8e8c200d92b3db7628 assets/exdeorum/models/item/flint_mesh.json ff1e2e653bf0dcba9d25bdf6b44cc6118b2f0cc8 assets/exdeorum/models/item/golden_hammer.json f2138f982e5ee62ca1ed52c3a64a7813fd91ead9 assets/exdeorum/models/item/golden_mesh.json @@ -46,15 +52,27 @@ f2138f982e5ee62ca1ed52c3a64a7813fd91ead9 assets/exdeorum/models/item/golden_mesh ee9de2285230b32b42585283793b265c4bb14773 assets/exdeorum/models/item/gold_ore_chunk.json 5c80508cc8b27f55f91efc58efb7955e70dd2592 assets/exdeorum/models/item/granite_pebble.json f558ddd632278ad3ab548ce85cdc4661a2d70684 assets/exdeorum/models/item/grass_seeds.json +b0d0d1ec41f465872243ea5b59a22caeadc1b81a assets/exdeorum/models/item/hellbark_barrel.json +4de47af7d2a66a6e18ce93c9e3a1582b33073a6b assets/exdeorum/models/item/hellbark_crucible.json +c3a5bdc2c3e8b12b41e9c3aae44839a331a5d238 assets/exdeorum/models/item/hellbark_sieve.json abd9901aa00893690461a6c6e276bb6bc96a60bb assets/exdeorum/models/item/iridium_ore_chunk.json b91a19335ff248805cf0861cae82b93d71a9e805 assets/exdeorum/models/item/iron_hammer.json 3398985db718bd990d9f7cfdf4bacf67a858b906 assets/exdeorum/models/item/iron_mesh.json 5016a7f832edb2ccfa9de7c85aa9ecf7ce45cb69 assets/exdeorum/models/item/iron_ore_chunk.json a4a83946b9cb63dfa2a6fa22dcc3c3a4773bf79f assets/exdeorum/models/item/iron_watering_can.json +7ea984b53340e7757ff90d945cc3a7830305b4c8 assets/exdeorum/models/item/jacaranda_barrel.json +a7fd711025bd0813e185851ecf0ad79df2c1b60e assets/exdeorum/models/item/jacaranda_crucible.json +bd75e7a2a4fb4b9302d300ba0deb21a376821fc6 assets/exdeorum/models/item/jacaranda_sieve.json e4719451e58406787ac0d5fb40416b76b2a03002 assets/exdeorum/models/item/jungle_barrel.json 746006f07a42bc786ccab5c6f5849f175e117183 assets/exdeorum/models/item/jungle_crucible.json eebf19c29a53f46c26a33bb9e2052190c88ecc50 assets/exdeorum/models/item/jungle_sieve.json 5b40d64710f86ff702001cf658e4928f8195f2fa assets/exdeorum/models/item/lead_ore_chunk.json +3331c8b6920e1ca297578e6b50ea657c7b4a1ae8 assets/exdeorum/models/item/magic_barrel.json +d731d1ae590d603ebcd2b619fa0d60b7426beb70 assets/exdeorum/models/item/magic_crucible.json +a47f968f3ad7d417b636e0d66fc19a9b0411ec41 assets/exdeorum/models/item/magic_sieve.json +fd7c31ca35797385e7097fbd955116331f03cd61 assets/exdeorum/models/item/mahogany_barrel.json +ff89dc05408074da0e9d41bfef91dfe975302403 assets/exdeorum/models/item/mahogany_crucible.json +8d2317ac94f204d63024d465b3ef7d952d7232be assets/exdeorum/models/item/mahogany_sieve.json 40db3277bce3f5291d16740d6dd0d96661e04197 assets/exdeorum/models/item/mangrove_barrel.json 9d8b0cd120a6965dcba6cc3753d76b7171bbddbc assets/exdeorum/models/item/mangrove_crucible.json 319ea63595a7f9ceff1818414c8250f777f087f4 assets/exdeorum/models/item/mangrove_sieve.json @@ -67,6 +85,9 @@ c8b55bd8b222b2914d0b21d847788abce42c1d06 assets/exdeorum/models/item/oak_barrel. dd1d9002a22eb6f5a187d53e041cd498f4ef998b assets/exdeorum/models/item/oak_crucible.json 4de21205436d30940d690f457a3614c9235f5e88 assets/exdeorum/models/item/oak_sieve.json 08409f22e4cf59c658f80029e1c3c00b015a86ac assets/exdeorum/models/item/osmium_ore_chunk.json +b2aa282668919cfcaf3a987d90ae7d872d5cd348 assets/exdeorum/models/item/palm_barrel.json +7d252a577065678c74bf0fd4bf932f9974832152 assets/exdeorum/models/item/palm_crucible.json +3b5a8414bdb4d5510153d0b46befdd1ff76310e8 assets/exdeorum/models/item/palm_sieve.json 2c7baa04ad1b1310e219359fc8a7d2453e05548e assets/exdeorum/models/item/platinum_ore_chunk.json 0e330ed6d5ef4af907bb537a42282a41b1e7698a assets/exdeorum/models/item/porcelain_bucket.json f843e3bbc432c370ea62f421580b5447807e8b8b assets/exdeorum/models/item/porcelain_clay_ball.json @@ -75,6 +96,11 @@ acb7c543d965cfc01ba4cb7b2dc0577ebd1e0eba assets/exdeorum/models/item/porcelain_c 653c865c2af937bf1d4db587ef5190c5f4781a6f assets/exdeorum/models/item/porcelain_milk_bucket.json 83c0f1e491cb6d502b43de4411f7288ea5534a81 assets/exdeorum/models/item/porcelain_water_bucket.json 8012448a03d9a5a439daa36ae8f76f9fe13c3629 assets/exdeorum/models/item/porcelain_witch_water_bucket.json +dd7fb4ac7abfdde6e563eba6d4f1531836ff2432 assets/exdeorum/models/item/random_armor_trim.json +52ebfa48c9f80357ab39cf66ef19d819f3cbcfd2 assets/exdeorum/models/item/random_pottery_sherd.json +a51ffb5d633cc0ced05c55cc9635acfd1a2113a1 assets/exdeorum/models/item/redwood_barrel.json +02b795c250fe11107f0d53449b1aeb94b0e38ebd assets/exdeorum/models/item/redwood_crucible.json +db1a7251bc49b8433b1e8183ce146a8c1d147165 assets/exdeorum/models/item/redwood_sieve.json 3818c896e463945cc5081644bc1ed52edbde6ebb assets/exdeorum/models/item/sculk_core.json 52d8514e585524122e32cae1c18a838da5eb6f09 assets/exdeorum/models/item/silk_worm.json f7ca92f0d009a188c037bf129356b6f493564853 assets/exdeorum/models/item/silver_ore_chunk.json @@ -88,6 +114,9 @@ b71e04a912b620bfebfd309bf5d61cee8fba35b9 assets/exdeorum/models/item/stone_hamme d9561f75ac700cf33abf8e1f7684d1c5fec85a89 assets/exdeorum/models/item/string_mesh.json d2f8f4dad969d875e4e455dc1cdc58e80c84e45e assets/exdeorum/models/item/tin_ore_chunk.json b7b483e30fc97f7f307f5b09249bbdd03e980caa assets/exdeorum/models/item/tuff_pebble.json +33652049b52514a022a3d4e682e37c118e04bc31 assets/exdeorum/models/item/umbran_barrel.json +e06fa3b4f845806e35507f3854086aeb8bb20917 assets/exdeorum/models/item/umbran_crucible.json +4f23ffcb72a5f25c3f71942f6b5498c6e960960a assets/exdeorum/models/item/umbran_sieve.json b56c539af5e9e562830143e9c32f10b33a26eb5a assets/exdeorum/models/item/unfired_porcelain_bucket.json a83a24ae2611430c290b4f866c73769aacdb9c92 assets/exdeorum/models/item/unfired_porcelain_crucible.json be960745ad88b8bf2277dc3ba8308ec3707edbe1 assets/exdeorum/models/item/uranium_ore_chunk.json @@ -95,6 +124,9 @@ bb3b00cc253bc23b65d775bcb9134f38b049e3ce assets/exdeorum/models/item/warped_barr 1c4832816b0a69ff0e422bd21e20dd05e3c40090 assets/exdeorum/models/item/warped_crucible.json 8b76cf494636338cceec59d252dd4145f046cc58 assets/exdeorum/models/item/warped_nylium_spores.json 1f8bdb9ece2b010aa4c5cf710f2ea75b81565103 assets/exdeorum/models/item/warped_sieve.json +31acbd7eee0074e70c60518b8cd8eeca92bcaf70 assets/exdeorum/models/item/willow_barrel.json +e2ad31377f42d42f3ad708ac50576e8bc99e2257 assets/exdeorum/models/item/willow_crucible.json +e4df47baeb322b38fe7b58ef1b9ea675424be7c3 assets/exdeorum/models/item/willow_sieve.json c72e7359dd4934c756c49350682ac667fffe009b assets/exdeorum/models/item/witch_water_bucket.json 7089629f8033bd4e52780fe88437aa684f4ee0a9 assets/exdeorum/models/item/wooden_hammer.json d6c652c6828ed14e33c4e948afc1c9a29f977853 assets/exdeorum/models/item/wooden_watering_can.json diff --git a/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 b/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 index f91039b6..face1c71 100644 --- a/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 +++ b/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 @@ -1,4 +1,4 @@ -// 1.20.1 2023-08-08T11:59:32.0397483 ModKit Block Models for mod 'exdeorum' +// 1.20.1 2023-09-18T11:17:35.1916779 ModKit Block Models for mod 'exdeorum' c73197f2dc770a353883c387b2b1f0b082283576 assets/exdeorum/blockstates/acacia_barrel.json a3ef4562a4c7833439d8d66ff9c210406d317995 assets/exdeorum/blockstates/acacia_crucible.json b3383c530978c5f67d897ba16fda9a2a359482cd assets/exdeorum/blockstates/acacia_sieve.json @@ -21,25 +21,55 @@ ed5687c99bd36a19685bbf84251f70c6b8a864df assets/exdeorum/blockstates/crimson_cru 2da1a307b707e9c60df5a3edcd05a0dde1e9b2ad assets/exdeorum/blockstates/dark_oak_barrel.json 23deb16d368141b5bf7719ec37d192877f2b17a2 assets/exdeorum/blockstates/dark_oak_crucible.json 4f3fb658e92bd49bbc1e490c4f43d192a8e1d820 assets/exdeorum/blockstates/dark_oak_sieve.json +ce1cd0da179c016d89de0ad9d7dfa5df4c9b1f31 assets/exdeorum/blockstates/dead_barrel.json +ac1dd0acdb4f05237afa46729bc4092b3d6e3db7 assets/exdeorum/blockstates/dead_crucible.json +796b6e3fa339b6e14b8093309001d71e00391650 assets/exdeorum/blockstates/dead_sieve.json 2b3a23c53e758b09237bc1c9fab54ebc4fc9cd0f assets/exdeorum/blockstates/dust.json +d63832f824cac69fa8187df7edc31731a1af8feb assets/exdeorum/blockstates/fir_barrel.json +93ee45895d7606fdd2827302f8b6d880ccfab725 assets/exdeorum/blockstates/fir_crucible.json +b27c1b2144d433b6ffd6d3ed4829dd39b1205c34 assets/exdeorum/blockstates/fir_sieve.json +be6c0b5ac28f356b5864f9e39c0646b68ca6ffd7 assets/exdeorum/blockstates/hellbark_barrel.json +9f7bf54fc13cb566d3d1395791638826fb6003b6 assets/exdeorum/blockstates/hellbark_crucible.json +d3370f4244423e3cb9bee27131aefdc52b6c1299 assets/exdeorum/blockstates/hellbark_sieve.json +e6c43ff0288d41a3f0982300184a6776e0c231f5 assets/exdeorum/blockstates/jacaranda_barrel.json +f697e130f40e5d04fa55a3f31b2acb39c40e9f11 assets/exdeorum/blockstates/jacaranda_crucible.json +f23a84b813f91a2e06513869e80ce9e3dc36865d assets/exdeorum/blockstates/jacaranda_sieve.json d7c007d5985f8b3f58bbc272f61c925f63b895c2 assets/exdeorum/blockstates/jungle_barrel.json 1bb680b56e473a9579d3b4ab580a463aa7320bce assets/exdeorum/blockstates/jungle_crucible.json b110cceb998d70afeb7a3e86f7221823baca13f1 assets/exdeorum/blockstates/jungle_sieve.json +96ae0b56b359ccb043e30a39c5a76c93cc35e1dd assets/exdeorum/blockstates/magic_barrel.json +b2e3e3d75547a2a7dfc6c1424d2258256a05abf2 assets/exdeorum/blockstates/magic_crucible.json +f1203d261298616fdebfd668d5a65eb38c4eec0a assets/exdeorum/blockstates/magic_sieve.json +c2e0ce3cba5e48e19352189079c4f7c070f73757 assets/exdeorum/blockstates/mahogany_barrel.json +9558e97aeb93fa5d1695e61f560d7de7b6517558 assets/exdeorum/blockstates/mahogany_crucible.json +e98b18c8e612f4f7b28ad27118fe561b479d7b31 assets/exdeorum/blockstates/mahogany_sieve.json a36247640a8c8d753629c0932db2a6f1fe902242 assets/exdeorum/blockstates/mangrove_barrel.json acfaab8a50091b22983e613fad447a1ba58cb563 assets/exdeorum/blockstates/mangrove_crucible.json bae1185e471e1fd7593558d45f325890d3ac22af assets/exdeorum/blockstates/mangrove_sieve.json 796c87e3943774050d577bdad4fb43f01d430a21 assets/exdeorum/blockstates/oak_barrel.json 426eb8511dae435c2bcf78343cf7552c7bddcb38 assets/exdeorum/blockstates/oak_crucible.json 119a076801031739f1b4323050260c0f2af7cb94 assets/exdeorum/blockstates/oak_sieve.json +ea8ce1e2d897636e796c53271928e47a4e568746 assets/exdeorum/blockstates/palm_barrel.json +e6cc311733a888fcbb7f1b54d295375b9a01b1df assets/exdeorum/blockstates/palm_crucible.json +fe9e903ab70c7c7cc177bcc72e3c797113289c90 assets/exdeorum/blockstates/palm_sieve.json 952a5b1185dab4dfd023df32312f0719b22a9855 assets/exdeorum/blockstates/porcelain_crucible.json +e45eb114f51881dc5f031763d6f48739b6a2c2c9 assets/exdeorum/blockstates/redwood_barrel.json +1ce3a30ff94133de2a4e8456d952c625ac310a9d assets/exdeorum/blockstates/redwood_crucible.json +1d1b612ab74c57672b85120f0d4acf3684c62295 assets/exdeorum/blockstates/redwood_sieve.json 05fed7f7136bdb949fc12b3a3f6c89c55778a177 assets/exdeorum/blockstates/spruce_barrel.json 44010d261124a2cda9ca8ed887aba9f766b3e71f assets/exdeorum/blockstates/spruce_crucible.json 4782482871677bfe372816bc8f17dbdfc9eb21f9 assets/exdeorum/blockstates/spruce_sieve.json fc4d16f61cb43aeff11df5a91ca40b5225cd4617 assets/exdeorum/blockstates/stone_barrel.json +5e65863299c88a5545a9b0cf689459c3f3fcbfb9 assets/exdeorum/blockstates/umbran_barrel.json +a231d5ebaf7f4bdc793afab3809221a71ae31e85 assets/exdeorum/blockstates/umbran_crucible.json +59a287bd341067b111ac300b58f7a5e184cfa66e assets/exdeorum/blockstates/umbran_sieve.json 195aa2f301ea71f0fbd65e7922d7f58b94bc019c assets/exdeorum/blockstates/unfired_porcelain_crucible.json 400b9a28200d52814574db828e4124ca976dfd4b assets/exdeorum/blockstates/warped_barrel.json 11027cbd3ed36bf76336dcfc4693790c844f9f67 assets/exdeorum/blockstates/warped_crucible.json a37d9738f75a9b432f59be365a0a5368b23e76aa assets/exdeorum/blockstates/warped_sieve.json +cd8d559c0e23f7f7053bb09f56d8f2034ed1f340 assets/exdeorum/blockstates/willow_barrel.json +fef1ff79302f56ecedee3103fa4f98385ed07606 assets/exdeorum/blockstates/willow_crucible.json +12f36eabf07aa74c5e0dfce27de576e2b3875eaf assets/exdeorum/blockstates/willow_sieve.json 860887c119547b23864f38dda264714330b45dfb assets/exdeorum/models/block/acacia_barrel.json b3c99174f2a76a79897a81f57ec8f0ce1cb42394 assets/exdeorum/models/block/acacia_crucible.json fa39007ebe3e9a5655dc00612e5841c784deb144 assets/exdeorum/models/block/acacia_sieve.json @@ -62,22 +92,52 @@ a2af67f20500b713eca8f7fe16172aa63a2247ef assets/exdeorum/models/block/crushed_de de9aa8b53fa49340ee517f1ba0d3fbdc438803b8 assets/exdeorum/models/block/dark_oak_barrel.json ff1a89eceac7e45fd607e185d7866257d98484ae assets/exdeorum/models/block/dark_oak_crucible.json ac71aabed761bad18215a7cdb9cb48467f27124d assets/exdeorum/models/block/dark_oak_sieve.json +a63ba3d05ccd7595d077c94a4c0b89ff5ae7661d assets/exdeorum/models/block/dead_barrel.json +cb84b3ac106da115c219eb8e395c270a8826c87c assets/exdeorum/models/block/dead_crucible.json +41224086b5a62452cfacbfd4027a903223e183c7 assets/exdeorum/models/block/dead_sieve.json d830e08e0746bdce09416afad8895c0fb2bf13e7 assets/exdeorum/models/block/dust.json +d27c5aea8db6502814fcd72eb49087d22a678e26 assets/exdeorum/models/block/fir_barrel.json +762efa7629a747986c1dcf9c42c549944604a8c1 assets/exdeorum/models/block/fir_crucible.json +85781b7b05ac544c7e8d4050ec631ad69e3eaec0 assets/exdeorum/models/block/fir_sieve.json +226167292ab0e0e7afc1818b620e08392746f781 assets/exdeorum/models/block/hellbark_barrel.json +dba8058f7ae253910dce77995cd4b88087c126ce assets/exdeorum/models/block/hellbark_crucible.json +cb12e4e64037076c64e64d4f1ca24fcd367b236f assets/exdeorum/models/block/hellbark_sieve.json +8321c610d96765a4d43433c1b97a9d3613ab6268 assets/exdeorum/models/block/jacaranda_barrel.json +c274dadcabc0db219303e71798f0825e75be679f assets/exdeorum/models/block/jacaranda_crucible.json +d765115bebd6325784d0f6af834384b02e31e457 assets/exdeorum/models/block/jacaranda_sieve.json 9866ea51238290ad4047a8f465cca265a031ba2e assets/exdeorum/models/block/jungle_barrel.json 859ecb3e78e7397ccb6215da9847a13bc18be585 assets/exdeorum/models/block/jungle_crucible.json b2f1598de1a629c7188abff444e55656a52c980a assets/exdeorum/models/block/jungle_sieve.json +ab1ac99442f476a3c25192c596d2c981a7e40599 assets/exdeorum/models/block/magic_barrel.json +5268cff33d51bbcf94d1a77a2c55daba67401f91 assets/exdeorum/models/block/magic_crucible.json +0e1c298f02ba19e4af29af000e5f31f9e6e58930 assets/exdeorum/models/block/magic_sieve.json +c4790768dff2c8a9d13565cea2947f9e44fefbaf assets/exdeorum/models/block/mahogany_barrel.json +cf5aab5da193275d6ffc00b4106a772855c8e1b8 assets/exdeorum/models/block/mahogany_crucible.json +ab60983ae0982770c32b5fabb6658fb3d71ad1e5 assets/exdeorum/models/block/mahogany_sieve.json a17a9e140df3b806392140fdef1143baf5c48be1 assets/exdeorum/models/block/mangrove_barrel.json bce011e499cf4b2228eacfe9b36b9c208be87fcf assets/exdeorum/models/block/mangrove_crucible.json 21d00d555f5c784b862e55ef4553aafd69397c09 assets/exdeorum/models/block/mangrove_sieve.json ab7dc4690a875587d3db6f7434c17bcf1f791ce5 assets/exdeorum/models/block/oak_barrel.json c38c960b89de5cf12880ade53b2e5d93353999a3 assets/exdeorum/models/block/oak_crucible.json e99bd2a977838d228af9431c39adbf9209b21484 assets/exdeorum/models/block/oak_sieve.json +cf4d2e0edae49e117f740ce0ddfe91ac2914aae7 assets/exdeorum/models/block/palm_barrel.json +14c6411a10b0ec4491a4b9009d1892d5331ad4c3 assets/exdeorum/models/block/palm_crucible.json +9bf10698687dd3b602360e749232a8e02f0a8826 assets/exdeorum/models/block/palm_sieve.json c61e5a082d800671fe55031495511fa716f99183 assets/exdeorum/models/block/porcelain_crucible.json +37106dba7aef1020447ae1a218b780a2b34c4080 assets/exdeorum/models/block/redwood_barrel.json +1c1878a06cd94031964115e9fa238c4ef7fbebac assets/exdeorum/models/block/redwood_crucible.json +26f9658ac8bdab2e2acd776a01f5577d6f716438 assets/exdeorum/models/block/redwood_sieve.json 962b3fda993c93727e3196181f346c8824723c26 assets/exdeorum/models/block/spruce_barrel.json 37c045fb5d4dab5cc648986bbbd3532e0a47500c assets/exdeorum/models/block/spruce_crucible.json b089184195ded615924623228fd356d87784d080 assets/exdeorum/models/block/spruce_sieve.json a1bfa20c0c4314fdfd75b2f04533fef81a949bcd assets/exdeorum/models/block/stone_barrel.json +50cee371b0c38beff561b772df5fb6b5e824c6a6 assets/exdeorum/models/block/umbran_barrel.json +a9141f4555651c7055f573ee06e72067c91cb47a assets/exdeorum/models/block/umbran_crucible.json +8ede041f12c907b1f83183e2061edd71c1bd1d70 assets/exdeorum/models/block/umbran_sieve.json 79ac0044d90aaf89aa1141b7eacbf1c592c9167d assets/exdeorum/models/block/unfired_porcelain_crucible.json 8d724bdf66e9383106b7e78f45b9dec332d821b8 assets/exdeorum/models/block/warped_barrel.json 9f5e229dada9bfcbcccb6da4379ad63dfd6dc94c assets/exdeorum/models/block/warped_crucible.json 4a771578288c4ac4522f2f3d3373fc290cf4ca64 assets/exdeorum/models/block/warped_sieve.json +d43fe6024c6c32de7ee08869ad2ce20ff3c48b9f assets/exdeorum/models/block/willow_barrel.json +a4aa5ef22a02cd9786596f7c2edf83200b6847e0 assets/exdeorum/models/block/willow_crucible.json +774301272f25059b15249e67081bac62ff6c3722 assets/exdeorum/models/block/willow_sieve.json diff --git a/src/generated/resources/assets/exdeorum/blockstates/dead_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/dead_barrel.json new file mode 100644 index 00000000..0bf7dc9d --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/dead_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/dead_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/dead_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/dead_crucible.json new file mode 100644 index 00000000..f91c32a2 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/dead_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/dead_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/dead_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/dead_sieve.json new file mode 100644 index 00000000..8ba59c00 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/dead_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/dead_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/fir_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/fir_barrel.json new file mode 100644 index 00000000..37492a47 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/fir_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/fir_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/fir_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/fir_crucible.json new file mode 100644 index 00000000..4962d928 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/fir_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/fir_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/fir_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/fir_sieve.json new file mode 100644 index 00000000..2e43c7dd --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/fir_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/fir_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/hellbark_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/hellbark_barrel.json new file mode 100644 index 00000000..b55b4eee --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/hellbark_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/hellbark_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/hellbark_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/hellbark_crucible.json new file mode 100644 index 00000000..a3f981d0 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/hellbark_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/hellbark_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/hellbark_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/hellbark_sieve.json new file mode 100644 index 00000000..17f689a3 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/hellbark_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/hellbark_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/jacaranda_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/jacaranda_barrel.json new file mode 100644 index 00000000..0d7742a0 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/jacaranda_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/jacaranda_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/jacaranda_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/jacaranda_crucible.json new file mode 100644 index 00000000..3384830f --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/jacaranda_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/jacaranda_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/jacaranda_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/jacaranda_sieve.json new file mode 100644 index 00000000..b367f265 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/jacaranda_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/jacaranda_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/magic_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/magic_barrel.json new file mode 100644 index 00000000..a1dd05d0 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/magic_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/magic_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/magic_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/magic_crucible.json new file mode 100644 index 00000000..26a8226a --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/magic_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/magic_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/magic_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/magic_sieve.json new file mode 100644 index 00000000..0ae6b693 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/magic_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/magic_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/mahogany_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/mahogany_barrel.json new file mode 100644 index 00000000..39e27725 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/mahogany_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/mahogany_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/mahogany_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/mahogany_crucible.json new file mode 100644 index 00000000..a2befc15 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/mahogany_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/mahogany_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/mahogany_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/mahogany_sieve.json new file mode 100644 index 00000000..c1940887 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/mahogany_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/mahogany_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/palm_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/palm_barrel.json new file mode 100644 index 00000000..d4ae1332 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/palm_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/palm_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/palm_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/palm_crucible.json new file mode 100644 index 00000000..a15260b3 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/palm_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/palm_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/palm_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/palm_sieve.json new file mode 100644 index 00000000..f0e15b55 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/palm_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/palm_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/redwood_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/redwood_barrel.json new file mode 100644 index 00000000..3565e423 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/redwood_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/redwood_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/redwood_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/redwood_crucible.json new file mode 100644 index 00000000..8ae7ace2 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/redwood_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/redwood_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/redwood_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/redwood_sieve.json new file mode 100644 index 00000000..ed48855f --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/redwood_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/redwood_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/umbran_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/umbran_barrel.json new file mode 100644 index 00000000..ee1192d9 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/umbran_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/umbran_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/umbran_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/umbran_crucible.json new file mode 100644 index 00000000..db95b9c5 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/umbran_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/umbran_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/umbran_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/umbran_sieve.json new file mode 100644 index 00000000..06a21d2a --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/umbran_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/umbran_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/willow_barrel.json b/src/generated/resources/assets/exdeorum/blockstates/willow_barrel.json new file mode 100644 index 00000000..3dd7bb65 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/willow_barrel.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/willow_barrel" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/willow_crucible.json b/src/generated/resources/assets/exdeorum/blockstates/willow_crucible.json new file mode 100644 index 00000000..3b7b68f6 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/willow_crucible.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/willow_crucible" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/willow_sieve.json b/src/generated/resources/assets/exdeorum/blockstates/willow_sieve.json new file mode 100644 index 00000000..7094a8e5 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/willow_sieve.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/willow_sieve" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/lang/en_us.json b/src/generated/resources/assets/exdeorum/lang/en_us.json index b8f3f68c..5702aa5e 100644 --- a/src/generated/resources/assets/exdeorum/lang/en_us.json +++ b/src/generated/resources/assets/exdeorum/lang/en_us.json @@ -31,27 +31,57 @@ "block.exdeorum.dark_oak_barrel": "Dark Oak Barrel", "block.exdeorum.dark_oak_crucible": "Dark Oak Crucible", "block.exdeorum.dark_oak_sieve": "Dark Oak Sieve", + "block.exdeorum.dead_barrel": "Dead Barrel", + "block.exdeorum.dead_crucible": "Dead Crucible", + "block.exdeorum.dead_sieve": "Dead Sieve", "block.exdeorum.dust": "Dust", "block.exdeorum.end_cake": "End Cake", + "block.exdeorum.fir_barrel": "Fir Barrel", + "block.exdeorum.fir_crucible": "Fir Crucible", + "block.exdeorum.fir_sieve": "Fir Sieve", + "block.exdeorum.hellbark_barrel": "Hellbark Barrel", + "block.exdeorum.hellbark_crucible": "Hellbark Crucible", + "block.exdeorum.hellbark_sieve": "Hellbark Sieve", "block.exdeorum.infested_leaves": "Infested Leaves", + "block.exdeorum.jacaranda_barrel": "Jacaranda Barrel", + "block.exdeorum.jacaranda_crucible": "Jacaranda Crucible", + "block.exdeorum.jacaranda_sieve": "Jacaranda Sieve", "block.exdeorum.jungle_barrel": "Jungle Barrel", "block.exdeorum.jungle_crucible": "Jungle Crucible", "block.exdeorum.jungle_sieve": "Jungle Sieve", + "block.exdeorum.magic_barrel": "Magic Barrel", + "block.exdeorum.magic_crucible": "Magic Crucible", + "block.exdeorum.magic_sieve": "Magic Sieve", + "block.exdeorum.mahogany_barrel": "Mahogany Barrel", + "block.exdeorum.mahogany_crucible": "Mahogany Crucible", + "block.exdeorum.mahogany_sieve": "Mahogany Sieve", "block.exdeorum.mangrove_barrel": "Mangrove Barrel", "block.exdeorum.mangrove_crucible": "Mangrove Crucible", "block.exdeorum.mangrove_sieve": "Mangrove Sieve", "block.exdeorum.oak_barrel": "Oak Barrel", "block.exdeorum.oak_crucible": "Oak Crucible", "block.exdeorum.oak_sieve": "Oak Sieve", + "block.exdeorum.palm_barrel": "Palm Barrel", + "block.exdeorum.palm_crucible": "Palm Crucible", + "block.exdeorum.palm_sieve": "Palm Sieve", "block.exdeorum.porcelain_crucible": "Porcelain Crucible", + "block.exdeorum.redwood_barrel": "Redwood Barrel", + "block.exdeorum.redwood_crucible": "Redwood Crucible", + "block.exdeorum.redwood_sieve": "Redwood Sieve", "block.exdeorum.spruce_barrel": "Spruce Barrel", "block.exdeorum.spruce_crucible": "Spruce Crucible", "block.exdeorum.spruce_sieve": "Spruce Sieve", "block.exdeorum.stone_barrel": "Stone Barrel", + "block.exdeorum.umbran_barrel": "Umbran Barrel", + "block.exdeorum.umbran_crucible": "Umbran Crucible", + "block.exdeorum.umbran_sieve": "Umbran Sieve", "block.exdeorum.unfired_porcelain_crucible": "Unfired Porcelain Crucible", "block.exdeorum.warped_barrel": "Warped Barrel", "block.exdeorum.warped_crucible": "Warped Crucible", "block.exdeorum.warped_sieve": "Warped Sieve", + "block.exdeorum.willow_barrel": "Willow Barrel", + "block.exdeorum.willow_crucible": "Willow Crucible", + "block.exdeorum.willow_sieve": "Willow Sieve", "block.exdeorum.witch_water": "Witch Water", "fluid_type.exdeorum.witch_water": "Witch Water", "generator.exdeorum.void_world": "Void World", @@ -117,6 +147,8 @@ "item.exdeorum.porcelain_milk_bucket": "Porcelain Milk Bucket", "item.exdeorum.porcelain_water_bucket": "Porcelain Water Bucket", "item.exdeorum.porcelain_witch_water_bucket": "Porcelain Witch Water Bucket", + "item.exdeorum.random_armor_trim": "Random Armor Trim", + "item.exdeorum.random_pottery_sherd": "Random Pottery Sherd", "item.exdeorum.sculk_core": "Sculk Core", "item.exdeorum.silk_worm": "Silk Worm", "item.exdeorum.silver_ore_chunk": "Silver Ore Chunk", diff --git a/src/generated/resources/assets/exdeorum/models/block/dead_barrel.json b/src/generated/resources/assets/exdeorum/models/block/dead_barrel.json new file mode 100644 index 00000000..2e769862 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/dead_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "biomesoplenty:block/dead_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/dead_crucible.json b/src/generated/resources/assets/exdeorum/models/block/dead_crucible.json new file mode 100644 index 00000000..53dcc1b0 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/dead_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "biomesoplenty:block/dead_log", + "inside": "biomesoplenty:block/dead_log", + "side": "biomesoplenty:block/dead_log", + "top": "biomesoplenty:block/dead_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/dead_sieve.json b/src/generated/resources/assets/exdeorum/models/block/dead_sieve.json new file mode 100644 index 00000000..eee47461 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/dead_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "biomesoplenty:block/dead_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/fir_barrel.json b/src/generated/resources/assets/exdeorum/models/block/fir_barrel.json new file mode 100644 index 00000000..2b4e1c09 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/fir_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "biomesoplenty:block/fir_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/fir_crucible.json b/src/generated/resources/assets/exdeorum/models/block/fir_crucible.json new file mode 100644 index 00000000..df0473f2 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/fir_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "biomesoplenty:block/fir_log", + "inside": "biomesoplenty:block/fir_log", + "side": "biomesoplenty:block/fir_log", + "top": "biomesoplenty:block/fir_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/fir_sieve.json b/src/generated/resources/assets/exdeorum/models/block/fir_sieve.json new file mode 100644 index 00000000..f7de1f62 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/fir_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "biomesoplenty:block/fir_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/hellbark_barrel.json b/src/generated/resources/assets/exdeorum/models/block/hellbark_barrel.json new file mode 100644 index 00000000..8e61aad3 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/hellbark_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "biomesoplenty:block/hellbark_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/hellbark_crucible.json b/src/generated/resources/assets/exdeorum/models/block/hellbark_crucible.json new file mode 100644 index 00000000..dafa6efe --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/hellbark_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "biomesoplenty:block/hellbark_log", + "inside": "biomesoplenty:block/hellbark_log", + "side": "biomesoplenty:block/hellbark_log", + "top": "biomesoplenty:block/hellbark_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/hellbark_sieve.json b/src/generated/resources/assets/exdeorum/models/block/hellbark_sieve.json new file mode 100644 index 00000000..343ee6e3 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/hellbark_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "biomesoplenty:block/hellbark_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/jacaranda_barrel.json b/src/generated/resources/assets/exdeorum/models/block/jacaranda_barrel.json new file mode 100644 index 00000000..60e29cea --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/jacaranda_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "biomesoplenty:block/jacaranda_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/jacaranda_crucible.json b/src/generated/resources/assets/exdeorum/models/block/jacaranda_crucible.json new file mode 100644 index 00000000..a10c3bcf --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/jacaranda_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "biomesoplenty:block/jacaranda_log", + "inside": "biomesoplenty:block/jacaranda_log", + "side": "biomesoplenty:block/jacaranda_log", + "top": "biomesoplenty:block/jacaranda_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/jacaranda_sieve.json b/src/generated/resources/assets/exdeorum/models/block/jacaranda_sieve.json new file mode 100644 index 00000000..920edb0a --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/jacaranda_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "biomesoplenty:block/jacaranda_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/magic_barrel.json b/src/generated/resources/assets/exdeorum/models/block/magic_barrel.json new file mode 100644 index 00000000..759873a1 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/magic_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "biomesoplenty:block/magic_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/magic_crucible.json b/src/generated/resources/assets/exdeorum/models/block/magic_crucible.json new file mode 100644 index 00000000..474b5d09 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/magic_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "biomesoplenty:block/magic_log", + "inside": "biomesoplenty:block/magic_log", + "side": "biomesoplenty:block/magic_log", + "top": "biomesoplenty:block/magic_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/magic_sieve.json b/src/generated/resources/assets/exdeorum/models/block/magic_sieve.json new file mode 100644 index 00000000..b94ecd79 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/magic_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "biomesoplenty:block/magic_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/mahogany_barrel.json b/src/generated/resources/assets/exdeorum/models/block/mahogany_barrel.json new file mode 100644 index 00000000..96fb3606 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/mahogany_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "biomesoplenty:block/mahogany_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/mahogany_crucible.json b/src/generated/resources/assets/exdeorum/models/block/mahogany_crucible.json new file mode 100644 index 00000000..9ddb6d8d --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/mahogany_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "biomesoplenty:block/mahogany_log", + "inside": "biomesoplenty:block/mahogany_log", + "side": "biomesoplenty:block/mahogany_log", + "top": "biomesoplenty:block/mahogany_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/mahogany_sieve.json b/src/generated/resources/assets/exdeorum/models/block/mahogany_sieve.json new file mode 100644 index 00000000..476dfc94 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/mahogany_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "biomesoplenty:block/mahogany_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/palm_barrel.json b/src/generated/resources/assets/exdeorum/models/block/palm_barrel.json new file mode 100644 index 00000000..8266fc86 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/palm_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "biomesoplenty:block/palm_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/palm_crucible.json b/src/generated/resources/assets/exdeorum/models/block/palm_crucible.json new file mode 100644 index 00000000..99e11ab5 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/palm_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "biomesoplenty:block/palm_log", + "inside": "biomesoplenty:block/palm_log", + "side": "biomesoplenty:block/palm_log", + "top": "biomesoplenty:block/palm_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/palm_sieve.json b/src/generated/resources/assets/exdeorum/models/block/palm_sieve.json new file mode 100644 index 00000000..3d13c85d --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/palm_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "biomesoplenty:block/palm_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/redwood_barrel.json b/src/generated/resources/assets/exdeorum/models/block/redwood_barrel.json new file mode 100644 index 00000000..26dda428 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/redwood_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "biomesoplenty:block/redwood_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/redwood_crucible.json b/src/generated/resources/assets/exdeorum/models/block/redwood_crucible.json new file mode 100644 index 00000000..28a1bb67 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/redwood_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "biomesoplenty:block/redwood_log", + "inside": "biomesoplenty:block/redwood_log", + "side": "biomesoplenty:block/redwood_log", + "top": "biomesoplenty:block/redwood_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/redwood_sieve.json b/src/generated/resources/assets/exdeorum/models/block/redwood_sieve.json new file mode 100644 index 00000000..48ad6b9a --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/redwood_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "biomesoplenty:block/redwood_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/umbran_barrel.json b/src/generated/resources/assets/exdeorum/models/block/umbran_barrel.json new file mode 100644 index 00000000..7ec8e1c8 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/umbran_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "biomesoplenty:block/umbran_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/umbran_crucible.json b/src/generated/resources/assets/exdeorum/models/block/umbran_crucible.json new file mode 100644 index 00000000..f96bfe29 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/umbran_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "biomesoplenty:block/umbran_log", + "inside": "biomesoplenty:block/umbran_log", + "side": "biomesoplenty:block/umbran_log", + "top": "biomesoplenty:block/umbran_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/umbran_sieve.json b/src/generated/resources/assets/exdeorum/models/block/umbran_sieve.json new file mode 100644 index 00000000..876d7c45 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/umbran_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "biomesoplenty:block/umbran_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/willow_barrel.json b/src/generated/resources/assets/exdeorum/models/block/willow_barrel.json new file mode 100644 index 00000000..0e7c51f6 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/willow_barrel.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_barrel", + "textures": { + "barrel": "biomesoplenty:block/willow_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/willow_crucible.json b/src/generated/resources/assets/exdeorum/models/block/willow_crucible.json new file mode 100644 index 00000000..01d9b73b --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/willow_crucible.json @@ -0,0 +1,9 @@ +{ + "parent": "exdeorum:block/template_crucible", + "textures": { + "bottom": "biomesoplenty:block/willow_log", + "inside": "biomesoplenty:block/willow_log", + "side": "biomesoplenty:block/willow_log", + "top": "biomesoplenty:block/willow_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/willow_sieve.json b/src/generated/resources/assets/exdeorum/models/block/willow_sieve.json new file mode 100644 index 00000000..a01a5b4b --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/willow_sieve.json @@ -0,0 +1,6 @@ +{ + "parent": "exdeorum:block/template_sieve", + "textures": { + "texture": "biomesoplenty:block/willow_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/dead_barrel.json b/src/generated/resources/assets/exdeorum/models/item/dead_barrel.json new file mode 100644 index 00000000..c3b2ac59 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/dead_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/dead_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/dead_crucible.json b/src/generated/resources/assets/exdeorum/models/item/dead_crucible.json new file mode 100644 index 00000000..41b9598c --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/dead_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/dead_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/dead_sieve.json b/src/generated/resources/assets/exdeorum/models/item/dead_sieve.json new file mode 100644 index 00000000..c1811869 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/dead_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/dead_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/fir_barrel.json b/src/generated/resources/assets/exdeorum/models/item/fir_barrel.json new file mode 100644 index 00000000..ae0af554 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/fir_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/fir_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/fir_crucible.json b/src/generated/resources/assets/exdeorum/models/item/fir_crucible.json new file mode 100644 index 00000000..033c348c --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/fir_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/fir_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/fir_sieve.json b/src/generated/resources/assets/exdeorum/models/item/fir_sieve.json new file mode 100644 index 00000000..6b88a5ad --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/fir_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/fir_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/hellbark_barrel.json b/src/generated/resources/assets/exdeorum/models/item/hellbark_barrel.json new file mode 100644 index 00000000..af8f3d6f --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/hellbark_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/hellbark_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/hellbark_crucible.json b/src/generated/resources/assets/exdeorum/models/item/hellbark_crucible.json new file mode 100644 index 00000000..38fdd7cd --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/hellbark_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/hellbark_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/hellbark_sieve.json b/src/generated/resources/assets/exdeorum/models/item/hellbark_sieve.json new file mode 100644 index 00000000..9d6f700b --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/hellbark_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/hellbark_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/jacaranda_barrel.json b/src/generated/resources/assets/exdeorum/models/item/jacaranda_barrel.json new file mode 100644 index 00000000..057c1c99 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/jacaranda_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/jacaranda_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/jacaranda_crucible.json b/src/generated/resources/assets/exdeorum/models/item/jacaranda_crucible.json new file mode 100644 index 00000000..31c17e93 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/jacaranda_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/jacaranda_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/jacaranda_sieve.json b/src/generated/resources/assets/exdeorum/models/item/jacaranda_sieve.json new file mode 100644 index 00000000..a144b8bd --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/jacaranda_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/jacaranda_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/magic_barrel.json b/src/generated/resources/assets/exdeorum/models/item/magic_barrel.json new file mode 100644 index 00000000..6f404c83 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/magic_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/magic_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/magic_crucible.json b/src/generated/resources/assets/exdeorum/models/item/magic_crucible.json new file mode 100644 index 00000000..e1745f0f --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/magic_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/magic_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/magic_sieve.json b/src/generated/resources/assets/exdeorum/models/item/magic_sieve.json new file mode 100644 index 00000000..5d11dafc --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/magic_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/magic_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/mahogany_barrel.json b/src/generated/resources/assets/exdeorum/models/item/mahogany_barrel.json new file mode 100644 index 00000000..2d18f93a --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/mahogany_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/mahogany_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/mahogany_crucible.json b/src/generated/resources/assets/exdeorum/models/item/mahogany_crucible.json new file mode 100644 index 00000000..79aa2a70 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/mahogany_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/mahogany_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/mahogany_sieve.json b/src/generated/resources/assets/exdeorum/models/item/mahogany_sieve.json new file mode 100644 index 00000000..4065a333 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/mahogany_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/mahogany_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/palm_barrel.json b/src/generated/resources/assets/exdeorum/models/item/palm_barrel.json new file mode 100644 index 00000000..4269afb0 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/palm_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/palm_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/palm_crucible.json b/src/generated/resources/assets/exdeorum/models/item/palm_crucible.json new file mode 100644 index 00000000..193aab2b --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/palm_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/palm_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/palm_sieve.json b/src/generated/resources/assets/exdeorum/models/item/palm_sieve.json new file mode 100644 index 00000000..a3237dc1 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/palm_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/palm_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/random_armor_trim.json b/src/generated/resources/assets/exdeorum/models/item/random_armor_trim.json new file mode 100644 index 00000000..d2bc2c12 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/random_armor_trim.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/random_armor_trim" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/random_pottery_sherd.json b/src/generated/resources/assets/exdeorum/models/item/random_pottery_sherd.json new file mode 100644 index 00000000..c6f03a77 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/random_pottery_sherd.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/random_pottery_sherd" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/redwood_barrel.json b/src/generated/resources/assets/exdeorum/models/item/redwood_barrel.json new file mode 100644 index 00000000..db966daf --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/redwood_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/redwood_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/redwood_crucible.json b/src/generated/resources/assets/exdeorum/models/item/redwood_crucible.json new file mode 100644 index 00000000..2f0597f0 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/redwood_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/redwood_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/redwood_sieve.json b/src/generated/resources/assets/exdeorum/models/item/redwood_sieve.json new file mode 100644 index 00000000..b106199a --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/redwood_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/redwood_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/umbran_barrel.json b/src/generated/resources/assets/exdeorum/models/item/umbran_barrel.json new file mode 100644 index 00000000..4a35b78c --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/umbran_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/umbran_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/umbran_crucible.json b/src/generated/resources/assets/exdeorum/models/item/umbran_crucible.json new file mode 100644 index 00000000..758a5f05 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/umbran_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/umbran_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/umbran_sieve.json b/src/generated/resources/assets/exdeorum/models/item/umbran_sieve.json new file mode 100644 index 00000000..22d2d7c5 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/umbran_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/umbran_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/willow_barrel.json b/src/generated/resources/assets/exdeorum/models/item/willow_barrel.json new file mode 100644 index 00000000..a2098e92 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/willow_barrel.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/willow_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/willow_crucible.json b/src/generated/resources/assets/exdeorum/models/item/willow_crucible.json new file mode 100644 index 00000000..ee1918ce --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/willow_crucible.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/willow_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/willow_sieve.json b/src/generated/resources/assets/exdeorum/models/item/willow_sieve.json new file mode 100644 index 00000000..0e090293 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/willow_sieve.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/willow_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/dead_barrel.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/dead_barrel.json new file mode 100644 index 00000000..1be2519c --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/dead_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:dead_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/dead_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/dead_crucible.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/dead_crucible.json new file mode 100644 index 00000000..6cf8c730 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/dead_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:dead_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/dead_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/dead_sieve.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/dead_sieve.json new file mode 100644 index 00000000..ee3063cc --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/dead_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:dead_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/dead_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/fir_barrel.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/fir_barrel.json new file mode 100644 index 00000000..c4b698cc --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/fir_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:fir_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/fir_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/fir_crucible.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/fir_crucible.json new file mode 100644 index 00000000..e2564371 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/fir_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:fir_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/fir_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/fir_sieve.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/fir_sieve.json new file mode 100644 index 00000000..51d75564 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/fir_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:fir_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/fir_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_barrel.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_barrel.json new file mode 100644 index 00000000..dc09663a --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:hellbark_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/hellbark_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_crucible.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_crucible.json new file mode 100644 index 00000000..e44dc85b --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:hellbark_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/hellbark_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_sieve.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_sieve.json new file mode 100644 index 00000000..f9fe8ea6 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/hellbark_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:hellbark_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/hellbark_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_barrel.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_barrel.json new file mode 100644 index 00000000..e7c98c1a --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:jacaranda_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/jacaranda_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_crucible.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_crucible.json new file mode 100644 index 00000000..621e891f --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:jacaranda_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/jacaranda_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_sieve.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_sieve.json new file mode 100644 index 00000000..4a3c8f13 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/jacaranda_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:jacaranda_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/jacaranda_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/magic_barrel.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/magic_barrel.json new file mode 100644 index 00000000..17977ac5 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/magic_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:magic_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/magic_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/magic_crucible.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/magic_crucible.json new file mode 100644 index 00000000..9bc16852 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/magic_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:magic_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/magic_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/magic_sieve.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/magic_sieve.json new file mode 100644 index 00000000..7e7f2888 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/magic_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:magic_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/magic_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_barrel.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_barrel.json new file mode 100644 index 00000000..246ded57 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:mahogany_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/mahogany_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_crucible.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_crucible.json new file mode 100644 index 00000000..9ae5633c --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:mahogany_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/mahogany_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_sieve.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_sieve.json new file mode 100644 index 00000000..289f03a7 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/mahogany_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:mahogany_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/mahogany_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/palm_barrel.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/palm_barrel.json new file mode 100644 index 00000000..cc62c7dc --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/palm_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:palm_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/palm_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/palm_crucible.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/palm_crucible.json new file mode 100644 index 00000000..6ed302bf --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/palm_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:palm_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/palm_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/palm_sieve.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/palm_sieve.json new file mode 100644 index 00000000..b6de3504 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/palm_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:palm_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/palm_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_barrel.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_barrel.json new file mode 100644 index 00000000..04f70478 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:redwood_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/redwood_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_crucible.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_crucible.json new file mode 100644 index 00000000..ef34c24f --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:redwood_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/redwood_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_sieve.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_sieve.json new file mode 100644 index 00000000..89d7b5c5 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/redwood_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:redwood_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/redwood_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_barrel.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_barrel.json new file mode 100644 index 00000000..eb6a2c99 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:umbran_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/umbran_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_crucible.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_crucible.json new file mode 100644 index 00000000..21f504fd --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:umbran_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/umbran_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_sieve.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_sieve.json new file mode 100644 index 00000000..c72bf10b --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/umbran_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:umbran_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/umbran_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/willow_barrel.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/willow_barrel.json new file mode 100644 index 00000000..f251d3fa --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/willow_barrel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:willow_barrel" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/willow_barrel" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/willow_crucible.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/willow_crucible.json new file mode 100644 index 00000000..9f53fa44 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/willow_crucible.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:willow_crucible" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/willow_crucible" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/willow_sieve.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/willow_sieve.json new file mode 100644 index 00000000..5d61c8aa --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/willow_sieve.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:willow_sieve" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/willow_sieve" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/hammer/red_sand.json b/src/generated/resources/data/exdeorum/recipes/hammer/red_sand.json new file mode 100644 index 00000000..ebb16bb1 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/hammer/red_sand.json @@ -0,0 +1,8 @@ +{ + "type": "exdeorum:hammer", + "ingredient": { + "item": "exdeorum:crushed_netherrack" + }, + "result": "minecraft:red_sand", + "result_amount": 1.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/dust/diamond/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipes/sieve/dust/diamond/yellorium_dust.json new file mode 100644 index 00000000..506aebcc --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/dust/diamond/yellorium_dust.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "bigreactors" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:dust" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "bigreactors:yellorium_dust", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.12 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/dust/flint/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipes/sieve/dust/flint/yellorium_dust.json new file mode 100644 index 00000000..529c11b6 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/dust/flint/yellorium_dust.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "bigreactors" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:dust" + }, + "mesh": "exdeorum:flint_mesh", + "result": "bigreactors:yellorium_dust", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.055 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/dust/golden/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipes/sieve/dust/golden/yellorium_dust.json new file mode 100644 index 00000000..5554a5c8 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/dust/golden/yellorium_dust.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "bigreactors" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:dust" + }, + "mesh": "exdeorum:golden_mesh", + "result": "bigreactors:yellorium_dust", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.1 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/dust/iron/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipes/sieve/dust/iron/yellorium_dust.json new file mode 100644 index 00000000..d8290d71 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/dust/iron/yellorium_dust.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "bigreactors" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:dust" + }, + "mesh": "exdeorum:iron_mesh", + "result": "bigreactors:yellorium_dust", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.08 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/dust/netherite/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipes/sieve/dust/netherite/yellorium_dust.json new file mode 100644 index 00000000..43484a13 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/dust/netherite/yellorium_dust.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "bigreactors" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:dust" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "bigreactors:yellorium_dust", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.14 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/dust/string/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipes/sieve/dust/string/yellorium_dust.json new file mode 100644 index 00000000..cd3a80a0 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/dust/string/yellorium_dust.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "bigreactors" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:dust" + }, + "mesh": "exdeorum:string_mesh", + "result": "bigreactors:yellorium_dust", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.05 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/iron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/iron_ore_chunk.json index 6c38dfcf..3edcfbf1 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/iron_ore_chunk.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/iron_ore_chunk.json @@ -8,6 +8,6 @@ "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.07 + "p": 0.08 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/iron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/iron_ore_chunk.json index 2243da30..1ca801ef 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/iron_ore_chunk.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/iron_ore_chunk.json @@ -8,6 +8,6 @@ "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.05 + "p": 0.07 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/dead_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/dead_sapling.json new file mode 100644 index 00000000..d2b2bc5c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/dead_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:dead_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/fir_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/fir_sapling.json new file mode 100644 index 00000000..ebaf2ee3 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/fir_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:fir_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/flowering_oak_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/flowering_oak_sapling.json new file mode 100644 index 00000000..7393ee50 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/flowering_oak_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:flowering_oak_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/hellbark_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/hellbark_sapling.json new file mode 100644 index 00000000..e142c735 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/hellbark_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:hellbark_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/jacaranda_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/jacaranda_sapling.json new file mode 100644 index 00000000..ececf193 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/jacaranda_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:jacaranda_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/magic_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/magic_sapling.json new file mode 100644 index 00000000..f2027aed --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/magic_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:magic_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/mahogany_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/mahogany_sapling.json new file mode 100644 index 00000000..352ad2df --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/mahogany_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:mahogany_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/maple_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/maple_sapling.json new file mode 100644 index 00000000..c614372b --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/maple_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:maple_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/orange_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/orange_autumn_sapling.json new file mode 100644 index 00000000..66d8c67d --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/orange_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:orange_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/origin_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/origin_sapling.json new file mode 100644 index 00000000..9cbd61e7 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/origin_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:origin_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/palm_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/palm_sapling.json new file mode 100644 index 00000000..332739a9 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/palm_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:palm_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/rainbow_birch_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/rainbow_birch_sapling.json new file mode 100644 index 00000000..85f4804e --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/rainbow_birch_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:rainbow_birch_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/redwood_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/redwood_sapling.json new file mode 100644 index 00000000..e474b283 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/redwood_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:redwood_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/snowblossom_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/snowblossom_sapling.json new file mode 100644 index 00000000..4218dd12 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/snowblossom_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:snowblossom_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/umbran_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/umbran_sapling.json new file mode 100644 index 00000000..158108b8 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/umbran_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:umbran_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/willow_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/willow_sapling.json new file mode 100644 index 00000000..10c1ac56 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/willow_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:willow_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/yellow_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/yellow_autumn_sapling.json new file mode 100644 index 00000000..e8f39602 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/diamond/yellow_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "biomesoplenty:yellow_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/dead_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/dead_sapling.json new file mode 100644 index 00000000..d4a7f952 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/dead_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:dead_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/fir_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/fir_sapling.json new file mode 100644 index 00000000..5bc06ae1 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/fir_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:fir_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/flowering_oak_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/flowering_oak_sapling.json new file mode 100644 index 00000000..6b489033 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/flowering_oak_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:flowering_oak_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/hellbark_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/hellbark_sapling.json new file mode 100644 index 00000000..fdbf21cd --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/hellbark_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:hellbark_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/jacaranda_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/jacaranda_sapling.json new file mode 100644 index 00000000..a4f9797b --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/jacaranda_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:jacaranda_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/magic_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/magic_sapling.json new file mode 100644 index 00000000..79f0d746 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/magic_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:magic_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/mahogany_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/mahogany_sapling.json new file mode 100644 index 00000000..8ebd7cc3 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/mahogany_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:mahogany_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/maple_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/maple_sapling.json new file mode 100644 index 00000000..af5faff8 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/maple_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:maple_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/orange_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/orange_autumn_sapling.json new file mode 100644 index 00000000..c8b96b06 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/orange_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:orange_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/origin_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/origin_sapling.json new file mode 100644 index 00000000..5a16d625 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/origin_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:origin_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/palm_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/palm_sapling.json new file mode 100644 index 00000000..3122c043 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/palm_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:palm_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/rainbow_birch_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/rainbow_birch_sapling.json new file mode 100644 index 00000000..bd49e5cc --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/rainbow_birch_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:rainbow_birch_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/redwood_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/redwood_sapling.json new file mode 100644 index 00000000..45755164 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/redwood_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:redwood_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/snowblossom_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/snowblossom_sapling.json new file mode 100644 index 00000000..383bb799 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/snowblossom_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:snowblossom_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/umbran_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/umbran_sapling.json new file mode 100644 index 00000000..09ff75e8 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/umbran_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:umbran_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/willow_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/willow_sapling.json new file mode 100644 index 00000000..fa71de6d --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/willow_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:willow_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/yellow_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/yellow_autumn_sapling.json new file mode 100644 index 00000000..7abcd8d4 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/flint/yellow_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:flint_mesh", + "result": "biomesoplenty:yellow_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/dead_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/dead_sapling.json new file mode 100644 index 00000000..41eee1a5 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/dead_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:dead_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/fir_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/fir_sapling.json new file mode 100644 index 00000000..694dd1be --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/fir_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:fir_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/flowering_oak_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/flowering_oak_sapling.json new file mode 100644 index 00000000..c774fd78 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/flowering_oak_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:flowering_oak_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/hellbark_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/hellbark_sapling.json new file mode 100644 index 00000000..e6f1576e --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/hellbark_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:hellbark_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/jacaranda_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/jacaranda_sapling.json new file mode 100644 index 00000000..617b05c1 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/jacaranda_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:jacaranda_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/magic_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/magic_sapling.json new file mode 100644 index 00000000..1b6231ef --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/magic_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:magic_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/mahogany_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/mahogany_sapling.json new file mode 100644 index 00000000..ebd295c0 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/mahogany_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:mahogany_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/maple_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/maple_sapling.json new file mode 100644 index 00000000..dc44e441 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/maple_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:maple_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/orange_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/orange_autumn_sapling.json new file mode 100644 index 00000000..b41bd0d6 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/orange_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:orange_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/origin_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/origin_sapling.json new file mode 100644 index 00000000..bd9a0d53 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/origin_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:origin_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/palm_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/palm_sapling.json new file mode 100644 index 00000000..2844b7e2 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/palm_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:palm_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/rainbow_birch_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/rainbow_birch_sapling.json new file mode 100644 index 00000000..d8073cfb --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/rainbow_birch_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:rainbow_birch_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/redwood_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/redwood_sapling.json new file mode 100644 index 00000000..fa4bb588 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/redwood_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:redwood_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/snowblossom_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/snowblossom_sapling.json new file mode 100644 index 00000000..0b02b3ea --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/snowblossom_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:snowblossom_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/umbran_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/umbran_sapling.json new file mode 100644 index 00000000..af2aa596 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/umbran_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:umbran_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/willow_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/willow_sapling.json new file mode 100644 index 00000000..5346e9a1 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/willow_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:willow_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/yellow_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/yellow_autumn_sapling.json new file mode 100644 index 00000000..e2222fab --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/golden/yellow_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:golden_mesh", + "result": "biomesoplenty:yellow_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/dead_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/dead_sapling.json new file mode 100644 index 00000000..ca5c3899 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/dead_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:dead_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/fir_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/fir_sapling.json new file mode 100644 index 00000000..15e9e52a --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/fir_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:fir_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/flowering_oak_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/flowering_oak_sapling.json new file mode 100644 index 00000000..bc4fac36 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/flowering_oak_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:flowering_oak_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/hellbark_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/hellbark_sapling.json new file mode 100644 index 00000000..1e4a5ca4 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/hellbark_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:hellbark_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/jacaranda_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/jacaranda_sapling.json new file mode 100644 index 00000000..60f20d80 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/jacaranda_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:jacaranda_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/magic_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/magic_sapling.json new file mode 100644 index 00000000..96e04577 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/magic_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:magic_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/mahogany_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/mahogany_sapling.json new file mode 100644 index 00000000..6f6e654e --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/mahogany_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:mahogany_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/maple_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/maple_sapling.json new file mode 100644 index 00000000..825872d8 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/maple_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:maple_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/orange_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/orange_autumn_sapling.json new file mode 100644 index 00000000..79cff5bf --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/orange_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:orange_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/origin_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/origin_sapling.json new file mode 100644 index 00000000..21a61e39 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/origin_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:origin_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/palm_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/palm_sapling.json new file mode 100644 index 00000000..eed487aa --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/palm_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:palm_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/rainbow_birch_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/rainbow_birch_sapling.json new file mode 100644 index 00000000..fa4fe8df --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/rainbow_birch_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:rainbow_birch_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/redwood_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/redwood_sapling.json new file mode 100644 index 00000000..ca5c570e --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/redwood_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:redwood_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/snowblossom_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/snowblossom_sapling.json new file mode 100644 index 00000000..803d1abd --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/snowblossom_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:snowblossom_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/umbran_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/umbran_sapling.json new file mode 100644 index 00000000..04e93ee4 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/umbran_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:umbran_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/willow_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/willow_sapling.json new file mode 100644 index 00000000..2ee6fa19 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/willow_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:willow_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/yellow_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/yellow_autumn_sapling.json new file mode 100644 index 00000000..fee9a96b --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/iron/yellow_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:iron_mesh", + "result": "biomesoplenty:yellow_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/dead_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/dead_sapling.json new file mode 100644 index 00000000..fcf02aba --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/dead_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:dead_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/fir_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/fir_sapling.json new file mode 100644 index 00000000..0208968a --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/fir_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:fir_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/flowering_oak_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/flowering_oak_sapling.json new file mode 100644 index 00000000..9e2ff6d9 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/flowering_oak_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:flowering_oak_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/hellbark_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/hellbark_sapling.json new file mode 100644 index 00000000..f510cbd3 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/hellbark_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:hellbark_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/jacaranda_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/jacaranda_sapling.json new file mode 100644 index 00000000..a2daac6b --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/jacaranda_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:jacaranda_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/magic_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/magic_sapling.json new file mode 100644 index 00000000..125a36bb --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/magic_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:magic_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/mahogany_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/mahogany_sapling.json new file mode 100644 index 00000000..32635aac --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/mahogany_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:mahogany_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/maple_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/maple_sapling.json new file mode 100644 index 00000000..f3557f38 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/maple_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:maple_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/orange_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/orange_autumn_sapling.json new file mode 100644 index 00000000..a10ed6d1 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/orange_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:orange_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/origin_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/origin_sapling.json new file mode 100644 index 00000000..e4acb9fd --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/origin_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:origin_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/palm_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/palm_sapling.json new file mode 100644 index 00000000..cbc2636f --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/palm_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:palm_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/rainbow_birch_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/rainbow_birch_sapling.json new file mode 100644 index 00000000..6aa8af86 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/rainbow_birch_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:rainbow_birch_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/redwood_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/redwood_sapling.json new file mode 100644 index 00000000..8d82869a --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/redwood_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:redwood_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/snowblossom_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/snowblossom_sapling.json new file mode 100644 index 00000000..8ff40658 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/snowblossom_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:snowblossom_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/umbran_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/umbran_sapling.json new file mode 100644 index 00000000..8c1ec682 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/umbran_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:umbran_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/willow_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/willow_sapling.json new file mode 100644 index 00000000..2c14da51 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/willow_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:willow_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/yellow_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/yellow_autumn_sapling.json new file mode 100644 index 00000000..680b1366 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/netherite/yellow_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "biomesoplenty:yellow_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/dead_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/dead_sapling.json new file mode 100644 index 00000000..d75bd27e --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/dead_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:dead_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/fir_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/fir_sapling.json new file mode 100644 index 00000000..d6212d7c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/fir_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:fir_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/flowering_oak_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/flowering_oak_sapling.json new file mode 100644 index 00000000..4e3cadc0 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/flowering_oak_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:flowering_oak_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/hellbark_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/hellbark_sapling.json new file mode 100644 index 00000000..f5fd8b8a --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/hellbark_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:hellbark_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/jacaranda_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/jacaranda_sapling.json new file mode 100644 index 00000000..19acccf7 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/jacaranda_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:jacaranda_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/magic_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/magic_sapling.json new file mode 100644 index 00000000..b8351c81 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/magic_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:magic_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/mahogany_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/mahogany_sapling.json new file mode 100644 index 00000000..ac6fbc8c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/mahogany_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:mahogany_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/maple_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/maple_sapling.json new file mode 100644 index 00000000..a72b7b0b --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/maple_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:maple_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/orange_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/orange_autumn_sapling.json new file mode 100644 index 00000000..7664cf14 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/orange_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:orange_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/origin_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/origin_sapling.json new file mode 100644 index 00000000..86233cdb --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/origin_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:origin_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/palm_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/palm_sapling.json new file mode 100644 index 00000000..857acd1f --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/palm_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:palm_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/rainbow_birch_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/rainbow_birch_sapling.json new file mode 100644 index 00000000..fe59adb0 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/rainbow_birch_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:rainbow_birch_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/redwood_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/redwood_sapling.json new file mode 100644 index 00000000..93692099 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/redwood_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:redwood_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/snowblossom_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/snowblossom_sapling.json new file mode 100644 index 00000000..88c038c9 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/snowblossom_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:snowblossom_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/umbran_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/umbran_sapling.json new file mode 100644 index 00000000..fc225149 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/umbran_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:umbran_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/willow_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/willow_sapling.json new file mode 100644 index 00000000..77228ff1 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/willow_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:willow_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/yellow_autumn_sapling.json b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/yellow_autumn_sapling.json new file mode 100644 index 00000000..9674f85f --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/moss_block/string/yellow_autumn_sapling.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:moss_block" + }, + "mesh": "exdeorum:string_mesh", + "result": "biomesoplenty:yellow_autumn_sapling", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/cactus.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/cactus.json new file mode 100644 index 00000000..c9bad9da --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/cactus.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "minecraft:cactus", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.1 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/dead_bush.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/dead_bush.json new file mode 100644 index 00000000..8050f76d --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/dead_bush.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "minecraft:dead_bush", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.03 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/gold_nugget.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/gold_nugget.json new file mode 100644 index 00000000..f111ec72 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/gold_nugget.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "minecraft:gold_nugget", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.14 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/raw_gold.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/raw_gold.json new file mode 100644 index 00000000..a5da9576 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/raw_gold.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "minecraft:raw_gold", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.08 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/redstone.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/redstone.json new file mode 100644 index 00000000..a01db23b --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/diamond/redstone.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "minecraft:redstone", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.14 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/howl_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/cactus.json similarity index 64% rename from src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/howl_pottery_sherd.json rename to src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/cactus.json index 96b7758e..fbd3373a 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/howl_pottery_sherd.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/cactus.json @@ -1,13 +1,13 @@ { "type": "exdeorum:sieve", "ingredient": { - "item": "minecraft:sand" + "item": "minecraft:red_sand" }, "mesh": "exdeorum:flint_mesh", - "result": "minecraft:howl_pottery_sherd", + "result": "minecraft:cactus", "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.03 + "p": 0.12 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/heart_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/dead_bush.json similarity index 64% rename from src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/heart_pottery_sherd.json rename to src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/dead_bush.json index 8841a7e7..cba4dffa 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/heart_pottery_sherd.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/dead_bush.json @@ -1,13 +1,13 @@ { "type": "exdeorum:sieve", "ingredient": { - "item": "minecraft:sand" + "item": "minecraft:red_sand" }, "mesh": "exdeorum:flint_mesh", - "result": "minecraft:heart_pottery_sherd", + "result": "minecraft:dead_bush", "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.03 + "p": 0.07 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/blade_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/gold_nugget.json similarity index 64% rename from src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/blade_pottery_sherd.json rename to src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/gold_nugget.json index 17f98c13..4be84a23 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/blade_pottery_sherd.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/gold_nugget.json @@ -1,13 +1,13 @@ { "type": "exdeorum:sieve", "ingredient": { - "item": "minecraft:sand" + "item": "minecraft:red_sand" }, "mesh": "exdeorum:flint_mesh", - "result": "minecraft:blade_pottery_sherd", + "result": "minecraft:gold_nugget", "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.03 + "p": 0.12 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/raw_gold.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/raw_gold.json new file mode 100644 index 00000000..59f6af74 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/raw_gold.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:flint_mesh", + "result": "minecraft:raw_gold", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/redstone.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/redstone.json new file mode 100644 index 00000000..f7424a24 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/flint/redstone.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:flint_mesh", + "result": "minecraft:redstone", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.09 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/coast_armor_trim_smithing_template.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/cactus.json similarity index 60% rename from src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/coast_armor_trim_smithing_template.json rename to src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/cactus.json index f21dab2d..468fb5b4 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/coast_armor_trim_smithing_template.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/cactus.json @@ -1,13 +1,13 @@ { "type": "exdeorum:sieve", "ingredient": { - "item": "minecraft:sand" + "item": "minecraft:red_sand" }, "mesh": "exdeorum:golden_mesh", - "result": "minecraft:coast_armor_trim_smithing_template", + "result": "minecraft:cactus", "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.01 + "p": 0.12 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/raiser_armor_trim_smithing_template.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/dead_bush.json similarity index 60% rename from src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/raiser_armor_trim_smithing_template.json rename to src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/dead_bush.json index 07813162..b67dc126 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/raiser_armor_trim_smithing_template.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/dead_bush.json @@ -1,13 +1,13 @@ { "type": "exdeorum:sieve", "ingredient": { - "item": "minecraft:sand" + "item": "minecraft:red_sand" }, "mesh": "exdeorum:golden_mesh", - "result": "minecraft:raiser_armor_trim_smithing_template", + "result": "minecraft:dead_bush", "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.01 + "p": 0.07 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/shaper_armor_trim_smithing_template.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/gold_nugget.json similarity index 60% rename from src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/shaper_armor_trim_smithing_template.json rename to src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/gold_nugget.json index fca03aa2..133e4238 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/shaper_armor_trim_smithing_template.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/gold_nugget.json @@ -1,13 +1,13 @@ { "type": "exdeorum:sieve", "ingredient": { - "item": "minecraft:sand" + "item": "minecraft:red_sand" }, "mesh": "exdeorum:golden_mesh", - "result": "minecraft:shaper_armor_trim_smithing_template", + "result": "minecraft:gold_nugget", "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.01 + "p": 0.19 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/raw_gold.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/raw_gold.json new file mode 100644 index 00000000..4ab9e985 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/raw_gold.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:golden_mesh", + "result": "minecraft:raw_gold", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.11 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/redstone.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/redstone.json new file mode 100644 index 00000000..f2e0063c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/golden/redstone.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:golden_mesh", + "result": "minecraft:redstone", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.07 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/cactus.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/cactus.json new file mode 100644 index 00000000..0543f1a3 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/cactus.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:iron_mesh", + "result": "minecraft:cactus", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.12 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/dead_bush.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/dead_bush.json new file mode 100644 index 00000000..0d2f5b24 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/dead_bush.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:iron_mesh", + "result": "minecraft:dead_bush", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.07 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/gold_nugget.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/gold_nugget.json new file mode 100644 index 00000000..8b9e108a --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/gold_nugget.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:iron_mesh", + "result": "minecraft:gold_nugget", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.09 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/raw_gold.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/raw_gold.json new file mode 100644 index 00000000..4014642e --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/raw_gold.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:iron_mesh", + "result": "minecraft:raw_gold", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.06 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/redstone.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/redstone.json new file mode 100644 index 00000000..84c0d31b --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/iron/redstone.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:iron_mesh", + "result": "minecraft:redstone", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.11 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/cactus.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/cactus.json new file mode 100644 index 00000000..353f3f11 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/cactus.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "minecraft:cactus", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.12 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/gold_nugget.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/gold_nugget.json new file mode 100644 index 00000000..f52588c2 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/gold_nugget.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "minecraft:gold_nugget", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.15 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/raw_gold.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/raw_gold.json new file mode 100644 index 00000000..a40337b8 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/raw_gold.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "minecraft:raw_gold", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.1 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/redstone.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/redstone.json new file mode 100644 index 00000000..13358c5f --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/netherite/redstone.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "minecraft:redstone", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.17 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/cactus.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/cactus.json new file mode 100644 index 00000000..af228224 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/cactus.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:string_mesh", + "result": "minecraft:cactus", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.12 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/dead_bush.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/dead_bush.json new file mode 100644 index 00000000..e9683ec3 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/dead_bush.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:string_mesh", + "result": "minecraft:dead_bush", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.07 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/gold_nugget.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/gold_nugget.json new file mode 100644 index 00000000..be21ac30 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/gold_nugget.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:string_mesh", + "result": "minecraft:gold_nugget", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.09 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/raw_gold.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/raw_gold.json new file mode 100644 index 00000000..e66460f2 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/raw_gold.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:string_mesh", + "result": "minecraft:raw_gold", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.03 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/redstone.json b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/redstone.json new file mode 100644 index 00000000..e29abb7c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/red_sand/string/redstone.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:red_sand" + }, + "mesh": "exdeorum:string_mesh", + "result": "minecraft:redstone", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.08 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/diamond/certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/diamond/certus_quartz_crystal.json new file mode 100644 index 00000000..c77fab81 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/diamond/certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "ae2:certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.09 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/diamond/charged_certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/diamond/charged_certus_quartz_crystal.json new file mode 100644 index 00000000..ea388ce0 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/diamond/charged_certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "ae2:charged_certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.02 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/angler_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/angler_pottery_sherd.json deleted file mode 100644 index 13638e80..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/angler_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:angler_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/archer_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/archer_pottery_sherd.json deleted file mode 100644 index 68c459e6..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/archer_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:archer_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/arms_up_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/arms_up_pottery_sherd.json deleted file mode 100644 index d22cd857..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/arms_up_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:arms_up_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/brewer_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/brewer_pottery_sherd.json deleted file mode 100644 index 25059335..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/brewer_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:brewer_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/certus_quartz_crystal.json new file mode 100644 index 00000000..d7e84c50 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:flint_mesh", + "result": "ae2:certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.04 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/charged_certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/charged_certus_quartz_crystal.json new file mode 100644 index 00000000..a1b89165 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/charged_certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:flint_mesh", + "result": "ae2:charged_certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.005 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/danger_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/danger_pottery_sherd.json deleted file mode 100644 index 3c24e03d..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/danger_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:danger_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/explorer_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/explorer_pottery_sherd.json deleted file mode 100644 index fd4503bc..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/explorer_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:explorer_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/friend_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/friend_pottery_sherd.json deleted file mode 100644 index c69e0443..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/friend_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:friend_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/heartbreak_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/heartbreak_pottery_sherd.json deleted file mode 100644 index 4d5f9042..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/heartbreak_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:heartbreak_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/miner_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/miner_pottery_sherd.json deleted file mode 100644 index a10ac9d5..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/miner_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:miner_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/mourner_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/mourner_pottery_sherd.json deleted file mode 100644 index 5bb8e4fd..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/mourner_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:mourner_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/plenty_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/plenty_pottery_sherd.json deleted file mode 100644 index 465393c7..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/plenty_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:plenty_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/prize_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/prize_pottery_sherd.json deleted file mode 100644 index 9ddfdb5d..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/prize_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:prize_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/burn_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/random_pottery_sherd.json similarity index 75% rename from src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/burn_pottery_sherd.json rename to src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/random_pottery_sherd.json index 8eb3402b..aacc55d1 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/burn_pottery_sherd.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/random_pottery_sherd.json @@ -4,10 +4,10 @@ "item": "minecraft:sand" }, "mesh": "exdeorum:flint_mesh", - "result": "minecraft:burn_pottery_sherd", + "result": "exdeorum:random_pottery_sherd", "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.03 + "p": 0.04 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/sheaf_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/sheaf_pottery_sherd.json deleted file mode 100644 index 0a92eed4..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/sheaf_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:sheaf_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/shelter_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/shelter_pottery_sherd.json deleted file mode 100644 index 2fa332b4..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/shelter_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:shelter_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/skull_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/skull_pottery_sherd.json deleted file mode 100644 index 146105bb..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/skull_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:skull_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/snort_pottery_sherd.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/snort_pottery_sherd.json deleted file mode 100644 index 0ad3634b..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/flint/snort_pottery_sherd.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:flint_mesh", - "result": "minecraft:snort_pottery_sherd", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.03 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/certus_quartz_crystal.json new file mode 100644 index 00000000..d8e4ba58 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:golden_mesh", + "result": "ae2:certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.07 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/charged_certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/charged_certus_quartz_crystal.json new file mode 100644 index 00000000..14bc9983 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/charged_certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:golden_mesh", + "result": "ae2:charged_certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.015 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/host_armor_trim_smithing_template.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/random_armor_trim.json similarity index 71% rename from src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/host_armor_trim_smithing_template.json rename to src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/random_armor_trim.json index ba251e0e..6650882c 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/host_armor_trim_smithing_template.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/random_armor_trim.json @@ -4,10 +4,10 @@ "item": "minecraft:sand" }, "mesh": "exdeorum:golden_mesh", - "result": "minecraft:host_armor_trim_smithing_template", + "result": "exdeorum:random_armor_trim", "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.01 + "p": 0.02 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/wayfinder_armor_trim_smithing_template.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/wayfinder_armor_trim_smithing_template.json deleted file mode 100644 index 0e4ba915..00000000 --- a/src/generated/resources/data/exdeorum/recipes/sieve/sand/golden/wayfinder_armor_trim_smithing_template.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "exdeorum:sieve", - "ingredient": { - "item": "minecraft:sand" - }, - "mesh": "exdeorum:golden_mesh", - "result": "minecraft:wayfinder_armor_trim_smithing_template", - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.01 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/iron/certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/iron/certus_quartz_crystal.json new file mode 100644 index 00000000..6827b2b4 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/iron/certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:iron_mesh", + "result": "ae2:certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.06 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/iron/charged_certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/iron/charged_certus_quartz_crystal.json new file mode 100644 index 00000000..62a9b1c7 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/iron/charged_certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:iron_mesh", + "result": "ae2:charged_certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.0125 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/netherite/certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/netherite/certus_quartz_crystal.json new file mode 100644 index 00000000..96ef7931 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/netherite/certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "ae2:certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.095 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/netherite/charged_certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/netherite/charged_certus_quartz_crystal.json new file mode 100644 index 00000000..008152bd --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/netherite/charged_certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "ae2:charged_certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.035 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/string/certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/string/certus_quartz_crystal.json new file mode 100644 index 00000000..6a7d0447 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/string/certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:string_mesh", + "result": "ae2:certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.03 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/sand/string/charged_certus_quartz_crystal.json b/src/generated/resources/data/exdeorum/recipes/sieve/sand/string/charged_certus_quartz_crystal.json new file mode 100644 index 00000000..ed035658 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/sand/string/charged_certus_quartz_crystal.json @@ -0,0 +1,26 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ae2" + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:sand" + }, + "mesh": "exdeorum:string_mesh", + "result": "ae2:charged_certus_quartz_crystal", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.005 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/java/thedarkcolour/exdeorum/block/AbstractCrucibleBlock.java b/src/main/java/thedarkcolour/exdeorum/block/AbstractCrucibleBlock.java index f04bad69..4068cf96 100644 --- a/src/main/java/thedarkcolour/exdeorum/block/AbstractCrucibleBlock.java +++ b/src/main/java/thedarkcolour/exdeorum/block/AbstractCrucibleBlock.java @@ -45,7 +45,7 @@ public abstract class AbstractCrucibleBlock extends EBlock { @Override public int getLightEmission(BlockState state, BlockGetter level, BlockPos pos) { - if (level.getBlockEntity(pos) instanceof AbstractCrucibleBlockEntity crucible) { + if (level.getExistingBlockEntity(pos) instanceof AbstractCrucibleBlockEntity crucible) { return crucible.getTank().getFluid().getFluid().getFluidType().getLightLevel(); } return 0; @@ -54,6 +54,6 @@ public abstract class AbstractCrucibleBlock extends EBlock { @Nullable @Override public BlockEntityTicker getTicker(Level level, BlockState pState, BlockEntityType type) { - return !level.isClientSide && (type == EBlockEntities.WATER_CRUCIBLE.get() || type == EBlockEntities.LAVA_CRUCIBLE.get()) ? (BlockEntityTicker) new AbstractCrucibleBlockEntity.Ticker() : null; + return (type == EBlockEntities.WATER_CRUCIBLE.get() || type == EBlockEntities.LAVA_CRUCIBLE.get()) ? (BlockEntityTicker) new AbstractCrucibleBlockEntity.Ticker() : null; } } diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/AbstractCrucibleBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/AbstractCrucibleBlockEntity.java index 9190c97f..d9ff5639 100644 --- a/src/main/java/thedarkcolour/exdeorum/blockentity/AbstractCrucibleBlockEntity.java +++ b/src/main/java/thedarkcolour/exdeorum/blockentity/AbstractCrucibleBlockEntity.java @@ -36,6 +36,7 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.level.material.Fluids; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.Lazy; @@ -47,11 +48,11 @@ import net.minecraftforge.fluids.capability.templates.FluidTank; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.registries.ForgeRegistries; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import thedarkcolour.exdeorum.recipe.crucible.CrucibleRecipe; import thedarkcolour.exdeorum.registry.EItems; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.HashMap; import java.util.function.Consumer; @@ -70,17 +71,20 @@ public abstract class AbstractCrucibleBlockEntity extends EBlockEntity { private final LazyOptional itemHandler = LazyOptional.of(() -> item); private final LazyOptional fluidHandler = LazyOptional.of(() -> tank); + @Nullable private Block lastMelted; - private Fluid fluid; + @Nullable + private Fluid fluid = null; private short solids; + private boolean needsLightUpdate; public AbstractCrucibleBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); } - @Nonnull + @NotNull @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { + public LazyOptional getCapability(@NotNull Capability cap, @Nullable Direction side) { if (!remove) { if (cap == ForgeCapabilities.FLUID_HANDLER) { return fluidHandler.cast(); @@ -111,6 +115,7 @@ public abstract class AbstractCrucibleBlockEntity extends EBlockEntity { lastMelted = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(nbt.getString("LastMelted"))); fluid = ForgeRegistries.FLUIDS.getValue(new ResourceLocation(nbt.getString("Fluid"))); solids = nbt.getShort("Solids"); + needsLightUpdate = true; } public InteractionResult use(Level level, Player player, InteractionHand hand) { @@ -128,6 +133,7 @@ public abstract class AbstractCrucibleBlockEntity extends EBlockEntity { } // Gets a crucible recipe, using the cache if possible + @Nullable protected abstract CrucibleRecipe getRecipe(ItemStack item); /** @@ -148,10 +154,11 @@ public abstract class AbstractCrucibleBlockEntity extends EBlockEntity { var result = recipe.getResult(); var contained = this.tank.getFluid(); shrinkAction.accept(item); - this.solids = (short) Math.max(solids + result.getAmount(), MAX_SOLIDS); + this.solids = (short) Math.min(solids + result.getAmount(), MAX_SOLIDS); if (contained.isEmpty()) { fluid = result.getFluid(); + needsLightUpdate = true; } var melts = MELT_OVERRIDES.get(); @@ -198,6 +205,7 @@ public abstract class AbstractCrucibleBlockEntity extends EBlockEntity { public abstract Block getDefaultMeltBlock(); + @Nullable public Block getLastMelted() { return lastMelted; } @@ -258,12 +266,12 @@ public abstract class AbstractCrucibleBlockEntity extends EBlockEntity { } @Override - protected int getStackLimit(int slot, @Nonnull ItemStack stack) { + protected int getStackLimit(int slot, @NotNull ItemStack stack) { return 1; } @Override - public boolean isItemValid(int slot, @Nonnull ItemStack stack) { + public boolean isItemValid(int slot, @NotNull ItemStack stack) { return canInsertItem(stack); } @@ -272,13 +280,17 @@ public abstract class AbstractCrucibleBlockEntity extends EBlockEntity { } } - // Only ticks on client + // Only ticks on server public static class Ticker implements BlockEntityTicker { @Override public void tick(Level level, BlockPos pos, BlockState state, AbstractCrucibleBlockEntity crucible) { + if (crucible.needsLightUpdate) { + level.getLightEngine().checkBlock(crucible.worldPosition); + crucible.needsLightUpdate = false; + } // Update twice per tick - if ((level.getGameTime() % 10L) == 0L) { - int delta = Math.min(crucible.solids, crucible.getMeltingRate()); + if (!level.isClientSide && (level.getGameTime() % 10L) == 0L) { + short delta = (short) Math.min(crucible.solids, crucible.getMeltingRate()); // Skip if no heat if (delta <= 0) return; @@ -289,7 +301,10 @@ public abstract class AbstractCrucibleBlockEntity extends EBlockEntity { // Add lava if (crucible.tank.isEmpty()) { - crucible.tank.setFluid(new FluidStack(crucible.fluid, delta)); + if (crucible.fluid != null) { + crucible.tank.setFluid(new FluidStack(crucible.fluid, delta)); + crucible.needsLightUpdate = true; + } } else { crucible.tank.getFluid().grow(delta); } diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/LavaCrucibleBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/LavaCrucibleBlockEntity.java index 655ba103..4bff1a55 100644 --- a/src/main/java/thedarkcolour/exdeorum/blockentity/LavaCrucibleBlockEntity.java +++ b/src/main/java/thedarkcolour/exdeorum/blockentity/LavaCrucibleBlockEntity.java @@ -18,6 +18,7 @@ package thedarkcolour.exdeorum.blockentity; +import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.minecraft.core.BlockPos; @@ -30,17 +31,18 @@ import thedarkcolour.exdeorum.recipe.RecipeUtil; import thedarkcolour.exdeorum.recipe.crucible.CrucibleRecipe; import thedarkcolour.exdeorum.registry.EBlockEntities; +import javax.annotation.Nullable; import java.util.function.Predicate; public class LavaCrucibleBlockEntity extends AbstractCrucibleBlockEntity { - // todo add KubeJS support for this - private static final Object2IntMap HEAT_REGISTRY = new Object2IntOpenHashMap<>(); + public static final Object2IntMap HEAT_REGISTRY = new Object2IntOpenHashMap<>(); + public static final Object2IntMap KUBEJS_HEAT_VALUES = new Object2IntLinkedOpenHashMap<>(); static { putDefaultHeatValues(); } - private static void putDefaultHeatValues() { + public static void putDefaultHeatValues() { HEAT_REGISTRY.clear(); putAllStates(Blocks.TORCH, 1); @@ -55,10 +57,15 @@ public class LavaCrucibleBlockEntity extends AbstractCrucibleBlockEntity { putStates(Blocks.CAMPFIRE, 2, state -> state.getValue(CampfireBlock.LIT)); putStates(Blocks.SOUL_CAMPFIRE, 2, state -> state.getValue(CampfireBlock.LIT)); + + HEAT_REGISTRY.putAll(KUBEJS_HEAT_VALUES); + KUBEJS_HEAT_VALUES.clear(); } public static void putAllStates(Block block, int heat) { - putStates(block, heat, state -> true); + for (var state : block.getStateDefinition().getPossibleStates()) { + HEAT_REGISTRY.put(state, heat); + } } public static void putStates(Block block, int heat, Predicate predicate) { @@ -81,7 +88,7 @@ public class LavaCrucibleBlockEntity extends AbstractCrucibleBlockEntity { } @Override - protected CrucibleRecipe getRecipe(ItemStack item) { + protected @Nullable CrucibleRecipe getRecipe(ItemStack item) { return RecipeUtil.getLavaCrucibleRecipe(item); } diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/WaterCrucibleBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/WaterCrucibleBlockEntity.java index 6217b300..21b65848 100644 --- a/src/main/java/thedarkcolour/exdeorum/blockentity/WaterCrucibleBlockEntity.java +++ b/src/main/java/thedarkcolour/exdeorum/blockentity/WaterCrucibleBlockEntity.java @@ -27,13 +27,15 @@ import thedarkcolour.exdeorum.recipe.RecipeUtil; import thedarkcolour.exdeorum.recipe.crucible.CrucibleRecipe; import thedarkcolour.exdeorum.registry.EBlockEntities; +import javax.annotation.Nullable; + public class WaterCrucibleBlockEntity extends AbstractCrucibleBlockEntity { public WaterCrucibleBlockEntity(BlockPos pos, BlockState state) { super(EBlockEntities.WATER_CRUCIBLE.get(), pos, state); } @Override - protected CrucibleRecipe getRecipe(ItemStack item) { + protected @Nullable CrucibleRecipe getRecipe(ItemStack item) { return RecipeUtil.getWaterCrucibleRecipe(item); } diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/package-info.java b/src/main/java/thedarkcolour/exdeorum/blockentity/package-info.java new file mode 100644 index 00000000..ec76d08b --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/blockentity/package-info.java @@ -0,0 +1,27 @@ +/* + * Ex Deorum + * Copyright (c) 2023 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * This package contains all data generation for Ex Deorum. It is not to be used outside of data generation. + *

+ * Ex Deorum uses the ModKit library, which adds several utilities primarily for data generation + * without needing to be shaded or depended upon outside a development environment. + */ +@net.minecraft.MethodsReturnNonnullByDefault +@javax.annotation.ParametersAreNonnullByDefault +package thedarkcolour.exdeorum.blockentity; diff --git a/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java b/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java index f6727fd2..84dde865 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java @@ -33,4 +33,6 @@ public class ModIds { public static final String MEKANISM = "mekanism"; public static final String CREATE = "create"; public static final String ENDERIO = "enderio"; + public static final String BIOMES_O_PLENTY = "biomesoplenty"; + public static final String APPLIED_ENERGISTICS_2 = "ae2"; } diff --git a/src/main/java/thedarkcolour/exdeorum/compat/ModdedTags.java b/src/main/java/thedarkcolour/exdeorum/compat/ModdedTags.java index 98cd4ab3..4f3ee856 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/ModdedTags.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/ModdedTags.java @@ -1,3 +1,21 @@ +/* + * Ex Deorum + * Copyright (c) 2023 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package thedarkcolour.exdeorum.compat; import com.google.common.collect.Lists; diff --git a/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java b/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java index 565a2b76..78273499 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java @@ -18,6 +18,7 @@ package thedarkcolour.exdeorum.compat.jei; +import com.google.common.collect.Lists; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.VanillaTypes; @@ -31,9 +32,12 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Recipe; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.ModList; import thedarkcolour.exdeorum.ExDeorum; +import thedarkcolour.exdeorum.compat.ModIds; import thedarkcolour.exdeorum.data.TranslationKeys; import thedarkcolour.exdeorum.item.WateringCanItem; import thedarkcolour.exdeorum.recipe.RecipeUtil; @@ -72,7 +76,7 @@ public class ExDeorumJeiPlugin implements IModPlugin { public void registerCategories(IRecipeCategoryRegistration registration) { var helper = registration.getJeiHelpers().getGuiHelper(); var arrow = helper.createDrawable(ExDeorumJeiPlugin.EX_DEORUM_JEI_TEXTURE, 0, 18, 22, 15); - var plus = helper.createDrawable(ExDeorumJeiPlugin.EX_DEORUM_JEI_TEXTURE, 22,18, 8, 8); + var plus = helper.createDrawable(ExDeorumJeiPlugin.EX_DEORUM_JEI_TEXTURE, 22, 18, 8, 8); registration.addRecipeCategories(new BarrelCompostCategory(helper)); registration.addRecipeCategories(new BarrelMixingCategory(helper, plus, arrow)); @@ -84,50 +88,95 @@ public class ExDeorumJeiPlugin implements IModPlugin { @Override public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) { - var barrels = new ItemStack[]{ - new ItemStack(EItems.OAK_BARREL.get()), - new ItemStack(EItems.SPRUCE_BARREL.get()), - new ItemStack(EItems.BIRCH_BARREL.get()), - new ItemStack(EItems.JUNGLE_BARREL.get()), - new ItemStack(EItems.ACACIA_BARREL.get()), - new ItemStack(EItems.DARK_OAK_BARREL.get()), - new ItemStack(EItems.MANGROVE_BARREL.get()), - new ItemStack(EItems.CHERRY_BARREL.get()), - new ItemStack(EItems.BAMBOO_BARREL.get()), - new ItemStack(EItems.CRIMSON_BARREL.get()), - new ItemStack(EItems.WARPED_BARREL.get()), - new ItemStack(EItems.STONE_BARREL.get()), - }; - for (var barrel : barrels) { - registration.addRecipeCatalyst(barrel, BARREL_COMPOST); - registration.addRecipeCatalyst(barrel, BARREL_MIXING); + var barrels = Lists.newArrayList( + EItems.OAK_BARREL.get(), + EItems.SPRUCE_BARREL.get(), + EItems.BIRCH_BARREL.get(), + EItems.JUNGLE_BARREL.get(), + EItems.ACACIA_BARREL.get(), + EItems.DARK_OAK_BARREL.get(), + EItems.MANGROVE_BARREL.get(), + EItems.CHERRY_BARREL.get(), + EItems.BAMBOO_BARREL.get(), + EItems.CRIMSON_BARREL.get(), + EItems.WARPED_BARREL.get(), + EItems.STONE_BARREL.get() + ); + var sieves = Lists.newArrayList( + EItems.OAK_SIEVE.get(), + EItems.SPRUCE_SIEVE.get(), + EItems.BIRCH_SIEVE.get(), + EItems.JUNGLE_SIEVE.get(), + EItems.ACACIA_SIEVE.get(), + EItems.DARK_OAK_SIEVE.get(), + EItems.MANGROVE_SIEVE.get(), + EItems.CHERRY_SIEVE.get(), + EItems.BAMBOO_SIEVE.get(), + EItems.CRIMSON_SIEVE.get(), + EItems.WARPED_SIEVE.get() + ); + var lavaCrucibles = Lists.newArrayList( + EItems.PORCELAIN_CRUCIBLE.get(), + EItems.WARPED_CRUCIBLE.get(), + EItems.CRIMSON_CRUCIBLE.get() + ); + var waterCrucibles = Lists.newArrayList( + EItems.OAK_CRUCIBLE.get(), + EItems.SPRUCE_CRUCIBLE.get(), + EItems.BIRCH_CRUCIBLE.get(), + EItems.JUNGLE_CRUCIBLE.get(), + EItems.ACACIA_CRUCIBLE.get(), + EItems.DARK_OAK_CRUCIBLE.get(), + EItems.MANGROVE_CRUCIBLE.get(), + EItems.CHERRY_CRUCIBLE.get(), + EItems.BAMBOO_CRUCIBLE.get() + ); + if (ModList.get().isLoaded(ModIds.BIOMES_O_PLENTY)) { + barrels.add(EItems.FIR_BARREL.get()); + barrels.add(EItems.REDWOOD_BARREL.get()); + barrels.add(EItems.MAHOGANY_BARREL.get()); + barrels.add(EItems.JACARANDA_BARREL.get()); + barrels.add(EItems.PALM_BARREL.get()); + barrels.add(EItems.WILLOW_BARREL.get()); + barrels.add(EItems.DEAD_BARREL.get()); + barrels.add(EItems.MAGIC_BARREL.get()); + barrels.add(EItems.UMBRAN_BARREL.get()); + barrels.add(EItems.HELLBARK_BARREL.get()); + sieves.add(EItems.FIR_SIEVE.get()); + sieves.add(EItems.REDWOOD_SIEVE.get()); + sieves.add(EItems.MAHOGANY_SIEVE.get()); + sieves.add(EItems.JACARANDA_SIEVE.get()); + sieves.add(EItems.PALM_SIEVE.get()); + sieves.add(EItems.WILLOW_SIEVE.get()); + sieves.add(EItems.DEAD_SIEVE.get()); + sieves.add(EItems.MAGIC_SIEVE.get()); + sieves.add(EItems.UMBRAN_SIEVE.get()); + sieves.add(EItems.HELLBARK_SIEVE.get()); + lavaCrucibles.add(EItems.HELLBARK_CRUCIBLE.get()); + waterCrucibles.add(EItems.FIR_CRUCIBLE.get()); + waterCrucibles.add(EItems.REDWOOD_CRUCIBLE.get()); + waterCrucibles.add(EItems.MAHOGANY_CRUCIBLE.get()); + waterCrucibles.add(EItems.JACARANDA_CRUCIBLE.get()); + waterCrucibles.add(EItems.PALM_CRUCIBLE.get()); + waterCrucibles.add(EItems.WILLOW_CRUCIBLE.get()); + waterCrucibles.add(EItems.DEAD_CRUCIBLE.get()); + waterCrucibles.add(EItems.MAGIC_CRUCIBLE.get()); + waterCrucibles.add(EItems.UMBRAN_CRUCIBLE.get()); + } + for (var barrel : barrels) { + var stack = new ItemStack(barrel); + registration.addRecipeCatalyst(stack, BARREL_COMPOST); + registration.addRecipeCatalyst(stack, BARREL_MIXING); + } + for (var lavaCrucible : lavaCrucibles) { + registration.addRecipeCatalyst(new ItemStack(lavaCrucible), LAVA_CRUCIBLE); + } + for (var waterCrucible : waterCrucibles) { + registration.addRecipeCatalyst(new ItemStack(waterCrucible), WATER_CRUCIBLE); + } + for (var sieve : sieves) { + registration.addRecipeCatalyst(new ItemStack(sieve), SIEVE); } - - registration.addRecipeCatalyst(new ItemStack(EItems.PORCELAIN_CRUCIBLE.get()), LAVA_CRUCIBLE); - registration.addRecipeCatalyst(new ItemStack(EItems.WARPED_CRUCIBLE.get()), LAVA_CRUCIBLE); - registration.addRecipeCatalyst(new ItemStack(EItems.CRIMSON_CRUCIBLE.get()), LAVA_CRUCIBLE); - - registration.addRecipeCatalyst(new ItemStack(EItems.OAK_CRUCIBLE.get()), WATER_CRUCIBLE); - registration.addRecipeCatalyst(new ItemStack(EItems.SPRUCE_CRUCIBLE.get()), WATER_CRUCIBLE); - registration.addRecipeCatalyst(new ItemStack(EItems.BIRCH_CRUCIBLE.get()), WATER_CRUCIBLE); - registration.addRecipeCatalyst(new ItemStack(EItems.JUNGLE_CRUCIBLE.get()), WATER_CRUCIBLE); - registration.addRecipeCatalyst(new ItemStack(EItems.ACACIA_CRUCIBLE.get()), WATER_CRUCIBLE); - registration.addRecipeCatalyst(new ItemStack(EItems.DARK_OAK_CRUCIBLE.get()), WATER_CRUCIBLE); - registration.addRecipeCatalyst(new ItemStack(EItems.MANGROVE_CRUCIBLE.get()), WATER_CRUCIBLE); - registration.addRecipeCatalyst(new ItemStack(EItems.CHERRY_CRUCIBLE.get()), WATER_CRUCIBLE); - registration.addRecipeCatalyst(new ItemStack(EItems.BAMBOO_CRUCIBLE.get()), WATER_CRUCIBLE); - - registration.addRecipeCatalyst(new ItemStack(EItems.OAK_SIEVE.get()), SIEVE); - registration.addRecipeCatalyst(new ItemStack(EItems.SPRUCE_SIEVE.get()), SIEVE); - registration.addRecipeCatalyst(new ItemStack(EItems.BIRCH_SIEVE.get()), SIEVE); - registration.addRecipeCatalyst(new ItemStack(EItems.JUNGLE_SIEVE.get()), SIEVE); - registration.addRecipeCatalyst(new ItemStack(EItems.ACACIA_SIEVE.get()), SIEVE); - registration.addRecipeCatalyst(new ItemStack(EItems.DARK_OAK_SIEVE.get()), SIEVE); - registration.addRecipeCatalyst(new ItemStack(EItems.MANGROVE_SIEVE.get()), SIEVE); - registration.addRecipeCatalyst(new ItemStack(EItems.CHERRY_SIEVE.get()), SIEVE); - registration.addRecipeCatalyst(new ItemStack(EItems.BAMBOO_SIEVE.get()), SIEVE); - registration.addRecipeCatalyst(new ItemStack(EItems.CRIMSON_SIEVE.get()), SIEVE); - registration.addRecipeCatalyst(new ItemStack(EItems.WARPED_SIEVE.get()), SIEVE); registration.addRecipeCatalyst(new ItemStack(EItems.WOODEN_HAMMER.get()), HAMMER); registration.addRecipeCatalyst(new ItemStack(EItems.STONE_HAMMER.get()), HAMMER); @@ -153,11 +202,13 @@ public class ExDeorumJeiPlugin implements IModPlugin { var toRemove = new ArrayList(); - if (RecipeUtil.isTagEmpty(EItemTags.ORES_ALUMINUM)) toRemove.add(new ItemStack(EItems.ALUMINUM_ORE_CHUNK.get())); + if (RecipeUtil.isTagEmpty(EItemTags.ORES_ALUMINUM)) + toRemove.add(new ItemStack(EItems.ALUMINUM_ORE_CHUNK.get())); if (RecipeUtil.isTagEmpty(EItemTags.ORES_COBALT)) toRemove.add(new ItemStack(EItems.COBALT_ORE_CHUNK.get())); if (RecipeUtil.isTagEmpty(EItemTags.ORES_SILVER)) toRemove.add(new ItemStack(EItems.SILVER_ORE_CHUNK.get())); if (RecipeUtil.isTagEmpty(EItemTags.ORES_LEAD)) toRemove.add(new ItemStack(EItems.LEAD_ORE_CHUNK.get())); - if (RecipeUtil.isTagEmpty(EItemTags.ORES_PLATINUM)) toRemove.add(new ItemStack(EItems.PLATINUM_ORE_CHUNK.get())); + if (RecipeUtil.isTagEmpty(EItemTags.ORES_PLATINUM)) + toRemove.add(new ItemStack(EItems.PLATINUM_ORE_CHUNK.get())); if (RecipeUtil.isTagEmpty(EItemTags.ORES_NICKEL)) toRemove.add(new ItemStack(EItems.NICKEL_ORE_CHUNK.get())); if (RecipeUtil.isTagEmpty(EItemTags.ORES_URANIUM)) toRemove.add(new ItemStack(EItems.URANIUM_ORE_CHUNK.get())); if (RecipeUtil.isTagEmpty(EItemTags.ORES_OSMIUM)) toRemove.add(new ItemStack(EItems.OSMIUM_ORE_CHUNK.get())); diff --git a/src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsBindings.java b/src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsBindings.java new file mode 100644 index 00000000..74df48c8 --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsBindings.java @@ -0,0 +1,35 @@ +/* + * Ex Deorum + * Copyright (c) 2023 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package thedarkcolour.exdeorum.compat.kubejs; + +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import thedarkcolour.exdeorum.blockentity.LavaCrucibleBlockEntity; + +class ExDeorumKubeJsBindings { + public void setCrucibleHeatValue(BlockState state, int value) { + LavaCrucibleBlockEntity.KUBEJS_HEAT_VALUES.put(state, value); + } + + public void setCrucibleHeatValueForBlock(Block block, int value) { + for (var state : block.getStateDefinition().getPossibleStates()) { + LavaCrucibleBlockEntity.KUBEJS_HEAT_VALUES.put(state, value); + } + } +} diff --git a/src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsPlugin.java b/src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsPlugin.java new file mode 100644 index 00000000..96375f39 --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/compat/kubejs/ExDeorumKubeJsPlugin.java @@ -0,0 +1,37 @@ +/* + * Ex Deorum + * Copyright (c) 2023 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package thedarkcolour.exdeorum.compat.kubejs; + +import dev.latvian.mods.kubejs.KubeJSPlugin; +import dev.latvian.mods.kubejs.script.BindingsEvent; +import dev.latvian.mods.kubejs.script.ScriptType; +import dev.latvian.mods.kubejs.util.ClassFilter; +import thedarkcolour.exdeorum.ExDeorum; + +public class ExDeorumKubeJsPlugin extends KubeJSPlugin { + @Override + public void registerBindings(BindingsEvent event) { + event.add(ExDeorum.ID, new ExDeorumKubeJsBindings()); + } + + @Override + public void registerClasses(ScriptType type, ClassFilter filter) { + super.registerClasses(type, filter); + } +} diff --git a/src/main/java/thedarkcolour/exdeorum/config/EConfig.java b/src/main/java/thedarkcolour/exdeorum/config/EConfig.java index 69d4ab26..69f2c4b2 100644 --- a/src/main/java/thedarkcolour/exdeorum/config/EConfig.java +++ b/src/main/java/thedarkcolour/exdeorum/config/EConfig.java @@ -101,6 +101,8 @@ public class EConfig { public final DoubleValue barrelProgressStep; public final BooleanValue witchWaterNetherrackGenerator; public final BooleanValue setVoidWorldAsDefault; + public final ConfigValue defaultSpawnTreeFeature; + public final BooleanValue useBiomeAppropriateTree; public Server(ForgeConfigSpec.Builder builder) { builder.comment("Server configuration for Ex Deorum").push("server"); @@ -126,6 +128,12 @@ public class EConfig { this.setVoidWorldAsDefault = builder .comment("Whether the Void World type is used by default in the \"server.properties\" file when creating a server.") .define("set_void_world_as_default", true); + this.defaultSpawnTreeFeature = builder + .comment("The ID of the default tree feature to use when generating a spawn island (or when useBiomeAppropriateTree is true and the biome has no tree set). By default, minecraft:oak_tree_bees_005 is used.") + .define("default_spawn_tree_feature", ModIds.MINECRAFT + ":oak_tree_bees_005"); + this.useBiomeAppropriateTree = builder + .comment("Whether the Spawn Tree in the void world changes based on the biome it's in. If false, Oak Tree is always used.") + .define("use_biome_appropriate_tree", false); builder.pop(); } diff --git a/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java b/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java index ba006cb7..3dc6bd25 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java +++ b/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java @@ -20,6 +20,7 @@ package thedarkcolour.exdeorum.data; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.client.model.data.ModelData; import net.minecraftforge.client.model.generators.BlockModelBuilder; import net.minecraftforge.client.model.generators.ConfiguredModel; import thedarkcolour.exdeorum.registry.EBlocks; @@ -75,6 +76,44 @@ class BlockModels { crucible(models, EBlocks.MANGROVE_CRUCIBLE.get(), Blocks.MANGROVE_LOG); crucible(models, EBlocks.CHERRY_CRUCIBLE.get(), Blocks.CHERRY_LOG); crucible(models, EBlocks.BAMBOO_CRUCIBLE.get(), Blocks.BAMBOO_BLOCK); + + // Mod compat + bopModels(models); + } + + private static void bopModels(MKBlockModelProvider models) { + barrel(models, EBlocks.FIR_BARREL.get(), ModCompatData.FIR_PLANKS.get()); + barrel(models, EBlocks.REDWOOD_BARREL.get(), ModCompatData.REDWOOD_PLANKS.get()); + barrel(models, EBlocks.MAHOGANY_BARREL.get(), ModCompatData.MAHOGANY_PLANKS.get()); + barrel(models, EBlocks.JACARANDA_BARREL.get(), ModCompatData.JACARANDA_PLANKS.get()); + barrel(models, EBlocks.PALM_BARREL.get(), ModCompatData.PALM_PLANKS.get()); + barrel(models, EBlocks.WILLOW_BARREL.get(), ModCompatData.WILLOW_PLANKS.get()); + barrel(models, EBlocks.DEAD_BARREL.get(), ModCompatData.DEAD_PLANKS.get()); + barrel(models, EBlocks.MAGIC_BARREL.get(), ModCompatData.MAGIC_PLANKS.get()); + barrel(models, EBlocks.UMBRAN_BARREL.get(), ModCompatData.UMBRAN_PLANKS.get()); + barrel(models, EBlocks.HELLBARK_BARREL.get(), ModCompatData.HELLBARK_PLANKS.get()); + + sieve(models, EBlocks.FIR_SIEVE.get(), ModCompatData.FIR_PLANKS.get()); + sieve(models, EBlocks.REDWOOD_SIEVE.get(), ModCompatData.REDWOOD_PLANKS.get()); + sieve(models, EBlocks.MAHOGANY_SIEVE.get(), ModCompatData.MAHOGANY_PLANKS.get()); + sieve(models, EBlocks.JACARANDA_SIEVE.get(), ModCompatData.JACARANDA_PLANKS.get()); + sieve(models, EBlocks.PALM_SIEVE.get(), ModCompatData.PALM_PLANKS.get()); + sieve(models, EBlocks.WILLOW_SIEVE.get(), ModCompatData.WILLOW_PLANKS.get()); + sieve(models, EBlocks.DEAD_SIEVE.get(), ModCompatData.DEAD_PLANKS.get()); + sieve(models, EBlocks.MAGIC_SIEVE.get(), ModCompatData.MAGIC_PLANKS.get()); + sieve(models, EBlocks.UMBRAN_SIEVE.get(), ModCompatData.UMBRAN_PLANKS.get()); + sieve(models, EBlocks.HELLBARK_SIEVE.get(), ModCompatData.HELLBARK_PLANKS.get()); + + crucible(models, EBlocks.FIR_CRUCIBLE.get(), ModCompatData.FIR_LOG.get()); + crucible(models, EBlocks.REDWOOD_CRUCIBLE.get(), ModCompatData.REDWOOD_LOG.get()); + crucible(models, EBlocks.MAHOGANY_CRUCIBLE.get(), ModCompatData.MAHOGANY_LOG.get()); + crucible(models, EBlocks.JACARANDA_CRUCIBLE.get(), ModCompatData.JACARANDA_LOG.get()); + crucible(models, EBlocks.PALM_CRUCIBLE.get(), ModCompatData.PALM_LOG.get()); + crucible(models, EBlocks.WILLOW_CRUCIBLE.get(), ModCompatData.WILLOW_LOG.get()); + crucible(models, EBlocks.DEAD_CRUCIBLE.get(), ModCompatData.DEAD_LOG.get()); + crucible(models, EBlocks.MAGIC_CRUCIBLE.get(), ModCompatData.MAGIC_LOG.get()); + crucible(models, EBlocks.UMBRAN_CRUCIBLE.get(), ModCompatData.UMBRAN_LOG.get()); + crucible(models, EBlocks.HELLBARK_CRUCIBLE.get(), ModCompatData.HELLBARK_LOG.get()); } public static void crucible(MKBlockModelProvider models, Block block) { diff --git a/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java b/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java index 7c18f11d..75f0c580 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java +++ b/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java @@ -1,33 +1,147 @@ +/* + * Ex Deorum + * Copyright (c) 2023 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package thedarkcolour.exdeorum.data; import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; import thedarkcolour.exdeorum.compat.ModIds; +import java.util.function.Consumer; +import java.util.function.Function; + // registers dummy items so that data generation can reference modded items without needing those mods installed. public class ModCompatData { - public static RegistryObject GRAINS_OF_INFINITY = null; - public static RegistryObject YELLORITE_DUST = null; + // Ender IO + public static RegistryObject GRAINS_OF_INFINITY; + // Bigger reactors + public static RegistryObject YELLORIUM_DUST; + // Biomes O' Plenty + public static RegistryObject FIR_PLANKS; + public static RegistryObject REDWOOD_PLANKS; + public static RegistryObject MAHOGANY_PLANKS; + public static RegistryObject JACARANDA_PLANKS; + public static RegistryObject PALM_PLANKS; + public static RegistryObject WILLOW_PLANKS; + public static RegistryObject DEAD_PLANKS; + public static RegistryObject MAGIC_PLANKS; + public static RegistryObject UMBRAN_PLANKS; + public static RegistryObject HELLBARK_PLANKS; + public static RegistryObject FIR_LOG; + public static RegistryObject REDWOOD_LOG; + public static RegistryObject MAHOGANY_LOG; + public static RegistryObject JACARANDA_LOG; + public static RegistryObject PALM_LOG; + public static RegistryObject WILLOW_LOG; + public static RegistryObject DEAD_LOG; + public static RegistryObject MAGIC_LOG; + public static RegistryObject UMBRAN_LOG; + public static RegistryObject HELLBARK_LOG; + public static RegistryObject ORIGIN_SAPLING; + public static RegistryObject FLOWERING_OAK_SAPLING; + public static RegistryObject SNOWBLOSSOM_SAPLING; + public static RegistryObject RAINBOW_BIRCH_SAPLING; + public static RegistryObject YELLOW_AUTUMN_SAPLING; + public static RegistryObject ORANGE_AUTUMN_SAPLING; + public static RegistryObject MAPLE_SAPLING; + public static RegistryObject FIR_SAPLING; + public static RegistryObject REDWOOD_SAPLING; + public static RegistryObject MAHOGANY_SAPLING; + public static RegistryObject JACARANDA_SAPLING; + public static RegistryObject PALM_SAPLING; + public static RegistryObject WILLOW_SAPLING; + public static RegistryObject DEAD_SAPLING; + public static RegistryObject MAGIC_SAPLING; + public static RegistryObject UMBRAN_SAPLING; + public static RegistryObject HELLBARK_SAPLING; + // Applied Energistics 2 + public static RegistryObject CERTUS_QUARTZ_CRYSTAL; + public static RegistryObject CHARGED_CERTUS_QUARTZ_CRYSTAL; + public static RegistryObject CERTUS_QUARTZ_DUST; public static void registerModData() { - registerEnderIO(); - registerExtremeReactors(); + registerModItems(ModIds.ENDERIO, addItem -> GRAINS_OF_INFINITY = addItem.apply("grains_of_infinity")); + registerModItems(ModIds.EXTREME_REACTORS, addItem -> YELLORIUM_DUST = addItem.apply("yellorium_dust")); + registerModBlocks(ModIds.BIOMES_O_PLENTY, addBlock -> { + FIR_PLANKS = addBlock.apply("fir_planks"); + REDWOOD_PLANKS = addBlock.apply("redwood_planks"); + MAHOGANY_PLANKS = addBlock.apply("mahogany_planks"); + JACARANDA_PLANKS = addBlock.apply("jacaranda_planks"); + PALM_PLANKS = addBlock.apply("palm_planks"); + WILLOW_PLANKS = addBlock.apply("willow_planks"); + DEAD_PLANKS = addBlock.apply("dead_planks"); + MAGIC_PLANKS = addBlock.apply("magic_planks"); + UMBRAN_PLANKS = addBlock.apply("umbran_planks"); + HELLBARK_PLANKS = addBlock.apply("hellbark_planks"); + FIR_LOG = addBlock.apply("fir_log"); + REDWOOD_LOG = addBlock.apply("redwood_log"); + MAHOGANY_LOG = addBlock.apply("mahogany_log"); + JACARANDA_LOG = addBlock.apply("jacaranda_log"); + PALM_LOG = addBlock.apply("palm_log"); + WILLOW_LOG = addBlock.apply("willow_log"); + DEAD_LOG = addBlock.apply("dead_log"); + MAGIC_LOG = addBlock.apply("magic_log"); + UMBRAN_LOG = addBlock.apply("umbran_log"); + HELLBARK_LOG = addBlock.apply("hellbark_log"); + }); + registerModItems(ModIds.BIOMES_O_PLENTY, addItem -> { + ORIGIN_SAPLING = addItem.apply("origin_sapling"); + FLOWERING_OAK_SAPLING = addItem.apply("flowering_oak_sapling"); + SNOWBLOSSOM_SAPLING = addItem.apply("snowblossom_sapling"); + RAINBOW_BIRCH_SAPLING = addItem.apply("rainbow_birch_sapling"); + YELLOW_AUTUMN_SAPLING = addItem.apply("yellow_autumn_sapling"); + ORANGE_AUTUMN_SAPLING = addItem.apply("orange_autumn_sapling"); + MAPLE_SAPLING = addItem.apply("maple_sapling"); + FIR_SAPLING = addItem.apply("fir_sapling"); + REDWOOD_SAPLING = addItem.apply("redwood_sapling"); + MAHOGANY_SAPLING = addItem.apply("mahogany_sapling"); + JACARANDA_SAPLING = addItem.apply("jacaranda_sapling"); + PALM_SAPLING = addItem.apply("palm_sapling"); + WILLOW_SAPLING = addItem.apply("willow_sapling"); + DEAD_SAPLING = addItem.apply("dead_sapling"); + MAGIC_SAPLING = addItem.apply("magic_sapling"); + UMBRAN_SAPLING = addItem.apply("umbran_sapling"); + HELLBARK_SAPLING = addItem.apply("hellbark_sapling"); + }); + registerModItems(ModIds.APPLIED_ENERGISTICS_2, addItem -> { + CERTUS_QUARTZ_CRYSTAL = addItem.apply("certus_quartz_crystal"); + CHARGED_CERTUS_QUARTZ_CRYSTAL = addItem.apply("charged_certus_quartz_crystal"); + CERTUS_QUARTZ_DUST = addItem.apply("certus_quartz_dust"); + }); } - private static void registerEnderIO() { - var deferredRegister = DeferredRegister.create(ForgeRegistries.ITEMS, ModIds.ENDERIO); + private static void registerModItems(String modid, Consumer>> addItems) { + var deferredRegister = DeferredRegister.create(ForgeRegistries.ITEMS, modid); deferredRegister.register(FMLJavaModLoadingContext.get().getModEventBus()); - GRAINS_OF_INFINITY = deferredRegister.register("grains_of_infinity", () -> new Item(new Item.Properties())); + addItems.accept(name -> deferredRegister.register(name, () -> new Item(new Item.Properties()))); } - private static void registerExtremeReactors() { - var deferredRegister = DeferredRegister.create(ForgeRegistries.ITEMS, ModIds.BIGGER_REACTORS); + @SuppressWarnings("SameParameterValue") + private static void registerModBlocks(String modid, Consumer>> addBlocks) { + var deferredRegister = DeferredRegister.create(ForgeRegistries.BLOCKS, modid); deferredRegister.register(FMLJavaModLoadingContext.get().getModEventBus()); - YELLORITE_DUST = deferredRegister.register("yellorium_dust", () -> new Item(new Item.Properties())); + addBlocks.accept(name -> deferredRegister.register(name, () -> new Block(BlockBehaviour.Properties.of()))); } } diff --git a/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java b/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java index ad27815c..6f0d6b02 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java +++ b/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java @@ -1,3 +1,21 @@ +/* + * Ex Deorum + * Copyright (c) 2023 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package thedarkcolour.exdeorum.data.recipe; import com.mojang.datafixers.util.Either; @@ -142,7 +160,7 @@ class SieveRecipes { addDrop.accept(Items.COAL, chance(0.1f)); addDrop.accept(Items.LAPIS_LAZULI, chance(0.03f)); addDrop.accept(EItems.COPPER_ORE_CHUNK.get(), chance(0.08f)); - addDrop.accept(EItems.IRON_ORE_CHUNK.get(), chance(0.05f)); + addDrop.accept(EItems.IRON_ORE_CHUNK.get(), chance(0.07f)); addDrop.accept(EItems.GOLD_ORE_CHUNK.get(), chance(0.03f)); addDrop.accept(Items.DIAMOND, chance(0.02f)); addDrop.accept(Items.EMERALD, chance(0.01f)); @@ -168,7 +186,7 @@ class SieveRecipes { addDrop.accept(Items.COAL, chance(0.125f)); addDrop.accept(Items.LAPIS_LAZULI, chance(0.05f)); addDrop.accept(EItems.COPPER_ORE_CHUNK.get(), chance(0.1f)); - addDrop.accept(EItems.IRON_ORE_CHUNK.get(), chance(0.07f)); + addDrop.accept(EItems.IRON_ORE_CHUNK.get(), chance(0.08f)); addDrop.accept(EItems.GOLD_ORE_CHUNK.get(), chance(0.04f)); addDrop.accept(Items.DIAMOND, chance(0.03f)); addDrop.accept(Items.EMERALD, chance(0.015f)); @@ -287,32 +305,19 @@ class SieveRecipes { addDrop.accept(Items.IRON_NUGGET, chance(0.13f)); addDrop.accept(Items.KELP, chance(0.1f)); addDrop.accept(Items.SEA_PICKLE, chance(0.05f)); + + addConditionalDrop.accept(ModCompatData.CERTUS_QUARTZ_CRYSTAL.get(), chance(0.03f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); + addConditionalDrop.accept(ModCompatData.CHARGED_CERTUS_QUARTZ_CRYSTAL.get(), chance(0.005f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); }); forMesh(writer, ingredient(Items.SAND), EItems.FLINT_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(Items.FLINT, binomial(2, 0.2f)); addDrop.accept(Items.DEAD_BUSH, chance(0.03f)); addDrop.accept(Items.GOLD_NUGGET, chance(0.16f)); addDrop.accept(Items.IRON_NUGGET, chance(0.16f)); - addDrop.accept(Items.BURN_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.DANGER_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.FRIEND_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.HEART_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.HEARTBREAK_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.HOWL_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.SHEAF_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.BLADE_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.EXPLORER_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.MOURNER_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.PLENTY_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.ANGLER_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.SHELTER_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.SNORT_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.ARCHER_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.MINER_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.PRIZE_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.SKULL_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.ARMS_UP_POTTERY_SHERD, chance(0.03f)); - addDrop.accept(Items.BREWER_POTTERY_SHERD, chance(0.03f)); + addDrop.accept(EItems.RANDOM_POTTERY_SHERD.get(), chance(0.04f)); + + addConditionalDrop.accept(ModCompatData.CERTUS_QUARTZ_CRYSTAL.get(), chance(0.04f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); + addConditionalDrop.accept(ModCompatData.CHARGED_CERTUS_QUARTZ_CRYSTAL.get(), chance(0.005f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); }); forMesh(writer, ingredient(Items.SAND), EItems.IRON_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(Items.CACTUS, chance(0.13f)); @@ -324,6 +329,9 @@ class SieveRecipes { addDrop.accept(Items.SEA_PICKLE, chance(0.03f)); addDrop.accept(Items.PRISMARINE_SHARD, chance(0.06f)); addDrop.accept(Items.PRISMARINE_CRYSTALS, chance(0.06f)); + + addConditionalDrop.accept(ModCompatData.CERTUS_QUARTZ_CRYSTAL.get(), chance(0.06f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); + addConditionalDrop.accept(ModCompatData.CHARGED_CERTUS_QUARTZ_CRYSTAL.get(), chance(0.0125f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); }); forMesh(writer, ingredient(Items.SAND), EItems.GOLDEN_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(Items.CACTUS, chance(0.10f)); @@ -336,11 +344,10 @@ class SieveRecipes { addDrop.accept(Items.PRISMARINE_SHARD, chance(0.08f)); addDrop.accept(Items.PRISMARINE_CRYSTALS, chance(0.08f)); addDrop.accept(Items.RAW_GOLD, chance(0.04f)); - addDrop.accept(Items.WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE, chance(0.01f)); - addDrop.accept(Items.SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE, chance(0.01f)); - addDrop.accept(Items.HOST_ARMOR_TRIM_SMITHING_TEMPLATE, chance(0.01f)); - addDrop.accept(Items.RAISER_ARMOR_TRIM_SMITHING_TEMPLATE, chance(0.01f)); - addDrop.accept(Items.COAST_ARMOR_TRIM_SMITHING_TEMPLATE, chance(0.01f)); + addDrop.accept(EItems.RANDOM_ARMOR_TRIM.get(), chance(0.02f)); + + addConditionalDrop.accept(ModCompatData.CERTUS_QUARTZ_CRYSTAL.get(), chance(0.07f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); + addConditionalDrop.accept(ModCompatData.CHARGED_CERTUS_QUARTZ_CRYSTAL.get(), chance(0.015f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); }); forMesh(writer, ingredient(Items.SAND), EItems.DIAMOND_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(Items.FLINT, chance(0.23f)); @@ -348,6 +355,9 @@ class SieveRecipes { addDrop.accept(Items.IRON_NUGGET, chance(0.22f)); addDrop.accept(Items.PRISMARINE_SHARD, chance(0.09f)); addDrop.accept(Items.PRISMARINE_CRYSTALS, chance(0.09f)); + + addConditionalDrop.accept(ModCompatData.CERTUS_QUARTZ_CRYSTAL.get(), chance(0.09f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); + addConditionalDrop.accept(ModCompatData.CHARGED_CERTUS_QUARTZ_CRYSTAL.get(), chance(0.02f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); }); forMesh(writer, ingredient(Items.SAND), EItems.NETHERITE_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(Items.CACTUS, chance(0.15f)); @@ -358,6 +368,9 @@ class SieveRecipes { addDrop.accept(Items.SEA_PICKLE, chance(0.07f)); addDrop.accept(Items.PRISMARINE_SHARD, chance(0.12f)); addDrop.accept(Items.PRISMARINE_CRYSTALS, chance(0.12f)); + + addConditionalDrop.accept(ModCompatData.CERTUS_QUARTZ_CRYSTAL.get(), chance(0.095f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); + addConditionalDrop.accept(ModCompatData.CHARGED_CERTUS_QUARTZ_CRYSTAL.get(), chance(0.035f), modInstalled(ModIds.APPLIED_ENERGISTICS_2)); }); // Red Sand -> String mesh @@ -411,7 +424,7 @@ class SieveRecipes { addDrop.accept(Items.BLAZE_POWDER, chance(0.03f)); addConditionalDrop.accept(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.06f), modInstalled(ModIds.ENDERIO)); - addConditionalDrop.accept(ModCompatData.YELLORITE_DUST.get(), chance(0.05f), modInstalled(ModIds.EXTREME_REACTORS)); + addConditionalDrop.accept(ModCompatData.YELLORIUM_DUST.get(), chance(0.05f), modInstalled(ModIds.EXTREME_REACTORS)); }); forMesh(writer, ingredient(EItems.DUST.get()), EItems.FLINT_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(Items.GUNPOWDER, chance(0.11f)); @@ -421,7 +434,7 @@ class SieveRecipes { addDrop.accept(Items.BLAZE_POWDER, chance(0.04f)); addConditionalDrop.accept(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.07f), modInstalled(ModIds.ENDERIO)); - addConditionalDrop.accept(ModCompatData.YELLORITE_DUST.get(), chance(0.055f), modInstalled(ModIds.EXTREME_REACTORS)); + addConditionalDrop.accept(ModCompatData.YELLORIUM_DUST.get(), chance(0.055f), modInstalled(ModIds.EXTREME_REACTORS)); }); forMesh(writer, ingredient(EItems.DUST.get()), EItems.IRON_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(Items.GUNPOWDER, chance(0.13f)); @@ -432,7 +445,7 @@ class SieveRecipes { addDrop.accept(Items.IRON_NUGGET, chance(0.06f)); addConditionalDrop.accept(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.09f), modInstalled(ModIds.ENDERIO)); - addConditionalDrop.accept(ModCompatData.YELLORITE_DUST.get(), chance(0.08f), modInstalled(ModIds.EXTREME_REACTORS)); + addConditionalDrop.accept(ModCompatData.YELLORIUM_DUST.get(), chance(0.08f), modInstalled(ModIds.EXTREME_REACTORS)); }); forMesh(writer, ingredient(EItems.DUST.get()), EItems.GOLDEN_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(Items.GUNPOWDER, chance(0.13f)); @@ -444,7 +457,7 @@ class SieveRecipes { addDrop.accept(Items.RAW_GOLD, chance(0.02f)); addConditionalDrop.accept(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.11f), modInstalled(ModIds.ENDERIO)); - addConditionalDrop.accept(ModCompatData.YELLORITE_DUST.get(), chance(0.10f), modInstalled(ModIds.EXTREME_REACTORS)); + addConditionalDrop.accept(ModCompatData.YELLORIUM_DUST.get(), chance(0.10f), modInstalled(ModIds.EXTREME_REACTORS)); }); forMesh(writer, ingredient(EItems.DUST.get()), EItems.DIAMOND_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(Items.GUNPOWDER, chance(0.14f)); @@ -455,7 +468,7 @@ class SieveRecipes { addDrop.accept(Items.GOLD_NUGGET, chance(0.08f)); addConditionalDrop.accept(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.12f), modInstalled(ModIds.ENDERIO)); - addConditionalDrop.accept(ModCompatData.YELLORITE_DUST.get(), chance(0.12f), modInstalled(ModIds.EXTREME_REACTORS)); + addConditionalDrop.accept(ModCompatData.YELLORIUM_DUST.get(), chance(0.12f), modInstalled(ModIds.EXTREME_REACTORS)); }); forMesh(writer, ingredient(EItems.DUST.get()), EItems.NETHERITE_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(Items.GUNPOWDER, chance(0.14f)); @@ -467,7 +480,7 @@ class SieveRecipes { addDrop.accept(Items.IRON_NUGGET, chance(0.08f)); addConditionalDrop.accept(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.135f), modInstalled(ModIds.ENDERIO)); - addConditionalDrop.accept(ModCompatData.YELLORITE_DUST.get(), chance(0.14f), modInstalled(ModIds.EXTREME_REACTORS)); + addConditionalDrop.accept(ModCompatData.YELLORIUM_DUST.get(), chance(0.14f), modInstalled(ModIds.EXTREME_REACTORS)); }); // Crushed Deepslate -> String mesh @@ -816,6 +829,26 @@ class SieveRecipes { addDrop.accept(Items.SMALL_DRIPLEAF, chance(0.07f + j * 0.025f)); addDrop.accept(Items.BIG_DRIPLEAF, chance(0.05f + j * 0.02f)); addDrop.accept(Items.SPORE_BLOSSOM, chance(0.03f + j * 0.015f)); + + var bop = modInstalled(ModIds.BIOMES_O_PLENTY); + addConditionalDrop.accept(ModCompatData.ORIGIN_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.FLOWERING_OAK_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.SNOWBLOSSOM_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.RAINBOW_BIRCH_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.YELLOW_AUTUMN_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.ORANGE_AUTUMN_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.MAPLE_SAPLING.get(), chance(0.04f), bop); + + addConditionalDrop.accept(ModCompatData.FIR_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.REDWOOD_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.MAHOGANY_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.JACARANDA_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.PALM_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.WILLOW_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.DEAD_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.MAGIC_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.UMBRAN_SAPLING.get(), chance(0.04f), bop); + addConditionalDrop.accept(ModCompatData.HELLBARK_SAPLING.get(), chance(0.04f), bop); }); } forMesh(writer, ingredient(Items.MOSS_BLOCK), EItems.FLINT_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { @@ -860,10 +893,6 @@ class SieveRecipes { default void accept(Item result, NumberProvider resultAmount, ICondition condition) { this.accept(Either.left(result), resultAmount, condition); } - - default void accept(TagKey result, NumberProvider resultAmount, ICondition condition) { - this.accept(Either.right(result), resultAmount, condition); - } } private static void sieveRecipe(Consumer writer, String name, Ingredient block, Supplier mesh, Item result, NumberProvider resultAmount) { diff --git a/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java b/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java index 17a7688b..89712b97 100644 --- a/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java +++ b/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java @@ -24,6 +24,7 @@ import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.features.TreeFeatures; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -48,6 +49,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import thedarkcolour.exdeorum.ExDeorum; +import thedarkcolour.exdeorum.blockentity.LavaCrucibleBlockEntity; import thedarkcolour.exdeorum.client.CompostColors; import thedarkcolour.exdeorum.compat.ModIds; import thedarkcolour.exdeorum.compat.top.ExDeorumTopCompat; @@ -58,6 +60,7 @@ import thedarkcolour.exdeorum.network.NetworkHandler; import thedarkcolour.exdeorum.recipe.RecipeUtil; import thedarkcolour.exdeorum.registry.EFluids; import thedarkcolour.exdeorum.registry.EItems; +import thedarkcolour.exdeorum.tag.EBiomeTags; import thedarkcolour.exdeorum.voidworld.VoidChunkGenerator; public final class EventHandler { @@ -82,7 +85,10 @@ public final class EventHandler { try { CompostColors.loadColors(); - Minecraft.getInstance().player.displayClientMessage(Component.literal("Reloaded " + CompostColors.COLORS.size() + " compost colors!"), false); + var player = Minecraft.getInstance().player; + if (player != null) { + player.displayClientMessage(Component.literal("Reloaded " + CompostColors.COLORS.size() + " compost colors!"), false); + } } catch (Exception e) { ExDeorum.LOGGER.error("Failed to load vanilla compost colors", e); } @@ -93,23 +99,49 @@ public final class EventHandler { private static void createSpawnTree(LevelEvent.CreateSpawnPosition event) { if (event.getLevel() instanceof ServerLevel level && level.getChunkSource().getGenerator() instanceof VoidChunkGenerator) { - // todo have config option for more kinds of platforms var rand = new XoroshiroRandomSource(level.getSeed()); var pos = new BlockPos.MutableBlockPos(rand.nextIntBetweenInclusive(-200, 200), 64, rand.nextIntBetweenInclusive(-200, 200)); level.setBlock(pos, Blocks.DIRT.defaultBlockState(), 2); pos.move(0, 1, 0); // grow tree, has 5% chance to spawn bees based on world seed - var feature = TreeFeatures.OAK_BEES_005; - Holder> holder = level.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).getHolder(feature).orElse(null); + var configuredFeatureRegistry = level.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE); + var defaultTreeFeature = TreeFeatures.OAK_BEES_005; + var defaultTreeFeatureLoc = ResourceLocation.tryParse(EConfig.SERVER.defaultSpawnTreeFeature.get()); + + Holder> holder = configuredFeatureRegistry.getHolder(defaultTreeFeature).orElse(null); + + if (defaultTreeFeatureLoc != null) { + var value = configuredFeatureRegistry.getHolder(ResourceKey.create(Registries.CONFIGURED_FEATURE, defaultTreeFeatureLoc)).orElse(null); + if (value != null) { + holder = value; + } + } + + if (EConfig.SERVER.useBiomeAppropriateTree.get()) { + var biome = level.getBiome(pos); + + for (var entry : EBiomeTags.TREE_TAGS.entrySet()) { + if (biome.is(entry.getKey())) { + var optional = entry.getValue().getHolder(); + + if (optional.isPresent()) { + holder = (optional.get()); + break; + } + } + } + } + if (holder == null || !holder.value().place(level, level.getChunkSource().getGenerator(), rand, pos)) { ExDeorum.LOGGER.error("Failed to generate spawn tree :("); } else { - ExDeorum.LOGGER.info("Generated spawn tree at {}", pos); + ExDeorum.LOGGER.debug("Generated spawn tree at {}", pos); } + event.setCanceled(true); event.getSettings().setSpawn(level.getHeightmapPos(Heightmap.Types.WORLD_SURFACE_WG, pos), 90.0F); - ((ServerLevel) event.getLevel()).getGameRules().getRule(GameRules.RULE_SPAWN_RADIUS).set(0, level.getServer()); + level.getGameRules().getRule(GameRules.RULE_SPAWN_RADIUS).set(0, level.getServer()); } } @@ -128,16 +160,18 @@ public final class EventHandler { NetworkHandler.sendVoidWorld(player); var advancement = player.server.getAdvancements().getAdvancement(new ResourceLocation(ExDeorum.ID, "core/root")); - if (advancement != null && !player.getAdvancements().getOrStartProgress(advancement).isDone()) { - player.getAdvancements().award(advancement, "in_void_world"); - if (EConfig.SERVER.startingTorch.get()) { - player.getInventory().add(new ItemStack(Items.TORCH)); - } - if (EConfig.SERVER.startingWateringCan.get()) { - player.getInventory().add(WateringCanItem.getFull(EItems.WOODEN_WATERING_CAN)); + if (advancement != null) { + if (!player.getAdvancements().getOrStartProgress(advancement).isDone()) { + player.getAdvancements().award(advancement, "in_void_world"); + if (EConfig.SERVER.startingTorch.get()) { + player.getInventory().add(new ItemStack(Items.TORCH)); + } + if (EConfig.SERVER.startingWateringCan.get()) { + player.getInventory().add(WateringCanItem.getFull(EItems.WOODEN_WATERING_CAN)); + } } } else { - ExDeorum.LOGGER.error("Unable to grant player the Void World advancement. Ex Nihilo Reborn advancements will not show"); + ExDeorum.LOGGER.error("Unable to grant player the Void World advancement. Ex Deorum advancements will not show"); } } } @@ -156,6 +190,7 @@ public final class EventHandler { return prepBarrier.wait(Unit.INSTANCE).thenRunAsync(() -> { HammerItem.refreshValidBlocks(recipes); RecipeUtil.reload(recipes); + LavaCrucibleBlockEntity.putDefaultHeatValues(); }, gameExecutor); }); } diff --git a/src/main/java/thedarkcolour/exdeorum/item/RandomResultItem.java b/src/main/java/thedarkcolour/exdeorum/item/RandomResultItem.java new file mode 100644 index 00000000..15f3b9bc --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/item/RandomResultItem.java @@ -0,0 +1,103 @@ +/* + * Ex Deorum + * Copyright (c) 2023 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package thedarkcolour.exdeorum.item; + +import com.google.common.collect.Lists; +import net.minecraft.Util; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.Level; + +import java.util.ArrayList; +import java.util.List; + +public abstract class RandomResultItem extends Item { + public RandomResultItem(Properties properties) { + super(properties); + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + var stack = player.getItemInHand(hand); + + if (!level.isClientSide) { + var consumed = false; + var possibilities = getPossibilities(); + + if (!player.getAbilities().instabuild) { + stack.shrink(1); + consumed = true; + } + var newItem = new ItemStack(Util.getRandom(possibilities, level.random)); + player.getInventory().placeItemBackInInventory(newItem); + + return InteractionResultHolder.consume(stack.isEmpty() ? player.getItemInHand(hand) : stack); + } + return InteractionResultHolder.success(stack); + } + + protected abstract List getPossibilities(); + + public static class RandomSherd extends RandomResultItem { + public RandomSherd(Properties properties) { + super(properties); + } + + @Override + protected List getPossibilities() { + var list = new ArrayList(); + for (var holder : BuiltInRegistries.ITEM.getTagOrEmpty(ItemTags.DECORATED_POT_SHERDS)) { + list.add(holder.value()); + } + return list; + } + } + + public static class RandomSandyArmorTrim extends RandomResultItem { + public static final List POSSIBLE_TRIMS = Lists.newArrayList( + Items.WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.HOST_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.RAISER_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.COAST_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.DUNE_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.EYE_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.VEX_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.WARD_ARMOR_TRIM_SMITHING_TEMPLATE, + Items.WILD_ARMOR_TRIM_SMITHING_TEMPLATE + ); + + public RandomSandyArmorTrim(Properties properties) { + super(properties); + } + + @Override + protected List getPossibilities() { + return POSSIBLE_TRIMS; + } + } +} diff --git a/src/main/java/thedarkcolour/exdeorum/recipe/TagResultRecipe.java b/src/main/java/thedarkcolour/exdeorum/recipe/TagResultRecipe.java index 908f9abe..982a380b 100644 --- a/src/main/java/thedarkcolour/exdeorum/recipe/TagResultRecipe.java +++ b/src/main/java/thedarkcolour/exdeorum/recipe/TagResultRecipe.java @@ -1,3 +1,21 @@ +/* + * Ex Deorum + * Copyright (c) 2023 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package thedarkcolour.exdeorum.recipe; import com.google.gson.JsonObject; diff --git a/src/main/java/thedarkcolour/exdeorum/registry/EBlockEntities.java b/src/main/java/thedarkcolour/exdeorum/registry/EBlockEntities.java index 74f49407..cee63c60 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/EBlockEntities.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/EBlockEntities.java @@ -36,7 +36,9 @@ public class EBlockEntities { public static final RegistryObject> LAVA_CRUCIBLE = BLOCK_ENTITIES.register("lava_crucible", () -> BlockEntityType.Builder.of(LavaCrucibleBlockEntity::new, EBlocks.WARPED_CRUCIBLE.get(), EBlocks.CRIMSON_CRUCIBLE.get(), - EBlocks.PORCELAIN_CRUCIBLE.get() + EBlocks.PORCELAIN_CRUCIBLE.get(), + // BOP + EBlocks.HELLBARK_CRUCIBLE.get() ).build(null)); public static final RegistryObject> WATER_CRUCIBLE = BLOCK_ENTITIES.register("water_crucible", () -> BlockEntityType.Builder.of(WaterCrucibleBlockEntity::new, EBlocks.OAK_CRUCIBLE.get(), @@ -47,7 +49,17 @@ public class EBlockEntities { EBlocks.DARK_OAK_CRUCIBLE.get(), EBlocks.MANGROVE_CRUCIBLE.get(), EBlocks.CHERRY_CRUCIBLE.get(), - EBlocks.BAMBOO_CRUCIBLE.get() + EBlocks.BAMBOO_CRUCIBLE.get(), + // BOP + EBlocks.FIR_CRUCIBLE.get(), + EBlocks.REDWOOD_CRUCIBLE.get(), + EBlocks.MAHOGANY_CRUCIBLE.get(), + EBlocks.JACARANDA_CRUCIBLE.get(), + EBlocks.PALM_CRUCIBLE.get(), + EBlocks.WILLOW_CRUCIBLE.get(), + EBlocks.DEAD_CRUCIBLE.get(), + EBlocks.MAGIC_CRUCIBLE.get(), + EBlocks.UMBRAN_CRUCIBLE.get() ).build(null)); public static final RegistryObject> BARREL = BLOCK_ENTITIES.register("barrel", () -> BlockEntityType.Builder.of(BarrelBlockEntity::new, EBlocks.OAK_BARREL.get(), @@ -61,7 +73,18 @@ public class EBlockEntities { EBlocks.BAMBOO_BARREL.get(), EBlocks.CRIMSON_BARREL.get(), EBlocks.WARPED_BARREL.get(), - EBlocks.STONE_BARREL.get() + EBlocks.STONE_BARREL.get(), + // BOP + EBlocks.FIR_BARREL.get(), + EBlocks.REDWOOD_BARREL.get(), + EBlocks.MAHOGANY_BARREL.get(), + EBlocks.JACARANDA_BARREL.get(), + EBlocks.PALM_BARREL.get(), + EBlocks.WILLOW_BARREL.get(), + EBlocks.DEAD_BARREL.get(), + EBlocks.MAGIC_BARREL.get(), + EBlocks.UMBRAN_BARREL.get(), + EBlocks.HELLBARK_BARREL.get() ).build(null)); public static final RegistryObject> SIEVE = BLOCK_ENTITIES.register("sieve", () -> BlockEntityType.Builder.of(SieveBlockEntity::new, EBlocks.OAK_SIEVE.get(), @@ -74,6 +97,17 @@ public class EBlockEntities { EBlocks.CHERRY_SIEVE.get(), EBlocks.BAMBOO_SIEVE.get(), EBlocks.CRIMSON_SIEVE.get(), - EBlocks.WARPED_SIEVE.get() + EBlocks.WARPED_SIEVE.get(), + // BOP + EBlocks.FIR_SIEVE.get(), + EBlocks.REDWOOD_SIEVE.get(), + EBlocks.MAHOGANY_SIEVE.get(), + EBlocks.JACARANDA_SIEVE.get(), + EBlocks.PALM_SIEVE.get(), + EBlocks.WILLOW_SIEVE.get(), + EBlocks.DEAD_SIEVE.get(), + EBlocks.MAGIC_SIEVE.get(), + EBlocks.UMBRAN_SIEVE.get(), + EBlocks.HELLBARK_SIEVE.get() ).build(null)); } diff --git a/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java b/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java index c61f2095..b8748807 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java @@ -64,6 +64,17 @@ public class EBlocks { public static final RegistryObject CRIMSON_BARREL = registerBarrel("crimson_barrel", false, true, MapColor.CRIMSON_STEM); public static final RegistryObject WARPED_BARREL = registerBarrel("warped_barrel", false, true, MapColor.WARPED_STEM); public static final RegistryObject STONE_BARREL = registerBarrel("stone_barrel", true, true, MapColor.STONE); + // BOP Barrels + public static final RegistryObject FIR_BARREL = registerBarrel("fir_barrel", false, false, MapColor.TERRACOTTA_WHITE); + public static final RegistryObject REDWOOD_BARREL = registerBarrel("redwood_barrel", false, false, MapColor.TERRACOTTA_ORANGE); + public static final RegistryObject MAHOGANY_BARREL = registerBarrel("mahogany_barrel", false, false, MapColor.TERRACOTTA_PINK); + public static final RegistryObject JACARANDA_BARREL = registerBarrel("jacaranda_barrel", false, false, MapColor.QUARTZ); + public static final RegistryObject PALM_BARREL = registerBarrel("palm_barrel", false, false, MapColor.TERRACOTTA_YELLOW); + public static final RegistryObject WILLOW_BARREL = registerBarrel("willow_barrel", false, false, MapColor.TERRACOTTA_LIGHT_GREEN); + public static final RegistryObject DEAD_BARREL = registerBarrel("dead_barrel", false, false, MapColor.STONE); + public static final RegistryObject MAGIC_BARREL = registerBarrel("magic_barrel", false, false, MapColor.COLOR_BLUE); + public static final RegistryObject UMBRAN_BARREL = registerBarrel("umbran_barrel", false, false, MapColor.TERRACOTTA_BLUE); + public static final RegistryObject HELLBARK_BARREL = registerBarrel("hellbark_barrel", false, false, MapColor.TERRACOTTA_GRAY); // Sieves public static final RegistryObject OAK_SIEVE = registerSieve("oak_sieve"); @@ -77,12 +88,25 @@ public class EBlocks { public static final RegistryObject BAMBOO_SIEVE = registerSieve("bamboo_sieve"); public static final RegistryObject CRIMSON_SIEVE = registerSieve("crimson_sieve"); public static final RegistryObject WARPED_SIEVE = registerSieve("warped_sieve"); + // BOP Sieves + public static final RegistryObject FIR_SIEVE = registerSieve("fir_sieve"); + public static final RegistryObject REDWOOD_SIEVE = registerSieve("redwood_sieve"); + public static final RegistryObject MAHOGANY_SIEVE = registerSieve("mahogany_sieve"); + public static final RegistryObject JACARANDA_SIEVE = registerSieve("jacaranda_sieve"); + public static final RegistryObject PALM_SIEVE = registerSieve("palm_sieve"); + public static final RegistryObject WILLOW_SIEVE = registerSieve("willow_sieve"); + public static final RegistryObject DEAD_SIEVE = registerSieve("dead_sieve"); + public static final RegistryObject MAGIC_SIEVE = registerSieve("magic_sieve"); + public static final RegistryObject UMBRAN_SIEVE = registerSieve("umbran_sieve"); + public static final RegistryObject HELLBARK_SIEVE = registerSieve("hellbark_sieve"); // Lava Crucibles - public static final RegistryObject PORCELAIN_CRUCIBLE = registerLavaCrucible("porcelain_crucible", false); - public static final RegistryObject WARPED_CRUCIBLE = registerLavaCrucible("warped_crucible", true); - public static final RegistryObject CRIMSON_CRUCIBLE = registerLavaCrucible("crimson_crucible", true); + public static final RegistryObject PORCELAIN_CRUCIBLE = registerLavaCrucible("porcelain_crucible", true, SoundType.STONE); + public static final RegistryObject WARPED_CRUCIBLE = registerLavaCrucible("warped_crucible", false, SoundType.STEM); + public static final RegistryObject CRIMSON_CRUCIBLE = registerLavaCrucible("crimson_crucible", false, SoundType.STEM); public static final RegistryObject UNFIRED_PORCELAIN_CRUCIBLE = BLOCKS.register("unfired_porcelain_crucible", () -> new UnfiredCrucibleBlock(of().strength(2.0f))); + // BOP Lava Crucibles + public static final RegistryObject HELLBARK_CRUCIBLE = registerLavaCrucible("hellbark_crucible", false, SoundType.WOOD); // Water Crucibles public static final RegistryObject OAK_CRUCIBLE = registerWaterCrucible("oak_crucible"); @@ -94,6 +118,16 @@ public class EBlocks { public static final RegistryObject MANGROVE_CRUCIBLE = registerWaterCrucible("mangrove_crucible"); public static final RegistryObject CHERRY_CRUCIBLE = registerWaterCrucible("cherry_crucible"); public static final RegistryObject BAMBOO_CRUCIBLE = registerWaterCrucible("bamboo_crucible"); + // BOP Water Crucibles + public static final RegistryObject FIR_CRUCIBLE = registerWaterCrucible("fir_crucible"); + public static final RegistryObject REDWOOD_CRUCIBLE = registerWaterCrucible("redwood_crucible"); + public static final RegistryObject MAHOGANY_CRUCIBLE = registerWaterCrucible("mahogany_crucible"); + public static final RegistryObject JACARANDA_CRUCIBLE = registerWaterCrucible("jacaranda_crucible"); + public static final RegistryObject PALM_CRUCIBLE = registerWaterCrucible("palm_crucible"); + public static final RegistryObject WILLOW_CRUCIBLE = registerWaterCrucible("willow_crucible"); + public static final RegistryObject DEAD_CRUCIBLE = registerWaterCrucible("dead_crucible"); + public static final RegistryObject MAGIC_CRUCIBLE = registerWaterCrucible("magic_crucible"); + public static final RegistryObject UMBRAN_CRUCIBLE = registerWaterCrucible("umbran_crucible"); // Misc public static final RegistryObject INFESTED_LEAVES = BLOCKS.register("infested_leaves", () -> new InfestedLeavesBlock(copy(Blocks.OAK_LEAVES))); @@ -121,10 +155,10 @@ public class EBlocks { }); } - public static RegistryObject registerLavaCrucible(String name, boolean stem) { + public static RegistryObject registerLavaCrucible(String name, boolean stone, SoundType sound) { return BLOCKS.register(name, () -> { - var props = of().noOcclusion().strength(stem ? 1.5f : 2.0f).sound(stem ? SoundType.STEM : SoundType.STONE); - if (!stem) { + var props = of().noOcclusion().strength(stone ? 2.0f : 1.5f).sound(sound); + if (stone) { props.requiresCorrectToolForDrops(); } return new LavaCrucibleBlock(props); diff --git a/src/main/java/thedarkcolour/exdeorum/registry/EItems.java b/src/main/java/thedarkcolour/exdeorum/registry/EItems.java index 1c4e2f9b..6aa3aee8 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/EItems.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/EItems.java @@ -27,23 +27,13 @@ import net.minecraft.world.item.Tiers; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.Fluids; +import net.minecraftforge.fml.ModList; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; import thedarkcolour.exdeorum.ExDeorum; -import thedarkcolour.exdeorum.item.CookedSilkWormItem; -import thedarkcolour.exdeorum.item.CrookItem; -import thedarkcolour.exdeorum.item.GrassSpreaderItem; -import thedarkcolour.exdeorum.item.HammerItem; -import thedarkcolour.exdeorum.item.MeshItem; -import thedarkcolour.exdeorum.item.NyliumSpreaderItem; -import thedarkcolour.exdeorum.item.PorcelainBucket; -import thedarkcolour.exdeorum.item.PorcelainMilkBucket; -import thedarkcolour.exdeorum.item.SculkCoreItem; -import thedarkcolour.exdeorum.item.SilkWormItem; -import thedarkcolour.exdeorum.item.WateringCanItem; -import thedarkcolour.exdeorum.item.WideWateringCanItem; -import thedarkcolour.exdeorum.item.WitchWaterBucketItem; +import thedarkcolour.exdeorum.compat.ModIds; +import thedarkcolour.exdeorum.item.*; import thedarkcolour.exdeorum.recipe.RecipeUtil; import thedarkcolour.exdeorum.tag.EItemTags; @@ -119,6 +109,8 @@ public class EItems { public static final RegistryObject WARPED_NYLIUM_SPORES = ITEMS.register("warped_nylium_spores", () -> new NyliumSpreaderItem(props(), Blocks.WARPED_NYLIUM::defaultBlockState)); public static final RegistryObject CRIMSON_NYLIUM_SPORES = ITEMS.register("crimson_nylium_spores", () -> new NyliumSpreaderItem(props(), Blocks.CRIMSON_NYLIUM::defaultBlockState)); public static final RegistryObject SCULK_CORE = ITEMS.register("sculk_core", () -> new SculkCoreItem(props().stacksTo(1))); + public static final RegistryObject RANDOM_POTTERY_SHERD = ITEMS.register("random_pottery_sherd", () -> new RandomResultItem.RandomSherd(props())); + public static final RegistryObject RANDOM_ARMOR_TRIM = ITEMS.register("random_armor_trim", () -> new RandomResultItem.RandomSandyArmorTrim(props())); // Buckets public static final RegistryObject UNFIRED_PORCELAIN_BUCKET = registerSimpleItem("unfired_porcelain_bucket"); @@ -165,6 +157,17 @@ public class EItems { public static final RegistryObject CRIMSON_BARREL = registerItemBlock(EBlocks.CRIMSON_BARREL); public static final RegistryObject WARPED_BARREL = registerItemBlock(EBlocks.WARPED_BARREL); public static final RegistryObject STONE_BARREL = registerItemBlock(EBlocks.STONE_BARREL); + // BOP Barrels + public static final RegistryObject FIR_BARREL = registerItemBlock(EBlocks.FIR_BARREL); + public static final RegistryObject REDWOOD_BARREL = registerItemBlock(EBlocks.REDWOOD_BARREL); + public static final RegistryObject MAHOGANY_BARREL = registerItemBlock(EBlocks.MAHOGANY_BARREL); + public static final RegistryObject JACARANDA_BARREL = registerItemBlock(EBlocks.JACARANDA_BARREL); + public static final RegistryObject PALM_BARREL = registerItemBlock(EBlocks.PALM_BARREL); + public static final RegistryObject WILLOW_BARREL = registerItemBlock(EBlocks.WILLOW_BARREL); + public static final RegistryObject DEAD_BARREL = registerItemBlock(EBlocks.DEAD_BARREL); + public static final RegistryObject MAGIC_BARREL = registerItemBlock(EBlocks.MAGIC_BARREL); + public static final RegistryObject UMBRAN_BARREL = registerItemBlock(EBlocks.UMBRAN_BARREL); + public static final RegistryObject HELLBARK_BARREL = registerItemBlock(EBlocks.HELLBARK_BARREL); // Sieves public static final RegistryObject OAK_SIEVE = registerItemBlock(EBlocks.OAK_SIEVE); @@ -178,12 +181,25 @@ public class EItems { public static final RegistryObject BAMBOO_SIEVE = registerItemBlock(EBlocks.BAMBOO_SIEVE); public static final RegistryObject CRIMSON_SIEVE = registerItemBlock(EBlocks.CRIMSON_SIEVE); public static final RegistryObject WARPED_SIEVE = registerItemBlock(EBlocks.WARPED_SIEVE); + // BOP Sieves + public static final RegistryObject FIR_SIEVE = registerItemBlock(EBlocks.FIR_SIEVE); + public static final RegistryObject REDWOOD_SIEVE = registerItemBlock(EBlocks.REDWOOD_SIEVE); + public static final RegistryObject MAHOGANY_SIEVE = registerItemBlock(EBlocks.MAHOGANY_SIEVE); + public static final RegistryObject JACARANDA_SIEVE = registerItemBlock(EBlocks.JACARANDA_SIEVE); + public static final RegistryObject PALM_SIEVE = registerItemBlock(EBlocks.PALM_SIEVE); + public static final RegistryObject WILLOW_SIEVE = registerItemBlock(EBlocks.WILLOW_SIEVE); + public static final RegistryObject DEAD_SIEVE = registerItemBlock(EBlocks.DEAD_SIEVE); + public static final RegistryObject MAGIC_SIEVE = registerItemBlock(EBlocks.MAGIC_SIEVE); + public static final RegistryObject UMBRAN_SIEVE = registerItemBlock(EBlocks.UMBRAN_SIEVE); + public static final RegistryObject HELLBARK_SIEVE = registerItemBlock(EBlocks.HELLBARK_SIEVE); // Lava Crucibles public static final RegistryObject PORCELAIN_CRUCIBLE = registerItemBlock(EBlocks.PORCELAIN_CRUCIBLE); public static final RegistryObject WARPED_CRUCIBLE = registerItemBlock(EBlocks.WARPED_CRUCIBLE); public static final RegistryObject CRIMSON_CRUCIBLE = registerItemBlock(EBlocks.CRIMSON_CRUCIBLE); public static final RegistryObject UNFIRED_PORCELAIN_CRUCIBLE = registerItemBlock(EBlocks.UNFIRED_PORCELAIN_CRUCIBLE); + // BOP Lava Crucibles + public static final RegistryObject HELLBARK_CRUCIBLE = registerItemBlock(EBlocks.HELLBARK_CRUCIBLE); // Water Crucibles public static final RegistryObject OAK_CRUCIBLE = registerItemBlock(EBlocks.OAK_CRUCIBLE); @@ -195,6 +211,16 @@ public class EItems { public static final RegistryObject MANGROVE_CRUCIBLE = registerItemBlock(EBlocks.MANGROVE_CRUCIBLE); public static final RegistryObject CHERRY_CRUCIBLE = registerItemBlock(EBlocks.CHERRY_CRUCIBLE); public static final RegistryObject BAMBOO_CRUCIBLE = registerItemBlock(EBlocks.BAMBOO_CRUCIBLE); + // BOP Water Crucible + public static final RegistryObject FIR_CRUCIBLE = registerItemBlock(EBlocks.FIR_CRUCIBLE); + public static final RegistryObject REDWOOD_CRUCIBLE = registerItemBlock(EBlocks.REDWOOD_CRUCIBLE); + public static final RegistryObject MAHOGANY_CRUCIBLE = registerItemBlock(EBlocks.MAHOGANY_CRUCIBLE); + public static final RegistryObject JACARANDA_CRUCIBLE = registerItemBlock(EBlocks.JACARANDA_CRUCIBLE); + public static final RegistryObject PALM_CRUCIBLE = registerItemBlock(EBlocks.PALM_CRUCIBLE); + public static final RegistryObject WILLOW_CRUCIBLE = registerItemBlock(EBlocks.WILLOW_CRUCIBLE); + public static final RegistryObject DEAD_CRUCIBLE = registerItemBlock(EBlocks.DEAD_CRUCIBLE); + public static final RegistryObject MAGIC_CRUCIBLE = registerItemBlock(EBlocks.MAGIC_CRUCIBLE); + public static final RegistryObject UMBRAN_CRUCIBLE = registerItemBlock(EBlocks.UMBRAN_CRUCIBLE); public static final RegistryObject END_CAKE = registerItemBlock(EBlocks.END_CAKE); @@ -222,10 +248,25 @@ public class EItems { output.accept(BAMBOO_SIEVE.get()); output.accept(CRIMSON_SIEVE.get()); output.accept(WARPED_SIEVE.get()); + if (ModList.get().isLoaded(ModIds.BIOMES_O_PLENTY)) { + output.accept(FIR_SIEVE.get()); + output.accept(REDWOOD_SIEVE.get()); + output.accept(MAHOGANY_SIEVE.get()); + output.accept(JACARANDA_SIEVE.get()); + output.accept(PALM_SIEVE.get()); + output.accept(WILLOW_SIEVE.get()); + output.accept(DEAD_SIEVE.get()); + output.accept(MAGIC_SIEVE.get()); + output.accept(UMBRAN_SIEVE.get()); + output.accept(HELLBARK_SIEVE.get()); + } output.accept(PORCELAIN_CRUCIBLE.get()); output.accept(WARPED_CRUCIBLE.get()); output.accept(CRIMSON_CRUCIBLE.get()); output.accept(UNFIRED_PORCELAIN_CRUCIBLE.get()); + if (ModList.get().isLoaded(ModIds.BIOMES_O_PLENTY)) { + output.accept(HELLBARK_CRUCIBLE.get()); + } output.accept(OAK_CRUCIBLE.get()); output.accept(SPRUCE_CRUCIBLE.get()); output.accept(BIRCH_CRUCIBLE.get()); @@ -235,12 +276,27 @@ public class EItems { output.accept(MANGROVE_CRUCIBLE.get()); output.accept(CHERRY_CRUCIBLE.get()); output.accept(BAMBOO_CRUCIBLE.get()); + + if (ModList.get().isLoaded(ModIds.BIOMES_O_PLENTY)) { + output.accept(FIR_CRUCIBLE.get()); + output.accept(REDWOOD_CRUCIBLE.get()); + output.accept(MAHOGANY_CRUCIBLE.get()); + output.accept(JACARANDA_CRUCIBLE.get()); + output.accept(PALM_CRUCIBLE.get()); + output.accept(WILLOW_CRUCIBLE.get()); + output.accept(DEAD_CRUCIBLE.get()); + output.accept(MAGIC_CRUCIBLE.get()); + output.accept(UMBRAN_CRUCIBLE.get()); + } + output.accept(DUST.get()); output.accept(CRUSHED_NETHERRACK.get()); output.accept(CRUSHED_END_STONE.get()); output.accept(CRUSHED_DEEPSLATE.get()); output.accept(CRUSHED_BLACKSTONE.get()); output.accept(END_CAKE.get()); + output.accept(RANDOM_ARMOR_TRIM.get()); + output.accept(RANDOM_POTTERY_SHERD.get()); output.accept(SILK_WORM.get()); output.accept(COOKED_SILK_WORM.get()); @@ -302,5 +358,18 @@ public class EItems { output.accept(PORCELAIN_LAVA_BUCKET.get()); output.accept(PORCELAIN_MILK_BUCKET.get()); output.accept(PORCELAIN_WITCH_WATER_BUCKET.get()); + + if (ModList.get().isLoaded(ModIds.BIOMES_O_PLENTY)) { + output.accept(FIR_BARREL.get()); + output.accept(REDWOOD_BARREL.get()); + output.accept(MAHOGANY_BARREL.get()); + output.accept(JACARANDA_BARREL.get()); + output.accept(PALM_BARREL.get()); + output.accept(WILLOW_BARREL.get()); + output.accept(DEAD_BARREL.get()); + output.accept(MAGIC_BARREL.get()); + output.accept(UMBRAN_BARREL.get()); + output.accept(HELLBARK_BARREL.get()); + } } } diff --git a/src/main/java/thedarkcolour/exdeorum/tag/EBiomeTags.java b/src/main/java/thedarkcolour/exdeorum/tag/EBiomeTags.java new file mode 100644 index 00000000..fe61bc8d --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/tag/EBiomeTags.java @@ -0,0 +1,68 @@ +/* + * Ex Deorum + * Copyright (c) 2023 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package thedarkcolour.exdeorum.tag; + +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.features.TreeFeatures; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.minecraftforge.registries.RegistryObject; +import thedarkcolour.exdeorum.ExDeorum; +import thedarkcolour.exdeorum.compat.ModIds; + +import java.util.HashMap; +import java.util.Map; + +public class EBiomeTags { + public static final Map, RegistryObject>> TREE_TAGS = new HashMap<>(); + + // Vanilla + public static final TagKey OAK_TREE_BIOMES = addTreeTag("oak_tree_biomes", TreeFeatures.OAK_BEES_005.location()); + public static final TagKey SPRUCE_TREE_BIOMES = addTreeTag("spruce_tree_biomes", TreeFeatures.SPRUCE.location()); + public static final TagKey BIRCH_TREE_BIOMES = addTreeTag("birch_tree_biomes", TreeFeatures.BIRCH_BEES_002.location()); + public static final TagKey JUNGLE_TREE_BIOMES = addTreeTag("jungle_tree_biomes", TreeFeatures.JUNGLE_TREE_NO_VINE.location()); + public static final TagKey ACACIA_TREE_BIOMES = addTreeTag("acacia_tree_biomes", TreeFeatures.ACACIA.location()); + public static final TagKey CHERRY_TREE_BIOMES = addTreeTag("cherry_tree_biomes", TreeFeatures.CHERRY_BEES_005.location()); + public static final TagKey DARK_OAK_TREE_BIOMES = addTreeTag("dark_oak_tree_biomes", TreeFeatures.DARK_OAK.location()); + public static final TagKey MANGROVE_TREE_BIOMES = addTreeTag("mangrove_tree_biomes", TreeFeatures.MANGROVE.location()); + + // Bop tags + public static final TagKey FLOWERING_OAK_TREE_BIOMES = addTreeTag("flowering_oak_tree_biomes", new ResourceLocation(ModIds.BIOMES_O_PLENTY, "flowering_oak_tree_bees")); + public static final TagKey MAHOGANY_TREE_BIOMES = addTreeTag("mahogany_tree_biomes", new ResourceLocation(ModIds.BIOMES_O_PLENTY, "mahogany_tree")); + public static final TagKey JACARANDA_TREE_BIOMES = addTreeTag("jacaranda_tree_biomes", new ResourceLocation(ModIds.BIOMES_O_PLENTY, "jacaranda_tree_bees")); + public static final TagKey PALM_TREE_BIOMES = addTreeTag("palm_tree_biomes", new ResourceLocation(ModIds.BIOMES_O_PLENTY, "palm_tree")); + public static final TagKey WILLOW_TREE_BIOMES = addTreeTag("willow_tree_biomes", new ResourceLocation(ModIds.BIOMES_O_PLENTY, "willow_tree")); + public static final TagKey DEAD_TREE_BIOMES = addTreeTag("dead_tree_biomes", new ResourceLocation(ModIds.BIOMES_O_PLENTY, "dead_tree_wasteland")); + public static final TagKey MAGIC_TREE_BIOMES = addTreeTag("magic_tree_biomes", new ResourceLocation(ModIds.BIOMES_O_PLENTY, "magic_tree")); + public static final TagKey UMBRAN_TREE_BIOMES = addTreeTag("umbran_tree_biomes", new ResourceLocation(ModIds.BIOMES_O_PLENTY, "umbran_tree")); + + public static TagKey addTreeTag(String tagName, ResourceLocation id) { + var tag = tag(tagName); + if (TREE_TAGS.put(tag, RegistryObject.createOptional(id, Registries.CONFIGURED_FEATURE, ExDeorum.ID)) != null) { + throw new IllegalStateException("Already added a tree tag under " + tag); + } + return tag; + } + + public static TagKey tag(String name) { + return TagKey.create(Registries.BIOME, new ResourceLocation(ExDeorum.ID, name)); + } +} diff --git a/src/main/resources/assets/exdeorum/textures/item/random_armor_trim.png b/src/main/resources/assets/exdeorum/textures/item/random_armor_trim.png new file mode 100644 index 0000000000000000000000000000000000000000..539f20425d19b04559fe74dab394f6c1304e0c1a GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|+7KkpD5OZVuAM0F(@Lme|QevlbT`v3KT6njaKU+{l0V36`=b^{7= z7I;J!GcfQS24TkI`72U@g1Me9jv*Ssq35{y4k&OiUl5z{TfS2FjE=J5sm*m4f*Hy$ zay!ISDGD$?V|7beW;9dZ;N+(j$r=gU8u>$-R+)%go%a5O&A!DaPD=B-cIGg%eO>C{ zlOXhaiQU4uf@dv!aW9fDbzhdAR+kWz`L2%PN*VL?vRii3fEF`&y85}Sb4q9e0OPM! Ae*gdg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/exdeorum/textures/item/random_pottery_sherd.png b/src/main/resources/assets/exdeorum/textures/item/random_pottery_sherd.png new file mode 100644 index 0000000000000000000000000000000000000000..4f6cdd2e196f65575d33b0193d074a99ef1d025b GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|-oQYW+dk)D~>h7$rDW6_8XGxG>@P8;^ z2==cK0tps)L>4nJ@BtO@9cDb9zaj-FnBnQ-7@`pzdzPE;fC2~e1uc#{|Bq;^MxU7_ zak*XoioSlrC&p=;SZxy