From 4713f3e07697bf5df026d43ac6f6e09051007650 Mon Sep 17 00:00:00 2001 From: BluSunrize Date: Sun, 7 Jan 2024 15:33:28 +0100 Subject: [PATCH] Adjust recipes for the accumulator pack & magnet --- .../immersiveengineering/data/Recipes.java | 16 +++++++++------- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 8 ++++---- .../recipes/crafting/electromagnet.json | 2 +- .../crafting/toolupgrade_powerpack_magnet.json | 12 ++++++++---- .../crafting/toolupgrade_powerpack_tesla.json | 10 +++++----- .../manual/en_us/powerpack.txt | 2 +- 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java b/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java index a6b10df3ef..a1130062ce 100644 --- a/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java +++ b/src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java @@ -2302,7 +2302,7 @@ private void recipesMetalDevices(@Nonnull Consumer out) .pattern("wiw") .pattern("pwp") .define('w', Misc.WIRE_COILS.get(WireType.COPPER)) - .define('p', IETags.getTagsFor(EnumMetals.STEEL).plate) + .define('p', IETags.steelRod) .define('i', IETags.getTagsFor(EnumMetals.IRON).ingot) .define('c', Ingredients.COMPONENT_ELECTRONIC) .unlockedBy("has_"+toPath(Ingredients.COMPONENT_ELECTRONIC), has(Ingredients.COMPONENT_ELECTRONIC)) @@ -3005,19 +3005,21 @@ private void recipesIngredients(@Nonnull Consumer out) .save(out, toRL(toPath(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_INDUCTION)))); shapedMisc(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_TESLA)) .pattern("iii") - .pattern("cfc") - .pattern("cec") + .pattern("wfw") + .pattern("wew") .define('i', IETags.getTagsFor(EnumMetals.ALUMINUM).plate) .define('f', WoodenDecoration.TREATED_FENCE) - .define('c', IETags.electrumWire) + .define('w', Misc.WIRE_COILS.get(WireType.ELECTRUM)) .define('e', Ingredients.COMPONENT_ELECTRONIC_ADV) .unlockedBy("has_powerpack", has(Misc.POWERPACK)) .save(out, toRL(toPath(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_TESLA)))); shapedMisc(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_MAGNET)) - .pattern("wew") + .pattern("rer") .pattern("wiw") - .define('w', IETags.copperWire) - .define('e', Ingredients.COMPONENT_ELECTRONIC) + .pattern(" w ") + .define('r', IETags.steelRod) + .define('w', Misc.WIRE_COILS.get(WireType.COPPER)) + .define('e', Ingredients.COMPONENT_ELECTRONIC_ADV) .define('i', IETags.getTagsFor(EnumMetals.IRON).ingot) .unlockedBy("has_powerpack", has(Misc.POWERPACK)) .save(out, toRL(toPath(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_MAGNET)))); diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index f84ebf6174..5d910c7e7a 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2024-01-07T14:12:22.0745208 Recipes +// 1.20.1 2024-01-07T15:31:13.5102247 Recipes 11eec1c90c86322604ee56b59c32dead974ae804 data/immersiveengineering/advancements/recipes/misc/crafting/alloybrick.json 351a01207bf89c71c2e95884864d365cd5d7a23d data/immersiveengineering/advancements/recipes/misc/crafting/alloybrick_from_slab.json 3aae30cf5b8337fcdd006bd53b3269616a8893ec data/immersiveengineering/advancements/recipes/misc/crafting/alloybrick_to_slab.json @@ -833,7 +833,7 @@ deede613088164683d0beac2369863e970be8023 data/immersiveengineering/recipes/craft 7da697330b1023a6b0a44796f3c65065b58b2893 data/immersiveengineering/recipes/crafting/dynamo.json 521799fbb3932c8b8960653f7b0423ecd1a5b5a8 data/immersiveengineering/recipes/crafting/earmuffs.json bb43de6d6360a5c6b7fa805fc57866ced5acb7f5 data/immersiveengineering/recipes/crafting/electric_lantern.json -c8bed4dcc9a4a987748e23f25148d31a95ceae1d data/immersiveengineering/recipes/crafting/electromagnet.json +9a9026e4a23ae160de4df03c31ad31ca3c1d35ca data/immersiveengineering/recipes/crafting/electromagnet.json 9fe4ee3992da8893215e091c280895514b15b9b9 data/immersiveengineering/recipes/crafting/electrum_mix.json d243a488ed8afb76e37d26be5134e1a6e986d75e data/immersiveengineering/recipes/crafting/empty_casing.json b4692c6d67f55cafe1fe45ccf90942c1a5e4c271 data/immersiveengineering/recipes/crafting/empty_shell.json @@ -1139,8 +1139,8 @@ a16a9224e4a48d5c724bc9393c6ef35a616c3666 data/immersiveengineering/recipes/craft d0da0845e2a34cd4dff27893749d5158d8e7eaec data/immersiveengineering/recipes/crafting/toolupgrade_drill_waterproof.json 9d6e1efd251d07895e62828334f3f316b6d93519 data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_antenna.json 287d48cfed40033dc4f495b51045d42a9876f3bc data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_induction.json -631321710090ebbd6ee7032c2cab1a9f9b1057e2 data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_magnet.json -1071915d6a4771fb911a17d2710551082b15f0cc data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_tesla.json +ee16906a6c1c69f5dac9d128798ac4439e0317a6 data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_magnet.json +a6bed69ae36d42182e2d7a49b9de77f238499474 data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_tesla.json 0af3fcb1862d9dc45591daa7631abb4edbff970d data/immersiveengineering/recipes/crafting/toolupgrade_railgun_capacitors.json 399bc375479756ce6229b3084c701c55727b2afe data/immersiveengineering/recipes/crafting/toolupgrade_railgun_scope.json 480c374e6be877646f1f2f3118e2711627b23ee3 data/immersiveengineering/recipes/crafting/toolupgrade_revolver_bayonet.json diff --git a/src/generated/resources/data/immersiveengineering/recipes/crafting/electromagnet.json b/src/generated/resources/data/immersiveengineering/recipes/crafting/electromagnet.json index 2f13d6bd1c..070c4e100d 100644 --- a/src/generated/resources/data/immersiveengineering/recipes/crafting/electromagnet.json +++ b/src/generated/resources/data/immersiveengineering/recipes/crafting/electromagnet.json @@ -9,7 +9,7 @@ "tag": "forge:ingots/iron" }, "p": { - "tag": "forge:plates/steel" + "tag": "forge:rods/steel" }, "w": { "item": "immersiveengineering:wirecoil_copper" diff --git a/src/generated/resources/data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_magnet.json b/src/generated/resources/data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_magnet.json index 74d205270d..7d4483f747 100644 --- a/src/generated/resources/data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_magnet.json +++ b/src/generated/resources/data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_magnet.json @@ -3,18 +3,22 @@ "category": "misc", "key": { "e": { - "item": "immersiveengineering:component_electronic" + "item": "immersiveengineering:component_electronic_adv" }, "i": { "tag": "forge:ingots/iron" }, + "r": { + "tag": "forge:rods/steel" + }, "w": { - "tag": "forge:wires/copper" + "item": "immersiveengineering:wirecoil_copper" } }, "pattern": [ - "wew", - "wiw" + "rer", + "wiw", + " w " ], "result": { "item": "immersiveengineering:toolupgrade_powerpack_magnet" diff --git a/src/generated/resources/data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_tesla.json b/src/generated/resources/data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_tesla.json index afa7ce0cea..2b0b73ef4b 100644 --- a/src/generated/resources/data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_tesla.json +++ b/src/generated/resources/data/immersiveengineering/recipes/crafting/toolupgrade_powerpack_tesla.json @@ -2,9 +2,6 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "c": { - "tag": "forge:wires/electrum" - }, "e": { "item": "immersiveengineering:component_electronic_adv" }, @@ -13,12 +10,15 @@ }, "i": { "tag": "forge:plates/aluminum" + }, + "w": { + "item": "immersiveengineering:wirecoil_electrum" } }, "pattern": [ "iii", - "cfc", - "cec" + "wfw", + "wew" ], "result": { "item": "immersiveengineering:toolupgrade_powerpack_tesla" diff --git a/src/main/resources/assets/immersiveengineering/manual/en_us/powerpack.txt b/src/main/resources/assets/immersiveengineering/manual/en_us/powerpack.txt index da01a7588f..ecf2637a54 100644 --- a/src/main/resources/assets/immersiveengineering/manual/en_us/powerpack.txt +++ b/src/main/resources/assets/immersiveengineering/manual/en_us/powerpack.txt @@ -8,6 +8,6 @@ Note that you can not use the to charge <&antenna>By attaching a §2Charging Antenna§r to the backpack, you can charge its accumulator on the go! Simply walk underneath an to have the antenna connect to it.
While you remain close enough to the wire, the antenna will flex and stay connected, slowly charging the accumulator from the wire network. <&induction>The §2Induction Charger§r allows the accumulator pack to charge all the items in your inventory instead of just those in your hands. Due to not using a direct wired connection however, this charging is much slower. -<&magnet>The §2Portable Electromagnet§r is designed to attract nearby items to the user, allowing them to be easily picked up. This consumes energy from the installed accumulator, but only while items are being moved. +<&magnet>The §2Portable Electromagnet§r is a specialized version of the , designed to attract nearby items to the user, allowing them to be easily picked up. Thanks to improved circuitry, this upgrade only consumes energy while items are being moved. <&tesla>As its name may suggest, the §2Miniaturized Tesla Coil§r is much like its , a device that delivers dangerous shocks to nearby targets. It does so in response to the wearer being attacked, thus substituting thorny armor for electricity.
Due to attaching at the top of the backpack, the coil can not be used at the same time as the Charging Antenna. \ No newline at end of file