From 92d87c50e856de8dedbbcfcf95c046858d962d95 Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:03:51 -0800 Subject: [PATCH] Ex Deorum 1.11 --- changelog.md | 5 + .../93943142017732f21fbc4fa325d116c728b69767 | 4 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 56 ++++++- .../fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd | 6 +- .../resources/assets/exdeorum/lang/en_us.json | 4 + .../exdeorum/models/item/boron_ore_chunk.json | 6 + .../models/item/lithium_ore_chunk.json | 6 + .../models/item/magnesium_ore_chunk.json | 6 + .../models/item/thorium_ore_chunk.json | 6 + .../recipes/misc/ores/boron_tag.json | 35 +++++ .../recipes/misc/ores/lithium_tag.json | 35 +++++ .../recipes/misc/ores/magnesium_tag.json | 35 +++++ .../recipes/misc/ores/thorium_tag.json | 35 +++++ .../data/exdeorum/recipes/ores/boron_tag.json | 21 +++ .../exdeorum/recipes/ores/lithium_tag.json | 21 +++ .../exdeorum/recipes/ores/magnesium_tag.json | 21 +++ .../exdeorum/recipes/ores/thorium_tag.json | 21 +++ .../diamond/boron_ore_chunk.json | 29 ++++ .../diamond/lithium_ore_chunk.json | 29 ++++ .../diamond/magnesium_ore_chunk.json | 29 ++++ .../diamond/thorium_ore_chunk.json | 29 ++++ .../flint/boron_ore_chunk.json | 29 ++++ .../flint/lithium_ore_chunk.json | 29 ++++ .../flint/magnesium_ore_chunk.json | 29 ++++ .../flint/thorium_ore_chunk.json | 29 ++++ .../golden/boron_ore_chunk.json | 29 ++++ .../golden/lithium_ore_chunk.json | 29 ++++ .../golden/magnesium_ore_chunk.json | 29 ++++ .../golden/thorium_ore_chunk.json | 29 ++++ .../iron/boron_ore_chunk.json | 29 ++++ .../iron/lithium_ore_chunk.json | 29 ++++ .../iron/magnesium_ore_chunk.json | 29 ++++ .../iron/thorium_ore_chunk.json | 29 ++++ .../netherite/boron_ore_chunk.json | 29 ++++ .../netherite/lithium_ore_chunk.json | 29 ++++ .../netherite/magnesium_ore_chunk.json | 29 ++++ .../netherite/thorium_ore_chunk.json | 29 ++++ .../string/boron_ore_chunk.json | 29 ++++ .../string/lithium_ore_chunk.json | 29 ++++ .../string/magnesium_ore_chunk.json | 29 ++++ .../string/thorium_ore_chunk.json | 29 ++++ .../sieve/gravel/diamond/boron_ore_chunk.json | 29 ++++ .../gravel/diamond/magnesium_ore_chunk.json | 29 ++++ .../gravel/diamond/thorium_ore_chunk.json | 29 ++++ .../sieve/gravel/flint/boron_ore_chunk.json | 29 ++++ .../gravel/flint/magnesium_ore_chunk.json | 29 ++++ .../sieve/gravel/flint/thorium_ore_chunk.json | 29 ++++ .../sieve/gravel/golden/boron_ore_chunk.json | 29 ++++ .../recipes/sieve/gravel/golden/diamond.json | 2 +- .../sieve/gravel/golden/iron_ore_chunk.json | 2 +- .../gravel/golden/magnesium_ore_chunk.json | 29 ++++ .../gravel/golden/thorium_ore_chunk.json | 29 ++++ .../sieve/gravel/iron/boron_ore_chunk.json | 29 ++++ .../gravel/iron/magnesium_ore_chunk.json | 29 ++++ .../sieve/gravel/iron/thorium_ore_chunk.json | 29 ++++ .../gravel/netherite/boron_ore_chunk.json | 29 ++++ .../gravel/netherite/magnesium_ore_chunk.json | 29 ++++ .../gravel/netherite/thorium_ore_chunk.json | 29 ++++ .../sieve/gravel/string/boron_ore_chunk.json | 29 ++++ .../gravel/string/magnesium_ore_chunk.json | 29 ++++ .../gravel/string/thorium_ore_chunk.json | 29 ++++ .../exdeorum/block/BarrelBlock.java | 9 +- .../blockentity/BarrelBlockEntity.java | 144 +++++++++--------- .../blockentity/SieveBlockEntity.java | 5 +- .../exdeorum/client/ter/BarrelRenderer.java | 3 +- .../thedarkcolour/exdeorum/compat/ModIds.java | 1 + .../exdeorum/compat/PreferredOres.java | 42 ++++- .../compat/jei/ExDeorumJeiPlugin.java | 96 +++++++----- .../exdeorum/config/EConfig.java | 10 +- .../exdeorum/data/recipe/Recipes.java | 4 + .../exdeorum/data/recipe/SieveRecipes.java | 48 +++++- .../exdeorum/item/GrassSpreaderItem.java | 1 - .../exdeorum/registry/EItems.java | 8 + .../thedarkcolour/exdeorum/tag/EItemTags.java | 4 + .../textures/item/boron_ore_chunk.png | Bin 0 -> 294 bytes .../textures/item/lithium_ore_chunk.png | Bin 0 -> 294 bytes .../textures/item/magnesium_ore_chunk.png | Bin 0 -> 294 bytes .../textures/item/thorium_ore_chunk.png | Bin 0 -> 294 bytes 78 files changed, 1787 insertions(+), 133 deletions(-) create mode 100644 src/generated/resources/assets/exdeorum/models/item/boron_ore_chunk.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/lithium_ore_chunk.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/magnesium_ore_chunk.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/boron_tag.json create mode 100644 src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/lithium_tag.json create mode 100644 src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/magnesium_tag.json create mode 100644 src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/thorium_tag.json create mode 100644 src/generated/resources/data/exdeorum/recipes/ores/boron_tag.json create mode 100644 src/generated/resources/data/exdeorum/recipes/ores/lithium_tag.json create mode 100644 src/generated/resources/data/exdeorum/recipes/ores/magnesium_tag.json create mode 100644 src/generated/resources/data/exdeorum/recipes/ores/thorium_tag.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/lithium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/lithium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/lithium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/lithium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/lithium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/lithium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/diamond/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/diamond/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/diamond/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/iron/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/iron/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/iron/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/thorium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/boron_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/magnesium_ore_chunk.json create mode 100644 src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/thorium_ore_chunk.json create mode 100644 src/main/resources/assets/exdeorum/textures/item/boron_ore_chunk.png create mode 100644 src/main/resources/assets/exdeorum/textures/item/lithium_ore_chunk.png create mode 100644 src/main/resources/assets/exdeorum/textures/item/magnesium_ore_chunk.png create mode 100644 src/main/resources/assets/exdeorum/textures/item/thorium_ore_chunk.png diff --git a/changelog.md b/changelog.md index f7bef2c1..a0a8369f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,8 @@ +## Ex Deorum 1.11 +- Added support for NuclearCraft: Neoteric - Boron, Thorium, Lithium, and Magnesium ores +- Fixed bug where hoppers and other automation could not craft fluid mixing recipes in the barrel (ex. Water and Lava to make Obsidian) +- Fixed bug where JEI compatibility would fail to load if every mod compatible with Ex Deorum was also loaded (like in ATM9 mod pack) + ## Ex Deorum 1.10 - Added crucibles, sieves, and barrels for wood types from Blue Skies and Aether mods. - Added Certus Quartz Dust as a sieve drop from Dust. diff --git a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 index b159de50..c3723cb2 100644 --- a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 +++ b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 @@ -1,2 +1,2 @@ -// 1.20.1 2023-12-15T22:39:48.8310527 ModKit Language: en_us for mod 'exdeorum' -88329666bba1a5ffe3105b55e2bf2dc58d402008 assets/exdeorum/lang/en_us.json +// 1.20.1 2023-12-27T21:44:18.5767591 ModKit Language: en_us for mod 'exdeorum' +fa2402f02d915c4e06246efb4e86afbeb49fa718 assets/exdeorum/lang/en_us.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 3b87db7f..944afe6f 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2023-12-15T22:04:05.0210898 Recipes +// 1.20.1 2023-12-29T14:57:29.393698 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 @@ -48,13 +48,17 @@ d85bf493287a94e61ee13f713625b3dec0624706 data/exdeorum/advancements/recipes/misc 83cb594324378aa27e88363a95b95389045f6bb5 data/exdeorum/advancements/recipes/misc/oak_crucible.json 24d790eac1a1dafd023859cce63b2e3647730ffb data/exdeorum/advancements/recipes/misc/oak_sieve.json cb476801fffaa7fe555e75984cbcdc6afd275b84 data/exdeorum/advancements/recipes/misc/ores/aluminum_tag.json +23043d529759b484e9d5d92cfaf7b3b0f3969d55 data/exdeorum/advancements/recipes/misc/ores/boron_tag.json 4c9c1076eb176e8b5eba6157bdcfea03c54eb730 data/exdeorum/advancements/recipes/misc/ores/cobalt_tag.json 21f8edbc56c9a38d10da104df5c9ce61e6d972ce data/exdeorum/advancements/recipes/misc/ores/iridium_tag.json 71515dde924b53d08c0459bd8d872fadb358641e data/exdeorum/advancements/recipes/misc/ores/lead_tag.json +a829d32b4ce3632ca1ad5adf805d32f93e1aeed3 data/exdeorum/advancements/recipes/misc/ores/lithium_tag.json +772f37a11988a3b6d4e71bfcb3a988292c1c9f81 data/exdeorum/advancements/recipes/misc/ores/magnesium_tag.json a5477a021d3518960a79fcbb79d88d2781652b4e data/exdeorum/advancements/recipes/misc/ores/nickel_tag.json 5a8f42499f72e2a66975159b6f10fa845a0ae8d4 data/exdeorum/advancements/recipes/misc/ores/osmium_tag.json e8104e269a1beae248b9d92cbc60d3cb48b6f6bb data/exdeorum/advancements/recipes/misc/ores/platinum_tag.json b997fb55b84b5dd8940490108febcba43d8f0a9c data/exdeorum/advancements/recipes/misc/ores/silver_tag.json +34fced982155ce01341b1452c6cddaed3daf9195 data/exdeorum/advancements/recipes/misc/ores/thorium_tag.json ec3024d067a77ff62ebff34afcd112c5c5a56438 data/exdeorum/advancements/recipes/misc/ores/tin_tag.json 68224edf8b5e10cbbc288d12ac6ae5f45d931f04 data/exdeorum/advancements/recipes/misc/ores/uranium_tag.json 87cb2166c390d8929372bb3adc0e7a61e55cce08 data/exdeorum/advancements/recipes/misc/ores/zinc_tag.json @@ -291,13 +295,17 @@ a73d1813a804c37490e498646509b3c0d91a23a0 data/exdeorum/recipes/netherite_waterin 97bd28265ca9481edddebd8f274d2f07791b2528 data/exdeorum/recipes/oak_crucible.json da14c2579ad2e91b9ee70b84e3be1df51243944c data/exdeorum/recipes/oak_sieve.json 4a3c5509da26ba4e8244b69c13f0524dfeeaca11 data/exdeorum/recipes/ores/aluminum_tag.json +927eaf41dd3ab687dcd8061d54df6282518a3493 data/exdeorum/recipes/ores/boron_tag.json 745b2c12a6e71b42299a7da5a563797041285f81 data/exdeorum/recipes/ores/cobalt_tag.json 3007e107e6925bb023873783971fa66cb5aa11fa data/exdeorum/recipes/ores/iridium_tag.json 5fb743141989ecd69322ead566674a57195f3edf data/exdeorum/recipes/ores/lead_tag.json +56bf035197f62b00fcd7616a96214f82e0562d7a data/exdeorum/recipes/ores/lithium_tag.json +fc1e3547ecbb0bc57d235f63a4797e078911d73b data/exdeorum/recipes/ores/magnesium_tag.json 59571d14ea2575d1ade24c15d4b833f930e37c6a data/exdeorum/recipes/ores/nickel_tag.json ad3a4c8b0ffd433528d7b2d10b98301843ba5417 data/exdeorum/recipes/ores/osmium_tag.json 611614e40cda7204f7773c204dd535df33bfd710 data/exdeorum/recipes/ores/platinum_tag.json 812feef671d40f6e89ee3b267706435f2bd2674d data/exdeorum/recipes/ores/silver_tag.json +8ccc8f2004e12022d36897d0c53b73064c1fe7fb data/exdeorum/recipes/ores/thorium_tag.json e50e0f6fb83cd233214ca62718e0c9155f29d7c1 data/exdeorum/recipes/ores/tin_tag.json ece0731639c9063416fb0183309fdf8252d774eb data/exdeorum/recipes/ores/uranium_tag.json 56600e7db58d4c74326a2f38bc014a47ddbeb731 data/exdeorum/recipes/ores/zinc_tag.json @@ -352,6 +360,7 @@ f2a3affa1eef7081ebc9a92823d2211e0a0f7277 data/exdeorum/recipes/sieve/crushed_bla a85db1c70f085b4b54ee8d51e55c1add89770b5d data/exdeorum/recipes/sieve/crushed_blackstone/string/gunpowder.json f99cede2662c5255e27fb4798c532f416b5c3020 data/exdeorum/recipes/sieve/crushed_blackstone/string/magma_cream.json 8eea388b4fd825b73e52ed219f007bc41a622f79 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/amethyst_shard.json +9e70e69ea2d3fb3b5bb9b2c6fe2a1f1dc838767c data/exdeorum/recipes/sieve/crushed_deepslate/diamond/boron_ore_chunk.json c546193f9cab7af9c92ea4a05c080c2ea24f33a2 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/copper_ore_chunk.json 63e3c8e6fd1a83795c11c0a59182575a82d4f5f8 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/deepslate_pebble.json 8a6e723e75bcc5c5731868c1d1b597f3f46b12d7 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/diamond.json @@ -361,14 +370,18 @@ b60486888c693bef336989c8e36b62f8bc60ce28 data/exdeorum/recipes/sieve/crushed_dee 91dabfb0a3256393d74779c2bc291a0b13f93eb4 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/iron_ore_chunk.json fa548967f2323aa67b8b0adb3802cb513047dff7 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/lapis_lazuli.json 1918afd9a0af6536a5a4c0fd90d11143f90f937e data/exdeorum/recipes/sieve/crushed_deepslate/diamond/lead_ore_chunk.json +fce785ad95a0f7c2f5077c7fe2f98ce64e3d4f92 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/lithium_ore_chunk.json +e88d4fef12913270e9ea5f285773e100184e9bc3 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/magnesium_ore_chunk.json 44808902beb66204c46a9e3151d0c5bf5d737df4 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/nickel_ore_chunk.json dea3d940a1940a03bd568c0e4057f74329104024 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/osmium_ore_chunk.json 5e7f7988a4dd3604ab7506be186f8b310c2eb4d7 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/platinum_ore_chunk.json 7adb9275483dbc0ad976c78e5593552e392e670a data/exdeorum/recipes/sieve/crushed_deepslate/diamond/silver_ore_chunk.json +6c07e50fba4ad26fe41a5e438f5f436580183811 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/thorium_ore_chunk.json 23661b51650863a10a9b9d05aa24a000ccd02e96 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/tin_ore_chunk.json 164e24136466ead321402e4ccdd88ab477c90ff6 data/exdeorum/recipes/sieve/crushed_deepslate/diamond/uranium_ore_chunk.json 119ad687854e9856f11a464a1b4a4fa006747a7d data/exdeorum/recipes/sieve/crushed_deepslate/flint/amethyst_shard.json f1de5b6e7b0533d5c8bdd0e88696e585598fbac9 data/exdeorum/recipes/sieve/crushed_deepslate/flint/basalt_pebble.json +a4a207c0890a0b210d37dd77e006fe7f1c6d0ca1 data/exdeorum/recipes/sieve/crushed_deepslate/flint/boron_ore_chunk.json 210d62b835e0526f6b4b2868a3effbcb2dd73956 data/exdeorum/recipes/sieve/crushed_deepslate/flint/calcite_pebble.json b755f3053dc2f2e3e766db64a80a1873d156885c data/exdeorum/recipes/sieve/crushed_deepslate/flint/copper_ore_chunk.json 90d2094c7bc6742140139219fd9a5b7ba8df9548 data/exdeorum/recipes/sieve/crushed_deepslate/flint/deepslate_pebble.json @@ -379,14 +392,18 @@ f90e1a71760aea8e3bede5b4ad8607c172e42b0e data/exdeorum/recipes/sieve/crushed_dee c8053bbcfc5f7b8933e09517b6457578401603db data/exdeorum/recipes/sieve/crushed_deepslate/flint/iron_ore_chunk.json 28d91d9c411f7a1d9daec605b3c1a204e75f063a data/exdeorum/recipes/sieve/crushed_deepslate/flint/lapis_lazuli.json 7b3cc3cf4af738377cef6d50dae392fc64e8848d data/exdeorum/recipes/sieve/crushed_deepslate/flint/lead_ore_chunk.json +eb1dc810e1f4ba76ce23b0799acfbc5f43e34eb7 data/exdeorum/recipes/sieve/crushed_deepslate/flint/lithium_ore_chunk.json +45a41c37e4cc03c19271a416993f06ce29d786cb data/exdeorum/recipes/sieve/crushed_deepslate/flint/magnesium_ore_chunk.json 379f3f019a96ce84929625e06a1ae1d4d7fcb45e data/exdeorum/recipes/sieve/crushed_deepslate/flint/nickel_ore_chunk.json 726c1a5dde11ab3e86bfcbaa1039b66a453dabde data/exdeorum/recipes/sieve/crushed_deepslate/flint/osmium_ore_chunk.json 4914af43c0409a1d50bf126fb9d4e96045de4c4d data/exdeorum/recipes/sieve/crushed_deepslate/flint/platinum_ore_chunk.json ad01a80b33c3cb7018542b918a622cc0f6e30287 data/exdeorum/recipes/sieve/crushed_deepslate/flint/silver_ore_chunk.json +1fb9cd717156f3db9f896244d6617b053477e6ce data/exdeorum/recipes/sieve/crushed_deepslate/flint/thorium_ore_chunk.json 798f3c77c9460a70f96df5292d82bc785553a6db data/exdeorum/recipes/sieve/crushed_deepslate/flint/tin_ore_chunk.json 57fe61192f1a88a8437074783b28e8d2547c4ddd data/exdeorum/recipes/sieve/crushed_deepslate/flint/tuff_pebble.json ef838ea5b17155db3a4114a2598cc3e9a422f14e data/exdeorum/recipes/sieve/crushed_deepslate/flint/uranium_ore_chunk.json 61f09f9de6004a4b48336164575ea2f6f345f576 data/exdeorum/recipes/sieve/crushed_deepslate/golden/amethyst_shard.json +20ddd0c738028ebf1c4dd543e34e761428b7961b data/exdeorum/recipes/sieve/crushed_deepslate/golden/boron_ore_chunk.json 31084da8449cb9e85be49d5b603cf733cf68381a data/exdeorum/recipes/sieve/crushed_deepslate/golden/copper_ore_chunk.json 3abe8201c98a5dc57c83e286ef2cefa5b6285119 data/exdeorum/recipes/sieve/crushed_deepslate/golden/deepslate_pebble.json a4b81bbfbeb70efa064fe6ea1eea68b6f2da96c8 data/exdeorum/recipes/sieve/crushed_deepslate/golden/diamond.json @@ -397,14 +414,18 @@ a4b81bbfbeb70efa064fe6ea1eea68b6f2da96c8 data/exdeorum/recipes/sieve/crushed_dee 93ace70556c0b59bfd2de7b14562506b032dbb46 data/exdeorum/recipes/sieve/crushed_deepslate/golden/iron_ore_chunk.json f82704720c2b43f9f482aac5109d00d0419186ff data/exdeorum/recipes/sieve/crushed_deepslate/golden/lapis_lazuli.json c2a7d4076e92291d7b183c9c30f85848a748883b data/exdeorum/recipes/sieve/crushed_deepslate/golden/lead_ore_chunk.json +bb0991f3c3362fa59f6221a13637c4a60335c5de data/exdeorum/recipes/sieve/crushed_deepslate/golden/lithium_ore_chunk.json +8bc6e7059e469e692482a47a095dbf9e04f648d2 data/exdeorum/recipes/sieve/crushed_deepslate/golden/magnesium_ore_chunk.json bf95dc8c0652cee1aaa41c780aa68cb08218b9d5 data/exdeorum/recipes/sieve/crushed_deepslate/golden/nickel_ore_chunk.json 1f5067c1fe68b89e9256151e4d0b649ac90210d3 data/exdeorum/recipes/sieve/crushed_deepslate/golden/osmium_ore_chunk.json cc8cb187f3be521fb2e4bdfcd02fecd3028c2c79 data/exdeorum/recipes/sieve/crushed_deepslate/golden/platinum_ore_chunk.json c1f458173553e56f543d22ae073274c4bb9e715a data/exdeorum/recipes/sieve/crushed_deepslate/golden/raw_gold.json 99a5f9a075b92777886472f94a2ee5fdc7d189e3 data/exdeorum/recipes/sieve/crushed_deepslate/golden/silver_ore_chunk.json +2ccffc94094df6f5dc3659932f62b38123be974e data/exdeorum/recipes/sieve/crushed_deepslate/golden/thorium_ore_chunk.json 27c44396803e9f569e705b08f88e27833bc18d1d data/exdeorum/recipes/sieve/crushed_deepslate/golden/tin_ore_chunk.json 2c78e0c109ecf0a62ea5787f4438e073595bee38 data/exdeorum/recipes/sieve/crushed_deepslate/golden/uranium_ore_chunk.json 3b6dfdf6a621c4332585840ed5ad79f62f22610c data/exdeorum/recipes/sieve/crushed_deepslate/iron/amethyst_shard.json +568ba84d96ea59909be50e6ae261f63347fd4b27 data/exdeorum/recipes/sieve/crushed_deepslate/iron/boron_ore_chunk.json 7d9e15feeb35d43825554b0eb891ffc1e26f5130 data/exdeorum/recipes/sieve/crushed_deepslate/iron/copper_ore_chunk.json caafb808464a51386e5994a7ca09623492e71084 data/exdeorum/recipes/sieve/crushed_deepslate/iron/deepslate_pebble.json a573a2731f646884bd3f4ae61136280dde8c2c96 data/exdeorum/recipes/sieve/crushed_deepslate/iron/diamond.json @@ -414,13 +435,17 @@ f387102be827d0ad7ef6590bdd97435adc0adb19 data/exdeorum/recipes/sieve/crushed_dee 4a9e056ddaeafce083fa91f4adca89f28e409b42 data/exdeorum/recipes/sieve/crushed_deepslate/iron/iron_ore_chunk.json e2356f1aa76f9f39f3d9eb71e34b206d567456be data/exdeorum/recipes/sieve/crushed_deepslate/iron/lapis_lazuli.json 9601262f949921d5bdd6c3fe2b8bd1aa75101007 data/exdeorum/recipes/sieve/crushed_deepslate/iron/lead_ore_chunk.json +6988d47f7ac27c7b0c2f43b22080df420a00cae2 data/exdeorum/recipes/sieve/crushed_deepslate/iron/lithium_ore_chunk.json +8f6997c65886cd91fec4023c80565948b765b13f data/exdeorum/recipes/sieve/crushed_deepslate/iron/magnesium_ore_chunk.json 63910b65bb9b5242936a0432a2826cf565198e8f data/exdeorum/recipes/sieve/crushed_deepslate/iron/nickel_ore_chunk.json b283a716446085dab306e9ad633652965c48051a data/exdeorum/recipes/sieve/crushed_deepslate/iron/osmium_ore_chunk.json 12a6df6b0325e92d1b5257c7b497f1c68b36c14b data/exdeorum/recipes/sieve/crushed_deepslate/iron/platinum_ore_chunk.json 3c325681cacb54c303743d272d06de1142ddc9d2 data/exdeorum/recipes/sieve/crushed_deepslate/iron/silver_ore_chunk.json +0ed98d90abe96ea245c250a582fee30794a3a405 data/exdeorum/recipes/sieve/crushed_deepslate/iron/thorium_ore_chunk.json adc271cef46fa97affdec9eac74f0d9f0321946c data/exdeorum/recipes/sieve/crushed_deepslate/iron/tin_ore_chunk.json b3d61ec2518e4ac27d9d66699de2954672dfdd13 data/exdeorum/recipes/sieve/crushed_deepslate/iron/uranium_ore_chunk.json 16e4a02042d54e881bedca80864c024144766956 data/exdeorum/recipes/sieve/crushed_deepslate/netherite/amethyst_shard.json +6d6ce76adf93e5f48eb1771e4ae70bc1540c9c21 data/exdeorum/recipes/sieve/crushed_deepslate/netherite/boron_ore_chunk.json 76c2024a3620feb4f2dd6a874f79e104f3c51b9b data/exdeorum/recipes/sieve/crushed_deepslate/netherite/copper_ore_chunk.json cf185f30a43f5b43112554a57dd815a0b77d6520 data/exdeorum/recipes/sieve/crushed_deepslate/netherite/deepslate_pebble.json cdc25d35d8ec98f7cca1a74dd417f3590a839583 data/exdeorum/recipes/sieve/crushed_deepslate/netherite/diamond.json @@ -430,13 +455,17 @@ a743371407c1200e19049de0c1cfb7db54e9e224 data/exdeorum/recipes/sieve/crushed_dee 641be85ac7300b45c139844316086cb5c30b8599 data/exdeorum/recipes/sieve/crushed_deepslate/netherite/iron_ore_chunk.json 0d84fa101dd247f42867022a1aa15cb45e719ef3 data/exdeorum/recipes/sieve/crushed_deepslate/netherite/lapis_lazuli.json 2b8244da348847d271355e1cadaa2d08e285bc8f data/exdeorum/recipes/sieve/crushed_deepslate/netherite/lead_ore_chunk.json +95537aa47bd9ad122c4330e70f593ebdee3c7676 data/exdeorum/recipes/sieve/crushed_deepslate/netherite/lithium_ore_chunk.json +eb12ab5af88c7b466ac8920171e1c720b6797f76 data/exdeorum/recipes/sieve/crushed_deepslate/netherite/magnesium_ore_chunk.json 01e29787eee8e841207f4474e02cfe7c43aea5f3 data/exdeorum/recipes/sieve/crushed_deepslate/netherite/nickel_ore_chunk.json f19c1ae8de8dbcc090e06e68383ef0440c8a2fab data/exdeorum/recipes/sieve/crushed_deepslate/netherite/osmium_ore_chunk.json 99058950f833ca3b569ebb041b33401b0c6e42c8 data/exdeorum/recipes/sieve/crushed_deepslate/netherite/platinum_ore_chunk.json a0f2ca88420e5b1e3cf42e40eac671e184b15a9f data/exdeorum/recipes/sieve/crushed_deepslate/netherite/silver_ore_chunk.json +dee749b64e430c09f975856ba9a3181e91c3d7ea data/exdeorum/recipes/sieve/crushed_deepslate/netherite/thorium_ore_chunk.json 7e7dfb046c8c163ef815b1d76a7ab869a2ed078f data/exdeorum/recipes/sieve/crushed_deepslate/netherite/tin_ore_chunk.json e8baba38e66571594c46363d31ad41e2c2d1e82e data/exdeorum/recipes/sieve/crushed_deepslate/netherite/uranium_ore_chunk.json 22d5d1515a8334764fcea71121d7a3dd725a4f4d data/exdeorum/recipes/sieve/crushed_deepslate/string/amethyst_shard.json +8f522ba214ab0f2351b842730f1f3629848920bc data/exdeorum/recipes/sieve/crushed_deepslate/string/boron_ore_chunk.json 9d68627c3154cb28d0870606f52b0642c09ef8bb data/exdeorum/recipes/sieve/crushed_deepslate/string/copper_ore_chunk.json e5e179dec565277380d0d0b4e35990c8baeeda65 data/exdeorum/recipes/sieve/crushed_deepslate/string/deepslate_pebble.json 32f9fbec3128803e965f407b785ea812f1860e27 data/exdeorum/recipes/sieve/crushed_deepslate/string/diamond.json @@ -446,10 +475,13 @@ b37bd819bfe576ac0f75b9eab2a59436832ad1a4 data/exdeorum/recipes/sieve/crushed_dee a2e895b8b68e6cddf045a4dc97f323679e37be60 data/exdeorum/recipes/sieve/crushed_deepslate/string/iron_ore_chunk.json c2165469fc079114e44a96c89753e01e276d4f05 data/exdeorum/recipes/sieve/crushed_deepslate/string/lapis_lazuli.json cd1cb531c5e7cdc9c96450e4bf0f411a279d3fd3 data/exdeorum/recipes/sieve/crushed_deepslate/string/lead_ore_chunk.json +defb4a676f1e5f08d81ba04acecb452bd497f8ec data/exdeorum/recipes/sieve/crushed_deepslate/string/lithium_ore_chunk.json +b5c74f4f98b37965b05f20fd830cc2d6bb5d15b2 data/exdeorum/recipes/sieve/crushed_deepslate/string/magnesium_ore_chunk.json 249ec3663631fed98c6b288b992e0648be710271 data/exdeorum/recipes/sieve/crushed_deepslate/string/nickel_ore_chunk.json 5d0640481af53e4543bcdd123ec92ec758cb69b0 data/exdeorum/recipes/sieve/crushed_deepslate/string/osmium_ore_chunk.json a78045579a330624ad2ec6fafeec47f5f4fc7531 data/exdeorum/recipes/sieve/crushed_deepslate/string/platinum_ore_chunk.json f67075aaf30d2c6ac86a6ecc6408a8deb07af0ea data/exdeorum/recipes/sieve/crushed_deepslate/string/silver_ore_chunk.json +075c0a8f7a561a9bf6aef412709bf4db75bcc928 data/exdeorum/recipes/sieve/crushed_deepslate/string/thorium_ore_chunk.json 281c6af1feaa84c6d4be0a00e16e98d0c8921ab0 data/exdeorum/recipes/sieve/crushed_deepslate/string/tin_ore_chunk.json 6f1e0508bffc4afe0bffba09d20e7ab4d4d3a755 data/exdeorum/recipes/sieve/crushed_deepslate/string/uranium_ore_chunk.json e76fb7f519c2b5f4acbc51fa71db1cae02533b10 data/exdeorum/recipes/sieve/crushed_end_stone/diamond/chorus_flower.json @@ -671,6 +703,7 @@ f4dd212eb788b5e16f13aefca723231e1e52d2ab data/exdeorum/recipes/sieve/dust/string 9b5162b466041d395a2428c2c944b0a450c135b6 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 +b1b856d222176ce724f70e2a13494e7e69cd2251 data/exdeorum/recipes/sieve/gravel/diamond/boron_ore_chunk.json 2284efd2a38ecb63f694ba0586c478b26207adce data/exdeorum/recipes/sieve/gravel/diamond/coal.json ac9139345f1b1d4bd8fb48350d3a6df9a33c2a93 data/exdeorum/recipes/sieve/gravel/diamond/copper_ore_chunk.json 9fe46afab01028b2b1aebe51ade62ba774f2d8fc data/exdeorum/recipes/sieve/gravel/diamond/deepslate_pebble.json @@ -682,14 +715,17 @@ b25b9a23f50fa60719f74ffc26b53017f8d74cd0 data/exdeorum/recipes/sieve/gravel/diam 6cf8e4f262fa4e4153bcaa6c684854712f720021 data/exdeorum/recipes/sieve/gravel/diamond/iron_ore_chunk.json 71084e96ae9c98c76ecb03b38de241b72ad0cf8c data/exdeorum/recipes/sieve/gravel/diamond/lapis_lazuli.json 981752f69c4094f1cb4a8d0272399117eb28f19b data/exdeorum/recipes/sieve/gravel/diamond/lead_ore_chunk.json +be9d385c0cb20baf3a5a084d4110e81fae2c2988 data/exdeorum/recipes/sieve/gravel/diamond/magnesium_ore_chunk.json f6de57c588c96a776056f60505ac902efc7495db data/exdeorum/recipes/sieve/gravel/diamond/nickel_ore_chunk.json ee29c9cfa88c60528d639c9c286f123e959787c7 data/exdeorum/recipes/sieve/gravel/diamond/osmium_ore_chunk.json 3f0adcb8f4b5ebcdbe21111242afdb70ba173aac data/exdeorum/recipes/sieve/gravel/diamond/silver_ore_chunk.json +9dd202ff24b90eefc6a3bc3b855085f66bc165ed data/exdeorum/recipes/sieve/gravel/diamond/thorium_ore_chunk.json 15348d9b88d923d36fa6bcdb84bdb009746cbf22 data/exdeorum/recipes/sieve/gravel/diamond/tin_ore_chunk.json 3fb22737f15f0bf7024e7277bbe8cc6a4e4bc75b data/exdeorum/recipes/sieve/gravel/diamond/zinc_ore_chunk.json 5ae5bcebab67694b32474bd28ea1fbab0b8333c6 data/exdeorum/recipes/sieve/gravel/flint/aluminum_ore_chunk.json 3791bf6a2875898602b4dbf3d5ef6b1451010583 data/exdeorum/recipes/sieve/gravel/flint/amethyst_shard.json d2e86dc8b2f2465ac26e95e7d38916fc14e2dae5 data/exdeorum/recipes/sieve/gravel/flint/andesite_pebble.json +adfae10501cc5a1f7d13ce93da1fe2b9f2d26624 data/exdeorum/recipes/sieve/gravel/flint/boron_ore_chunk.json 3b869472d11d1252ef06b9b0a6274c8a5660aa91 data/exdeorum/recipes/sieve/gravel/flint/coal.json 9da05d76bfd5abbd666907da39d3244728c46daf data/exdeorum/recipes/sieve/gravel/flint/copper_ore_chunk.json 5bfb486ef5dc14c1c5a85e14794ce49eda3708b5 data/exdeorum/recipes/sieve/gravel/flint/diamond.json @@ -702,36 +738,42 @@ cb1601e4e798f148a352d0910a028f594a944d4c data/exdeorum/recipes/sieve/gravel/flin 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 +0e26f51a7c57c969447ca398021c10225c38d839 data/exdeorum/recipes/sieve/gravel/flint/magnesium_ore_chunk.json 391add009436b8206ae851ce82efe1be208266b0 data/exdeorum/recipes/sieve/gravel/flint/nickel_ore_chunk.json 56081d362764dfd8f93703efe23281a255905287 data/exdeorum/recipes/sieve/gravel/flint/osmium_ore_chunk.json 6ca4057510d2b568a3559ae1005e037518a99745 data/exdeorum/recipes/sieve/gravel/flint/pointed_dripstone.json 730b28230adbd656e270bdc7b2f773a9459d434a data/exdeorum/recipes/sieve/gravel/flint/silver_ore_chunk.json fe663f47d5e16267a61b6f7111a6f588209888e7 data/exdeorum/recipes/sieve/gravel/flint/stone_pebble.json +697109cab3052982d2eaaf14cdd4de2486d94971 data/exdeorum/recipes/sieve/gravel/flint/thorium_ore_chunk.json bc6e6631affd1dbf1a3711bbc7b6ceb7df0b6005 data/exdeorum/recipes/sieve/gravel/flint/tin_ore_chunk.json 31e2fc038cb5269e24da8c8bf85aed6fb2bf7d75 data/exdeorum/recipes/sieve/gravel/flint/zinc_ore_chunk.json 8a2defff0d9856f22949fe0e271710c533f494dc data/exdeorum/recipes/sieve/gravel/golden/aluminum_ore_chunk.json 28678c0ce921c7b884db3d0e49a54b20deec4825 data/exdeorum/recipes/sieve/gravel/golden/amethyst_shard.json +ef53c6abcdd05eee1b8659039f23582b90f8b21a data/exdeorum/recipes/sieve/gravel/golden/boron_ore_chunk.json b5af4ec46beb6a5957a2099eaecac55b6a0a6637 data/exdeorum/recipes/sieve/gravel/golden/coal.json 0ec8d93ded300ec6fec985ee171466b42ed6eaa0 data/exdeorum/recipes/sieve/gravel/golden/copper_ore_chunk.json ac30b323cc9450fad45b67f9b9c382dc1d2b7803 data/exdeorum/recipes/sieve/gravel/golden/deepslate_pebble.json -300e5b260b0f25f47b7164170e109a8f5d5afc4c data/exdeorum/recipes/sieve/gravel/golden/diamond.json +67e32f55541a70942c111cd761a8d49ec8bd6177 data/exdeorum/recipes/sieve/gravel/golden/diamond.json b910213c60616555b2701eab2e6ed6c10ab2996d data/exdeorum/recipes/sieve/gravel/golden/emerald.json 85d089c35627a16344c652f9a347b930fbac779d data/exdeorum/recipes/sieve/gravel/golden/flint.json 4f0edad66d6d5899a81fb32c11da8b4f4943e483 data/exdeorum/recipes/sieve/gravel/golden/gold_nugget.json 4be0b7be825c07b1406f45f6b9182d6c0a643cb3 data/exdeorum/recipes/sieve/gravel/golden/gold_ore_chunk.json 5e940efaf67afe5273df3bdea9054e57f2685d52 data/exdeorum/recipes/sieve/gravel/golden/iridium_ore_chunk.json -bd443731b92b52d140fd1f1e21db4167e4a17243 data/exdeorum/recipes/sieve/gravel/golden/iron_ore_chunk.json +5a33eb0cec0ddfef976f26708dcc2f55ac7f167e data/exdeorum/recipes/sieve/gravel/golden/iron_ore_chunk.json ae0acc3deb886e04d8226b1cbe36e67a8dd360bf data/exdeorum/recipes/sieve/gravel/golden/lapis_lazuli.json 35f01fd1939936fa63ea4c13afda51a444e139e8 data/exdeorum/recipes/sieve/gravel/golden/lead_ore_chunk.json +ff3cb01dbb798637b1cbc6bfc3038944595ae519 data/exdeorum/recipes/sieve/gravel/golden/magnesium_ore_chunk.json 3f388614379e8785a490f71ee7ce8f58a95eefbc data/exdeorum/recipes/sieve/gravel/golden/nickel_ore_chunk.json 581cfcbd5e5faeaf20d7f1eddd1bf6e21cc1f4f2 data/exdeorum/recipes/sieve/gravel/golden/osmium_ore_chunk.json be8c717dd4b8661f42d102182e009f3a55813f3d data/exdeorum/recipes/sieve/gravel/golden/raw_gold.json 4bb392b0051de504d59fcd7ad1122ba1569c72e7 data/exdeorum/recipes/sieve/gravel/golden/silver_ore_chunk.json d1e92452ba4285a9b65f93cdec1cf65f31883c9f data/exdeorum/recipes/sieve/gravel/golden/stone_pebble.json +737ebe8ac91872b6a47f08754c3480eb0623099f data/exdeorum/recipes/sieve/gravel/golden/thorium_ore_chunk.json 405ae53ab5777de41d1fd2455a548255d0a42a13 data/exdeorum/recipes/sieve/gravel/golden/tin_ore_chunk.json d4fecb145a90683dfdd9202d518967208a3a0ec1 data/exdeorum/recipes/sieve/gravel/golden/zinc_ore_chunk.json 7186738ce82393fadb515a7b868dd3c45c16289f data/exdeorum/recipes/sieve/gravel/iron/aluminum_ore_chunk.json bc5e582d21730a7b0744f957e0388108742fba77 data/exdeorum/recipes/sieve/gravel/iron/amethyst_shard.json +3f1d6310b0fc7eb4e060d1555bd017c5c4d6f058 data/exdeorum/recipes/sieve/gravel/iron/boron_ore_chunk.json 4310e908dd8439964e6da95cb433e676f13788ef data/exdeorum/recipes/sieve/gravel/iron/coal.json 49952882ee7d8650f0ec83e9fed338c095e74b6b data/exdeorum/recipes/sieve/gravel/iron/copper_ore_chunk.json 2565a18d4abac7ae44e8f7e1bcec7d639b25725a data/exdeorum/recipes/sieve/gravel/iron/deepslate_pebble.json @@ -743,14 +785,17 @@ e28dd0cc2ae440c324a78b97757266ef0243b94e data/exdeorum/recipes/sieve/gravel/iron be90f3b4db2a9e24f218ca9ba2b96bcbb607e693 data/exdeorum/recipes/sieve/gravel/iron/iron_ore_chunk.json b8b54b1de7034163b0f679f7e0368530dc15e159 data/exdeorum/recipes/sieve/gravel/iron/lapis_lazuli.json c02f2b1d17c3cdb68ed9b6afd41bd30adbc4fda6 data/exdeorum/recipes/sieve/gravel/iron/lead_ore_chunk.json +68757b584fee704ad0c459b16eab12f729362a5e data/exdeorum/recipes/sieve/gravel/iron/magnesium_ore_chunk.json 04367aa5229d3d7edb2c6da1aba48f0720aa5e45 data/exdeorum/recipes/sieve/gravel/iron/nickel_ore_chunk.json 274d86c9cf11cb45e37718231e826b109b867ce1 data/exdeorum/recipes/sieve/gravel/iron/osmium_ore_chunk.json a252e975c9b22a2bdf2e72514d80949ef8ada023 data/exdeorum/recipes/sieve/gravel/iron/silver_ore_chunk.json 641e557462f67d6e989c86e98f0e61219ac0f154 data/exdeorum/recipes/sieve/gravel/iron/stone_pebble.json +cb71ef4f529eafcdc9b37ac05c69d5f382ff85ea data/exdeorum/recipes/sieve/gravel/iron/thorium_ore_chunk.json 6eadbf2fa781f0fa4833359e8c6a3a4fdba55b83 data/exdeorum/recipes/sieve/gravel/iron/tin_ore_chunk.json 5bafdd563e5f052c69b30662741c81ff5022ea6b data/exdeorum/recipes/sieve/gravel/iron/zinc_ore_chunk.json 44f8cb84279fb80d2010951e2fc3a7a93d2dd718 data/exdeorum/recipes/sieve/gravel/netherite/aluminum_ore_chunk.json 1b01b51ac49be8b288d78eed9f13976947ba85b4 data/exdeorum/recipes/sieve/gravel/netherite/amethyst_shard.json +4fbcde7fa8346ea78032b6c690600b104b0a737c data/exdeorum/recipes/sieve/gravel/netherite/boron_ore_chunk.json 6e483128177c19df169f37efdfd778178d86f740 data/exdeorum/recipes/sieve/gravel/netherite/coal.json 75cf3e4a04f845e991a4eb7c664e54fb547574ce data/exdeorum/recipes/sieve/gravel/netherite/copper_ore_chunk.json 71911ac28a8d167282bbb24e87524572e591a10b data/exdeorum/recipes/sieve/gravel/netherite/deepslate_pebble.json @@ -762,14 +807,17 @@ f2c95dc2b7bee18aa27ad336ad470957050148d3 data/exdeorum/recipes/sieve/gravel/neth e28a30509e84956d6d193911cfe8ba252a2825cf data/exdeorum/recipes/sieve/gravel/netherite/iron_ore_chunk.json 8f49a2cdf84583537955e4c27c854bf34dc47903 data/exdeorum/recipes/sieve/gravel/netherite/lapis_lazuli.json f12a4bd98ef79dd7e9073d1626e8294f11f900ae data/exdeorum/recipes/sieve/gravel/netherite/lead_ore_chunk.json +61dda81ce471e511fc24d01c84866549a0c2888a data/exdeorum/recipes/sieve/gravel/netherite/magnesium_ore_chunk.json 79730a79998fb8c56eee3277c83eb2ebf3cb7bcd data/exdeorum/recipes/sieve/gravel/netherite/nickel_ore_chunk.json 55e6ab316d5281084a751060ea66b542b597f11f data/exdeorum/recipes/sieve/gravel/netherite/osmium_ore_chunk.json fa83bb8a17c0fc1fcec33ac08f464946cfdc206c data/exdeorum/recipes/sieve/gravel/netherite/raw_gold.json 7277f2905bcf0b9e51e7031296cf3363921aaf2e data/exdeorum/recipes/sieve/gravel/netherite/silver_ore_chunk.json +a30d07aa72811a808af4f2893fae7af106f8e167 data/exdeorum/recipes/sieve/gravel/netherite/thorium_ore_chunk.json 0eebd5aadf24a1e1d4f7086fb516404d78856f94 data/exdeorum/recipes/sieve/gravel/netherite/tin_ore_chunk.json fdeef4659d58556758cafb04cb97823a7e6280e5 data/exdeorum/recipes/sieve/gravel/netherite/zinc_ore_chunk.json 80ba4c9fb5907709dba07752128899aa222f4227 data/exdeorum/recipes/sieve/gravel/string/aluminum_ore_chunk.json 2aa745d14fdc3f52df7c1eca880125edf0b8009b data/exdeorum/recipes/sieve/gravel/string/amethyst_shard.json +8bc8984cc95ce865f7522db3dc5e1820730c5ddd data/exdeorum/recipes/sieve/gravel/string/boron_ore_chunk.json 5b0bbf7b85568dcd41f87692b65096a0f052d735 data/exdeorum/recipes/sieve/gravel/string/coal.json 032f1cdaf8a6854974e29980287a5a3138e4fa41 data/exdeorum/recipes/sieve/gravel/string/copper_ore_chunk.json bd1ce763ae605e9a0d82e4afa58c4811516bc6bf data/exdeorum/recipes/sieve/gravel/string/diamond.json @@ -780,10 +828,12 @@ b298e2f51255b88beea1394e2f609768fbb36921 data/exdeorum/recipes/sieve/gravel/stri 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 +78081972da9f17787319a28bc5d29b50ca8fab12 data/exdeorum/recipes/sieve/gravel/string/magnesium_ore_chunk.json b89e33d919dbd61f41f9d0eed39cd188fb1289ff data/exdeorum/recipes/sieve/gravel/string/nickel_ore_chunk.json 73ba3c31fc8ee5f88279289f571a5e5ea5bd14da data/exdeorum/recipes/sieve/gravel/string/osmium_ore_chunk.json 759250554ab4212c823eae23a4f15924579b8723 data/exdeorum/recipes/sieve/gravel/string/silver_ore_chunk.json e33e4503b24e2dc1ab1821746f49ac157f2350d3 data/exdeorum/recipes/sieve/gravel/string/stone_pebble.json +72dee8ef7a4c09a19006475c52c7f1a11b635ac7 data/exdeorum/recipes/sieve/gravel/string/thorium_ore_chunk.json 784265b509fa3a590f33651cb2c1d0cb263ed141 data/exdeorum/recipes/sieve/gravel/string/tin_ore_chunk.json 251d4876ef292135996e19ccb8fdf805f54d8f68 data/exdeorum/recipes/sieve/gravel/string/zinc_ore_chunk.json b774a52785ba81cf8c589b9962abce624862a6ec data/exdeorum/recipes/sieve/moss_block/diamond/acacia_sapling.json diff --git a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd index b8f47d33..21b5a20c 100644 --- a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd +++ b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd @@ -1,4 +1,4 @@ -// 1.20.1 2023-11-25T19:04:39.9733295 ModKit Item Models for mod 'exdeorum' +// 1.20.1 2023-12-27T21:44:18.578794 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 @@ -19,6 +19,7 @@ aca318964a4af0b54d935faa6c83c8653bdb4296 assets/exdeorum/models/item/bluebright_ 43e534189ef41de5ffe650e27f9e2039a9a8c0b2 assets/exdeorum/models/item/bluebright_sieve.json ce29c4adab1efa20645351b8bb2aa5a87f36729d assets/exdeorum/models/item/blue_archwood_crucible.json 19995d73ae76d8ebcb64cab9219373f6192f5e8d assets/exdeorum/models/item/bone_crook.json +09eda07fba0fa892e7706a726d267655119259be assets/exdeorum/models/item/boron_ore_chunk.json d3f7de31d0fba8578c3e36a16ab39ac0a4d54af9 assets/exdeorum/models/item/calcite_pebble.json 95b067616dfc39ad8f72bab6d2cf40c6c05a3748 assets/exdeorum/models/item/cherry_barrel.json 9480047be2df6b628b18f1102699ed8f24de4deb assets/exdeorum/models/item/cherry_crucible.json @@ -87,12 +88,14 @@ e4719451e58406787ac0d5fb40416b76b2a03002 assets/exdeorum/models/item/jungle_barr 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 +ca95c63b8b424cd75fdae1fe05d9050d31c7d9ef assets/exdeorum/models/item/lithium_ore_chunk.json c4e7ccf8e6915926936b165ff5980fd533327769 assets/exdeorum/models/item/lunar_barrel.json dec903b9466d6cf1ac05effcef8b8439fe524509 assets/exdeorum/models/item/lunar_crucible.json 59a7338eb3c8c6e4cfe49070cdadca01dec3007a assets/exdeorum/models/item/lunar_sieve.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 +dfc5932b6e9219720224dc5ea82c57bc4cd25900 assets/exdeorum/models/item/magnesium_ore_chunk.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 @@ -146,6 +149,7 @@ b71e04a912b620bfebfd309bf5d61cee8fba35b9 assets/exdeorum/models/item/stone_hamme 9cf157cd0b41f89c9291be6b6383e0494369c6ef assets/exdeorum/models/item/stone_pebble.json 3d848c2d1f094ceab9fb3f951f140b85cea2a6ab assets/exdeorum/models/item/stone_watering_can.json d9561f75ac700cf33abf8e1f7684d1c5fec85a89 assets/exdeorum/models/item/string_mesh.json +179728c4723f2f698bff43429ae83d31fb2dac87 assets/exdeorum/models/item/thorium_ore_chunk.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 diff --git a/src/generated/resources/assets/exdeorum/lang/en_us.json b/src/generated/resources/assets/exdeorum/lang/en_us.json index 8ceb64bf..c401ead4 100644 --- a/src/generated/resources/assets/exdeorum/lang/en_us.json +++ b/src/generated/resources/assets/exdeorum/lang/en_us.json @@ -147,6 +147,7 @@ "item.exdeorum.basalt_pebble": "Basalt Pebble", "item.exdeorum.blackstone_pebble": "Blackstone Pebble", "item.exdeorum.bone_crook": "Bone Crook", + "item.exdeorum.boron_ore_chunk": "Boron Ore Chunk", "item.exdeorum.calcite_pebble": "Calcite Pebble", "item.exdeorum.cobalt_ore_chunk": "Cobalt Ore Chunk", "item.exdeorum.cooked_silk_worm": "Cooked Silk Worm", @@ -171,6 +172,8 @@ "item.exdeorum.iron_ore_chunk": "Iron Ore Chunk", "item.exdeorum.iron_watering_can": "Iron Watering Can", "item.exdeorum.lead_ore_chunk": "Lead Ore Chunk", + "item.exdeorum.lithium_ore_chunk": "Lithium Ore Chunk", + "item.exdeorum.magnesium_ore_chunk": "Magnesium Ore Chunk", "item.exdeorum.mycelium_spores": "Mycelium Spores", "item.exdeorum.netherite_hammer": "Netherite Hammer", "item.exdeorum.netherite_mesh": "Netherite Mesh", @@ -193,6 +196,7 @@ "item.exdeorum.stone_pebble": "Stone Pebble", "item.exdeorum.stone_watering_can": "Stone Watering Can", "item.exdeorum.string_mesh": "String Mesh", + "item.exdeorum.thorium_ore_chunk": "Thorium Ore Chunk", "item.exdeorum.tin_ore_chunk": "Tin Ore Chunk", "item.exdeorum.tuff_pebble": "Tuff Pebble", "item.exdeorum.unfired_porcelain_bucket": "Unfired Porcelain Bucket", diff --git a/src/generated/resources/assets/exdeorum/models/item/boron_ore_chunk.json b/src/generated/resources/assets/exdeorum/models/item/boron_ore_chunk.json new file mode 100644 index 00000000..30d748df --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/boron_ore_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/boron_ore_chunk" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/lithium_ore_chunk.json b/src/generated/resources/assets/exdeorum/models/item/lithium_ore_chunk.json new file mode 100644 index 00000000..db57a1b7 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/lithium_ore_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/lithium_ore_chunk" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/magnesium_ore_chunk.json b/src/generated/resources/assets/exdeorum/models/item/magnesium_ore_chunk.json new file mode 100644 index 00000000..60b96ad7 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/magnesium_ore_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/magnesium_ore_chunk" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/thorium_ore_chunk.json b/src/generated/resources/assets/exdeorum/models/item/thorium_ore_chunk.json new file mode 100644 index 00000000..afe576e0 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/thorium_ore_chunk.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/thorium_ore_chunk" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/boron_tag.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/boron_tag.json new file mode 100644 index 00000000..99b2d5ba --- /dev/null +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/boron_tag.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:boron_ore_chunk" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "exdeorum:ores/boron_tag" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "exdeorum:ores/boron_tag" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/lithium_tag.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/lithium_tag.json new file mode 100644 index 00000000..62394217 --- /dev/null +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/lithium_tag.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:lithium_ore_chunk" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "exdeorum:ores/lithium_tag" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "exdeorum:ores/lithium_tag" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/magnesium_tag.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/magnesium_tag.json new file mode 100644 index 00000000..bf4a7c70 --- /dev/null +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/magnesium_tag.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:magnesium_ore_chunk" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "exdeorum:ores/magnesium_tag" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "exdeorum:ores/magnesium_tag" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/thorium_tag.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/thorium_tag.json new file mode 100644 index 00000000..dfa93b2d --- /dev/null +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/ores/thorium_tag.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:thorium_ore_chunk" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "exdeorum:ores/thorium_tag" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "exdeorum:ores/thorium_tag" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/ores/boron_tag.json b/src/generated/resources/data/exdeorum/recipes/ores/boron_tag.json new file mode 100644 index 00000000..91b987cc --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/ores/boron_tag.json @@ -0,0 +1,21 @@ +{ + "type": "exdeorum:tag_result", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "exdeorum:boron_ore_chunk" + } + }, + "pattern": [ + "##", + "##" + ], + "result": { + "item": "minecraft:air" + }, + "show_notification": true + }, + "result_tag": "forge:ores/boron" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/ores/lithium_tag.json b/src/generated/resources/data/exdeorum/recipes/ores/lithium_tag.json new file mode 100644 index 00000000..e642bbf0 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/ores/lithium_tag.json @@ -0,0 +1,21 @@ +{ + "type": "exdeorum:tag_result", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "exdeorum:lithium_ore_chunk" + } + }, + "pattern": [ + "##", + "##" + ], + "result": { + "item": "minecraft:air" + }, + "show_notification": true + }, + "result_tag": "forge:ores/lithium" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/ores/magnesium_tag.json b/src/generated/resources/data/exdeorum/recipes/ores/magnesium_tag.json new file mode 100644 index 00000000..7a842774 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/ores/magnesium_tag.json @@ -0,0 +1,21 @@ +{ + "type": "exdeorum:tag_result", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "exdeorum:magnesium_ore_chunk" + } + }, + "pattern": [ + "##", + "##" + ], + "result": { + "item": "minecraft:air" + }, + "show_notification": true + }, + "result_tag": "forge:ores/magnesium" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/ores/thorium_tag.json b/src/generated/resources/data/exdeorum/recipes/ores/thorium_tag.json new file mode 100644 index 00000000..8d566471 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/ores/thorium_tag.json @@ -0,0 +1,21 @@ +{ + "type": "exdeorum:tag_result", + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "exdeorum:thorium_ore_chunk" + } + }, + "pattern": [ + "##", + "##" + ], + "result": { + "item": "minecraft:air" + }, + "show_notification": true + }, + "result_tag": "forge:ores/thorium" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/boron_ore_chunk.json new file mode 100644 index 00000000..85fd9c5c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "exdeorum:boron_ore_chunk", + "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/crushed_deepslate/diamond/lithium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/lithium_ore_chunk.json new file mode 100644 index 00000000..e58d9d95 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/lithium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/lithium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "exdeorum:lithium_ore_chunk", + "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/crushed_deepslate/diamond/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/magnesium_ore_chunk.json new file mode 100644 index 00000000..47b85843 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "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/crushed_deepslate/diamond/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/thorium_ore_chunk.json new file mode 100644 index 00000000..81242401 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/diamond/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "exdeorum:thorium_ore_chunk", + "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/crushed_deepslate/flint/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/boron_ore_chunk.json new file mode 100644 index 00000000..8c0e1ede --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:flint_mesh", + "result": "exdeorum:boron_ore_chunk", + "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/crushed_deepslate/flint/lithium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/lithium_ore_chunk.json new file mode 100644 index 00000000..375f3309 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/lithium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/lithium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:flint_mesh", + "result": "exdeorum:lithium_ore_chunk", + "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/crushed_deepslate/flint/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/magnesium_ore_chunk.json new file mode 100644 index 00000000..650755a2 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:flint_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "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/crushed_deepslate/flint/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/thorium_ore_chunk.json new file mode 100644 index 00000000..895176df --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/flint/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:flint_mesh", + "result": "exdeorum:thorium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.065 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/boron_ore_chunk.json new file mode 100644 index 00000000..8fd4c14c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:golden_mesh", + "result": "exdeorum:boron_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.065 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/lithium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/lithium_ore_chunk.json new file mode 100644 index 00000000..4075230c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/lithium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/lithium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:golden_mesh", + "result": "exdeorum:lithium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.065 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/magnesium_ore_chunk.json new file mode 100644 index 00000000..16071c1c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:golden_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "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/crushed_deepslate/golden/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/thorium_ore_chunk.json new file mode 100644 index 00000000..64d76ae3 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/golden/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:golden_mesh", + "result": "exdeorum:thorium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.075 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/boron_ore_chunk.json new file mode 100644 index 00000000..dca33ab9 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:iron_mesh", + "result": "exdeorum:boron_ore_chunk", + "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/crushed_deepslate/iron/lithium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/lithium_ore_chunk.json new file mode 100644 index 00000000..9f852dc6 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/lithium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/lithium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:iron_mesh", + "result": "exdeorum:lithium_ore_chunk", + "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/crushed_deepslate/iron/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/magnesium_ore_chunk.json new file mode 100644 index 00000000..f28a2f29 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:iron_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "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/crushed_deepslate/iron/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/thorium_ore_chunk.json new file mode 100644 index 00000000..0e9303f0 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/iron/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:iron_mesh", + "result": "exdeorum:thorium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.075 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/boron_ore_chunk.json new file mode 100644 index 00000000..d6081688 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "exdeorum:boron_ore_chunk", + "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/crushed_deepslate/netherite/lithium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/lithium_ore_chunk.json new file mode 100644 index 00000000..25d96d50 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/lithium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/lithium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "exdeorum:lithium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.085 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/magnesium_ore_chunk.json new file mode 100644 index 00000000..f8c2beb3 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "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/crushed_deepslate/netherite/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/thorium_ore_chunk.json new file mode 100644 index 00000000..7019adfb --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/netherite/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "exdeorum:thorium_ore_chunk", + "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/crushed_deepslate/string/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/boron_ore_chunk.json new file mode 100644 index 00000000..55861197 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:string_mesh", + "result": "exdeorum:boron_ore_chunk", + "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/crushed_deepslate/string/lithium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/lithium_ore_chunk.json new file mode 100644 index 00000000..af6cfbde --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/lithium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/lithium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:string_mesh", + "result": "exdeorum:lithium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.045 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/magnesium_ore_chunk.json new file mode 100644 index 00000000..09751e72 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:string_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "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/crushed_deepslate/string/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/thorium_ore_chunk.json new file mode 100644 index 00000000..2cb7a1ec --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/crushed_deepslate/string/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "exdeorum:crushed_deepslate" + }, + "mesh": "exdeorum:string_mesh", + "result": "exdeorum:thorium_ore_chunk", + "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/gravel/diamond/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/diamond/boron_ore_chunk.json new file mode 100644 index 00000000..e0c50681 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/diamond/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "exdeorum:boron_ore_chunk", + "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/gravel/diamond/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/diamond/magnesium_ore_chunk.json new file mode 100644 index 00000000..d356091e --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/diamond/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.105 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/diamond/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/diamond/thorium_ore_chunk.json new file mode 100644 index 00000000..c0ca75e6 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/diamond/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:diamond_mesh", + "result": "exdeorum:thorium_ore_chunk", + "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/gravel/flint/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/boron_ore_chunk.json new file mode 100644 index 00000000..1789bbdf --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:flint_mesh", + "result": "exdeorum:boron_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.0325 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/magnesium_ore_chunk.json new file mode 100644 index 00000000..c49a06fc --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:flint_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.075 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/thorium_ore_chunk.json new file mode 100644 index 00000000..767ff73e --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/flint/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:flint_mesh", + "result": "exdeorum:thorium_ore_chunk", + "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/gravel/golden/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/boron_ore_chunk.json new file mode 100644 index 00000000..2af6c3c9 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:golden_mesh", + "result": "exdeorum:boron_ore_chunk", + "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/gravel/golden/diamond.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/diamond.json index 88be8f14..d4065525 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/diamond.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/diamond.json @@ -8,6 +8,6 @@ "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.1 + "p": 0.09 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/iron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/iron_ore_chunk.json index a3db3511..cdb815ac 100644 --- a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/iron_ore_chunk.json +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/iron_ore_chunk.json @@ -8,6 +8,6 @@ "result_amount": { "type": "minecraft:binomial", "n": 1.0, - "p": 0.04 + "p": 0.07 } } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/magnesium_ore_chunk.json new file mode 100644 index 00000000..973799f8 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:golden_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "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/gravel/golden/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/thorium_ore_chunk.json new file mode 100644 index 00000000..8573f5f8 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/golden/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:golden_mesh", + "result": "exdeorum:thorium_ore_chunk", + "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/gravel/iron/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/iron/boron_ore_chunk.json new file mode 100644 index 00000000..fddc1a6f --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/iron/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:iron_mesh", + "result": "exdeorum:boron_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.045 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/iron/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/iron/magnesium_ore_chunk.json new file mode 100644 index 00000000..49d345bb --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/iron/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:iron_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "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/gravel/iron/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/iron/thorium_ore_chunk.json new file mode 100644 index 00000000..5b9e014d --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/iron/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:iron_mesh", + "result": "exdeorum:thorium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.065 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/boron_ore_chunk.json new file mode 100644 index 00000000..3a809242 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "exdeorum:boron_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.065 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/magnesium_ore_chunk.json new file mode 100644 index 00000000..10ed6c2b --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "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/gravel/netherite/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/thorium_ore_chunk.json new file mode 100644 index 00000000..2671ab5f --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/netherite/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:netherite_mesh", + "result": "exdeorum:thorium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.075 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/boron_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/boron_ore_chunk.json new file mode 100644 index 00000000..b8c5d489 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/boron_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/boron" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:string_mesh", + "result": "exdeorum:boron_ore_chunk", + "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/gravel/string/magnesium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/magnesium_ore_chunk.json new file mode 100644 index 00000000..71966e81 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/magnesium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/magnesium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:string_mesh", + "result": "exdeorum:magnesium_ore_chunk", + "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/gravel/string/thorium_ore_chunk.json b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/thorium_ore_chunk.json new file mode 100644 index 00000000..bb0301b2 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/sieve/gravel/string/thorium_ore_chunk.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:ores/thorium" + } + } + ], + "recipe": { + "type": "exdeorum:sieve", + "ingredient": { + "item": "minecraft:gravel" + }, + "mesh": "exdeorum:string_mesh", + "result": "exdeorum:thorium_ore_chunk", + "result_amount": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.05 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/java/thedarkcolour/exdeorum/block/BarrelBlock.java b/src/main/java/thedarkcolour/exdeorum/block/BarrelBlock.java index c277a873..0cb78685 100644 --- a/src/main/java/thedarkcolour/exdeorum/block/BarrelBlock.java +++ b/src/main/java/thedarkcolour/exdeorum/block/BarrelBlock.java @@ -93,9 +93,12 @@ public class BarrelBlock extends Block implements EntityBlock { } @Override - public void neighborChanged(BlockState pState, Level level, BlockPos pos, Block pBlock, BlockPos pFromPos, boolean pIsMoving) { - if (level.getBlockEntity(pos) instanceof BarrelBlockEntity barrel) { - barrel.tryInWorldFluidMixing(); + public void neighborChanged(BlockState pState, Level level, BlockPos pos, Block pBlock, BlockPos fromPos, boolean pIsMoving) { + // Only check when the above block is updated + if (fromPos.getY() - pos.getY() == 1) { + if (level.getBlockEntity(pos) instanceof BarrelBlockEntity barrel) { + barrel.tryInWorldFluidMixing(); + } } } } diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java index db52a781..cc7f56b4 100644 --- a/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java +++ b/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java @@ -54,6 +54,7 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; import org.jetbrains.annotations.NotNull; +import thedarkcolour.exdeorum.block.BarrelBlock; import thedarkcolour.exdeorum.client.CompostColors; import thedarkcolour.exdeorum.config.EConfig; import thedarkcolour.exdeorum.recipe.RecipeUtil; @@ -63,7 +64,6 @@ import thedarkcolour.exdeorum.registry.EFluids; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.swing.text.html.Option; public class BarrelBlockEntity extends EBlockEntity { private static final int MOSS_SPREAD_RANGE = 2; @@ -134,7 +134,7 @@ public class BarrelBlockEntity extends EBlockEntity { } // Returns true if there are no solid ingredients (can a fluid be inserted?) - public boolean canInsertFluid() { + public boolean hasNoSolids() { return compost <= 0 && item.getStackInSlot(0).isEmpty(); } @@ -179,68 +179,69 @@ public class BarrelBlockEntity extends EBlockEntity { return giveResultItem(level, pos); } - // Handle item fluid interaction - if (canInsertFluid()) { + // Handle item fluid interaction first + if (hasNoSolids()) { var wasBurning = isBurning(); if (FluidUtil.interactWithFluidHandler(player, hand, tank)) { + // If the item is a fluid handler, try to transfer fluids if (wasBurning && !isHotFluid(tank.getFluid().getFluid().getFluidType())) { progress = 0.0f; } return InteractionResult.sidedSuccess(level.isClientSide); } else { - var heldItem = player.getItemInHand(hand); - var optionalBool = heldItem.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).map(item -> { - var fluidInTank = item.getFluidInTank(0); + // try one more time to transfer fluids between item and barrel + var playerItem = player.getItemInHand(hand); + if (EConfig.SERVER.allowWaterBottleTransfer.get()) { + var fluid = new FluidStack(Fluids.WATER, 250); + + if (playerItem.getItem() == Items.POTION && PotionUtils.getPotion(playerItem) == Potions.WATER) { + if (tank.fill(fluid, IFluidHandler.FluidAction.SIMULATE) > 0) { + if (!player.getAbilities().instabuild) { + player.setItemInHand(hand, new ItemStack(Items.GLASS_BOTTLE)); + } + tank.fill(fluid, IFluidHandler.FluidAction.EXECUTE); + level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + + markUpdated(); + return InteractionResult.sidedSuccess(level.isClientSide); + } + } else if (playerItem.getItem() == Items.GLASS_BOTTLE) { + if (tank.drain(fluid, IFluidHandler.FluidAction.SIMULATE).getAmount() == 250) { + extractWaterBottle(tank, level, player, playerItem, fluid); + + markUpdated(); + return InteractionResult.sidedSuccess(level.isClientSide); + } + } + } + + // Otherwise, mix the item's fluid into the barrel's fluid + var itemFluidCap = playerItem.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).resolve(); + if (itemFluidCap.isPresent()) { + var fluidInTank = itemFluidCap.get().getFluidInTank(0); + if (fluidInTank.getAmount() >= 1000) { if (!level.isClientSide) { - return tryFluidMixing(fluidInTank.getFluid()); + tryFluidMixing(fluidInTank.getFluid()); } - return true; + // If a mix was successful, skip rest of logic + return InteractionResult.sidedSuccess(level.isClientSide); } - - return false; - }); - if (optionalBool.isPresent() && optionalBool.get()) { - return InteractionResult.sidedSuccess(level.isClientSide); } } } + // If the barrel has no solids and no fluid mixing/transfer happened var playerItem = player.getItemInHand(hand); if (!level.isClientSide) { - var bottled = false; + // mix item ingredient into fluid OR turn into compost (delegated to item handler) + var handItem = item.insertItem(0, player.getAbilities().instabuild ? playerItem.copy() : playerItem, false); - if (EConfig.SERVER.allowWaterBottleTransfer.get()) { - var fluid = new FluidStack(Fluids.WATER, 250); - - if (playerItem.getItem() == Items.POTION && PotionUtils.getPotion(playerItem) == Potions.WATER) { - if (tank.fill(fluid, IFluidHandler.FluidAction.SIMULATE) > 0) { - if (!player.getAbilities().instabuild) { - player.setItemInHand(hand, new ItemStack(Items.GLASS_BOTTLE)); - } - tank.fill(fluid, IFluidHandler.FluidAction.EXECUTE); - bottled = true; - level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); - } - } else if (playerItem.getItem() == Items.GLASS_BOTTLE) { - if (tank.drain(fluid, IFluidHandler.FluidAction.SIMULATE).getAmount() == 250) { - extractWaterBottle(tank, level, player, playerItem, fluid); - bottled = true; - } - } - } - - if (!bottled) { - var handItem = item.insertItem(0, player.getAbilities().instabuild ? playerItem.copy() : playerItem, false); - - if (!player.getAbilities().instabuild) { - player.setItemInHand(hand, handItem); - giveResultItem(level, pos); - } - } else { - markUpdated(); + if (!player.getAbilities().instabuild) { + player.setItemInHand(hand, handItem); + giveResultItem(level, pos); } } @@ -283,7 +284,7 @@ public class BarrelBlockEntity extends EBlockEntity { } /** - * @param input The input item to craft with + * @param input The input item to craft with * @param simulate Whether the craft should actually take place * @return Whether a craft was made or is possible */ @@ -307,7 +308,7 @@ public class BarrelBlockEntity extends EBlockEntity { /** * @param playerItem The item to try to mix with this barrel's fluid - * @param simulate Whether this is a test or the player is actually mixing with the barrel + * @param simulate Whether this is a test or the player is actually mixing with the barrel * @return Whether something was mixed (if simulated, whether the mix is possible) */ private boolean tryMixing(ItemStack playerItem, boolean simulate) { @@ -332,28 +333,6 @@ public class BarrelBlockEntity extends EBlockEntity { } } - public boolean tryInWorldFluidMixing() { - if (!tank.isEmpty() && item.getStackInSlot(0).isEmpty()) { - var aboveFluid = level.getBlockState(worldPosition.above()).getFluidState().getType(); - - return aboveFluid != Fluids.EMPTY && tryFluidMixing(aboveFluid); - } else { - return false; - } - } - - private boolean tryFluidMixing(Fluid additive) { - BarrelFluidMixingRecipe recipe = RecipeUtil.getFluidMixingRecipe(tank.getFluid(), additive); - - if (recipe != null) { - tank.drain(recipe.baseFluidAmount, IFluidHandler.FluidAction.EXECUTE); - setItem(new ItemStack(recipe.result)); - return true; - } - - return false; - } - private boolean tryComposting(ItemStack stack, boolean simulate) { if (simulate) { return RecipeUtil.isCompostable(stack); @@ -389,6 +368,31 @@ public class BarrelBlockEntity extends EBlockEntity { level.playSound(null, worldPosition, SoundEvents.COMPOSTER_FILL, SoundSource.BLOCKS); } + /** + * Called in three cases, which should cover all the possible edge cases: + *
  • When the barrel is updated by a neighboring block (see {@link BarrelBlock#neighborChanged})
    • + *
  • When the barrel is first loaded from NBT (see {@link #onLoad})
    • + *
  • When the fluid in the barrel changes (see {@link FluidHandler#onContentsChanged()})
    • + */ + public void tryInWorldFluidMixing() { + if (!tank.isEmpty() && item.getStackInSlot(0).isEmpty()) { + var aboveFluid = level.getBlockState(worldPosition.above()).getFluidState().getType(); + + if (aboveFluid != Fluids.EMPTY) { + tryFluidMixing(aboveFluid); + } + } + } + + private void tryFluidMixing(Fluid additive) { + BarrelFluidMixingRecipe recipe = RecipeUtil.getFluidMixingRecipe(tank.getFluid(), additive); + + if (recipe != null) { + tank.drain(recipe.baseFluidAmount, IFluidHandler.FluidAction.EXECUTE); + setItem(new ItemStack(recipe.result)); + } + } + public static class Ticker implements BlockEntityTicker { @Override public void tick(Level level, BlockPos pos, BlockState state, BarrelBlockEntity barrel) { @@ -521,7 +525,7 @@ public class BarrelBlockEntity extends EBlockEntity { return ItemHandlerHelper.copyStackWithSize(stack, stack.getCount() - 1); } } else { - tryInWorldFluidMixing(); + stack.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).ifPresent(itemFluid -> tryFluidMixing(itemFluid.getFluidInTank(0).getFluid())); return stack; } } @@ -551,7 +555,7 @@ public class BarrelBlockEntity extends EBlockEntity { @Override public boolean isFluidValid(FluidStack stack) { - return !isBrewing() && BarrelBlockEntity.this.canInsertFluid(); + return !isBrewing() && BarrelBlockEntity.this.hasNoSolids(); } @Override diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/SieveBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/SieveBlockEntity.java index 6b130cb4..1ab9205a 100644 --- a/src/main/java/thedarkcolour/exdeorum/blockentity/SieveBlockEntity.java +++ b/src/main/java/thedarkcolour/exdeorum/blockentity/SieveBlockEntity.java @@ -37,7 +37,6 @@ import thedarkcolour.exdeorum.config.EConfig; import thedarkcolour.exdeorum.recipe.RecipeUtil; import thedarkcolour.exdeorum.recipe.sieve.SieveRecipe; import thedarkcolour.exdeorum.registry.EBlockEntities; -import thedarkcolour.exdeorum.registry.EItems; import thedarkcolour.exdeorum.tag.EItemTags; import java.util.Map; @@ -221,7 +220,7 @@ public class SieveBlockEntity extends EBlockEntity { } } - private InteractionResult removeMesh() { + private void removeMesh() { if (!level.isClientSide) { // Pop out item var itemEntity = new ItemEntity(level, worldPosition.getX() + 0.5, worldPosition.getY() + 1.5, worldPosition.getZ() + 0.5, mesh); @@ -233,8 +232,6 @@ public class SieveBlockEntity extends EBlockEntity { setMesh(ItemStack.EMPTY); markUpdated(); } - - return InteractionResult.sidedSuccess(level.isClientSide); } private void setMesh(ItemStack mesh) { diff --git a/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java b/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java index b50332fc..996ff866 100644 --- a/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java +++ b/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java @@ -29,6 +29,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.item.BlockItem; +import net.minecraft.world.level.material.Fluids; import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; import net.minecraftforge.client.model.data.ModelData; import net.minecraftforge.common.capabilities.ForgeCapabilities; @@ -68,7 +69,7 @@ public class BarrelRenderer implements BlockEntityRenderer { var fluidStack = tank.getFluidInTank(0); if (!fluidStack.isEmpty()) { // Get texture - var fluid = fluidStack.getFluid(); + var fluid = Fluids.LAVA;//fluidStack.getFluid(); var level = barrel.getLevel(); var pos = barrel.getBlockPos(); var percentage = fluidStack.getAmount() / 1000.0f; diff --git a/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java b/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java index a1da83eb..52df9997 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java @@ -41,4 +41,5 @@ public class ModIds { public static final String AETHER = "aether"; public static final String BLUE_SKIES = "blue_skies"; public static final String PAMS_HARVESTCRAFT_CROPS = "pamhc2crops"; + public static final String NUCLEARCRAFT_NEOTERIC = "nuclearcraft"; } diff --git a/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java b/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java index 39b4a25a..dfc6b3cc 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/PreferredOres.java @@ -53,8 +53,19 @@ public class PreferredOres { putPreferredOre(EItemTags.ORES_TIN, EConfig.COMMON.preferredTinOre, getDefaultTinOre()); putPreferredOre(EItemTags.ORES_ZINC, EConfig.COMMON.preferredZincOre, getDefaultZincOre()); putPreferredOre(EItemTags.ORES_IRIDIUM, EConfig.COMMON.preferredIridiumOre, getDefaultIridiumOre()); + putPreferredOre(EItemTags.ORES_THORIUM, EConfig.COMMON.preferredThoriumOre, getDefaultThoriumOre()); + putPreferredOre(EItemTags.ORES_MAGNESIUM, EConfig.COMMON.preferredMagnesiumOre, getDefaultMagnesiumOre()); + putPreferredOre(EItemTags.ORES_LITHIUM, EConfig.COMMON.preferredLithiumOre, getDefaultLithiumOre()); + putPreferredOre(EItemTags.ORES_BORON, EConfig.COMMON.preferredBoronOre, getDefaultBoronOre()); } + /** + * Determines which mod's ore should be crafted by Ex Deorum ore chunks. + * + * @param tag The tag which contains a list of choices for the desired ore. Might be empty. + * @param config A config which holds an override value chosen by the user. Could even be something that isn't an ore. + * @param defaultOre The default ore choice, picked by Ex Deorum based on which mod is the "best" choice according to thedarkcolour. + */ @SuppressWarnings("deprecation") private static void putPreferredOre(TagKey tag, ForgeConfigSpec.ConfigValue config, Item defaultOre) { var item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(config.get())); @@ -86,6 +97,7 @@ public class PreferredOres { } else { collection.sort(Comparator.comparing(holder -> BuiltInRegistries.ITEM.getKey(holder.get()))); + // todo should the PREFERRED_ORE map be updated with this value? return collection.get(0).get(); } } @@ -96,19 +108,19 @@ public class PreferredOres { } public static Item getDefaultCobaltOre() { - return defaultItem("cobalt_ore", ModIds.TINKERS_CONSTRUCT); + return defaultItem("cobalt_ore", ModIds.TINKERS_CONSTRUCT, ModIds.NUCLEARCRAFT_NEOTERIC); } public static Item getDefaultSilverOre() { - return defaultItem("silver_ore", ModIds.ALL_THE_ORES, ModIds.OCCULTISM, ModIds.RAILCRAFT, ModIds.FACTORIUM); + return defaultItem("silver_ore", ModIds.ALL_THE_ORES, ModIds.OCCULTISM, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC); } public static Item getDefaultLeadOre() { - return defaultItem("lead_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.MEKANISM, ModIds.RAILCRAFT, ModIds.FACTORIUM); + return defaultItem("lead_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.MEKANISM, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC); } public static Item getDefaultPlatinumOre() { - return defaultItem("platinum_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.FACTORIUM); + return defaultItem("platinum_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC); } public static Item getDefaultNickelOre() { @@ -116,7 +128,7 @@ public class PreferredOres { } public static Item getDefaultUraniumOre() { - var item = defaultItem("uranium_ore", ModIds.ALL_THE_ORES, ModIds.MEKANISM, ModIds.BIGGER_REACTORS); + var item = defaultItem("uranium_ore", ModIds.ALL_THE_ORES, ModIds.MEKANISM, ModIds.BIGGER_REACTORS, ModIds.NUCLEARCRAFT_NEOTERIC); if (item == Items.AIR && ModList.get().isLoaded(ModIds.EXTREME_REACTORS)) { item = defaultItem("yellorite_ore", ModIds.EXTREME_REACTORS); @@ -130,17 +142,33 @@ public class PreferredOres { } public static Item getDefaultTinOre() { - return defaultItem("tin_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.THERMAL, ModIds.MEKANISM, ModIds.RAILCRAFT, ModIds.FACTORIUM); + return defaultItem("tin_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.THERMAL, ModIds.MEKANISM, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC); } public static Item getDefaultZincOre() { - return defaultItem("zinc_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.CREATE, ModIds.RAILCRAFT, ModIds.FACTORIUM); + return defaultItem("zinc_ore", ModIds.ALL_THE_ORES, ModIds.GREG, ModIds.CREATE, ModIds.RAILCRAFT, ModIds.FACTORIUM, ModIds.NUCLEARCRAFT_NEOTERIC); } public static Item getDefaultIridiumOre() { return defaultItem("iridium_ore", ModIds.ALL_THE_ORES); } + public static Item getDefaultThoriumOre() { + return defaultItem("thorium_ore", ModIds.NUCLEARCRAFT_NEOTERIC); + } + + public static Item getDefaultMagnesiumOre() { + return defaultItem("magnesium_ore", ModIds.NUCLEARCRAFT_NEOTERIC); + } + + public static Item getDefaultLithiumOre() { + return defaultItem("lithium_ore", ModIds.NUCLEARCRAFT_NEOTERIC); + } + + public static Item getDefaultBoronOre() { + return defaultItem("boron_ore", ModIds.NUCLEARCRAFT_NEOTERIC); + } + private static Item defaultItem(String path, String... modIds) { var modId = getFirstAvailableModId(modIds); diff --git a/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java b/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java index 3183dab9..40f6af1b 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java @@ -33,6 +33,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.Container; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Recipe; @@ -43,6 +44,7 @@ import net.minecraft.world.level.block.WallTorchBlock; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.ModList; import thedarkcolour.exdeorum.ExDeorum; +import thedarkcolour.exdeorum.block.SieveBlock; import thedarkcolour.exdeorum.blockentity.LavaCrucibleBlockEntity; import thedarkcolour.exdeorum.compat.ModIds; import thedarkcolour.exdeorum.data.TranslationKeys; @@ -100,20 +102,7 @@ public class ExDeorumJeiPlugin implements IModPlugin { @Override public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) { - 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 barrels = getAvailableBarrels(); var sieves = Lists.newArrayList( EItems.OAK_SIEVE.get(), EItems.SPRUCE_SIEVE.get(), @@ -144,16 +133,6 @@ public class ExDeorumJeiPlugin implements IModPlugin { 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()); @@ -176,7 +155,6 @@ public class ExDeorumJeiPlugin implements IModPlugin { waterCrucibles.add(EItems.UMBRAN_CRUCIBLE.get()); } if (ModList.get().isLoaded(ModIds.ARS_NOUVEAU)) { - barrels.add(EItems.ARCHWOOD_BARREL.get()); sieves.add(EItems.ARCHWOOD_SIEVE.get()); waterCrucibles.add(EItems.CASCADING_ARCHWOOD_CRUCIBLE.get()); waterCrucibles.add(EItems.BLAZING_ARCHWOOD_CRUCIBLE.get()); @@ -184,20 +162,11 @@ public class ExDeorumJeiPlugin implements IModPlugin { waterCrucibles.add(EItems.FLOURISHING_ARCHWOOD_CRUCIBLE.get()); } if (ModList.get().isLoaded(ModIds.AETHER)) { - barrels.add(EItems.SKYROOT_BARREL.get()); sieves.add(EItems.SKYROOT_SIEVE.get()); waterCrucibles.add(EItems.SKYROOT_CRUCIBLE.get()); waterCrucibles.add(EItems.GOLDEN_OAK_CRUCIBLE.get()); } if (ModList.get().isLoaded(ModIds.BLUE_SKIES)) { - barrels.add(EItems.BLUEBRIGHT_BARREL.get()); - barrels.add(EItems.STARLIT_BARREL.get()); - barrels.add(EItems.FROSTBRIGHT_BARREL.get()); - barrels.add(EItems.COMET_BARREL.get()); - barrels.add(EItems.LUNAR_BARREL.get()); - barrels.add(EItems.DUSK_BARREL.get()); - barrels.add(EItems.MAPLE_BARREL.get()); - barrels.add(EItems.CRYSTALLIZED_BARREL.get()); sieves.add(EItems.BLUEBRIGHT_SIEVE.get()); sieves.add(EItems.STARLIT_SIEVE.get()); sieves.add(EItems.FROSTBRIGHT_SIEVE.get()); @@ -271,7 +240,9 @@ public class ExDeorumJeiPlugin implements IModPlugin { if (RecipeUtil.isTagEmpty(EItemTags.ORES_ZINC)) toRemove.add(new ItemStack(EItems.ZINC_ORE_CHUNK.get())); if (RecipeUtil.isTagEmpty(EItemTags.ORES_IRIDIUM)) toRemove.add(new ItemStack(EItems.IRIDIUM_ORE_CHUNK.get())); - registration.getIngredientManager().removeIngredientsAtRuntime(VanillaTypes.ITEM_STACK, toRemove); + if (!toRemove.isEmpty()) { + registration.getIngredientManager().removeIngredientsAtRuntime(VanillaTypes.ITEM_STACK, toRemove); + } addRecipes(registration, BARREL_COMPOST, ERecipeTypes.BARREL_COMPOST); addRecipes(registration, BARREL_MIXING, ERecipeTypes.BARREL_MIXING); @@ -332,4 +303,59 @@ public class ExDeorumJeiPlugin implements IModPlugin { private static > void addRecipes(IRecipeRegistration registration, RecipeType category, Supplier> type) { registration.addRecipes(category, Objects.requireNonNull(Minecraft.getInstance().level).getRecipeManager().getAllRecipesFor(type.get())); } + + public static List getAvailableBarrels() { + // Vanilla barrels + List 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()); + ModList mods = ModList.get(); + + if (mods.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()); + } + if (mods.isLoaded(ModIds.ARS_NOUVEAU)) { + barrels.add(EItems.ARCHWOOD_BARREL.get()); + } + if (mods.isLoaded(ModIds.AETHER)) { + barrels.add(EItems.SKYROOT_BARREL.get()); + } + if (mods.isLoaded(ModIds.BLUE_SKIES)) { + barrels.add(EItems.BLUEBRIGHT_BARREL.get()); + barrels.add(EItems.STARLIT_BARREL.get()); + barrels.add(EItems.FROSTBRIGHT_BARREL.get()); + barrels.add(EItems.COMET_BARREL.get()); + barrels.add(EItems.LUNAR_BARREL.get()); + barrels.add(EItems.DUSK_BARREL.get()); + barrels.add(EItems.MAPLE_BARREL.get()); + barrels.add(EItems.CRYSTALLIZED_BARREL.get()); + } + + return barrels; + } + + public static List getAvailableSieves() { + List 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() + ); + + return sieves; + } } diff --git a/src/main/java/thedarkcolour/exdeorum/config/EConfig.java b/src/main/java/thedarkcolour/exdeorum/config/EConfig.java index 6b8a37e0..4f2dd7e9 100644 --- a/src/main/java/thedarkcolour/exdeorum/config/EConfig.java +++ b/src/main/java/thedarkcolour/exdeorum/config/EConfig.java @@ -68,6 +68,10 @@ public class EConfig { public final ConfigValue preferredTinOre; public final ConfigValue preferredZincOre; public final ConfigValue preferredIridiumOre; + public final ConfigValue preferredThoriumOre; + public final ConfigValue preferredMagnesiumOre; + public final ConfigValue preferredLithiumOre; + public final ConfigValue preferredBoronOre; public Common(ForgeConfigSpec.Builder builder) { // Preferred items @@ -88,6 +92,10 @@ public class EConfig { this.preferredTinOre = preferredOreConfig(builder, "tin_ore", airId); this.preferredZincOre = preferredOreConfig(builder, "zinc_ore", airId); this.preferredIridiumOre = preferredOreConfig(builder, "iridium_ore", airId); + this.preferredThoriumOre = preferredOreConfig(builder, "thorium_ore", airId); + this.preferredMagnesiumOre = preferredOreConfig(builder, "magnesium_ore", airId); + this.preferredLithiumOre = preferredOreConfig(builder, "lithium_ore", airId); + this.preferredBoronOre = preferredOreConfig(builder, "boron_ore", airId); builder.pop(2); } @@ -123,7 +131,7 @@ public class EConfig { .comment("Whether machines/fake players can interact with the Sieve.") .define("automated_sieves", false); this.barrelProgressStep = builder - .comment("The progress to increment by each tick for barrel composting and witch water transformation.") + .comment("The progress to increment by each tick for barrel composting.") .defineInRange("barrel_progress_step", 0.004, 0.0f, 1.0f); this.witchWaterNetherrackGenerator = builder .comment("Whether Witch Water forms netherrack when lava flows into it, allowing for a netherrack version of a cobblestone generator.") diff --git a/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java b/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java index 1a8bfb5a..e0cef55e 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java +++ b/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java @@ -194,6 +194,10 @@ public class Recipes { grid2x2TagResult(writer, recipes, EItemTags.ORES_TIN, ingredient(EItems.TIN_ORE_CHUNK)); grid2x2TagResult(writer, recipes, EItemTags.ORES_ZINC, ingredient(EItems.ZINC_ORE_CHUNK)); grid2x2TagResult(writer, recipes, EItemTags.ORES_IRIDIUM, ingredient(EItems.IRIDIUM_ORE_CHUNK)); + grid2x2TagResult(writer, recipes, EItemTags.ORES_THORIUM, ingredient(EItems.THORIUM_ORE_CHUNK)); + grid2x2TagResult(writer, recipes, EItemTags.ORES_MAGNESIUM, ingredient(EItems.MAGNESIUM_ORE_CHUNK)); + grid2x2TagResult(writer, recipes, EItemTags.ORES_LITHIUM, ingredient(EItems.LITHIUM_ORE_CHUNK)); + grid2x2TagResult(writer, recipes, EItemTags.ORES_BORON, ingredient(EItems.BORON_ORE_CHUNK)); // Sieves sieve(recipes, EItems.OAK_SIEVE, Items.OAK_PLANKS, Items.OAK_SLAB); diff --git a/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java b/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java index c4781585..9c0305c9 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java +++ b/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java @@ -172,6 +172,9 @@ class SieveRecipes { addConditionalDrop.accept(EItems.TIN_ORE_CHUNK.get(), chance(0.06f), Recipes.tagNotEmpty(EItemTags.ORES_TIN)); addConditionalDrop.accept(EItems.ZINC_ORE_CHUNK.get(), chance(0.035f), Recipes.tagNotEmpty(EItemTags.ORES_ZINC)); addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.03f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.07f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.05f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.03f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); }); // Gravel -> Flint mesh forMesh(writer, ingredient(Items.GRAVEL), EItems.FLINT_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { @@ -198,6 +201,9 @@ class SieveRecipes { addConditionalDrop.accept(EItems.TIN_ORE_CHUNK.get(), chance(0.07f), Recipes.tagNotEmpty(EItemTags.ORES_TIN)); addConditionalDrop.accept(EItems.ZINC_ORE_CHUNK.get(), chance(0.04f), Recipes.tagNotEmpty(EItemTags.ORES_ZINC)); addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.03f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.075f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.055f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.0325f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); }); // Gravel -> Iron mesh forMesh(writer, ingredient(Items.GRAVEL), EItems.IRON_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { @@ -221,8 +227,11 @@ class SieveRecipes { addConditionalDrop.accept(EItems.TIN_ORE_CHUNK.get(), chance(0.09f), Recipes.tagNotEmpty(EItemTags.ORES_TIN)); addConditionalDrop.accept(EItems.ZINC_ORE_CHUNK.get(), chance(0.06f), Recipes.tagNotEmpty(EItemTags.ORES_ZINC)); addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.04f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.09f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.065f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.045f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); }); - // Golden mesh has much higher drops for gold and gems, but at the cost of much lower drops for metals + // Golden mesh has much higher drops for gold and gems // Gravel -> Golden mesh forMesh(writer, ingredient(Items.GRAVEL), EItems.GOLDEN_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(EItems.STONE_PEBBLE.get(), binomial(4, 0.5f)); @@ -231,9 +240,9 @@ class SieveRecipes { addDrop.accept(Items.COAL, chance(0.2f)); addDrop.accept(Items.LAPIS_LAZULI, chance(0.1f)); addDrop.accept(EItems.COPPER_ORE_CHUNK.get(), chance(0.07f)); - addDrop.accept(EItems.IRON_ORE_CHUNK.get(), chance(0.04f)); + addDrop.accept(EItems.IRON_ORE_CHUNK.get(), chance(0.07f)); addDrop.accept(EItems.GOLD_ORE_CHUNK.get(), chance(0.1f)); - addDrop.accept(Items.DIAMOND, chance(0.1f)); + addDrop.accept(Items.DIAMOND, chance(0.09f)); addDrop.accept(Items.EMERALD, chance(0.09f)); addDrop.accept(Items.AMETHYST_SHARD, chance(0.08f)); addDrop.accept(Items.GOLD_NUGGET, chance(0.08f)); @@ -247,6 +256,9 @@ class SieveRecipes { addConditionalDrop.accept(EItems.TIN_ORE_CHUNK.get(), chance(0.07f), Recipes.tagNotEmpty(EItemTags.ORES_TIN)); addConditionalDrop.accept(EItems.ZINC_ORE_CHUNK.get(), chance(0.05f), Recipes.tagNotEmpty(EItemTags.ORES_ZINC)); addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.05f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.04f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.04f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.04f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); }); // Gravel -> Diamond mesh forMesh(writer, ingredient(Items.GRAVEL), EItems.DIAMOND_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { @@ -269,6 +281,9 @@ class SieveRecipes { addConditionalDrop.accept(EItems.TIN_ORE_CHUNK.get(), chance(0.11f), Recipes.tagNotEmpty(EItemTags.ORES_TIN)); addConditionalDrop.accept(EItems.ZINC_ORE_CHUNK.get(), chance(0.08f), Recipes.tagNotEmpty(EItemTags.ORES_ZINC)); addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.05f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.105f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.07f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.06f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); }); // Gravel -> Netherite mesh forMesh(writer, ingredient(Items.GRAVEL), EItems.NETHERITE_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { @@ -292,6 +307,9 @@ class SieveRecipes { addConditionalDrop.accept(EItems.TIN_ORE_CHUNK.get(), chance(0.12f), Recipes.tagNotEmpty(EItemTags.ORES_TIN)); addConditionalDrop.accept(EItems.ZINC_ORE_CHUNK.get(), chance(0.08f), Recipes.tagNotEmpty(EItemTags.ORES_ZINC)); addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.055f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.12f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.075f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.065f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); }); // Sand -> String mesh @@ -512,6 +530,10 @@ class SieveRecipes { addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.04f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); addConditionalDrop.accept(EItems.PLATINUM_ORE_CHUNK.get(), chance(0.03f), Recipes.tagNotEmpty(EItemTags.ORES_PLATINUM)); addConditionalDrop.accept(EItems.URANIUM_ORE_CHUNK.get(), chance(0.04f), Recipes.tagNotEmpty(EItemTags.ORES_URANIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.09f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.06f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.05f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); + addConditionalDrop.accept(EItems.LITHIUM_ORE_CHUNK.get(), chance(0.045f), Recipes.tagNotEmpty(EItemTags.ORES_LITHIUM)); }); forMesh(writer, ingredient(EItems.CRUSHED_DEEPSLATE.get()), EItems.FLINT_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(EItems.DEEPSLATE_PEBBLE.get(), binomial(4, 0.5f)); @@ -534,6 +556,10 @@ class SieveRecipes { addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.05f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); addConditionalDrop.accept(EItems.PLATINUM_ORE_CHUNK.get(), chance(0.05f), Recipes.tagNotEmpty(EItemTags.ORES_PLATINUM)); addConditionalDrop.accept(EItems.URANIUM_ORE_CHUNK.get(), chance(0.06f), Recipes.tagNotEmpty(EItemTags.ORES_URANIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.10f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.065f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.06f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); + addConditionalDrop.accept(EItems.LITHIUM_ORE_CHUNK.get(), chance(0.05f), Recipes.tagNotEmpty(EItemTags.ORES_LITHIUM)); }); forMesh(writer, ingredient(EItems.CRUSHED_DEEPSLATE.get()), EItems.IRON_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(EItems.DEEPSLATE_PEBBLE.get(), binomial(4, 0.6f)); @@ -553,6 +579,10 @@ class SieveRecipes { addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.06f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); addConditionalDrop.accept(EItems.PLATINUM_ORE_CHUNK.get(), chance(0.065f), Recipes.tagNotEmpty(EItemTags.ORES_PLATINUM)); addConditionalDrop.accept(EItems.URANIUM_ORE_CHUNK.get(), chance(0.08f), Recipes.tagNotEmpty(EItemTags.ORES_URANIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.11f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.075f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.06f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); + addConditionalDrop.accept(EItems.LITHIUM_ORE_CHUNK.get(), chance(0.06f), Recipes.tagNotEmpty(EItemTags.ORES_LITHIUM)); }); forMesh(writer, ingredient(EItems.CRUSHED_DEEPSLATE.get()), EItems.GOLDEN_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(EItems.DEEPSLATE_PEBBLE.get(), binomial(4, 0.65f)); @@ -574,6 +604,10 @@ class SieveRecipes { addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.04f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); addConditionalDrop.accept(EItems.PLATINUM_ORE_CHUNK.get(), chance(0.09f), Recipes.tagNotEmpty(EItemTags.ORES_PLATINUM)); addConditionalDrop.accept(EItems.URANIUM_ORE_CHUNK.get(), chance(0.07f), Recipes.tagNotEmpty(EItemTags.ORES_URANIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.12f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.075f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.065f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); + addConditionalDrop.accept(EItems.LITHIUM_ORE_CHUNK.get(), chance(0.065f), Recipes.tagNotEmpty(EItemTags.ORES_LITHIUM)); }); forMesh(writer, ingredient(EItems.CRUSHED_DEEPSLATE.get()), EItems.DIAMOND_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(EItems.DEEPSLATE_PEBBLE.get(), binomial(4, 0.65f)); @@ -593,6 +627,10 @@ class SieveRecipes { addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.065f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); addConditionalDrop.accept(EItems.PLATINUM_ORE_CHUNK.get(), chance(0.075f), Recipes.tagNotEmpty(EItemTags.ORES_PLATINUM)); addConditionalDrop.accept(EItems.URANIUM_ORE_CHUNK.get(), chance(0.1f), Recipes.tagNotEmpty(EItemTags.ORES_URANIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.12f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.095f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.08f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); + addConditionalDrop.accept(EItems.LITHIUM_ORE_CHUNK.get(), chance(0.08f), Recipes.tagNotEmpty(EItemTags.ORES_LITHIUM)); }); forMesh(writer, ingredient(EItems.CRUSHED_DEEPSLATE.get()), EItems.NETHERITE_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { addDrop.accept(EItems.DEEPSLATE_PEBBLE.get(), binomial(4, 0.7f)); @@ -612,6 +650,10 @@ class SieveRecipes { addConditionalDrop.accept(EItems.IRIDIUM_ORE_CHUNK.get(), chance(0.065f), Recipes.tagNotEmpty(EItemTags.ORES_IRIDIUM)); addConditionalDrop.accept(EItems.PLATINUM_ORE_CHUNK.get(), chance(0.09f), Recipes.tagNotEmpty(EItemTags.ORES_PLATINUM)); addConditionalDrop.accept(EItems.URANIUM_ORE_CHUNK.get(), chance(0.12f), Recipes.tagNotEmpty(EItemTags.ORES_URANIUM)); + addConditionalDrop.accept(EItems.MAGNESIUM_ORE_CHUNK.get(), chance(0.14f), Recipes.tagNotEmpty(EItemTags.ORES_MAGNESIUM)); + addConditionalDrop.accept(EItems.THORIUM_ORE_CHUNK.get(), chance(0.11f), Recipes.tagNotEmpty(EItemTags.ORES_THORIUM)); + addConditionalDrop.accept(EItems.BORON_ORE_CHUNK.get(), chance(0.09f), Recipes.tagNotEmpty(EItemTags.ORES_BORON)); + addConditionalDrop.accept(EItems.LITHIUM_ORE_CHUNK.get(), chance(0.085f), Recipes.tagNotEmpty(EItemTags.ORES_LITHIUM)); }); forMesh(writer, ingredient(EItems.CRUSHED_BLACKSTONE.get()), EItems.STRING_MESH, (addDrop, addTagDrop, addConditionalDrop) -> { diff --git a/src/main/java/thedarkcolour/exdeorum/item/GrassSpreaderItem.java b/src/main/java/thedarkcolour/exdeorum/item/GrassSpreaderItem.java index 75aa8584..6c87385f 100644 --- a/src/main/java/thedarkcolour/exdeorum/item/GrassSpreaderItem.java +++ b/src/main/java/thedarkcolour/exdeorum/item/GrassSpreaderItem.java @@ -68,7 +68,6 @@ public class GrassSpreaderItem extends Item { level.addDestroyBlockEffect(pos, grass); } - return InteractionResult.SUCCESS; } diff --git a/src/main/java/thedarkcolour/exdeorum/registry/EItems.java b/src/main/java/thedarkcolour/exdeorum/registry/EItems.java index 4008a8e0..032c3baf 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/EItems.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/EItems.java @@ -92,6 +92,10 @@ public class EItems { public static final RegistryObject TIN_ORE_CHUNK = registerSimpleItem("tin_ore_chunk"); public static final RegistryObject ZINC_ORE_CHUNK = registerSimpleItem("zinc_ore_chunk"); public static final RegistryObject IRIDIUM_ORE_CHUNK = registerSimpleItem("iridium_ore_chunk"); + public static final RegistryObject THORIUM_ORE_CHUNK = registerSimpleItem("thorium_ore_chunk"); + public static final RegistryObject MAGNESIUM_ORE_CHUNK = registerSimpleItem("magnesium_ore_chunk"); + public static final RegistryObject LITHIUM_ORE_CHUNK = registerSimpleItem("lithium_ore_chunk"); + public static final RegistryObject BORON_ORE_CHUNK = registerSimpleItem("boron_ore_chunk"); // Pebbles public static final RegistryObject STONE_PEBBLE = registerSimpleItem("stone_pebble"); @@ -457,6 +461,10 @@ public class EItems { if (!RecipeUtil.isTagEmpty(EItemTags.ORES_TIN)) output.accept(TIN_ORE_CHUNK.get()); if (!RecipeUtil.isTagEmpty(EItemTags.ORES_ZINC)) output.accept(ZINC_ORE_CHUNK.get()); if (!RecipeUtil.isTagEmpty(EItemTags.ORES_IRIDIUM)) output.accept(IRIDIUM_ORE_CHUNK.get()); + if (!RecipeUtil.isTagEmpty(EItemTags.ORES_THORIUM)) output.accept(THORIUM_ORE_CHUNK.get()); + if (!RecipeUtil.isTagEmpty(EItemTags.ORES_MAGNESIUM)) output.accept(MAGNESIUM_ORE_CHUNK.get()); + if (!RecipeUtil.isTagEmpty(EItemTags.ORES_LITHIUM)) output.accept(LITHIUM_ORE_CHUNK.get()); + if (!RecipeUtil.isTagEmpty(EItemTags.ORES_BORON)) output.accept(BORON_ORE_CHUNK.get()); output.accept(STONE_PEBBLE.get()); output.accept(DIORITE_PEBBLE.get()); diff --git a/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java b/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java index 4faf8f27..7cd152b5 100644 --- a/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java +++ b/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java @@ -46,6 +46,10 @@ public class EItemTags { public static final TagKey ORES_TIN = forgeTag("ores/tin"); public static final TagKey ORES_ZINC = forgeTag("ores/zinc"); public static final TagKey ORES_IRIDIUM = forgeTag("ores/iridium"); + public static final TagKey ORES_THORIUM = forgeTag("ores/thorium"); + public static final TagKey ORES_MAGNESIUM = forgeTag("ores/magnesium"); + public static final TagKey ORES_LITHIUM = forgeTag("ores/lithium"); + public static final TagKey ORES_BORON = forgeTag("ores/boron"); public static TagKey tag(String name) { return ItemTags.create(new ResourceLocation(ExDeorum.ID, name)); diff --git a/src/main/resources/assets/exdeorum/textures/item/boron_ore_chunk.png b/src/main/resources/assets/exdeorum/textures/item/boron_ore_chunk.png new file mode 100644 index 0000000000000000000000000000000000000000..10aed29c3c516f8cb90b9bc997a71518eafd66d8 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|&0G|+7Z*T9In3#%+ijaV_5d{T>prD}n^XI#`x&jqe3b%y= zDV~xbzu^A}z#w%0+&Q2)XMsm#F#`kNK@eu#F){lsP_Wq3#W6%9IQFcg&`|{r<_isC zEAIW@XMb>8_x#pL&v}ymKV^L|^Bn8v#Lqoe&pw>~+mX-~e_fkbZsMdxCK8|G-W^Wn zy21TAZe}BU)*2VJu4tCjW9}_4vl+E6c^z8I8#aeG=IVt-eBao*xDM}3w0E`qkosQ! YqBYz1i^tx61zOMG>FVdQ&MBb@0HKU-OaK4? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/exdeorum/textures/item/lithium_ore_chunk.png b/src/main/resources/assets/exdeorum/textures/item/lithium_ore_chunk.png new file mode 100644 index 0000000000000000000000000000000000000000..3dc29ba9efcfc53c6bcfc7c57d79dbbb32a50ade GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|&0G|+7Z*T9In3#%+ijGyYs@4f;mWG~ox z5lHcr1o;L3M*s$)`{&L9#W@Q+B8wRq_zr?ZabJYL< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/exdeorum/textures/item/magnesium_ore_chunk.png b/src/main/resources/assets/exdeorum/textures/item/magnesium_ore_chunk.png new file mode 100644 index 0000000000000000000000000000000000000000..7827c083f386c14d876e5ae01ead430281c178bf GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|&0G|+7Z*T9In3#%+ij8_x#pL&v}ymKV^L|^Bn8v#Lqoe&pw>~+mX-~e_fkbZsMdxCK8|G-W^Wn zy21TAZe}BU)*2VJu4tCjW9}_4vl+E6c^z8I8#aeG=IVt-eBao*xDM}3w0E`qkosQ! YqBYz1i^tx61zOMG>FVdQ&MBb@0NT-SYybcN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/exdeorum/textures/item/thorium_ore_chunk.png b/src/main/resources/assets/exdeorum/textures/item/thorium_ore_chunk.png new file mode 100644 index 0000000000000000000000000000000000000000..75d95ad2a298672fcc8ba6d073203ff4a126ab3a GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|&0G|+7Z*T9In3#%+ijb|~J|Q8Ypr9aeadA;mQJ}(?Y}5V% zDV~xbzu^A}z#w%0+&Q2)XMsm#F#`kNeh_A~U=3CQ3Ko01IEH8h$DVZ*I;z0Ie4#;X z#l8Rg><@11p5Hp@IZx96r>qZVo@4!-__@dG*@x4AI}+OBuWR$lO`NpIMB-E2yTi#` zH@IKN&1_`PTH~VD70r@*%)RAhHlx-huS08j!{+eDT)nV}?;Bee*WsOs_O6y6Qs2v8 Yv}XH$@z~q1K