From ed89544011f7d1318f771a2fba9491c1e394b398 Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Sun, 5 Jan 2025 16:07:56 -0800 Subject: [PATCH] Remove Yellorium Dust sieve drop Closes #116 --- changelog.md | 3 +++ coremod/build.gradle | 1 + settings.gradle | 2 +- .../221483d9edeccdc82e726e39216c875f3fc356d3 | 2 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 2 +- .../5dcc257a984c72551805934aae700472bb3b56dd | 2 +- .../711e6e4ef0ec2176e93c58a9656c8098f7158439 | 2 +- .../735031f3addf80804addae5e3f53249900116f1e | 2 +- .../7aa54df69c09329e7fabfe3bd9efa66304777f0a | 2 +- .../93943142017732f21fbc4fa325d116c728b69767 | 4 ++-- .../962e88055ea3346318d91e954dd63cc7fe72cbd1 | 2 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 14 +---------- .../e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 | 2 +- .../f1f3e3a91f3dfa1ddb5216abfcdcc42a5cffc23b | 2 +- .../fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd | 2 +- .../fc41039380e20c0de816b178c0dd0b68eb0f1d50 | 2 +- .../dust/diamond/yellorium_dust.json | 24 ------------------- .../dust/flint/yellorium_dust.json | 24 ------------------- .../dust/golden/yellorium_dust.json | 24 ------------------- .../dust/iron/yellorium_dust.json | 24 ------------------- .../dust/netherite/yellorium_dust.json | 24 ------------------- .../dust/string/yellorium_dust.json | 24 ------------------- .../sieve/dust/diamond/yellorium_dust.json | 24 ------------------- .../sieve/dust/flint/yellorium_dust.json | 24 ------------------- .../sieve/dust/golden/yellorium_dust.json | 24 ------------------- .../sieve/dust/iron/yellorium_dust.json | 24 ------------------- .../sieve/dust/netherite/yellorium_dust.json | 24 ------------------- .../sieve/dust/string/yellorium_dust.json | 24 ------------------- .../exdeorum/data/ModCompatData.java | 4 ++-- .../exdeorum/data/recipe/SieveRecipes.java | 6 ----- 30 files changed, 21 insertions(+), 323 deletions(-) delete mode 100644 src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/diamond/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/flint/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/golden/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/iron/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/netherite/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/string/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/sieve/dust/diamond/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/sieve/dust/flint/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/sieve/dust/golden/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/sieve/dust/iron/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/sieve/dust/netherite/yellorium_dust.json delete mode 100644 src/generated/resources/data/exdeorum/recipe/sieve/dust/string/yellorium_dust.json diff --git a/changelog.md b/changelog.md index 71262cdc..78539f37 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +## Ex Deorum 3.5 +- Remove Yellorium Dust sieve drop (#116) + ## Ex Deorum 3.4 - Fix JEI bug with sieve recipes overflowing due to JEI API changes - Fix invisible output slots on JEI crook recipes diff --git a/coremod/build.gradle b/coremod/build.gradle index ccec93c0..52ee773d 100644 --- a/coremod/build.gradle +++ b/coremod/build.gradle @@ -3,6 +3,7 @@ plugins { } java.toolchain.languageVersion = JavaLanguageVersion.of(21) +java.toolchain.vendor = JvmVendorSpec.JETBRAINS jar { manifest { diff --git a/settings.gradle b/settings.gradle index ea06bbfc..0f90d355 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0' } include('coremod') diff --git a/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 b/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 index 8697335c..7a984acf 100644 --- a/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 +++ b/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 @@ -1,4 +1,4 @@ -// 1.21 2024-07-09T11:58:49.7850138 Tags for minecraft:item mod id exdeorum +// 1.21.1 2025-01-05T13:28:28.0238748 Tags for minecraft:item mod id exdeorum 6c72957356b1d59a27be736fa1da54a5a9795ef7 data/exdeorum/tags/item/barrels.json 6afa16b45f76c0defa1675d07586e2c6e6b0be69 data/exdeorum/tags/item/compressed/andesite.json 31b46613766e4cdc53196850495ab1019f61cb48 data/exdeorum/tags/item/compressed/blackstone.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index d5b35f95..7bf9d3f4 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21 2024-07-07T13:35:07.1965604 Loot Tables +// 1.21.1 2025-01-05T13:28:28.0008751 Loot Tables 105d8a61ea7145d7798146d385d4aad24fd1588d data/exdeorum/loot_table/blocks/acacia_barrel.json 83d50cbd5e45dfa72bf102fd4c0103a388cff9c4 data/exdeorum/loot_table/blocks/acacia_compressed_sieve.json 1e77127a82cbba0937bb02694f65cf1893aeffcb data/exdeorum/loot_table/blocks/acacia_crucible.json diff --git a/src/generated/resources/.cache/5dcc257a984c72551805934aae700472bb3b56dd b/src/generated/resources/.cache/5dcc257a984c72551805934aae700472bb3b56dd index a95ab096..111304ab 100644 --- a/src/generated/resources/.cache/5dcc257a984c72551805934aae700472bb3b56dd +++ b/src/generated/resources/.cache/5dcc257a984c72551805934aae700472bb3b56dd @@ -1,2 +1,2 @@ -// 1.21 2024-07-07T13:35:07.1915587 Tags for minecraft:fluid mod id exdeorum +// 1.21.1 2025-01-05T13:28:27.9888761 Tags for minecraft:fluid mod id exdeorum 71d650702c2830e62790c9a110dd0c62eb552cf5 data/minecraft/tags/fluid/water.json diff --git a/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 b/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 index 384d66ca..e88c1f61 100644 --- a/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 +++ b/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 @@ -1,4 +1,4 @@ -// 1.21 2024-07-07T13:35:07.193557 Tags for minecraft:block mod id exdeorum +// 1.21.1 2025-01-05T13:28:28.0038743 Tags for minecraft:block mod id exdeorum c2f6fb7224bd1e2fdb87249751113c4d66dbc21f data/exdeorum/tags/block/mineable/hammer.json 77dfab311d3714c77bcac2df0397d23d4707f03b data/exdeorum/tags/block/watering_can_tickable.json f6a9610ebae09549baf17e27200037cd17318055 data/minecraft/tags/block/leaves.json diff --git a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e index 29e2a43b..e1c891ba 100644 --- a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e +++ b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e @@ -1,2 +1,2 @@ -// 1.21 2024-07-07T13:35:07.2125585 Sound Definitions +// 1.21.1 2025-01-05T13:28:28.0258737 Sound Definitions 33424544e6cf49e7ad5d1a6a9bc815d66be63114 assets/exdeorum/sounds.json diff --git a/src/generated/resources/.cache/7aa54df69c09329e7fabfe3bd9efa66304777f0a b/src/generated/resources/.cache/7aa54df69c09329e7fabfe3bd9efa66304777f0a index 40188cb4..760052ef 100644 --- a/src/generated/resources/.cache/7aa54df69c09329e7fabfe3bd9efa66304777f0a +++ b/src/generated/resources/.cache/7aa54df69c09329e7fabfe3bd9efa66304777f0a @@ -1,2 +1,2 @@ -// 1.21 2024-07-07T13:35:07.2105588 Tags for minecraft:worldgen/world_preset mod id exdeorum +// 1.21.1 2025-01-05T13:28:28.0238748 Tags for minecraft:worldgen/world_preset mod id exdeorum 56085ba2e284a5043540b0ba0402f7352a4c2f16 data/minecraft/tags/worldgen/world_preset/normal.json diff --git a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 index e7ef6e94..53be7886 100644 --- a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 +++ b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 @@ -1,2 +1,2 @@ -// 1.21 2024-07-07T13:35:07.189558 ModKit Language: en_us for mod 'exdeorum' -8584d262168fdd9da42460087fdb8a38f7659a68 assets/exdeorum/lang/en_us.json +// 1.21.1 2025-01-05T13:28:27.9868734 ModKit Language: en_us for mod 'exdeorum' +849bf887027b0cab6ccc32bc76c89d838b19768c assets/exdeorum/lang/en_us.json diff --git a/src/generated/resources/.cache/962e88055ea3346318d91e954dd63cc7fe72cbd1 b/src/generated/resources/.cache/962e88055ea3346318d91e954dd63cc7fe72cbd1 index 62d311b8..39713729 100644 --- a/src/generated/resources/.cache/962e88055ea3346318d91e954dd63cc7fe72cbd1 +++ b/src/generated/resources/.cache/962e88055ea3346318d91e954dd63cc7fe72cbd1 @@ -1,4 +1,4 @@ -// 1.21 2024-07-07T13:35:07.1915587 Tags for minecraft:worldgen/structure_set mod id exdeorum +// 1.21.1 2025-01-05T13:28:28.0028751 Tags for minecraft:worldgen/structure_set mod id exdeorum 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/exdeorum/tags/worldgen/structure_set/overworld_void_structure_sets.json 56ffeb3beb8ca3df4a20420bc56f6139ebf57ada data/exdeorum/tags/worldgen/structure_set/the_end_void_structure_sets.json 14abefb27112e5ad3ebce0cb9618fb51c54e2f9d data/exdeorum/tags/worldgen/structure_set/the_nether_void_structure_sets.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 2d6abe78..6d503381 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21 2024-07-07T19:09:34.6313104 Recipes +// 1.21.1 2025-01-05T13:28:28.0038743 Recipes 0060d0e16dba2df44cc115f8ed68ef5dc52c74f1 data/exdeorum/advancement/recipes/building_blocks/andesite.json b9c5d12771d724cd646e637641da7a4d6b0a6bbf data/exdeorum/advancement/recipes/building_blocks/basalt.json d87a237248c140367dbfb748d45f532534e5b45c data/exdeorum/advancement/recipes/building_blocks/blackstone.json @@ -685,7 +685,6 @@ c4f53b0950018297e971d6bff3a212f9cc10a171 data/exdeorum/recipe/compressed_sieve/d 7b153dc60840b8019090140884dddad7b725293f data/exdeorum/recipe/compressed_sieve/dust/diamond/gunpowder.json 8170891e21051270ba9f59d2ba5c6b10cfcdfd8e data/exdeorum/recipe/compressed_sieve/dust/diamond/redstone.json e5e049c31533b7dbb9f9fe711e98732f7eb2bb28 data/exdeorum/recipe/compressed_sieve/dust/diamond/sky_dust.json -ab1071bf19ae85ddd0d1b35d58acdd6d01456da6 data/exdeorum/recipe/compressed_sieve/dust/diamond/yellorium_dust.json 67f88a4425147babb9830d510a34a0aae774df51 data/exdeorum/recipe/compressed_sieve/dust/flint/blaze_powder.json 342c9062834ee11eb716801a9075d656ddd49713 data/exdeorum/recipe/compressed_sieve/dust/flint/bone_meal.json 40bc84b70ebd1e8c100ad687eaccea369ba75dd7 data/exdeorum/recipe/compressed_sieve/dust/flint/certus_quartz_dust.json @@ -694,7 +693,6 @@ ab1071bf19ae85ddd0d1b35d58acdd6d01456da6 data/exdeorum/recipe/compressed_sieve/d 85b610c846feffbd894062d53a19d566c5f9c6f3 data/exdeorum/recipe/compressed_sieve/dust/flint/gunpowder.json 826aac6b13896fc809a67ce83ccba9eb8452746e data/exdeorum/recipe/compressed_sieve/dust/flint/redstone.json c9f79e7cb132b7ca07f2b045de9c1f74122ac812 data/exdeorum/recipe/compressed_sieve/dust/flint/sky_dust.json -209bfeb221a9b3f14798787fc7a13a8752906232 data/exdeorum/recipe/compressed_sieve/dust/flint/yellorium_dust.json cf768a949364dde6ad2927ea9c9cb827ee3da5b7 data/exdeorum/recipe/compressed_sieve/dust/golden/blaze_powder.json faaddd326cd18f8164982103b53853d823cfdd52 data/exdeorum/recipe/compressed_sieve/dust/golden/bone_meal.json d9a1cb5939312c4990bbf93bb57db4622af35bba data/exdeorum/recipe/compressed_sieve/dust/golden/certus_quartz_dust.json @@ -705,7 +703,6 @@ cad64d8bcc37bdb6bdf32e699d36a3e971ae40a5 data/exdeorum/recipe/compressed_sieve/d f99c66e9344427836091d053a9b754266a24a189 data/exdeorum/recipe/compressed_sieve/dust/golden/raw_gold.json 69228d60b742d955f327ecdae3ddca3415a2c9e2 data/exdeorum/recipe/compressed_sieve/dust/golden/redstone.json b39162edd94ace24664a3b8ff5c076133566ff7e data/exdeorum/recipe/compressed_sieve/dust/golden/sky_dust.json -b05c774cb20bed2e1d1579c6c1e69434b691b7d7 data/exdeorum/recipe/compressed_sieve/dust/golden/yellorium_dust.json 939a1bf0a86af68269cbd3b32b6be0c321737a22 data/exdeorum/recipe/compressed_sieve/dust/iron/blaze_powder.json ebbdf8044b6c749238c2893212febc3d69dd2fb8 data/exdeorum/recipe/compressed_sieve/dust/iron/bone_meal.json 148a97f3179a6b8f1680f02c8ca340401d971daa data/exdeorum/recipe/compressed_sieve/dust/iron/certus_quartz_dust.json @@ -715,7 +712,6 @@ ebbdf8044b6c749238c2893212febc3d69dd2fb8 data/exdeorum/recipe/compressed_sieve/d fb61bee9486ffcf601c85b7343db9b58f038e888 data/exdeorum/recipe/compressed_sieve/dust/iron/iron_nugget.json a252d9cd18e079ce973dded40a194491c594bc04 data/exdeorum/recipe/compressed_sieve/dust/iron/redstone.json 091d070f65a0b3a40ceb607b7a7fa10aa3c246bf data/exdeorum/recipe/compressed_sieve/dust/iron/sky_dust.json -0b22d30a1e84899703d477be568ed92ac1dd1da8 data/exdeorum/recipe/compressed_sieve/dust/iron/yellorium_dust.json f0fac3fadded5ad927c18ad97ecbeb5bd8948754 data/exdeorum/recipe/compressed_sieve/dust/netherite/blaze_powder.json 515ac2fbec2986a655315f22c54d221e39ad223d data/exdeorum/recipe/compressed_sieve/dust/netherite/bone_meal.json 13defbce749afac9071977a32a1d662f3e6db9f9 data/exdeorum/recipe/compressed_sieve/dust/netherite/certus_quartz_dust.json @@ -726,7 +722,6 @@ e93f272b8fce0b674310c2bf514faa334db4dfbc data/exdeorum/recipe/compressed_sieve/d bcb4bd970e039451dd2aefcffd474833c247ec95 data/exdeorum/recipe/compressed_sieve/dust/netherite/iron_nugget.json 765fe14856853a542b0be356c2c9513ff69264de data/exdeorum/recipe/compressed_sieve/dust/netherite/redstone.json 105e80e761312507a0c3e8fc23c71a2099614dca data/exdeorum/recipe/compressed_sieve/dust/netherite/sky_dust.json -7af7afadd97a2eeb319995db5bbb9ec532122c03 data/exdeorum/recipe/compressed_sieve/dust/netherite/yellorium_dust.json 9327b383204e2a18e739f192831f130ddc95c14b data/exdeorum/recipe/compressed_sieve/dust/string/blaze_powder.json 88732230b6c02858fc2cfe6739eba490cae26c67 data/exdeorum/recipe/compressed_sieve/dust/string/bone_meal.json 0caa41d25ca3b8d57f19914ad5cac568234af66e data/exdeorum/recipe/compressed_sieve/dust/string/certus_quartz_dust.json @@ -735,7 +730,6 @@ bcb4bd970e039451dd2aefcffd474833c247ec95 data/exdeorum/recipe/compressed_sieve/d 066dd8fc93b212c5499fc5be501286723559e56e data/exdeorum/recipe/compressed_sieve/dust/string/gunpowder.json 901da5c01595ccf9e568c1828971dd07378949d3 data/exdeorum/recipe/compressed_sieve/dust/string/redstone.json 04864eebbf5226421056579b9fad60767c0032ab data/exdeorum/recipe/compressed_sieve/dust/string/sky_dust.json -d78bc46dac04f848209b5f018c024bca7a82baf4 data/exdeorum/recipe/compressed_sieve/dust/string/yellorium_dust.json 3b4c94350a8908ffd503a59a83fd8c49debe2eee data/exdeorum/recipe/compressed_sieve/gravel/diamond/aluminum_ore_chunk.json 054ee2484be76425ea44e465a3a0af64d53bdac1 data/exdeorum/recipe/compressed_sieve/gravel/diamond/amethyst_shard.json a6e8512efeb47bf22bf63b13c8b3ea8d85b81aa7 data/exdeorum/recipe/compressed_sieve/gravel/diamond/boron_ore_chunk.json @@ -1719,7 +1713,6 @@ ede571a1e66a83bd98aaf8f6b69507b8802815ac data/exdeorum/recipe/sieve/dust/diamond 36c43fe35142d81b87474cbaf6076586dad93fcb data/exdeorum/recipe/sieve/dust/diamond/gunpowder.json 92c7744f049c54f24d622f812ffb70a0e3cda16b data/exdeorum/recipe/sieve/dust/diamond/redstone.json a48919609f7242a1659c632307a86a506748b771 data/exdeorum/recipe/sieve/dust/diamond/sky_dust.json -e7ab1a04ca905af72a9f0170a516481432593d5c data/exdeorum/recipe/sieve/dust/diamond/yellorium_dust.json 303292ea85045dc645dec5010e288fe0d40860a2 data/exdeorum/recipe/sieve/dust/flint/blaze_powder.json 418c9a1a917392b9a21a17dd4169e15b342db4fa data/exdeorum/recipe/sieve/dust/flint/bone_meal.json 9aeca57c824db55d08324be332ba0f676a01af03 data/exdeorum/recipe/sieve/dust/flint/certus_quartz_dust.json @@ -1728,7 +1721,6 @@ f576674a5e441d0eaa05116bbe0284553557ba47 data/exdeorum/recipe/sieve/dust/flint/g cc89959ddce1eba69eae648a808dca5075bb2f0b data/exdeorum/recipe/sieve/dust/flint/gunpowder.json 52465f5d5bccd60ab92bc527f0ce120d8b5de1a8 data/exdeorum/recipe/sieve/dust/flint/redstone.json 46c98e16b3418b1bf2beb403762e6fab351283be data/exdeorum/recipe/sieve/dust/flint/sky_dust.json -29259b58e844b5bef627d43f6698b0e97ec3a450 data/exdeorum/recipe/sieve/dust/flint/yellorium_dust.json 423bcbdfb3b9150f83cbdc1282a916e971634937 data/exdeorum/recipe/sieve/dust/golden/blaze_powder.json 14f80e66a0eaf72cf01fda201d7fb0d944f782b9 data/exdeorum/recipe/sieve/dust/golden/bone_meal.json cdaf9c1f5fd3584018cc22407f15e1cd79dcdcef data/exdeorum/recipe/sieve/dust/golden/certus_quartz_dust.json @@ -1739,7 +1731,6 @@ cdaf9c1f5fd3584018cc22407f15e1cd79dcdcef data/exdeorum/recipe/sieve/dust/golden/ 51faf72371ce967bafc17acdf596a9a5619dbd2b data/exdeorum/recipe/sieve/dust/golden/raw_gold.json f12d267253e79958e9cd7ec3d83c6e41954232d3 data/exdeorum/recipe/sieve/dust/golden/redstone.json 17daed8e91c77e280cdc796ad93d0ff45db25b65 data/exdeorum/recipe/sieve/dust/golden/sky_dust.json -d9083ae741aa12ea15fc6d44d685ee0d568bbe22 data/exdeorum/recipe/sieve/dust/golden/yellorium_dust.json 8cd69d125cb24b6a3b1c39cc5bf128adfd85b06b data/exdeorum/recipe/sieve/dust/iron/blaze_powder.json babb9a91ed76b9646ca59a71a41a86bad4b892ed data/exdeorum/recipe/sieve/dust/iron/bone_meal.json 0ef818c7dda3be46a888ca31572b80b6285f8596 data/exdeorum/recipe/sieve/dust/iron/certus_quartz_dust.json @@ -1749,7 +1740,6 @@ c98210715ca3d839693434141d9e8a904dcaa40e data/exdeorum/recipe/sieve/dust/iron/gr 2e14de48b4dee734007fe477cf25520beca3ef6e data/exdeorum/recipe/sieve/dust/iron/iron_nugget.json 90a4230141746c2412bbc1399d7aa8f16eb111a6 data/exdeorum/recipe/sieve/dust/iron/redstone.json 04e81ef9d78560e0d5a8f65d85896309f3715f41 data/exdeorum/recipe/sieve/dust/iron/sky_dust.json -9b984d09c904e78cd0e2e2f75af4b1030ffe638e data/exdeorum/recipe/sieve/dust/iron/yellorium_dust.json 71d76b6989e3eb3cd01145ca0906f632600c5bce data/exdeorum/recipe/sieve/dust/netherite/blaze_powder.json 39c75573c4a5db91d22053e78229035b8d231786 data/exdeorum/recipe/sieve/dust/netherite/bone_meal.json 5ec4c50fad6c87720a5ebb47287df3d9f4095d11 data/exdeorum/recipe/sieve/dust/netherite/certus_quartz_dust.json @@ -1760,7 +1750,6 @@ f802f1e478f16ce0c5d462d1cd402d2ee7a2bec6 data/exdeorum/recipe/sieve/dust/netheri 9c383adcf563681da09a3af19d5048fd761847ff data/exdeorum/recipe/sieve/dust/netherite/iron_nugget.json e2dfed4ec6e2173b38ba4cf9438ecf90de7555ff data/exdeorum/recipe/sieve/dust/netherite/redstone.json 16265ab169283d98cec0967061d0ef18995189e5 data/exdeorum/recipe/sieve/dust/netherite/sky_dust.json -dc9812de337601ee6f5383e6896c37959dcdadc0 data/exdeorum/recipe/sieve/dust/netherite/yellorium_dust.json 143d40d4a0ba03c3a2eb1d5e5c14b9795626d207 data/exdeorum/recipe/sieve/dust/string/blaze_powder.json e85f9e36c86c4743388a23347b91fe4fd89e833f data/exdeorum/recipe/sieve/dust/string/bone_meal.json 0cfb736683d24614f51babcd97bc6f810e19ca84 data/exdeorum/recipe/sieve/dust/string/certus_quartz_dust.json @@ -1769,7 +1758,6 @@ b82f4c4e8a8e8d3f81cfa12529ff9c91bd258930 data/exdeorum/recipe/sieve/dust/string/ 652a04bfad520c23e8f42515e9f3f63612c2a65b data/exdeorum/recipe/sieve/dust/string/gunpowder.json 7df24c2fb65827409de280fc5e1604f313fff5b7 data/exdeorum/recipe/sieve/dust/string/redstone.json 0172633335e28c8e770ebe8e897b9f000cb9929e data/exdeorum/recipe/sieve/dust/string/sky_dust.json -bb4d21aa9f8f68dfeb6b9bd8e9f13a8c829bd8dd data/exdeorum/recipe/sieve/dust/string/yellorium_dust.json d1e5352b7dfca55be5be84f1ea25f2d837ab7bf1 data/exdeorum/recipe/sieve/gravel/diamond/aluminum_ore_chunk.json c2d0893f3d45a5bc10196791c0be17600c4a1149 data/exdeorum/recipe/sieve/gravel/diamond/amethyst_shard.json 36fa9dd4488b6ad206f280e93a79e86109991970 data/exdeorum/recipe/sieve/gravel/diamond/boron_ore_chunk.json diff --git a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 index b46a7f84..b3b48dc0 100644 --- a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 +++ b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 @@ -1,4 +1,4 @@ -// 1.21 2024-07-07T13:35:07.2115571 Advancements +// 1.21.1 2025-01-05T13:28:28.0248746 Advancements dd4ecee3e84646521f1b79795d467d69cf9fd5ec data/exdeorum/advancement/core/barrel.json 33171a87fed6c1d520a8d3addf1799451d6ee882 data/exdeorum/advancement/core/crook.json 82e6fb7ca651de853a24ce4e7b896460490872bd data/exdeorum/advancement/core/root.json diff --git a/src/generated/resources/.cache/f1f3e3a91f3dfa1ddb5216abfcdcc42a5cffc23b b/src/generated/resources/.cache/f1f3e3a91f3dfa1ddb5216abfcdcc42a5cffc23b index cd14a260..fd9eb38c 100644 --- a/src/generated/resources/.cache/f1f3e3a91f3dfa1ddb5216abfcdcc42a5cffc23b +++ b/src/generated/resources/.cache/f1f3e3a91f3dfa1ddb5216abfcdcc42a5cffc23b @@ -1,4 +1,4 @@ -// 1.21 2024-07-09T12:06:52.712022 Global Loot Modifiers : exdeorum +// 1.21.1 2025-01-05T13:28:28.0028751 Global Loot Modifiers : exdeorum 539ba0e881830430ae2c03f7ac8dec6f2de478a0 data/exdeorum/loot_modifiers/compressed_hammer.json dd0417e36e03e0f51e1f1bbcff295b54128fdf8f data/exdeorum/loot_modifiers/crook.json 57991d8346a472f12c1a4b6cb94151d2c1bfa371 data/exdeorum/loot_modifiers/hammer.json diff --git a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd index 3d01d693..074602ff 100644 --- a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd +++ b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd @@ -1,4 +1,4 @@ -// 1.21 2024-07-07T13:35:07.1915587 ModKit Item Models for mod 'exdeorum' +// 1.21.1 2025-01-05T13:28:27.9898762 ModKit Item Models for mod 'exdeorum' 4ba3bb2c6174ac3728a4b85e34681f118ec8eb34 assets/exdeorum/models/item/acacia_barrel.json 8ddbf3f507fc1ee45e3aa4db98d7f7d2e53adff1 assets/exdeorum/models/item/acacia_compressed_sieve.json c03ce41f7c071498fcbd5f5225e91dcb2f365fbb assets/exdeorum/models/item/acacia_crucible.json diff --git a/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 b/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 index c332c176..39c1c491 100644 --- a/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 +++ b/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 @@ -1,4 +1,4 @@ -// 1.21 2024-07-07T13:35:07.194558 ModKit Block Models for mod 'exdeorum' +// 1.21.1 2025-01-05T13:28:27.9948744 ModKit Block Models for mod 'exdeorum' c73197f2dc770a353883c387b2b1f0b082283576 assets/exdeorum/blockstates/acacia_barrel.json e36a3d22e00c0eae2336a39f3d0c904ef1d89119 assets/exdeorum/blockstates/acacia_compressed_sieve.json a3ef4562a4c7833439d8d66ff9c210406d317995 assets/exdeorum/blockstates/acacia_crucible.json diff --git a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/diamond/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/diamond/yellorium_dust.json deleted file mode 100644 index b7875793..00000000 --- a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/diamond/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:compressed_sieve", - "ingredient": { - "tag": "exdeorum:compressed/dust" - }, - "mesh": { - "item": "exdeorum:diamond_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 7.0, - "p": 0.12 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/flint/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/flint/yellorium_dust.json deleted file mode 100644 index 6796cdad..00000000 --- a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/flint/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:compressed_sieve", - "ingredient": { - "tag": "exdeorum:compressed/dust" - }, - "mesh": { - "item": "exdeorum:flint_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 7.0, - "p": 0.055 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/golden/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/golden/yellorium_dust.json deleted file mode 100644 index e52f1f11..00000000 --- a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/golden/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:compressed_sieve", - "ingredient": { - "tag": "exdeorum:compressed/dust" - }, - "mesh": { - "item": "exdeorum:golden_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 7.0, - "p": 0.1 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/iron/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/iron/yellorium_dust.json deleted file mode 100644 index 2b14bbab..00000000 --- a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/iron/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:compressed_sieve", - "ingredient": { - "tag": "exdeorum:compressed/dust" - }, - "mesh": { - "item": "exdeorum:iron_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 7.0, - "p": 0.08 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/netherite/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/netherite/yellorium_dust.json deleted file mode 100644 index e142f21a..00000000 --- a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/netherite/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:compressed_sieve", - "ingredient": { - "tag": "exdeorum:compressed/dust" - }, - "mesh": { - "item": "exdeorum:netherite_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 7.0, - "p": 0.14 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/string/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/string/yellorium_dust.json deleted file mode 100644 index 4b129bff..00000000 --- a/src/generated/resources/data/exdeorum/recipe/compressed_sieve/dust/string/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:compressed_sieve", - "ingredient": { - "tag": "exdeorum:compressed/dust" - }, - "mesh": { - "item": "exdeorum:string_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 7.0, - "p": 0.05 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/sieve/dust/diamond/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/sieve/dust/diamond/yellorium_dust.json deleted file mode 100644 index 40f2c198..00000000 --- a/src/generated/resources/data/exdeorum/recipe/sieve/dust/diamond/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:sieve", - "ingredient": { - "item": "exdeorum:dust" - }, - "mesh": { - "item": "exdeorum:diamond_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.12 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/sieve/dust/flint/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/sieve/dust/flint/yellorium_dust.json deleted file mode 100644 index 758a92c1..00000000 --- a/src/generated/resources/data/exdeorum/recipe/sieve/dust/flint/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:sieve", - "ingredient": { - "item": "exdeorum:dust" - }, - "mesh": { - "item": "exdeorum:flint_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.055 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/sieve/dust/golden/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/sieve/dust/golden/yellorium_dust.json deleted file mode 100644 index e4ad17e5..00000000 --- a/src/generated/resources/data/exdeorum/recipe/sieve/dust/golden/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:sieve", - "ingredient": { - "item": "exdeorum:dust" - }, - "mesh": { - "item": "exdeorum:golden_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.1 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/sieve/dust/iron/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/sieve/dust/iron/yellorium_dust.json deleted file mode 100644 index fd40c8a3..00000000 --- a/src/generated/resources/data/exdeorum/recipe/sieve/dust/iron/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:sieve", - "ingredient": { - "item": "exdeorum:dust" - }, - "mesh": { - "item": "exdeorum:iron_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.08 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/sieve/dust/netherite/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/sieve/dust/netherite/yellorium_dust.json deleted file mode 100644 index c29074b3..00000000 --- a/src/generated/resources/data/exdeorum/recipe/sieve/dust/netherite/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:sieve", - "ingredient": { - "item": "exdeorum:dust" - }, - "mesh": { - "item": "exdeorum:netherite_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "result_amount": { - "type": "minecraft:binomial", - "n": 1.0, - "p": 0.14 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipe/sieve/dust/string/yellorium_dust.json b/src/generated/resources/data/exdeorum/recipe/sieve/dust/string/yellorium_dust.json deleted file mode 100644 index 4bb385d9..00000000 --- a/src/generated/resources/data/exdeorum/recipe/sieve/dust/string/yellorium_dust.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "bigreactors" - } - ], - "type": "exdeorum:sieve", - "ingredient": { - "item": "exdeorum:dust" - }, - "mesh": { - "item": "exdeorum:string_mesh" - }, - "result": { - "count": 1, - "id": "biggerreactors:yellorium_dust" - }, - "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/data/ModCompatData.java b/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java index 594f086c..8aea9eaf 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java +++ b/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java @@ -62,8 +62,8 @@ public class ModCompatData { public static final DeferredItem GRAINS_OF_INFINITY = item(ModIds.ENDERIO, "grains_of_infinity"); // Bigger reactors - public static final DeferredItem - YELLORIUM_DUST = item(ModIds.BIGGER_REACTORS, "yellorium_dust"); + //public static final DeferredItem + // YELLORIUM_DUST = item(ModIds.BIGGER_REACTORS, "yellorium_dust"); // Biomes O' Plenty public static final DeferredBlock FIR_PLANKS = block(ModIds.BIOMES_O_PLENTY, "fir_planks"), diff --git a/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java b/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java index d2caeb4f..f2043ede 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java +++ b/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java @@ -467,7 +467,6 @@ class SieveRecipes { drops.add(Items.BLAZE_POWDER, chance(0.03f)); drops.addConditional(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.06f), Recipes.ENDERIO); - drops.addConditional(ModCompatData.YELLORIUM_DUST.get(), chance(0.05f), Recipes.EXTREME_REACTORS); drops.addConditional(ModCompatData.SKY_STONE_DUST.get(), chance(0.06f), Recipes.AE2); drops.addConditional(ModCompatData.CERTUS_QUARTZ_DUST.get(), chance(0.06f), Recipes.AE2); }); @@ -479,7 +478,6 @@ class SieveRecipes { drops.add(Items.BLAZE_POWDER, chance(0.04f)); drops.addConditional(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.07f), Recipes.ENDERIO); - drops.addConditional(ModCompatData.YELLORIUM_DUST.get(), chance(0.055f), Recipes.EXTREME_REACTORS); drops.addConditional(ModCompatData.SKY_STONE_DUST.get(), chance(0.07f), Recipes.AE2); drops.addConditional(ModCompatData.CERTUS_QUARTZ_DUST.get(), chance(0.07f), Recipes.AE2); }); @@ -492,7 +490,6 @@ class SieveRecipes { drops.add(Items.IRON_NUGGET, chance(0.06f)); drops.addConditional(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.09f), Recipes.ENDERIO); - drops.addConditional(ModCompatData.YELLORIUM_DUST.get(), chance(0.08f), Recipes.EXTREME_REACTORS); drops.addConditional(ModCompatData.SKY_STONE_DUST.get(), chance(0.075f), Recipes.AE2); drops.addConditional(ModCompatData.CERTUS_QUARTZ_DUST.get(), chance(0.075f), Recipes.AE2); }); @@ -506,7 +503,6 @@ class SieveRecipes { drops.add(Items.RAW_GOLD, chance(0.02f)); drops.addConditional(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.11f), Recipes.ENDERIO); - drops.addConditional(ModCompatData.YELLORIUM_DUST.get(), chance(0.10f), Recipes.EXTREME_REACTORS); drops.addConditional(ModCompatData.SKY_STONE_DUST.get(), chance(0.08f), Recipes.AE2); drops.addConditional(ModCompatData.CERTUS_QUARTZ_DUST.get(), chance(0.08f), Recipes.AE2); }); @@ -519,7 +515,6 @@ class SieveRecipes { drops.add(Items.GOLD_NUGGET, chance(0.08f)); drops.addConditional(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.12f), Recipes.ENDERIO); - drops.addConditional(ModCompatData.YELLORIUM_DUST.get(), chance(0.12f), Recipes.EXTREME_REACTORS); drops.addConditional(ModCompatData.SKY_STONE_DUST.get(), chance(0.10f), Recipes.AE2); drops.addConditional(ModCompatData.CERTUS_QUARTZ_DUST.get(), chance(0.10f), Recipes.AE2); }); @@ -533,7 +528,6 @@ class SieveRecipes { drops.add(Items.IRON_NUGGET, chance(0.08f)); drops.addConditional(ModCompatData.GRAINS_OF_INFINITY.get(), chance(0.135f), Recipes.ENDERIO); - drops.addConditional(ModCompatData.YELLORIUM_DUST.get(), chance(0.14f), Recipes.EXTREME_REACTORS); drops.addConditional(ModCompatData.SKY_STONE_DUST.get(), chance(0.11f), Recipes.AE2); drops.addConditional(ModCompatData.CERTUS_QUARTZ_DUST.get(), chance(0.11f), Recipes.AE2); });