From fb6f0779c70c59c65aee9809d02e4f30487893ce Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Sun, 11 Aug 2024 12:06:31 +0200 Subject: [PATCH] feat: add uraninite and dark gem compat --- gradle.properties | 2 +- .../469c78d8f4486110280e6206cdb5f7533d7b17cf | 19 ++++---- .../a712c7094f0a9eb0bca39d53c159ea6414e2f817 | 8 +++- .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 4 +- .../ccca92a6eec5aee95a4f810971c250f8552738a4 | 4 +- .../cd2a2a329a0824759638154124ef2435729ebb02 | 6 ++- .../fc3b48494f43114fa81b57d6279cd71dde510dad | 4 +- .../resources/assets/theurgy/lang/en_us.json | 10 +++++ .../models/item/alchemical_sulfur_dark.json | 3 ++ .../item/alchemical_sulfur_uraninite.json | 3 ++ .../resources/data/c/tags/item/gems/dark.json | 8 ++++ .../data/c/tags/item/ingots/uraninite.json | 8 ++++ .../data/c/tags/item/ores/dark_gem.json | 12 ++++++ ...gems_dark_from_alchemical_sulfur_dark.json | 28 ++++++++++++ ...nite_from_alchemical_sulfur_uraninite.json | 28 ++++++++++++ ...alchemical_sulfur_dark_from_gems_dark.json | 28 ++++++++++++ ...emical_sulfur_dark_from_ores_dark_gem.json | 28 ++++++++++++ ...ulfur_uraninite_from_ingots_uraninite.json | 28 ++++++++++++ ...r_uraninite_from_ores_uraninite_dense.json | 28 ++++++++++++ ...ur_uraninite_from_ores_uraninite_poor.json | 28 ++++++++++++ ...uraninite_from_ores_uraninite_regular.json | 28 ++++++++++++ ..._dark_from_alchemical_niter_gems_rare.json | 36 ++++++++++++++++ ...ark_from_alchemical_sulfurs_gems_rare.json | 43 +++++++++++++++++++ ...ite_from_alchemical_niter_metals_rare.json | 36 ++++++++++++++++ ...e_from_alchemical_sulfurs_metals_rare.json | 43 +++++++++++++++++++ .../theurgy/tags/item/alchemical_sulfurs.json | 2 + .../item/alchemical_sulfurs/gems/rare.json | 1 + .../item/alchemical_sulfurs/metals/rare.json | 1 + .../tags/item/metals/mercury/medium.json | 4 ++ .../theurgy/tags/item/ores/mercury/high.json | 4 ++ .../theurgy/tags/item/ores/mercury/low.json | 4 ++ .../tags/item/ores/mercury/medium.json | 4 ++ .../theurgy/datagen/lang/ENUSProvider.java | 2 + .../recipe/IncubationRecipeProvider.java | 2 + .../recipe/LiquefactionRecipeProvider.java | 6 +++ .../datagen/tag/TheurgyItemTagsProvider.java | 15 +++++++ .../theurgy/registry/ItemTagRegistry.java | 6 +++ .../theurgy/registry/SulfurRegistry.java | 2 + 38 files changed, 511 insertions(+), 15 deletions(-) create mode 100644 src/generated/resources/assets/theurgy/models/item/alchemical_sulfur_dark.json create mode 100644 src/generated/resources/assets/theurgy/models/item/alchemical_sulfur_uraninite.json create mode 100644 src/generated/resources/data/c/tags/item/gems/dark.json create mode 100644 src/generated/resources/data/c/tags/item/ingots/uraninite.json create mode 100644 src/generated/resources/data/c/tags/item/ores/dark_gem.json create mode 100644 src/generated/resources/data/theurgy/recipe/incubation/gems_dark_from_alchemical_sulfur_dark.json create mode 100644 src/generated/resources/data/theurgy/recipe/incubation/ingots_uraninite_from_alchemical_sulfur_uraninite.json create mode 100644 src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_from_gems_dark.json create mode 100644 src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_from_ores_dark_gem.json create mode 100644 src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ingots_uraninite.json create mode 100644 src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_dense.json create mode 100644 src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_poor.json create mode 100644 src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_regular.json create mode 100644 src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_dark_from_alchemical_niter_gems_rare.json create mode 100644 src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_dark_from_alchemical_sulfurs_gems_rare.json create mode 100644 src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_uraninite_from_alchemical_niter_metals_rare.json create mode 100644 src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_uraninite_from_alchemical_sulfurs_metals_rare.json diff --git a/gradle.properties b/gradle.properties index 8641799b2..f6bcd10d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,7 @@ group=com.klikli_dev mod_id=theurgy mod_name=Theurgy mod_license=MIT AND CC-BY-4.0 -mod_version=1.36.0 +mod_version=1.43.1 mod_authors=Kli Kli mod_description=An open-source magic mod built around classical alchemy to replicate and transmute matter, and create magical artifacts. diff --git a/src/generated/resources/.cache/469c78d8f4486110280e6206cdb5f7533d7b17cf b/src/generated/resources/.cache/469c78d8f4486110280e6206cdb5f7533d7b17cf index 05ec70fa0..2b3530e90 100644 --- a/src/generated/resources/.cache/469c78d8f4486110280e6206cdb5f7533d7b17cf +++ b/src/generated/resources/.cache/469c78d8f4486110280e6206cdb5f7533d7b17cf @@ -1,7 +1,10 @@ -// 1.21 2024-08-07T19:45:36.5858444 Tags for minecraft:item mod id theurgy +// 1.21 2024-08-11T12:18:31.6813104 Tags for minecraft:item mod id theurgy f41150cbf3906d7eb1284a3f289d93bb80e57b9f data/c/tags/item/gems.json +f17805722ccaefbf3d1c1b6e6b4f54f30f9af17c data/c/tags/item/gems/dark.json 9a414088a384ea8077655b79eb53ac263aaae5e3 data/c/tags/item/gems/sal_ammoniac.json +d98197052c711f528a2969cd0788b981688ac346 data/c/tags/item/ingots/uraninite.json 2a6db3eadd0ca532bb90db84dde920e689ea0e24 data/c/tags/item/ores.json +42a10b4d97599ff3b275891b7a1095e18819e31a data/c/tags/item/ores/dark_gem.json 04abd356cb9b230f4d1adcf90db05571e8a17d05 data/c/tags/item/ores/sal_ammoniac.json 9148832ee4e83df2b37e23918707fd8046f26ff7 data/c/tags/item/ores_in_ground/deepslate.json f8295983ffdb0c42c6c8b12788a5b63c1eb43f72 data/c/tags/item/ores_in_ground/stone.json @@ -9,7 +12,7 @@ e801bdef0719e27dd7decd88269ada7c5740348e data/c/tags/item/sugars.json c1ae367d1f7b1391996652acb8c12cfbe63abfc8 data/theurgy/tags/item/alchemical_mercuries.json 8541d9dee1c4f1aa26041bee5e4b93e1a23a22b8 data/theurgy/tags/item/alchemical_niters.json fc621fad0374e095b3d515bf5bfd1ee61fa90bf5 data/theurgy/tags/item/alchemical_salts.json -06ebb1be5887ef38d8b682bf28cb1a9b9fb9b440 data/theurgy/tags/item/alchemical_sulfurs.json +0b5ed2509b23d8789c61a909b521e47a20554e63 data/theurgy/tags/item/alchemical_sulfurs.json d3445ff0a2b1a662dc0e220a4ca8f8276c3a967d data/theurgy/tags/item/alchemical_sulfurs/abundant.json 25c27d686c1106f461a17bb0cbe0832bbe48915f data/theurgy/tags/item/alchemical_sulfurs/animals.json 3a05700dad92d9192cc83fec4b4beedcd00715d1 data/theurgy/tags/item/alchemical_sulfurs/animals/abundant.json @@ -22,14 +25,14 @@ ae17f155d761c4731b61e662cae2663bdb19124d data/theurgy/tags/item/alchemical_sulfu 99734639ab59a8484a1f580b87d9d464df9930cc data/theurgy/tags/item/alchemical_sulfurs/gems/abundant.json c56c45e99c36f27b6ef540c401e5cf5a60f277cd data/theurgy/tags/item/alchemical_sulfurs/gems/common.json 9dfadee6a62915083364c85f35e3e02edd9cc85e data/theurgy/tags/item/alchemical_sulfurs/gems/precious.json -4ee9899259587c6a96b49c6491d5daa44f0a929e data/theurgy/tags/item/alchemical_sulfurs/gems/rare.json +8837c2a19bbd18501b660154d4ca637e9a0aa993 data/theurgy/tags/item/alchemical_sulfurs/gems/rare.json 4282fc412e014a3ed177b8200d3708d0a8ba1aea data/theurgy/tags/item/alchemical_sulfurs/logs.json 293e608c98d8d39a615ba4940c727e22985b76d7 data/theurgy/tags/item/alchemical_sulfurs/logs/abundant.json 3fbcd6156c7403e016aedcf8bbef778ce64e75d2 data/theurgy/tags/item/alchemical_sulfurs/metals.json 90b2123e0734b83147c7faf3a7772e3b0a20788b data/theurgy/tags/item/alchemical_sulfurs/metals/abundant.json 4aaa5b7c7d39dcfeab03d2a59aa91e1bb9d78624 data/theurgy/tags/item/alchemical_sulfurs/metals/common.json fd4a27855c4fadc0b1ad51e39c412790e15138a5 data/theurgy/tags/item/alchemical_sulfurs/metals/precious.json -c900bed9ddc57f76195e303e1c44e0621dd4a034 data/theurgy/tags/item/alchemical_sulfurs/metals/rare.json +b6ad7e4e0e0d2cfdac2db3fba60954abc6ac27f6 data/theurgy/tags/item/alchemical_sulfurs/metals/rare.json 75c922d072696062be2074a5680b2557f1641cef data/theurgy/tags/item/alchemical_sulfurs/other_minerals.json e0a75026bb1d467b51628b3ccbbd4361dcbedb80 data/theurgy/tags/item/alchemical_sulfurs/other_minerals/abundant.json fd201c0e24e029cf75ee399b44961843afa4ad90 data/theurgy/tags/item/alchemical_sulfurs/other_minerals/common.json @@ -44,10 +47,10 @@ e873104df27d6faa558b42db26e56a3f0b9f8a59 data/theurgy/tags/item/gems/mercury/low d1e03d28eb707840e17f308c160dbf73077b84d1 data/theurgy/tags/item/gems/mercury/medium.json 51382a9c92345c3df994cee528187c92ae466bb5 data/theurgy/tags/item/metals/mercury/high.json 747540d1b7832800b61fdddbd722cdf7e5d73c80 data/theurgy/tags/item/metals/mercury/low.json -68a210ae8b304b7b50b42c6e7dd040dc36122767 data/theurgy/tags/item/metals/mercury/medium.json -474f9b4e1f9a47fc8f192c69d494aa44c391c128 data/theurgy/tags/item/ores/mercury/high.json -7d989993fd00bca9cd8eba6ea927bbdb72e86bb4 data/theurgy/tags/item/ores/mercury/low.json -da1973a5d50ffdfcb88f8727814dbde4af5bca81 data/theurgy/tags/item/ores/mercury/medium.json +00b056c444a71fe0986b9c26983bbb4dfbdea64e data/theurgy/tags/item/metals/mercury/medium.json +0467c81197dabdc5a80e092c46ed44ce80a705a7 data/theurgy/tags/item/ores/mercury/high.json +9363e3433089c307d4489af192e42e79295ffb6b data/theurgy/tags/item/ores/mercury/low.json +60206c73d05d824b4b430190bda8182a27f7a17f data/theurgy/tags/item/ores/mercury/medium.json c5e13a871dcf746d7fc2c995f5faab375b5c6a73 data/theurgy/tags/item/other_minerals.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/theurgy/tags/item/other_minerals/mercury/high.json c5e13a871dcf746d7fc2c995f5faab375b5c6a73 data/theurgy/tags/item/other_minerals/mercury/low.json diff --git a/src/generated/resources/.cache/a712c7094f0a9eb0bca39d53c159ea6414e2f817 b/src/generated/resources/.cache/a712c7094f0a9eb0bca39d53c159ea6414e2f817 index 93856c753..e8c4f4d04 100644 --- a/src/generated/resources/.cache/a712c7094f0a9eb0bca39d53c159ea6414e2f817 +++ b/src/generated/resources/.cache/a712c7094f0a9eb0bca39d53c159ea6414e2f817 @@ -1,4 +1,4 @@ -// 1.21 2024-08-07T19:13:48.3493986 Liquefaction Recipes +// 1.21 2024-08-11T12:18:31.674311 Liquefaction Recipes 9ce1a8a698731779295ae7cef9352893261f8e52 data/theurgy/recipe/liquefaction/alchemical_sulfur_acacia_log.json 401b4a08c4e47941b277be22d557f5c89efe1aed data/theurgy/recipe/liquefaction/alchemical_sulfur_allthemodium_from_ingots_allthemodium.json 132d15264a84219a79173db633c2347189b73c71 data/theurgy/recipe/liquefaction/alchemical_sulfur_allthemodium_from_ores_allthemodium.json @@ -73,6 +73,8 @@ cfbff545d6a7829dc334a04593afd4985f276f7e data/theurgy/recipe/liquefaction/alchem 4e40a21317c8fa9d8f1b99e038c08cdc46396f40 data/theurgy/recipe/liquefaction/alchemical_sulfur_cucumber_from_crops_cucumber.json 33bf87eab84a0aef1a92312fd4b032989fd16280 data/theurgy/recipe/liquefaction/alchemical_sulfur_currant_from_crops_currant.json c18da0045f114e36fd176e57c24a3290f010fd2a data/theurgy/recipe/liquefaction/alchemical_sulfur_darkwood_from_logs_darkwood.json +63590c93b591a6c435974d67ddeaefdc504e470e data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_from_gems_dark.json +3864f7649aa281ee57f2698553c78a6410643549 data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_from_ores_dark_gem.json fd7b199d9dc765c3eccd6770a4922b27a41cb747 data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_oak_log.json a2b1eac7ecc1d9ae19575237cb8c1b585c277276 data/theurgy/recipe/liquefaction/alchemical_sulfur_date_from_crops_date.json bed2643d853cdd04ae63d600d3ee7b8714418894 data/theurgy/recipe/liquefaction/alchemical_sulfur_dead_from_logs_dead.json @@ -254,6 +256,10 @@ a75d9b6495a0a4d598e6d423f058e27f83905d11 data/theurgy/recipe/liquefaction/alchem c15950f93020c24ae685083449b244ee368d2922 data/theurgy/recipe/liquefaction/alchemical_sulfur_unobtainium_from_ingots_unobtainium.json 74677989c1a2327edbc8e05310cd7602e80f50c1 data/theurgy/recipe/liquefaction/alchemical_sulfur_unobtainium_from_ores_unobtainium.json 2784e9f41ef3fa8f5c7d83ca8f010a03009a45d4 data/theurgy/recipe/liquefaction/alchemical_sulfur_unobtainium_from_raw_materials_unobtainium.json +ea8ab4b697d4f5a600b1a04852d0ee4858ef1b75 data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ingots_uraninite.json +aa9dc4a717a1bab8a6aabcbe7307bfde9eb3da69 data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_dense.json +dca020070b16e05685def53ef4a9733a479a5935 data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_poor.json +5c605670fdc8a2cb3d88ae96776c2fb056e3654d data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_regular.json 8f34774ae2c009a0f24fe6fc23101ae59fef8a7d data/theurgy/recipe/liquefaction/alchemical_sulfur_uranium_from_ingots_uranium.json 9a157e49922be7a9b213df4957bb606ca7560614 data/theurgy/recipe/liquefaction/alchemical_sulfur_uranium_from_ores_uranium.json e1d8a0d4d86e943246f0e64e3b0f965ee0588e6b data/theurgy/recipe/liquefaction/alchemical_sulfur_uranium_from_raw_materials_uranium.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index e9295db7f..a6ac68476 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.21 2024-08-07T19:53:17.838835 Languages: en_us -5aead01a9760b610eb3579d3fce9d3847b347fc0 assets/theurgy/lang/en_us.json +// 1.21 2024-08-11T12:02:32.2801953 Languages: en_us +5d5ec635bf8fb968e613b3094a8406d191e137cc assets/theurgy/lang/en_us.json diff --git a/src/generated/resources/.cache/ccca92a6eec5aee95a4f810971c250f8552738a4 b/src/generated/resources/.cache/ccca92a6eec5aee95a4f810971c250f8552738a4 index 4d38cb6ac..1bfc966b4 100644 --- a/src/generated/resources/.cache/ccca92a6eec5aee95a4f810971c250f8552738a4 +++ b/src/generated/resources/.cache/ccca92a6eec5aee95a4f810971c250f8552738a4 @@ -1,4 +1,4 @@ -// 1.21 2024-08-07T19:45:36.580847 Item Models: theurgy +// 1.21 2024-08-11T12:02:32.2771889 Item Models: theurgy e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_niter_animals_abundant.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_niter_animals_common.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_niter_animals_rare.json @@ -79,6 +79,7 @@ e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_s e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_crystallized.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_cucumber.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_currant.json +e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_dark.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_darkwood.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_dark_oak_log.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_date.json @@ -222,6 +223,7 @@ e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_s e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_umbran.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_undead.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_unobtainium.json +e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_uraninite.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_uranium.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_vanilla.json e0f7b66a84e6588f01abbbce75b1803ffe5d46e2 assets/theurgy/models/item/alchemical_sulfur_vibranium.json diff --git a/src/generated/resources/.cache/cd2a2a329a0824759638154124ef2435729ebb02 b/src/generated/resources/.cache/cd2a2a329a0824759638154124ef2435729ebb02 index 1d8a953fa..0435740b2 100644 --- a/src/generated/resources/.cache/cd2a2a329a0824759638154124ef2435729ebb02 +++ b/src/generated/resources/.cache/cd2a2a329a0824759638154124ef2435729ebb02 @@ -1,4 +1,4 @@ -// 1.21 2024-08-07T19:13:48.3458802 Reformation Recipes +// 1.21 2024-08-11T12:02:32.267679 Reformation Recipes f0addbf7e778515c9e253155ad57e9e229dfe8a8 data/theurgy/recipe/reformation/alchemical_niter_animals_abundant_from_alchemical_niter_crops_abundant.json 0756b67cae99db8a290913a11d6dbb9beeffab4c data/theurgy/recipe/reformation/alchemical_niter_animals_abundant_from_alchemical_niter_gems_abundant.json 1bfee5ecfc26e21f4366162d5a3e589b6f8519be data/theurgy/recipe/reformation/alchemical_niter_animals_abundant_from_alchemical_niter_logs_abundant.json @@ -160,6 +160,8 @@ f85e655ccd512ba060dfc202d91a55464e877dd2 data/theurgy/recipe/reformation/alchemi 994383968b0f01a635014976f386dd7b5fc89e7d data/theurgy/recipe/reformation/alchemical_sulfur_currant_from_alchemical_sulfurs_crops_abundant.json 7e0894f66cba3c096d708e87f3583f833a0bb4dd data/theurgy/recipe/reformation/alchemical_sulfur_darkwood_from_alchemical_niter_logs_abundant.json 80d362110d9b6da920c67ba877f73b5bbc631997 data/theurgy/recipe/reformation/alchemical_sulfur_darkwood_from_alchemical_sulfurs_logs_abundant.json +d71b625a5d992925ee1d93405f4263c3df2ea9a0 data/theurgy/recipe/reformation/alchemical_sulfur_dark_from_alchemical_niter_gems_rare.json +c67cd6e62aec6fee485634c86ff947159455571c data/theurgy/recipe/reformation/alchemical_sulfur_dark_from_alchemical_sulfurs_gems_rare.json 3d551ff0c98c4ac7756baa15507ff4afe76a608d data/theurgy/recipe/reformation/alchemical_sulfur_dark_oak_log_from_alchemical_niter_logs_abundant.json c9f590c8a27545036f30d83bdf99f0debfb351c3 data/theurgy/recipe/reformation/alchemical_sulfur_dark_oak_log_from_alchemical_sulfurs_logs_abundant.json 3def8d3a132259d6a58cc02af61ba7a1a178c0b7 data/theurgy/recipe/reformation/alchemical_sulfur_date_from_alchemical_niter_crops_abundant.json @@ -442,6 +444,8 @@ b5ea3d2283c7069be46007453534759d399df3fc data/theurgy/recipe/reformation/alchemi 47ef7e2c032d843c6c01ae84400b1616294c69d8 data/theurgy/recipe/reformation/alchemical_sulfur_umbran_from_alchemical_sulfurs_logs_abundant.json f7bc3945c8cacfe36121be6b19ff9dc31b93acab data/theurgy/recipe/reformation/alchemical_sulfur_undead_from_alchemical_niter_logs_abundant.json 36b002e568d5c8916d45f87de37b3bb654ffc384 data/theurgy/recipe/reformation/alchemical_sulfur_undead_from_alchemical_sulfurs_logs_abundant.json +243e7cf3b52df470814201a063b3f654d6a58747 data/theurgy/recipe/reformation/alchemical_sulfur_uraninite_from_alchemical_niter_metals_rare.json +72777ac1c0589925bc9e71cecc99016711ffaab2 data/theurgy/recipe/reformation/alchemical_sulfur_uraninite_from_alchemical_sulfurs_metals_rare.json cc155854451d660937f366cc1de37f013690a418 data/theurgy/recipe/reformation/alchemical_sulfur_uranium_from_alchemical_niter_metals_rare.json 54491b1d5eb48e7ed3f362dbe08fb5fda48bbf52 data/theurgy/recipe/reformation/alchemical_sulfur_uranium_from_alchemical_sulfurs_metals_rare.json 1c2c924350141187225d1a4f4c40493fa001008d data/theurgy/recipe/reformation/alchemical_sulfur_vanilla_from_alchemical_niter_crops_abundant.json diff --git a/src/generated/resources/.cache/fc3b48494f43114fa81b57d6279cd71dde510dad b/src/generated/resources/.cache/fc3b48494f43114fa81b57d6279cd71dde510dad index f79939b8c..102382d70 100644 --- a/src/generated/resources/.cache/fc3b48494f43114fa81b57d6279cd71dde510dad +++ b/src/generated/resources/.cache/fc3b48494f43114fa81b57d6279cd71dde510dad @@ -1,4 +1,4 @@ -// 1.21 2024-08-07T19:45:36.5768436 Incubation Recipes +// 1.21 2024-08-11T12:02:32.2746775 Incubation Recipes 3dd54c17ea0d5e84b20ad3de406c65f23a2ea0a0 data/theurgy/recipe/incubation/acacia_log.json 7f376e93947a0d23b71c21dcc84a8e45b6f0b4e0 data/theurgy/recipe/incubation/apple.json 0ab32027d9ee16ce268ec578f8bfe44e25cb6801 data/theurgy/recipe/incubation/armadillo_scute.json @@ -104,6 +104,7 @@ e5f63d2aac9fd83ddb9cdd1ea859178dc4b33db3 data/theurgy/recipe/incubation/feather. 56514eaee58348c92ef738a19e0da67e12ce0de4 data/theurgy/recipe/incubation/gems_amethyst_from_alchemical_sulfur_amethyst.json d6695b7b8cff7ee84aa6cea3997e54a363414a40 data/theurgy/recipe/incubation/gems_apatite_from_alchemical_sulfur_apatite.json 47707365dfb1f6bb94fd1535ba7ca60f89a2261a data/theurgy/recipe/incubation/gems_certus_quartz_from_alchemical_sulfur_certus_quartz.json +5605208e6b633701ea604821405c432529f24d6e data/theurgy/recipe/incubation/gems_dark_from_alchemical_sulfur_dark.json 7dfaa3fbd9c017329d81e8a3ea925b4f396c9bd0 data/theurgy/recipe/incubation/gems_diamond_from_alchemical_sulfur_diamond.json 2d2963326dc8c108d43bb12bc98528bd091b5c54 data/theurgy/recipe/incubation/gems_emerald_from_alchemical_sulfur_emerald.json 9f848b8067692d95e394732de5ce1f4ab20d5bdf data/theurgy/recipe/incubation/gems_fluix_from_alchemical_sulfur_fluix.json @@ -138,6 +139,7 @@ a4dbda2139df331d35125b48305b75ceb2fe233c data/theurgy/recipe/incubation/ingots_p dbe6c7cbcb8a01b8b2200c391ed1c8a08469d72a data/theurgy/recipe/incubation/ingots_silver_from_alchemical_sulfur_silver.json 24242e546127c18cb58f21125d0333914eee3818 data/theurgy/recipe/incubation/ingots_tin_from_alchemical_sulfur_tin.json fe0cc0c749521f80b28a53860cc13cf8245ed038 data/theurgy/recipe/incubation/ingots_unobtainium_from_alchemical_sulfur_unobtainium.json +d3c3ca1003674aedcb088da212e51a0aecaf5004 data/theurgy/recipe/incubation/ingots_uraninite_from_alchemical_sulfur_uraninite.json 5f09a613c48130dd7e09d06c6c1e1536d1967d12 data/theurgy/recipe/incubation/ingots_uranium_from_alchemical_sulfur_uranium.json 3b11e33b798f5286b2bdaed8cbdd0d7373ef8010 data/theurgy/recipe/incubation/ingots_vibranium_from_alchemical_sulfur_vibranium.json 848bc4a53261b2d87c1b16986512172b6c562fd0 data/theurgy/recipe/incubation/ingots_zinc_from_alchemical_sulfur_zinc.json diff --git a/src/generated/resources/assets/theurgy/lang/en_us.json b/src/generated/resources/assets/theurgy/lang/en_us.json index 153f0598a..f9cfa5c04 100644 --- a/src/generated/resources/assets/theurgy/lang/en_us.json +++ b/src/generated/resources/assets/theurgy/lang/en_us.json @@ -1261,6 +1261,11 @@ "item.theurgy.alchemical_sulfur_currant.tooltip": "Alchemical Sulfur crafted from %s %s %s.", "item.theurgy.alchemical_sulfur_currant.tooltip.extended": "Sulfur represents the \"idea\" or \"soul\" of an object", "item.theurgy.alchemical_sulfur_currant.tooltip.usage": "Sulfur is the central element used in Spagyrics processes.\n\n§oHint: Sulfurs crafted from different states of the same material (such as from Ore or Ingots) are interchangeable.§r", + "item.theurgy.alchemical_sulfur_dark": "Alchemical Sulfur %s", + "item.theurgy.alchemical_sulfur_dark.source": "Dark Gem", + "item.theurgy.alchemical_sulfur_dark.tooltip": "Alchemical Sulfur crafted from %s %s %s.", + "item.theurgy.alchemical_sulfur_dark.tooltip.extended": "Sulfur represents the \"idea\" or \"soul\" of an object", + "item.theurgy.alchemical_sulfur_dark.tooltip.usage": "Sulfur is the central element used in Spagyrics processes.\n\n§oHint: Sulfurs crafted from different states of the same material (such as from Ore or Ingots) are interchangeable.§r", "item.theurgy.alchemical_sulfur_dark_oak_log": "Alchemical Sulfur %s", "item.theurgy.alchemical_sulfur_dark_oak_log.source": "Dark Oak", "item.theurgy.alchemical_sulfur_dark_oak_log.tooltip": "Alchemical Sulfur crafted from %s %s %s.", @@ -1976,6 +1981,11 @@ "item.theurgy.alchemical_sulfur_unobtainium.tooltip": "Alchemical Sulfur crafted from %s %s %s.", "item.theurgy.alchemical_sulfur_unobtainium.tooltip.extended": "Sulfur represents the \"idea\" or \"soul\" of an object", "item.theurgy.alchemical_sulfur_unobtainium.tooltip.usage": "Sulfur is the central element used in Spagyrics processes.\n\n§oHint: Sulfurs crafted from different states of the same material (such as from Ore or Ingots) are interchangeable.§r", + "item.theurgy.alchemical_sulfur_uraninite": "Alchemical Sulfur %s", + "item.theurgy.alchemical_sulfur_uraninite.source": "Uraninite", + "item.theurgy.alchemical_sulfur_uraninite.tooltip": "Alchemical Sulfur crafted from %s %s %s.", + "item.theurgy.alchemical_sulfur_uraninite.tooltip.extended": "Sulfur represents the \"idea\" or \"soul\" of an object", + "item.theurgy.alchemical_sulfur_uraninite.tooltip.usage": "Sulfur is the central element used in Spagyrics processes.\n\n§oHint: Sulfurs crafted from different states of the same material (such as from Ore or Ingots) are interchangeable.§r", "item.theurgy.alchemical_sulfur_uranium": "Alchemical Sulfur %s", "item.theurgy.alchemical_sulfur_uranium.source": "Uranium", "item.theurgy.alchemical_sulfur_uranium.tooltip": "Alchemical Sulfur crafted from %s %s %s.", diff --git a/src/generated/resources/assets/theurgy/models/item/alchemical_sulfur_dark.json b/src/generated/resources/assets/theurgy/models/item/alchemical_sulfur_dark.json new file mode 100644 index 000000000..ad08d9786 --- /dev/null +++ b/src/generated/resources/assets/theurgy/models/item/alchemical_sulfur_dark.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:builtin/entity" +} \ No newline at end of file diff --git a/src/generated/resources/assets/theurgy/models/item/alchemical_sulfur_uraninite.json b/src/generated/resources/assets/theurgy/models/item/alchemical_sulfur_uraninite.json new file mode 100644 index 000000000..ad08d9786 --- /dev/null +++ b/src/generated/resources/assets/theurgy/models/item/alchemical_sulfur_uraninite.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:builtin/entity" +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/gems/dark.json b/src/generated/resources/data/c/tags/item/gems/dark.json new file mode 100644 index 000000000..a13729ccd --- /dev/null +++ b/src/generated/resources/data/c/tags/item/gems/dark.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#evilcraft:gems/dark", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots/uraninite.json b/src/generated/resources/data/c/tags/item/ingots/uraninite.json new file mode 100644 index 000000000..4a921b125 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ingots/uraninite.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "powah:uraninite", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/dark_gem.json b/src/generated/resources/data/c/tags/item/ores/dark_gem.json new file mode 100644 index 000000000..1b5c63ea5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/ores/dark_gem.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#evilcraft:dark_ores", + "required": false + }, + { + "id": "#evilcraft:ores/dark_gem", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/incubation/gems_dark_from_alchemical_sulfur_dark.json b/src/generated/resources/data/theurgy/recipe/incubation/gems_dark_from_alchemical_sulfur_dark.json new file mode 100644 index 000000000..9607ac5d5 --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/incubation/gems_dark_from_alchemical_sulfur_dark.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:gems/dark" + } + } + ], + "type": "theurgy:incubation", + "category": "misc", + "mercury": { + "item": "theurgy:mercury_shard" + }, + "result": { + "type": "theurgy:tag", + "count": 1, + "tag": "c:gems/dark" + }, + "salt": { + "item": "theurgy:alchemical_salt_mineral" + }, + "sulfur": { + "item": "theurgy:alchemical_sulfur_dark" + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/incubation/ingots_uraninite_from_alchemical_sulfur_uraninite.json b/src/generated/resources/data/theurgy/recipe/incubation/ingots_uraninite_from_alchemical_sulfur_uraninite.json new file mode 100644 index 000000000..62b02a3e2 --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/incubation/ingots_uraninite_from_alchemical_sulfur_uraninite.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/uraninite" + } + } + ], + "type": "theurgy:incubation", + "category": "misc", + "mercury": { + "item": "theurgy:mercury_shard" + }, + "result": { + "type": "theurgy:tag", + "count": 1, + "tag": "c:ingots/uraninite" + }, + "salt": { + "item": "theurgy:alchemical_salt_mineral" + }, + "sulfur": { + "item": "theurgy:alchemical_sulfur_uraninite" + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_from_gems_dark.json b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_from_gems_dark.json new file mode 100644 index 000000000..c203bea26 --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_from_gems_dark.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:gems/dark" + } + } + ], + "type": "theurgy:liquefaction", + "category": "misc", + "ingredient": { + "tag": "c:gems/dark" + }, + "result": { + "type": "theurgy:item", + "count": 1, + "id": "theurgy:alchemical_sulfur_dark" + }, + "solvent": { + "amount": 15, + "ingredient": { + "fluid": "theurgy:sal_ammoniac" + } + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_from_ores_dark_gem.json b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_from_ores_dark_gem.json new file mode 100644 index 000000000..599d6cbc0 --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_dark_from_ores_dark_gem.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ores/dark_gem" + } + } + ], + "type": "theurgy:liquefaction", + "category": "misc", + "ingredient": { + "tag": "c:ores/dark_gem" + }, + "result": { + "type": "theurgy:item", + "count": 6, + "id": "theurgy:alchemical_sulfur_dark" + }, + "solvent": { + "amount": 15, + "ingredient": { + "fluid": "theurgy:sal_ammoniac" + } + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ingots_uraninite.json b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ingots_uraninite.json new file mode 100644 index 000000000..8faa61a8e --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ingots_uraninite.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/uraninite" + } + } + ], + "type": "theurgy:liquefaction", + "category": "misc", + "ingredient": { + "tag": "c:ingots/uraninite" + }, + "result": { + "type": "theurgy:item", + "count": 1, + "id": "theurgy:alchemical_sulfur_uraninite" + }, + "solvent": { + "amount": 10, + "ingredient": { + "fluid": "theurgy:sal_ammoniac" + } + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_dense.json b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_dense.json new file mode 100644 index 000000000..c28768da7 --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_dense.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ores/uraninite_dense" + } + } + ], + "type": "theurgy:liquefaction", + "category": "misc", + "ingredient": { + "tag": "c:ores/uraninite_dense" + }, + "result": { + "type": "theurgy:item", + "count": 13, + "id": "theurgy:alchemical_sulfur_uraninite" + }, + "solvent": { + "amount": 20, + "ingredient": { + "fluid": "theurgy:sal_ammoniac" + } + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_poor.json b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_poor.json new file mode 100644 index 000000000..c0f29218d --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_poor.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ores/uraninite_poor" + } + } + ], + "type": "theurgy:liquefaction", + "category": "misc", + "ingredient": { + "tag": "c:ores/uraninite_poor" + }, + "result": { + "type": "theurgy:item", + "count": 5, + "id": "theurgy:alchemical_sulfur_uraninite" + }, + "solvent": { + "amount": 10, + "ingredient": { + "fluid": "theurgy:sal_ammoniac" + } + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_regular.json b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_regular.json new file mode 100644 index 000000000..cca0ccd13 --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/liquefaction/alchemical_sulfur_uraninite_from_ores_uraninite_regular.json @@ -0,0 +1,28 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ores/uraninite_regular" + } + } + ], + "type": "theurgy:liquefaction", + "category": "misc", + "ingredient": { + "tag": "c:ores/uraninite_regular" + }, + "result": { + "type": "theurgy:item", + "count": 7, + "id": "theurgy:alchemical_sulfur_uraninite" + }, + "solvent": { + "amount": 15, + "ingredient": { + "fluid": "theurgy:sal_ammoniac" + } + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_dark_from_alchemical_niter_gems_rare.json b/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_dark_from_alchemical_niter_gems_rare.json new file mode 100644 index 000000000..0e822b920 --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_dark_from_alchemical_niter_gems_rare.json @@ -0,0 +1,36 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:gems/dark" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:gems/dark" + } + } + ], + "type": "theurgy:reformation", + "category": "misc", + "mercuryFlux": 150, + "result": { + "type": "theurgy:item", + "count": 1, + "id": "theurgy:alchemical_sulfur_dark" + }, + "sources": [ + { + "count": 1, + "item": "theurgy:alchemical_niter_gems_rare" + } + ], + "target": { + "item": "theurgy:alchemical_sulfur_dark" + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_dark_from_alchemical_sulfurs_gems_rare.json b/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_dark_from_alchemical_sulfurs_gems_rare.json new file mode 100644 index 000000000..771f5034c --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_dark_from_alchemical_sulfurs_gems_rare.json @@ -0,0 +1,43 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:gems/dark" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:gems/dark" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "theurgy:alchemical_sulfurs/gems/rare" + } + } + ], + "type": "theurgy:reformation", + "category": "misc", + "mercuryFlux": 150, + "result": { + "type": "theurgy:item", + "count": 1, + "id": "theurgy:alchemical_sulfur_dark" + }, + "sources": [ + { + "count": 1, + "tag": "theurgy:alchemical_sulfurs/gems/rare" + } + ], + "target": { + "item": "theurgy:alchemical_sulfur_dark" + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_uraninite_from_alchemical_niter_metals_rare.json b/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_uraninite_from_alchemical_niter_metals_rare.json new file mode 100644 index 000000000..0fb0f96a9 --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_uraninite_from_alchemical_niter_metals_rare.json @@ -0,0 +1,36 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/uraninite" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/uraninite" + } + } + ], + "type": "theurgy:reformation", + "category": "misc", + "mercuryFlux": 150, + "result": { + "type": "theurgy:item", + "count": 1, + "id": "theurgy:alchemical_sulfur_uraninite" + }, + "sources": [ + { + "count": 1, + "item": "theurgy:alchemical_niter_metals_rare" + } + ], + "target": { + "item": "theurgy:alchemical_sulfur_uraninite" + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_uraninite_from_alchemical_sulfurs_metals_rare.json b/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_uraninite_from_alchemical_sulfurs_metals_rare.json new file mode 100644 index 000000000..5d180219d --- /dev/null +++ b/src/generated/resources/data/theurgy/recipe/reformation/alchemical_sulfur_uraninite_from_alchemical_sulfurs_metals_rare.json @@ -0,0 +1,43 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/uraninite" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/uraninite" + } + }, + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "theurgy:alchemical_sulfurs/metals/rare" + } + } + ], + "type": "theurgy:reformation", + "category": "misc", + "mercuryFlux": 150, + "result": { + "type": "theurgy:item", + "count": 1, + "id": "theurgy:alchemical_sulfur_uraninite" + }, + "sources": [ + { + "count": 1, + "tag": "theurgy:alchemical_sulfurs/metals/rare" + } + ], + "target": { + "item": "theurgy:alchemical_sulfur_uraninite" + }, + "time": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs.json b/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs.json index 47ffa88c9..cd30e2a50 100644 --- a/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs.json +++ b/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs.json @@ -178,6 +178,7 @@ "theurgy:alchemical_sulfur_gold", "theurgy:alchemical_sulfur_netherite", "theurgy:alchemical_sulfur_uranium", + "theurgy:alchemical_sulfur_uraninite", "theurgy:alchemical_sulfur_azure_silver", "theurgy:alchemical_sulfur_zinc", "theurgy:alchemical_sulfur_osmium", @@ -206,6 +207,7 @@ "theurgy:alchemical_sulfur_peridot", "theurgy:alchemical_sulfur_fluorite", "theurgy:alchemical_sulfur_sapphire", + "theurgy:alchemical_sulfur_dark", "theurgy:alchemical_sulfur_sal_ammoniac", "theurgy:alchemical_sulfur_certus_quartz", "theurgy:alchemical_sulfur_fluix", diff --git a/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs/gems/rare.json b/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs/gems/rare.json index 494e1384c..818f61e93 100644 --- a/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs/gems/rare.json +++ b/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs/gems/rare.json @@ -5,6 +5,7 @@ "theurgy:alchemical_sulfur_ruby", "theurgy:alchemical_sulfur_peridot", "theurgy:alchemical_sulfur_sapphire", + "theurgy:alchemical_sulfur_dark", "theurgy:alchemical_sulfur_fluix" ] } \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs/metals/rare.json b/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs/metals/rare.json index 6b671431d..58663a690 100644 --- a/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs/metals/rare.json +++ b/src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs/metals/rare.json @@ -3,6 +3,7 @@ "theurgy:alchemical_sulfur_silver", "theurgy:alchemical_sulfur_gold", "theurgy:alchemical_sulfur_uranium", + "theurgy:alchemical_sulfur_uraninite", "theurgy:alchemical_sulfur_azure_silver", "theurgy:alchemical_sulfur_iridium", "theurgy:alchemical_sulfur_crimson_iron", diff --git a/src/generated/resources/data/theurgy/tags/item/metals/mercury/medium.json b/src/generated/resources/data/theurgy/tags/item/metals/mercury/medium.json index 4ddbe21f2..cade9da20 100644 --- a/src/generated/resources/data/theurgy/tags/item/metals/mercury/medium.json +++ b/src/generated/resources/data/theurgy/tags/item/metals/mercury/medium.json @@ -5,6 +5,10 @@ "id": "#c:ingots/uranium", "required": false }, + { + "id": "#c:ingots/uraninite", + "required": false + }, { "id": "#c:ingots/silver", "required": false diff --git a/src/generated/resources/data/theurgy/tags/item/ores/mercury/high.json b/src/generated/resources/data/theurgy/tags/item/ores/mercury/high.json index 691441cd4..f93a707f7 100644 --- a/src/generated/resources/data/theurgy/tags/item/ores/mercury/high.json +++ b/src/generated/resources/data/theurgy/tags/item/ores/mercury/high.json @@ -3,6 +3,10 @@ "#c:ores/diamond", "#c:ores/emerald", "#c:ores/netherite_scrap", + { + "id": "#c:ores/uraninite_dense", + "required": false + }, { "id": "#c:ores/allthemodium", "required": false diff --git a/src/generated/resources/data/theurgy/tags/item/ores/mercury/low.json b/src/generated/resources/data/theurgy/tags/item/ores/mercury/low.json index f8f84d4f2..ad216a78f 100644 --- a/src/generated/resources/data/theurgy/tags/item/ores/mercury/low.json +++ b/src/generated/resources/data/theurgy/tags/item/ores/mercury/low.json @@ -37,6 +37,10 @@ { "id": "#c:ores/sulfur", "required": false + }, + { + "id": "#c:ores/uraninite_poor", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/theurgy/tags/item/ores/mercury/medium.json b/src/generated/resources/data/theurgy/tags/item/ores/mercury/medium.json index 078891f2d..f358eee47 100644 --- a/src/generated/resources/data/theurgy/tags/item/ores/mercury/medium.json +++ b/src/generated/resources/data/theurgy/tags/item/ores/mercury/medium.json @@ -13,6 +13,10 @@ "id": "#c:ores/uranium", "required": false }, + { + "id": "#c:ores/uraninite_regular", + "required": false + }, { "id": "#c:ores/iridium", "required": false diff --git a/src/main/java/com/klikli_dev/theurgy/datagen/lang/ENUSProvider.java b/src/main/java/com/klikli_dev/theurgy/datagen/lang/ENUSProvider.java index ead3c123f..664392114 100644 --- a/src/main/java/com/klikli_dev/theurgy/datagen/lang/ENUSProvider.java +++ b/src/main/java/com/klikli_dev/theurgy/datagen/lang/ENUSProvider.java @@ -753,6 +753,7 @@ private void addSulfurs() { this.addDerivativeSource(SulfurRegistry.GOLD, "Gold"); this.addDerivativeSource(SulfurRegistry.NETHERITE, "Netherite"); this.addDerivativeSource(SulfurRegistry.URANIUM, "Uranium"); + this.addDerivativeSource(SulfurRegistry.URANINITE, "Uraninite"); this.addDerivativeSource(SulfurRegistry.AZURE_SILVER, "Azure Silver"); this.addDerivativeSource(SulfurRegistry.ZINC, "Zinc"); this.addDerivativeSource(SulfurRegistry.OSMIUM, "Osmium"); @@ -783,6 +784,7 @@ private void addSulfurs() { this.addDerivativeSource(SulfurRegistry.PERIDOT, "Peridot"); this.addDerivativeSource(SulfurRegistry.FLUORITE, "Fluorite"); this.addDerivativeSource(SulfurRegistry.SAPPHIRE, "Sapphire"); + this.addDerivativeSource(SulfurRegistry.DARK_GEM, "Dark Gem"); this.addDerivativeSource(SulfurRegistry.SAL_AMMONIAC, "Sal Ammoniac"); this.addDerivativeSource(SulfurRegistry.CERTUS_QUARTZ, "Certus Quartz"); this.addDerivativeSource(SulfurRegistry.FLUIX, "Fluix"); diff --git a/src/main/java/com/klikli_dev/theurgy/datagen/recipe/IncubationRecipeProvider.java b/src/main/java/com/klikli_dev/theurgy/datagen/recipe/IncubationRecipeProvider.java index c30feff78..9036631a2 100644 --- a/src/main/java/com/klikli_dev/theurgy/datagen/recipe/IncubationRecipeProvider.java +++ b/src/main/java/com/klikli_dev/theurgy/datagen/recipe/IncubationRecipeProvider.java @@ -218,6 +218,7 @@ public void buildRecipes(BiConsumer recipeConsumer this.makeRecipe(Tags.Items.INGOTS_GOLD, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.GOLD.get()); this.makeRecipe(Tags.Items.INGOTS_NETHERITE, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.NETHERITE.get()); this.makeRecipe(ItemTagRegistry.INGOTS_URANIUM, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.URANIUM.get()); + this.makeRecipe(ItemTagRegistry.INGOTS_URANINITE, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.URANINITE.get()); this.makeRecipe(ItemTagRegistry.INGOTS_SILVER, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.SILVER.get()); this.makeRecipe(ItemTagRegistry.INGOTS_AZURE_SILVER, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.AZURE_SILVER.get()); this.makeRecipe(ItemTagRegistry.INGOTS_ZINC, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.ZINC.get()); @@ -249,6 +250,7 @@ public void buildRecipes(BiConsumer recipeConsumer this.makeRecipe(ItemTagRegistry.GEMS_PERIDOT, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.PERIDOT.get()); this.makeRecipe(ItemTagRegistry.GEMS_FLUORITE, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.FLUORITE.get()); this.makeRecipe(ItemTagRegistry.GEMS_SAPPHIRE, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.SAPPHIRE.get()); + this.makeRecipe(ItemTagRegistry.GEMS_DARK, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.DARK_GEM.get()); this.makeRecipe(ItemTagRegistry.GEMS_SAL_AMMONIAC, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.SAL_AMMONIAC.get()); this.makeRecipe(ItemTagRegistry.GEMS_CERTUS_QUARTZ, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.CERTUS_QUARTZ.get()); this.makeRecipe(ItemTagRegistry.GEMS_FLUIX, ItemRegistry.MERCURY_SHARD.get(), SaltRegistry.MINERAL.get(), SulfurRegistry.FLUIX.get()); diff --git a/src/main/java/com/klikli_dev/theurgy/datagen/recipe/LiquefactionRecipeProvider.java b/src/main/java/com/klikli_dev/theurgy/datagen/recipe/LiquefactionRecipeProvider.java index 31d933f66..f2692aeed 100644 --- a/src/main/java/com/klikli_dev/theurgy/datagen/recipe/LiquefactionRecipeProvider.java +++ b/src/main/java/com/klikli_dev/theurgy/datagen/recipe/LiquefactionRecipeProvider.java @@ -223,6 +223,9 @@ public void buildRecipes(BiConsumer recipeConsumer //netherite has a custom recipe in vanilla, 4 scraps per ingot, so we only do 1 sulfur here to avoid insane duplication rates this.makeRecipe(SulfurRegistry.NETHERITE.get(), 1, Tags.Items.ORES_NETHERITE_SCRAP, salAmmoniac, 100); this.makeRecipe(SulfurRegistry.URANIUM.get(), 5, ItemTagRegistry.ORES_URANIUM, salAmmoniac, 10); + this.makeRecipe(SulfurRegistry.URANINITE.get(), 5, ItemTagRegistry.ORES_URANINITE_POOR, salAmmoniac, 10); + this.makeRecipe(SulfurRegistry.URANINITE.get(), 7, ItemTagRegistry.ORES_URANINITE_REGULAR, salAmmoniac, 15); + this.makeRecipe(SulfurRegistry.URANINITE.get(), 13, ItemTagRegistry.ORES_URANINITE_DENSE, salAmmoniac, 20); this.makeRecipe(SulfurRegistry.SILVER.get(), 5, ItemTagRegistry.ORES_SILVER, salAmmoniac, 10); this.makeRecipe(SulfurRegistry.AZURE_SILVER.get(), 5, ItemTagRegistry.ORES_AZURE_SILVER, salAmmoniac, 10); this.makeRecipe(SulfurRegistry.ZINC.get(), 5, ItemTagRegistry.ORES_ZINC, salAmmoniac, 10); @@ -252,6 +255,7 @@ public void buildRecipes(BiConsumer recipeConsumer this.makeRecipe(SulfurRegistry.PERIDOT.get(), 8, ItemTagRegistry.ORES_PERIDOT, salAmmoniac, 15); this.makeRecipe(SulfurRegistry.FLUORITE.get(), 8, ItemTagRegistry.ORES_FLUORITE, salAmmoniac, 10); this.makeRecipe(SulfurRegistry.SAPPHIRE.get(), 8, ItemTagRegistry.ORES_SAPPHIRE, salAmmoniac, 15); + this.makeRecipe(SulfurRegistry.DARK_GEM.get(), 6, ItemTagRegistry.ORES_DARK_GEM, salAmmoniac, 15); this.makeRecipe(SulfurRegistry.SAL_AMMONIAC.get(), 6, ItemTagRegistry.ORES_SAL_AMMONIAC, salAmmoniac, 15); this.makeRecipe(SulfurRegistry.CERTUS_QUARTZ.get(), 6, ItemTagRegistry.ORES_CERTUS_QUARTZ, salAmmoniac, 15); this.makeRecipe(SulfurRegistry.NITER.get(), 6, ItemTagRegistry.ORES_NITER, salAmmoniac, 15); @@ -291,6 +295,7 @@ public void buildRecipes(BiConsumer recipeConsumer this.makeRecipe(SulfurRegistry.GOLD.get(), 1, Tags.Items.INGOTS_GOLD, salAmmoniac, 15); this.makeRecipe(SulfurRegistry.NETHERITE.get(), 1, Tags.Items.INGOTS_NETHERITE, salAmmoniac, 100); this.makeRecipe(SulfurRegistry.URANIUM.get(), 1, ItemTagRegistry.INGOTS_URANIUM, salAmmoniac, 10); + this.makeRecipe(SulfurRegistry.URANINITE.get(), 1, ItemTagRegistry.INGOTS_URANINITE, salAmmoniac, 10); this.makeRecipe(SulfurRegistry.SILVER.get(), 1, ItemTagRegistry.INGOTS_SILVER, salAmmoniac, 10); this.makeRecipe(SulfurRegistry.AZURE_SILVER.get(), 1, ItemTagRegistry.INGOTS_AZURE_SILVER, salAmmoniac, 10); this.makeRecipe(SulfurRegistry.ZINC.get(), 1, ItemTagRegistry.INGOTS_ZINC, salAmmoniac, 10); @@ -322,6 +327,7 @@ public void buildRecipes(BiConsumer recipeConsumer this.makeRecipe(SulfurRegistry.PERIDOT.get(), 1, ItemTagRegistry.GEMS_PERIDOT, salAmmoniac, 15); this.makeRecipe(SulfurRegistry.FLUORITE.get(), 1, ItemTagRegistry.GEMS_FLUORITE, salAmmoniac, 10); this.makeRecipe(SulfurRegistry.SAPPHIRE.get(), 1, ItemTagRegistry.GEMS_SAPPHIRE, salAmmoniac, 15); + this.makeRecipe(SulfurRegistry.DARK_GEM.get(), 1, ItemTagRegistry.GEMS_DARK, salAmmoniac, 15); this.makeRecipe(SulfurRegistry.SAL_AMMONIAC.get(), 1, ItemTagRegistry.GEMS_SAL_AMMONIAC, salAmmoniac, 15); this.makeRecipe(SulfurRegistry.CERTUS_QUARTZ.get(), 1, ItemTagRegistry.GEMS_CERTUS_QUARTZ, salAmmoniac, 15); this.makeRecipe(SulfurRegistry.FLUIX.get(), 1, ItemTagRegistry.GEMS_FLUIX, salAmmoniac, 15); diff --git a/src/main/java/com/klikli_dev/theurgy/datagen/tag/TheurgyItemTagsProvider.java b/src/main/java/com/klikli_dev/theurgy/datagen/tag/TheurgyItemTagsProvider.java index d1c68b57d..4b180fdbe 100644 --- a/src/main/java/com/klikli_dev/theurgy/datagen/tag/TheurgyItemTagsProvider.java +++ b/src/main/java/com/klikli_dev/theurgy/datagen/tag/TheurgyItemTagsProvider.java @@ -231,6 +231,7 @@ protected void addTags(HolderLookup.Provider pProvider) { .addOptionalTag(ItemTagRegistry.ORES_CINNABAR) .addOptionalTag(ItemTagRegistry.ORES_APATITE) .addOptionalTag(ItemTagRegistry.ORES_SULFUR) + .addOptionalTag(ItemTagRegistry.ORES_URANINITE_POOR) ; this.tag(ItemTagRegistry.MEDIUM_MERCURY_ORES) @@ -238,6 +239,7 @@ protected void addTags(HolderLookup.Provider pProvider) { .addOptionalTag(ItemTagRegistry.ORES_AZURE_SILVER) .addOptionalTag(ItemTagRegistry.ORES_SILVER) .addOptionalTag(ItemTagRegistry.ORES_URANIUM) + .addOptionalTag(ItemTagRegistry.ORES_URANINITE_REGULAR) .addOptionalTag(ItemTagRegistry.ORES_IRIDIUM) .addOptionalTag(ItemTagRegistry.ORES_PLATINUM) .addOptionalTag(ItemTagRegistry.ORES_CRIMSON_IRON) @@ -251,6 +253,7 @@ protected void addTags(HolderLookup.Provider pProvider) { .addTag(Tags.Items.ORES_DIAMOND) .addTag(Tags.Items.ORES_EMERALD) .addTag(Tags.Items.ORES_NETHERITE_SCRAP) + .addOptionalTag(ItemTagRegistry.ORES_URANINITE_DENSE) .addOptionalTag(ItemTagRegistry.ORES_ALLTHEMODIUM) .addOptionalTag(ItemTagRegistry.ORES_UNOBTAINIUM) .addOptionalTag(ItemTagRegistry.ORES_VIBRANIUM) @@ -298,6 +301,7 @@ protected void addTags(HolderLookup.Provider pProvider) { this.tag(ItemTagRegistry.MEDIUM_MERCURY_METALS) .addTag(Tags.Items.INGOTS_GOLD) .addOptionalTag(ItemTagRegistry.INGOTS_URANIUM) + .addOptionalTag(ItemTagRegistry.INGOTS_URANINITE) .addOptionalTag(ItemTagRegistry.INGOTS_SILVER) .addOptionalTag(ItemTagRegistry.INGOTS_AZURE_SILVER) .addOptionalTag(ItemTagRegistry.INGOTS_IRIDIUM) @@ -351,6 +355,17 @@ protected void addTags(HolderLookup.Provider pProvider) { // .addOptionalTag(ItemTagRegistry.GEMS_SULFUR) sulfur is classified as a gem, so its handled in the Tags.Items.GEMS ; + + //Set up tags for other mods that may not properly tag their mats + this.tag(ItemTagRegistry.INGOTS_URANINITE) + .addOptional(this.rl("powah:uraninite")); //powah adds ore tags and raw material tags but not ingot tags + + this.tag(ItemTagRegistry.ORES_DARK_GEM) + .addOptionalTag(this.rl("evilcraft:dark_ores")) + .addOptionalTag(this.rl("evilcraft:ores/dark_gem")); //does not exist as of 1.21, but if they unify the pattern it will + + this.tag(ItemTagRegistry.GEMS_DARK) + .addOptionalTag(this.rl("evilcraft:gems/dark")); } public ResourceLocation rl(String tag) { diff --git a/src/main/java/com/klikli_dev/theurgy/registry/ItemTagRegistry.java b/src/main/java/com/klikli_dev/theurgy/registry/ItemTagRegistry.java index 254c544bc..a452b2ce9 100644 --- a/src/main/java/com/klikli_dev/theurgy/registry/ItemTagRegistry.java +++ b/src/main/java/com/klikli_dev/theurgy/registry/ItemTagRegistry.java @@ -241,6 +241,9 @@ public class ItemTagRegistry { //Common Metal Ores public static final TagKey ORES_URANIUM = cTag("ores/uranium"); + public static final TagKey ORES_URANINITE_POOR = cTag("ores/uraninite_poor"); + public static final TagKey ORES_URANINITE_REGULAR = cTag("ores/uraninite_regular"); + public static final TagKey ORES_URANINITE_DENSE = cTag("ores/uraninite_dense"); public static final TagKey ORES_SILVER = cTag("ores/silver"); public static final TagKey ORES_AZURE_SILVER = cTag("ores/azure_silver"); public static final TagKey ORES_ZINC = cTag("ores/zinc"); @@ -267,6 +270,7 @@ public class ItemTagRegistry { public static final TagKey ORES_PERIDOT = cTag("ores/peridot"); public static final TagKey ORES_FLUORITE = cTag("ores/fluorite"); public static final TagKey ORES_SAPPHIRE = cTag("ores/sapphire"); + public static final TagKey ORES_DARK_GEM = cTag("ores/dark_gem"); public static final TagKey ORES_NITER = cTag("ores/niter"); public static final TagKey ORES_CERTUS_QUARTZ = cTag("ores/certus_quartz"); @@ -300,6 +304,7 @@ public class ItemTagRegistry { //Common Metal Ingots public static final TagKey INGOTS_URANIUM = cTag("ingots/uranium"); + public static final TagKey INGOTS_URANINITE = cTag("ingots/uraninite"); public static final TagKey INGOTS_SILVER = cTag("ingots/silver"); public static final TagKey INGOTS_AZURE_SILVER = cTag("ingots/azure_silver"); public static final TagKey INGOTS_ZINC = cTag("ingots/zinc"); @@ -325,6 +330,7 @@ public class ItemTagRegistry { public static final TagKey GEMS_PERIDOT = cTag("gems/peridot"); public static final TagKey GEMS_FLUORITE = cTag("gems/fluorite"); public static final TagKey GEMS_SAPPHIRE = cTag("gems/sapphire"); + public static final TagKey GEMS_DARK = cTag("gems/dark"); public static final TagKey GEMS_NITER = cTag("gems/niter"); public static final TagKey GEMS_CERTUS_QUARTZ = cTag("gems/certus_quartz"); public static final TagKey GEMS_FLUIX = cTag("gems/fluix"); diff --git a/src/main/java/com/klikli_dev/theurgy/registry/SulfurRegistry.java b/src/main/java/com/klikli_dev/theurgy/registry/SulfurRegistry.java index 17ab2042c..c373e4f12 100644 --- a/src/main/java/com/klikli_dev/theurgy/registry/SulfurRegistry.java +++ b/src/main/java/com/klikli_dev/theurgy/registry/SulfurRegistry.java @@ -213,6 +213,7 @@ public class SulfurRegistry { public static final DeferredItem NETHERITE = registerForSourceTag(Tags.Items.INGOTS_NETHERITE, AlchemicalDerivativeTier.PRECIOUS, AlchemicalSulfurType.METALS); public static final DeferredItem URANIUM = registerForSourceTag(ItemTagRegistry.INGOTS_URANIUM, AlchemicalDerivativeTier.RARE, AlchemicalSulfurType.METALS); + public static final DeferredItem URANINITE = registerForSourceTag(ItemTagRegistry.INGOTS_URANINITE, AlchemicalDerivativeTier.RARE, AlchemicalSulfurType.METALS); public static final DeferredItem AZURE_SILVER = registerForSourceTag(ItemTagRegistry.INGOTS_AZURE_SILVER, AlchemicalDerivativeTier.RARE, AlchemicalSulfurType.METALS); public static final DeferredItem ZINC = registerForSourceTag(ItemTagRegistry.INGOTS_ZINC, AlchemicalDerivativeTier.COMMON, AlchemicalSulfurType.METALS); @@ -245,6 +246,7 @@ public class SulfurRegistry { public static final DeferredItem PERIDOT = registerForSourceTag(ItemTagRegistry.GEMS_PERIDOT, AlchemicalDerivativeTier.RARE, AlchemicalSulfurType.GEMS); public static final DeferredItem FLUORITE = registerForSourceTag(ItemTagRegistry.GEMS_FLUORITE, AlchemicalDerivativeTier.ABUNDANT, AlchemicalSulfurType.GEMS); public static final DeferredItem SAPPHIRE = registerForSourceTag(ItemTagRegistry.GEMS_SAPPHIRE, AlchemicalDerivativeTier.RARE, AlchemicalSulfurType.GEMS); + public static final DeferredItem DARK_GEM = registerForSourceTag(ItemTagRegistry.GEMS_DARK, AlchemicalDerivativeTier.RARE, AlchemicalSulfurType.GEMS); public static final DeferredItem SAL_AMMONIAC = registerForSourceTag(ItemTagRegistry.GEMS_SAL_AMMONIAC, AlchemicalDerivativeTier.ABUNDANT, AlchemicalSulfurType.GEMS); public static final DeferredItem CERTUS_QUARTZ = registerForSourceTag(ItemTagRegistry.GEMS_CERTUS_QUARTZ, AlchemicalDerivativeTier.COMMON, AlchemicalSulfurType.GEMS); public static final DeferredItem FLUIX = registerForSourceTag(ItemTagRegistry.GEMS_FLUIX, AlchemicalDerivativeTier.RARE, AlchemicalSulfurType.GEMS);