Skip to content

Commit

Permalink
Qio recipe adjustments (#8021)
Browse files Browse the repository at this point in the history
  • Loading branch information
thiakil committed Mar 11, 2024
1 parent aa5641d commit 9211ac5
Show file tree
Hide file tree
Showing 14 changed files with 89 additions and 73 deletions.
@@ -1,4 +1,4 @@
// Recipes 2024-03-10T14:34:06.4105512 Recipes
// Recipes 2024-03-10T15:05:05.328037 Recipes
b574fccc069b2808af98aa53c8b809e72bcd053d data/mekanism/recipes/antiprotonic_nucleosynthesizer.json
6be89827224a18f3aef522df254ae09cfe93304f data/mekanism/recipes/atomic_disassembler.json
2f33c48a639876d68a3a712c24540c3f78c5e86f data/mekanism/recipes/bin/advanced.json
Expand Down Expand Up @@ -4177,15 +4177,15 @@ e5dbb9e7be3eed27bba25a52ad69fc60e3a2edc7 data/mekanism/recipes/processing/uraniu
23c2261452d11592a47c7c22b40c125a4a82b6b8 data/mekanism/recipes/processing/uranium/uranium_oxide.json
b378a1bcdc8438911648afbd02a7441513a47529 data/mekanism/recipes/processing/uranium/yellow_cake_uranium.json
4dba57ef96cf605173abf0dde67746e2bad4a357 data/mekanism/recipes/purification_chamber.json
ad6a8a46a834430dca62f4d2d555ce0ea81adde3 data/mekanism/recipes/qio_dashboard.json
8e78f31841915d4034335ca2b17a852f2dd79523 data/mekanism/recipes/qio_drive_array.json
43b2766962bda7a65382ae98dd6c1a357ae8d66b data/mekanism/recipes/qio_drive_base.json
982d8490d7769a3561a62a3810ba9fa3b5529117 data/mekanism/recipes/qio_drive_hyper_dense.json
a63f3dfc9f37ae8aea77f4eed6f8a8e636bbb778 data/mekanism/recipes/qio_drive_supermassive.json
c4790c8bf57b7366f53f55b2bc34ddfbe77df252 data/mekanism/recipes/qio_drive_time_dilating.json
bb6156e90f9055c5696a776aa8b4c7c5707de529 data/mekanism/recipes/qio_exporter.json
01a50d1f68b7f8a1c998cc5fa6376f6f9c348be8 data/mekanism/recipes/qio_importer.json
42b2cb17268877cf1edb02cb6940c82f09fe17c2 data/mekanism/recipes/qio_redstone_adapter.json
1d1573287b370b742f3f508bfec3fd48f4a66485 data/mekanism/recipes/qio_dashboard.json
9738e0a9ec17a4a22eea973b5cb2a6f7302d7820 data/mekanism/recipes/qio_drive_array.json
79c89b40bbf891514a44150c3083eabf30839ae8 data/mekanism/recipes/qio_drive_base.json
b67aee93ac4239a7b1dab9d85063233c888f9f0d data/mekanism/recipes/qio_drive_hyper_dense.json
92e8c34e9f510e5936f18b45b37fe782dcc6546c data/mekanism/recipes/qio_drive_supermassive.json
5faa1cbed8ad9ae5bf35bcd742508dafe06eb671 data/mekanism/recipes/qio_drive_time_dilating.json
ec712e49b79a73a21afd8162ac4af2a4ddbba936 data/mekanism/recipes/qio_exporter.json
035085a0b37b2174596b2498539e316384b85a90 data/mekanism/recipes/qio_importer.json
6c4b9c0327845ed7395e2f2cb1d92232002705a0 data/mekanism/recipes/qio_redstone_adapter.json
aa93ac093d854a2fc375c0192b31b9c98187df82 data/mekanism/recipes/quantum_entangloporter.json
0f8a4a928a170c8e6b413bd6c46c469863643289 data/mekanism/recipes/radioactive_waste_barrel.json
2beee292a79afd8f9d66753c7145fcfd736a1fc8 data/mekanism/recipes/rails.json
Expand Down Expand Up @@ -4347,7 +4347,7 @@ a4e7d26f97088a120aa6e0051339168164cad92a data/mekanism/recipes/sawing/trapdoor/s
e88628edfbf5f07e4f1527ce06ff47bd9a48a98c data/mekanism/recipes/sawing/trapped_chest.json
37b7ad64d6b2e0fa02b6e8a9452b92e3e1be8ad7 data/mekanism/recipes/scuba_mask.json
aa0114b54fcb1cf2fb1b1be65c32f4367b75d6c5 data/mekanism/recipes/scuba_tank.json
65d56c6596468967fbc096fc81187a7ff0507385 data/mekanism/recipes/security_desk.json
ae69c24fd10df0063ef3b9b1607c396c6e97a438 data/mekanism/recipes/security_desk.json
00fc3debc278ff1f97c333e305e7a65d721b9a1b data/mekanism/recipes/seismic_reader.json
2727746b115cf4bc0d853128fee57c4e5dd1bb50 data/mekanism/recipes/seismic_vibrator.json
6256ebc28b9440b18c0130609a27e07cb02ba71b data/mekanism/recipes/separator/brine.json
Expand All @@ -4366,7 +4366,7 @@ e5f89fab0effc210b51eccc1d0b42cfbbd0457bf data/mekanism/recipes/storage_blocks/br
74e9c88613859627763b8e3eed69ea84b5e3c749 data/mekanism/recipes/structural_glass.json
352c79964c0ee957e695ad367b9d4741d14445ed data/mekanism/recipes/supercharged_coil.json
7d5d60493d0c0a35565a200d76825fbe50df3d8d data/mekanism/recipes/superheating_element.json
06a80a45a8f45f05569537ad56da78724d4169eb data/mekanism/recipes/teleportation_core.json
40ad34debe98607169df82b8d22fa466feffda42 data/mekanism/recipes/teleportation_core.json
503796349735050f36a48b6cb110c47d6312ffce data/mekanism/recipes/teleporter.json
5dfe20e7b7ad3209c6fd2182b782b5a004455fed data/mekanism/recipes/teleporter_frame.json
b7e83b50d39725b0d592e49ece4ab8bcd369467a data/mekanism/recipes/thermal_evaporation/block.json
Expand Down
Expand Up @@ -3,7 +3,7 @@
"category": "misc",
"key": {
"A": {
"tag": "forge:pellets/polonium"
"tag": "forge:ender_pearls"
},
"G": {
"tag": "forge:glass_panes"
Expand Down
Expand Up @@ -12,16 +12,16 @@
"tag": "forge:glass_panes"
},
"I": {
"tag": "forge:pellets/polonium"
"tag": "forge:ender_pearls"
},
"T": {
"item": "mekanism:teleportation_core"
}
},
"pattern": [
"IGI",
"TGT",
"C#C",
"ITI"
"TIT"
],
"result": {
"item": "mekanism:qio_drive_array"
Expand Down
Expand Up @@ -3,7 +3,7 @@
"category": "misc",
"key": {
"#": {
"tag": "forge:pellets/polonium"
"tag": "forge:ender_pearls"
},
"C": {
"item": "mekanism:ultimate_control_circuit"
Expand Down
Expand Up @@ -3,10 +3,10 @@
"category": "misc",
"key": {
"#": {
"tag": "forge:gems/diamond"
"item": "mekanism:teleportation_core"
},
"I": {
"tag": "forge:ingots/lead"
"tag": "forge:pellets/plutonium"
},
"P": {
"item": "mekanism:qio_drive_base"
Expand Down
Expand Up @@ -6,7 +6,7 @@
"tag": "forge:pellets/antimatter"
},
"I": {
"tag": "forge:ingots/lead"
"tag": "forge:pellets/polonium"
},
"P": {
"item": "mekanism:qio_drive_time_dilating"
Expand Down
Expand Up @@ -3,10 +3,10 @@
"category": "misc",
"key": {
"#": {
"tag": "forge:gems/emerald"
"tag": "forge:pellets/polonium"
},
"I": {
"tag": "forge:ingots/lead"
"tag": "forge:pellets/plutonium"
},
"P": {
"item": "mekanism:qio_drive_hyper_dense"
Expand Down
Expand Up @@ -6,7 +6,7 @@
"item": "minecraft:piston"
},
"A": {
"tag": "forge:pellets/polonium"
"tag": "forge:ender_pearls"
},
"C": {
"tag": "forge:circuits/ultimate"
Expand Down
Expand Up @@ -6,7 +6,7 @@
"item": "minecraft:sticky_piston"
},
"A": {
"tag": "forge:pellets/polonium"
"tag": "forge:ender_pearls"
},
"C": {
"tag": "forge:circuits/ultimate"
Expand Down
Expand Up @@ -6,7 +6,7 @@
"tag": "forge:circuits/ultimate"
},
"I": {
"tag": "forge:pellets/polonium"
"tag": "forge:ender_pearls"
},
"R": {
"tag": "forge:dusts/redstone"
Expand Down
Expand Up @@ -2,6 +2,9 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "mekanism:network_reader"
},
"C": {
"tag": "forge:circuits/elite"
},
Expand All @@ -11,17 +14,14 @@
"S": {
"tag": "forge:ingots/steel"
},
"T": {
"item": "mekanism:teleportation_core"
},
"X": {
"item": "mekanism:steel_casing"
}
},
"pattern": [
"SGS",
"CXC",
"STS"
"S#S"
],
"result": {
"item": "mekanism:security_desk"
Expand Down
Expand Up @@ -3,7 +3,7 @@
"category": "misc",
"key": {
"#": {
"tag": "forge:gems/lapis"
"tag": "forge:ender_pearls"
},
"A": {
"tag": "mekanism:alloys/atomic"
Expand Down
Expand Up @@ -4,8 +4,12 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Stream;
import mekanism.api.annotations.NothingNullByDefault;
import mekanism.common.resource.PrimaryResource;
import mekanism.common.resource.ResourceType;
import mekanism.common.tags.MekanismTags;
import net.minecraft.advancements.Advancement.Builder;
import net.minecraft.advancements.AdvancementHolder;
import net.minecraft.data.PackOutput;
Expand Down Expand Up @@ -85,4 +89,16 @@ public static Ingredient createIngredient(TagKey<Item>... tags) {
public static Ingredient difference(TagKey<Item> base, ItemLike subtracted) {
return DifferenceIngredient.of(Ingredient.of(base), Ingredient.of(subtracted));
}

public static TagKey<Item> osmiumIngot() {
return Objects.requireNonNull(MekanismTags.Items.PROCESSED_RESOURCES.get(ResourceType.INGOT, PrimaryResource.OSMIUM));
}

public static TagKey<Item> leadIngot() {
return Objects.requireNonNull(MekanismTags.Items.PROCESSED_RESOURCES.get(ResourceType.INGOT, PrimaryResource.LEAD));
}

public static TagKey<Item> tinIngot() {
return Objects.requireNonNull(MekanismTags.Items.PROCESSED_RESOURCES.get(ResourceType.INGOT, PrimaryResource.TIN));
}
}

0 comments on commit 9211ac5

Please sign in to comment.