Use polonium and plutonium pellet tags in places that were accidental…

…ly referencing the direct item
mekanism · Mar 10, 2024 · 31e567c · 31e567c
1 parent aec153d
commit 31e567c
Show file tree

Hide file tree

Showing 23 changed files with 59 additions and 59 deletions.
diff --git a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// Recipes	2024-03-09T17:43:20.998633	Recipes
+// Recipes	2024-03-10T14:34:06.4105512	Recipes
 b574fccc069b2808af98aa53c8b809e72bcd053d data/mekanism/recipes/antiprotonic_nucleosynthesizer.json
 6be89827224a18f3aef522df254ae09cfe93304f data/mekanism/recipes/atomic_disassembler.json
 2f33c48a639876d68a3a712c24540c3f78c5e86f data/mekanism/recipes/bin/advanced.json
@@ -3428,11 +3428,11 @@ b5cd65f310b7b7e4d045e5cf2c24bb47318fd586 data/mekanism/recipes/isotopic_centrifu
 4a32c62fed119792939363606bceec4664d858ca data/mekanism/recipes/laser_amplifier.json
 804843e8d165b0cc797e532cc8cb0e499e36c917 data/mekanism/recipes/laser_tractor_beam.json
 8ac5746273ea72e35e94dd49cb24ab43a3de7206 data/mekanism/recipes/logistical_sorter.json
-05c360e2b0af4c800be2e9c2d27400554f4a251b data/mekanism/recipes/mekasuit_bodyarmor.json
+6ee0229bb7bcd993a981e4452bf88f2cf542cb2b data/mekanism/recipes/mekasuit_bodyarmor.json
 5713c522009808ee855d181598ddba07ce351356 data/mekanism/recipes/mekasuit_boots.json
-e95cdb828b2de0d175988e6a31245421f0e1ca2a data/mekanism/recipes/mekasuit_helmet.json
-1f6b7da8a21647f63a653d2c9d9ff37051b62668 data/mekanism/recipes/mekasuit_pants.json
-5209a8d62f9ed6a6ce7d87ade2e2ca9afdefafaa data/mekanism/recipes/meka_tool.json
+b7e43b3246ccc4bfaa150b06715c0201b22eeaa7 data/mekanism/recipes/mekasuit_helmet.json
+5f7f4806565d42143862f615802021a842655618 data/mekanism/recipes/mekasuit_pants.json
+1b67fd756f112b39e1231efa667839b91507ee63 data/mekanism/recipes/meka_tool.json
 f878eb6ad76b961033610c9ed45433f5e58a93e6 data/mekanism/recipes/metallurgic_infuser.json
 e0a8503bc687485333302fb5b52cfa74b67fb5cf data/mekanism/recipes/metallurgic_infusing/alloy/atomic.json
 e06e6c4fea5d06bc95b8849d483e5efcf99d61dd data/mekanism/recipes/metallurgic_infusing/alloy/infused.json
@@ -3461,31 +3461,31 @@ f750ba695e124ea34145adddedb492e39c8386b2 data/mekanism/recipes/module_charge_dis
 73425425ceef389711bbb9cffe0ba3ea214dd872 data/mekanism/recipes/module_color_modulation_unit.json
 2886d57eb8e2bc4756f62053c3ddff0107e35582 data/mekanism/recipes/module_dosimeter_unit.json
 3a2746b5c6b2706aa0056db08f07373c611778fe data/mekanism/recipes/module_electrolytic_breathing_unit.json
-0c8685f72eb5b5a1b49e863706b9a2e082e0576d data/mekanism/recipes/module_elytra_unit.json
+448ca588e6519c48559c63684ae184808569e993 data/mekanism/recipes/module_elytra_unit.json
 4c49315c445e92024d48d24c0800bab264f2e483 data/mekanism/recipes/module_energy_unit.json
 736d331b2e0174dbaed0da26cce349ace3df6c1e data/mekanism/recipes/module_excavation_escalation_unit.json
 a374c77dd6135f2616aa89f23dc69cc669c84d84 data/mekanism/recipes/module_farming_unit.json
 f26f168d3f27b927993e2f49d6269beec0f4c7a7 data/mekanism/recipes/module_fortune_unit.json
-25e1c132bb76227e5bd2d4703b333b1890b39d9f data/mekanism/recipes/module_frost_walker_unit.json
+6dcd79d1c2beed12e5ade5963c48292acfe38dfe data/mekanism/recipes/module_frost_walker_unit.json
 221d4ea2f8d1f14f102c38d8e6cfbb32a7e12458 data/mekanism/recipes/module_geiger_unit.json
-907609629273aa875be8746ad98bedd0c69c04ae data/mekanism/recipes/module_gravitational_modulating_unit.json
-1aabb08cfbe1cadaebff09458a749ec40fef4ecc data/mekanism/recipes/module_gyroscopic_stabilization_unit.json
-3645cef3b0cb0dc7542d21fdff049e58ec3ebfb6 data/mekanism/recipes/module_hydraulic_propulsion_unit.json
-10b2a1cfbb9b57bb396e5441ce827deace161080 data/mekanism/recipes/module_hydrostatic_repulsor_unit.json
-b389f09dab91785f1ef2d944b42e53bff70bd4dd data/mekanism/recipes/module_inhalation_purification_unit.json
+631e74ea5518e31f4ed153ea460758fccc5a0dc2 data/mekanism/recipes/module_gravitational_modulating_unit.json
+5502a7bb0f010388369d3f053a84af29239260c5 data/mekanism/recipes/module_gyroscopic_stabilization_unit.json
+bca0d54f63cc80fa13f6d4c0ec9fe544cd1297d5 data/mekanism/recipes/module_hydraulic_propulsion_unit.json
+3d877ef1f042dc6fedfa02e2b313849db82734be data/mekanism/recipes/module_hydrostatic_repulsor_unit.json
+07f12ef164ba507a8331dbdfea78bc2e81b34540 data/mekanism/recipes/module_inhalation_purification_unit.json
 477423ae48b818804e1fed8938c76d1f411e6ede data/mekanism/recipes/module_jetpack_unit.json
 fcf3fa0e0dd4580d56b8348631fa2c1af9bf29d4 data/mekanism/recipes/module_laser_dissipation_unit.json
-1b43c76e41b547876e803fe43eec7e24472bc778 data/mekanism/recipes/module_locomotive_boosting_unit.json
-8667e54821352f675e07333125677445cf06fe8e data/mekanism/recipes/module_magnetic_attraction_unit.json
-59c62968510051f6510ce27ba3540a9116f887e2 data/mekanism/recipes/module_motorized_servo_unit.json
+4c576b5ba4f23f348c3363e22b43ad6e67a93c5f data/mekanism/recipes/module_locomotive_boosting_unit.json
+0bc391d630b52e509d4ef8af55017350627f982a data/mekanism/recipes/module_magnetic_attraction_unit.json
+0873e7000bbfde46f4251fa8e29f1b2b1b5d34af data/mekanism/recipes/module_motorized_servo_unit.json
 46aea085ece81400caf309f6b8cb8f4acd9c1a55 data/mekanism/recipes/module_nutritional_injection_unit.json
 e09b33f7931ad0ad58955ae28c85cd6a1c0078c6 data/mekanism/recipes/module_radiation_shielding_unit.json
 23bdc263d40d06ba1b821d29009517aaee62efb9 data/mekanism/recipes/module_shearing_unit.json
 8dd2969d099fa016d993611b7f679b6b4e4a0e63 data/mekanism/recipes/module_silk_touch_unit.json
-f4cb868a7d5e1c183641b4b6d1f09d63c4c0518f data/mekanism/recipes/module_soul_surfer_unit.json
+13e1712fbb38ae63ac04a1de4b3f31f21922fd4b data/mekanism/recipes/module_soul_surfer_unit.json
 21cb1f187b80dcbda28f491b54fb8f52d1fe5026 data/mekanism/recipes/module_teleportation_unit.json
 55c05ed7478f650bc4da612156743804bee12b8e data/mekanism/recipes/module_vein_mining_unit.json
-8ef00bf43e307485b327179eb2431f9f76a58a82 data/mekanism/recipes/module_vision_enhancement_unit.json
+6c5a8420bd668d779df98badf5cd7597459b00e1 data/mekanism/recipes/module_vision_enhancement_unit.json
 2325ca1d67bc55582c3ee6689c9aede5889bebcf data/mekanism/recipes/network_reader.json
 dd5b3a0759f599c012c91428757384248b0991f5 data/mekanism/recipes/nucleosynthesizing/chorus_flower.json
 a2130cb4f6fbf4fd16b8d5214adaddd06ea93f4c data/mekanism/recipes/nucleosynthesizing/crossbow.json
@@ -4364,7 +4364,7 @@ e5f89fab0effc210b51eccc1d0b42cfbbd0457bf data/mekanism/recipes/storage_blocks/br
 5599e19696e635e6f52d09a192f60f740b48dcea data/mekanism/recipes/storage_blocks/salt.json
 99137625993cf4f8017c4e57489e7929efd7771b data/mekanism/recipes/storage_blocks/steel.json
 74e9c88613859627763b8e3eed69ea84b5e3c749 data/mekanism/recipes/structural_glass.json
-9dc109edae5595178574de0c9fbd34c2cdf246a7 data/mekanism/recipes/supercharged_coil.json
+352c79964c0ee957e695ad367b9d4741d14445ed data/mekanism/recipes/supercharged_coil.json
 7d5d60493d0c0a35565a200d76825fbe50df3d8d data/mekanism/recipes/superheating_element.json
 06a80a45a8f45f05569537ad56da78724d4169eb data/mekanism/recipes/teleportation_core.json
 503796349735050f36a48b6cb110c47d6312ffce data/mekanism/recipes/teleporter.json

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/meka_tool.json b/src/datagen/generated/mekanism/data/mekanism/recipes/meka_tool.json
@@ -6,7 +6,7 @@
       "item": "mekanism:atomic_disassembler"
     },
     "A": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "C": {
       "tag": "forge:circuits/ultimate"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/mekasuit_bodyarmor.json b/src/datagen/generated/mekanism/data/mekanism/recipes/mekasuit_bodyarmor.json
@@ -6,7 +6,7 @@
       "item": "minecraft:netherite_chestplate"
     },
     "A": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "C": {
       "tag": "forge:circuits/ultimate"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/mekasuit_helmet.json b/src/datagen/generated/mekanism/data/mekanism/recipes/mekasuit_helmet.json
@@ -6,7 +6,7 @@
       "item": "minecraft:netherite_helmet"
     },
     "A": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "C": {
       "tag": "forge:circuits/ultimate"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/mekasuit_pants.json b/src/datagen/generated/mekanism/data/mekanism/recipes/mekasuit_pants.json
@@ -6,7 +6,7 @@
       "item": "minecraft:netherite_leggings"
     },
     "A": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "C": {
       "tag": "forge:circuits/ultimate"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/module_elytra_unit.json b/src/datagen/generated/mekanism/data/mekanism/recipes/module_elytra_unit.json
@@ -12,7 +12,7 @@
       "tag": "forge:pellets/polonium"
     },
     "N": {
-      "item": "mekanism:pellet_antimatter"
+      "tag": "forge:pellets/antimatter"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/module_frost_walker_unit.json b/src/datagen/generated/mekanism/data/mekanism/recipes/module_frost_walker_unit.json
@@ -9,7 +9,7 @@
       "tag": "forge:alloys/elite"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/...atagen/generated/mekanism/data/mekanism/recipes/module_gravitational_modulating_unit.json b/...atagen/generated/mekanism/data/mekanism/recipes/module_gravitational_modulating_unit.json
@@ -12,7 +12,7 @@
       "item": "mekanism:ultimate_induction_provider"
     },
     "H": {
-      "item": "mekanism:pellet_antimatter"
+      "tag": "forge:pellets/antimatter"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/...atagen/generated/mekanism/data/mekanism/recipes/module_gyroscopic_stabilization_unit.json b/...atagen/generated/mekanism/data/mekanism/recipes/module_gyroscopic_stabilization_unit.json
@@ -9,7 +9,7 @@
       "tag": "forge:alloys/elite"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/module_hydraulic_propulsion_unit.json b/src/datagen/generated/mekanism/data/mekanism/recipes/module_hydraulic_propulsion_unit.json
@@ -12,7 +12,7 @@
       "item": "mekanism:energy_tablet"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/module_hydrostatic_repulsor_unit.json b/src/datagen/generated/mekanism/data/mekanism/recipes/module_hydrostatic_repulsor_unit.json
@@ -9,7 +9,7 @@
       "tag": "forge:alloys/elite"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/...datagen/generated/mekanism/data/mekanism/recipes/module_inhalation_purification_unit.json b/...datagen/generated/mekanism/data/mekanism/recipes/module_inhalation_purification_unit.json
@@ -9,7 +9,7 @@
       "tag": "forge:alloys/elite"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/module_locomotive_boosting_unit.json b/src/datagen/generated/mekanism/data/mekanism/recipes/module_locomotive_boosting_unit.json
@@ -12,7 +12,7 @@
       "item": "mekanism:energy_tablet"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/module_magnetic_attraction_unit.json b/src/datagen/generated/mekanism/data/mekanism/recipes/module_magnetic_attraction_unit.json
@@ -12,7 +12,7 @@
       "tag": "forge:circuits/elite"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/module_motorized_servo_unit.json b/src/datagen/generated/mekanism/data/mekanism/recipes/module_motorized_servo_unit.json
@@ -12,7 +12,7 @@
       "tag": "forge:circuits/elite"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/module_soul_surfer_unit.json b/src/datagen/generated/mekanism/data/mekanism/recipes/module_soul_surfer_unit.json
@@ -12,7 +12,7 @@
       "tag": "minecraft:soul_fire_base_blocks"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/module_vision_enhancement_unit.json b/src/datagen/generated/mekanism/data/mekanism/recipes/module_vision_enhancement_unit.json
@@ -9,7 +9,7 @@
       "tag": "forge:alloys/elite"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/src/datagen/generated/mekanism/data/mekanism/recipes/supercharged_coil.json b/src/datagen/generated/mekanism/data/mekanism/recipes/supercharged_coil.json
@@ -6,7 +6,7 @@
       "item": "mekanism:laser"
     },
     "A": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "C": {
       "tag": "forge:circuits/ultimate"

diff --git a/src/datagen/generated/mekanismgenerators/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/datagen/generated/mekanismgenerators/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.20.4	2023-12-09T13:00:15.112805	Recipes
+// 1.20.4	2024-03-10T14:30:13.3591144	Recipes
 0d2fec7f38f694728a3fb6de67610ba154b1899d data/mekanismgenerators/recipes/activating/tritium.json
 685b1c780cb7df144f61bd9a3f678463e661b3cf data/mekanismgenerators/recipes/chemical_infusing/fusion_fuel.json
 2db509e674b9f96259675cd9de29b8b61564ad05 data/mekanismgenerators/recipes/electromagnetic_coil.json
@@ -15,8 +15,8 @@ d13858b376c1b7af71da55a541f6f712bfb540c1 data/mekanismgenerators/recipes/generat
 fb63fb69083dea0cbfbe88fcf0550d8e49c04c50 data/mekanismgenerators/recipes/generator/wind.json
 0bd12c9f2f953ca956ca6c5c3fc2af635ed8b13f data/mekanismgenerators/recipes/hohlraum.json
 25595d4e567a22fe1f144153123974f20228668f data/mekanismgenerators/recipes/laser_focus_matrix.json
-b7e780aef6f5847760146b9c284213a2db7e704f data/mekanismgenerators/recipes/module_geothermal_generator_unit.json
-da942fe7f5511963b1487e918091356fc199d661 data/mekanismgenerators/recipes/module_solar_recharging_unit.json
+8a99279553528e960c5da250b0423da476cb419c data/mekanismgenerators/recipes/module_geothermal_generator_unit.json
+dcc9fe05a841a74047c614fa174832c9087b8680 data/mekanismgenerators/recipes/module_solar_recharging_unit.json
 ac7422bfed63c05bd58c946321a4f9cd5e3cf83d data/mekanismgenerators/recipes/reactor/controller.json
 ac175ff24701451b374c9ad11517189f77808933 data/mekanismgenerators/recipes/reactor/frame.json
 21e7525264bffff098617a9c0fe5e5088aeb7dc9 data/mekanismgenerators/recipes/reactor/glass.json

diff --git a/.../mekanismgenerators/data/mekanismgenerators/recipes/module_geothermal_generator_unit.json b/.../mekanismgenerators/data/mekanismgenerators/recipes/module_geothermal_generator_unit.json
@@ -9,7 +9,7 @@
       "tag": "forge:alloys/elite"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/...ated/mekanismgenerators/data/mekanismgenerators/recipes/module_solar_recharging_unit.json b/...ated/mekanismgenerators/data/mekanismgenerators/recipes/module_solar_recharging_unit.json
@@ -9,7 +9,7 @@
       "tag": "forge:alloys/elite"
     },
     "H": {
-      "item": "mekanism:pellet_polonium"
+      "tag": "forge:pellets/polonium"
     },
     "P": {
       "item": "mekanism:module_base"

diff --git a/src/datagen/generators/java/mekanism/generators/common/GeneratorsRecipeProvider.java b/src/datagen/generators/java/mekanism/generators/common/GeneratorsRecipeProvider.java
@@ -251,15 +251,15 @@ private void addGearModuleRecipes(RecipeOutput consumer) {
               .key(Pattern.ALLOY, MekanismTags.Items.ALLOYS_ELITE)
               .key(Pattern.PREVIOUS, MekanismItems.MODULE_BASE)
               .key(Pattern.CONSTANT, GeneratorsBlocks.HEAT_GENERATOR)
-              .key(Pattern.HDPE_CHAR, MekanismItems.POLONIUM_PELLET)
+              .key(Pattern.HDPE_CHAR, MekanismTags.Items.PELLETS_POLONIUM)
               .build(consumer);
         //Solar Recharging Unit
         ExtendedShapedRecipeBuilder.shapedRecipe(GeneratorsItems.MODULE_SOLAR_RECHARGING)
               .pattern(MekanismRecipeProvider.BASIC_MODULE)
               .key(Pattern.ALLOY, MekanismTags.Items.ALLOYS_ELITE)
               .key(Pattern.PREVIOUS, MekanismItems.MODULE_BASE)
               .key(Pattern.CONSTANT, GeneratorsBlocks.ADVANCED_SOLAR_GENERATOR)
-              .key(Pattern.HDPE_CHAR, MekanismItems.POLONIUM_PELLET)
+              .key(Pattern.HDPE_CHAR, MekanismTags.Items.PELLETS_POLONIUM)
               .build(consumer);
     }