From c8bba65ad48f3e02ef1d054408228a3c370b6c45 Mon Sep 17 00:00:00 2001 From: malte0811 Date: Wed, 22 Aug 2018 10:38:43 +0200 Subject: [PATCH] Relays/connectors need to be craftable as well --- .../industrialwires/recipes/wire_tin_ins.json | 21 ---------- .../recipes/wires/copper_conn.json | 38 +++++++++++++++++ .../recipes/wires/copper_relay.json | 35 ++++++++++++++++ .../recipes/wires/glass_conn.json | 38 +++++++++++++++++ .../recipes/wires/glass_relay.json | 42 +++++++++++++++++++ .../recipes/wires/gold_conn.json | 36 ++++++++++++++++ .../recipes/wires/gold_relay.json | 35 ++++++++++++++++ .../recipes/wires/hv_conn.json | 36 ++++++++++++++++ .../recipes/wires/hv_relay.json | 37 ++++++++++++++++ .../recipes/wires/noic2_copper_conn.json | 40 ++++++++++++++++++ .../recipes/wires/noic2_copper_relay.json | 38 +++++++++++++++++ .../recipes/wires/noic2_gold_conn.json | 39 +++++++++++++++++ .../recipes/wires/noic2_gold_relay.json | 38 +++++++++++++++++ .../recipes/wires/noic2_hv_conn.json | 39 +++++++++++++++++ .../recipes/wires/noic2_hv_relay.json | 40 ++++++++++++++++++ .../recipes/wires/tin_conn.json | 38 +++++++++++++++++ .../recipes/wires/tin_relay.json | 35 ++++++++++++++++ .../recipes/{ => wires/wire}/wire_copper.json | 0 .../{ => wires/wire}/wire_copper_ins.json | 0 .../recipes/{ => wires/wire}/wire_glass.json | 13 +++++- .../recipes/{ => wires/wire}/wire_gold.json | 0 .../{ => wires/wire}/wire_gold_ins.json | 0 .../recipes/{ => wires/wire}/wire_hv.json | 0 .../recipes/{ => wires/wire}/wire_tin.json | 13 +++++- .../recipes/wires/wire/wire_tin_ins.json | 32 ++++++++++++++ 25 files changed, 658 insertions(+), 25 deletions(-) delete mode 100644 src/main/resources/assets/industrialwires/recipes/wire_tin_ins.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/copper_conn.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/copper_relay.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/glass_conn.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/glass_relay.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/gold_conn.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/gold_relay.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/hv_conn.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/hv_relay.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/noic2_copper_conn.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/noic2_copper_relay.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/noic2_gold_conn.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/noic2_gold_relay.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/noic2_hv_conn.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/noic2_hv_relay.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/tin_conn.json create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/tin_relay.json rename src/main/resources/assets/industrialwires/recipes/{ => wires/wire}/wire_copper.json (100%) rename src/main/resources/assets/industrialwires/recipes/{ => wires/wire}/wire_copper_ins.json (100%) rename src/main/resources/assets/industrialwires/recipes/{ => wires/wire}/wire_glass.json (58%) rename src/main/resources/assets/industrialwires/recipes/{ => wires/wire}/wire_gold.json (100%) rename src/main/resources/assets/industrialwires/recipes/{ => wires/wire}/wire_gold_ins.json (100%) rename src/main/resources/assets/industrialwires/recipes/{ => wires/wire}/wire_hv.json (100%) rename src/main/resources/assets/industrialwires/recipes/{ => wires/wire}/wire_tin.json (60%) create mode 100644 src/main/resources/assets/industrialwires/recipes/wires/wire/wire_tin_ins.json diff --git a/src/main/resources/assets/industrialwires/recipes/wire_tin_ins.json b/src/main/resources/assets/industrialwires/recipes/wire_tin_ins.json deleted file mode 100644 index 951fd97..0000000 --- a/src/main/resources/assets/industrialwires/recipes/wire_tin_ins.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "industrialwires:wire_coil", - "cables": [{ - "length": 1, - "ingredient": { - "type": "industrialwires:ic2_item", - "name": "cable", - "variant": "type:tin,insulation:1" - } - }], - "coil": { - "item": "industrialwires:ic2_wire_coil", - "data": 5 - }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "ic2" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/copper_conn.json b/src/main/resources/assets/industrialwires/recipes/wires/copper_conn.json new file mode 100644 index 0000000..5761fdc --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/copper_conn.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 2, + "count": 4 + }, + "pattern": [ + " c ", + "rcr", + "rcr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "type": "forge:ore_dict", + "ore": "itemRubber" + }, + "c": { + "type": "forge:ore_dict", + "ore": "ingotCopper" + } + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/copper_relay.json b/src/main/resources/assets/industrialwires/recipes/wires/copper_relay.json new file mode 100644 index 0000000..c057844 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/copper_relay.json @@ -0,0 +1,35 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 3, + "count": 4 + }, + "pattern": [ + " c ", + "rcr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "type": "forge:ore_dict", "ore": "itemRubber" + }, + "c": { + "type": "forge:ore_dict", "ore": "ingotCopper" + } + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/glass_conn.json b/src/main/resources/assets/industrialwires/recipes/wires/glass_conn.json new file mode 100644 index 0000000..d22d131 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/glass_conn.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 8, + "count": 4 + }, + "pattern": [ + " c ", + "rcr", + "rcr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "type": "forge:ore_dict", "ore": "itemRubber" + }, + "c": { + "type": "industrialwires:ic2_item", + "name": "cable", + "variant": "type:glass,insulation:0" + } + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/glass_relay.json b/src/main/resources/assets/industrialwires/recipes/wires/glass_relay.json new file mode 100644 index 0000000..d3eb69c --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/glass_relay.json @@ -0,0 +1,42 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 9, + "count": 4 + }, + "pattern": [ + " c ", + "grg", + "grg" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "type": "forge:ore_dict", "ore": "itemRubber" + }, + "c": { + "type": "industrialwires:ic2_item", + "name": "cable", + "variant": "type:glass,insulation:0" + }, + "g": { + "item": "immersiveengineering:stone_decoration", + "data": 8 + } + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/gold_conn.json b/src/main/resources/assets/industrialwires/recipes/wires/gold_conn.json new file mode 100644 index 0000000..7213773 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/gold_conn.json @@ -0,0 +1,36 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 4, + "count": 4 + }, + "pattern": [ + " g ", + "rgr", + "rgr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "type": "forge:ore_dict", "ore": "itemRubber" + }, + "g": { + "type": "forge:ore_dict", "ore": "ingotGold" + } + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/gold_relay.json b/src/main/resources/assets/industrialwires/recipes/wires/gold_relay.json new file mode 100644 index 0000000..917352e --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/gold_relay.json @@ -0,0 +1,35 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 5, + "count": 4 + }, + "pattern": [ + " g ", + "rgr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "type": "forge:ore_dict", "ore": "itemRubber" + }, + "g": { + "type": "forge:ore_dict", "ore": "ingotGold" + } + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/hv_conn.json b/src/main/resources/assets/industrialwires/recipes/wires/hv_conn.json new file mode 100644 index 0000000..5c736a8 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/hv_conn.json @@ -0,0 +1,36 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 6, + "count": 4 + }, + "pattern": [ + " i ", + "rir", + "rir" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "type": "forge:ore_dict", "ore": "itemRubber" + }, + "i": { + "type": "forge:ore_dict", "ore": "ingotIron" + } + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/hv_relay.json b/src/main/resources/assets/industrialwires/recipes/wires/hv_relay.json new file mode 100644 index 0000000..409af8e --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/hv_relay.json @@ -0,0 +1,37 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 7, + "count": 4 + }, + "pattern": [ + " i ", + "gig", + "gig" + ], + "type": "forge:ore_shaped", + "key": { + "g": { + "item": "immersiveengineering:stone_decoration", + "data": 8 + }, + "i": { + "type": "forge:ore_dict", "ore": "ingotIron" + } + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/noic2_copper_conn.json b/src/main/resources/assets/industrialwires/recipes/wires/noic2_copper_conn.json new file mode 100644 index 0000000..64c96ee --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/noic2_copper_conn.json @@ -0,0 +1,40 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 2, + "count": 4 + }, + "pattern": [ + " c ", + "rcr", + "rcr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "item": "minecraft:brick_block" + }, + "c": { + "type": "forge:ore_dict", + "ore": "ingotCopper" + } + }, + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/noic2_copper_relay.json b/src/main/resources/assets/industrialwires/recipes/wires/noic2_copper_relay.json new file mode 100644 index 0000000..ea2d1c4 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/noic2_copper_relay.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 3, + "count": 4 + }, + "pattern": [ + " c ", + "rcr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "item": "minecraft:brick_block" + }, + "c": { + "type": "forge:ore_dict", "ore": "ingotCopper" + } + }, + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/noic2_gold_conn.json b/src/main/resources/assets/industrialwires/recipes/wires/noic2_gold_conn.json new file mode 100644 index 0000000..a3e3419 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/noic2_gold_conn.json @@ -0,0 +1,39 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 4, + "count": 4 + }, + "pattern": [ + " g ", + "rgr", + "rgr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "item": "minecraft:brick_block" + }, + "g": { + "type": "forge:ore_dict", "ore": "ingotGold" + } + }, + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/noic2_gold_relay.json b/src/main/resources/assets/industrialwires/recipes/wires/noic2_gold_relay.json new file mode 100644 index 0000000..4715a52 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/noic2_gold_relay.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 5, + "count": 4 + }, + "pattern": [ + " g ", + "rgr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "item": "minecraft:brick_block" + }, + "g": { + "type": "forge:ore_dict", "ore": "ingotGold" + } + }, + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/noic2_hv_conn.json b/src/main/resources/assets/industrialwires/recipes/wires/noic2_hv_conn.json new file mode 100644 index 0000000..59a9645 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/noic2_hv_conn.json @@ -0,0 +1,39 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 6, + "count": 4 + }, + "pattern": [ + " i ", + "rir", + "rir" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "item": "minecraft:brick_block" + }, + "i": { + "type": "forge:ore_dict", "ore": "ingotIron" + } + }, + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/noic2_hv_relay.json b/src/main/resources/assets/industrialwires/recipes/wires/noic2_hv_relay.json new file mode 100644 index 0000000..2eb0ac7 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/noic2_hv_relay.json @@ -0,0 +1,40 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 7, + "count": 4 + }, + "pattern": [ + " i ", + "gig", + "gig" + ], + "type": "forge:ore_shaped", + "key": { + "g": { + "item": "immersiveengineering:stone_decoration", + "data": 8 + }, + "i": { + "type": "forge:ore_dict", "ore": "ingotIron" + } + }, + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/tin_conn.json b/src/main/resources/assets/industrialwires/recipes/wires/tin_conn.json new file mode 100644 index 0000000..896252e --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/tin_conn.json @@ -0,0 +1,38 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 0, + "count": 4 + }, + "pattern": [ + " t ", + "rtr", + "rtr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "type": "forge:ore_dict", + "ore": "itemRubber" + }, + "t": { + "type": "forge:ore_dict", + "ore": "ingotTin" + } + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/tin_relay.json b/src/main/resources/assets/industrialwires/recipes/wires/tin_relay.json new file mode 100644 index 0000000..f7a7674 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/tin_relay.json @@ -0,0 +1,35 @@ +{ + "result": { + "item": "industrialwires:ic2_connector", + "data": 1, + "count": 4 + }, + "pattern": [ + " t ", + "rtr" + ], + "type": "forge:ore_shaped", + "key": { + "r": { + "type": "forge:ore_dict", "ore": "itemRubber" + }, + "t": { + "type": "forge:ore_dict", "ore": "ingotTin" + } + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wire_copper.json b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_copper.json similarity index 100% rename from src/main/resources/assets/industrialwires/recipes/wire_copper.json rename to src/main/resources/assets/industrialwires/recipes/wires/wire/wire_copper.json diff --git a/src/main/resources/assets/industrialwires/recipes/wire_copper_ins.json b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_copper_ins.json similarity index 100% rename from src/main/resources/assets/industrialwires/recipes/wire_copper_ins.json rename to src/main/resources/assets/industrialwires/recipes/wires/wire/wire_copper_ins.json diff --git a/src/main/resources/assets/industrialwires/recipes/wire_glass.json b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_glass.json similarity index 58% rename from src/main/resources/assets/industrialwires/recipes/wire_glass.json rename to src/main/resources/assets/industrialwires/recipes/wires/wire/wire_glass.json index 2489c83..da2502c 100644 --- a/src/main/resources/assets/industrialwires/recipes/wire_glass.json +++ b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_glass.json @@ -14,8 +14,17 @@ }, "conditions": [ { - "type": "forge:mod_loaded", - "modid": "ic2" + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wire_gold.json b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_gold.json similarity index 100% rename from src/main/resources/assets/industrialwires/recipes/wire_gold.json rename to src/main/resources/assets/industrialwires/recipes/wires/wire/wire_gold.json diff --git a/src/main/resources/assets/industrialwires/recipes/wire_gold_ins.json b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_gold_ins.json similarity index 100% rename from src/main/resources/assets/industrialwires/recipes/wire_gold_ins.json rename to src/main/resources/assets/industrialwires/recipes/wires/wire/wire_gold_ins.json diff --git a/src/main/resources/assets/industrialwires/recipes/wire_hv.json b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_hv.json similarity index 100% rename from src/main/resources/assets/industrialwires/recipes/wire_hv.json rename to src/main/resources/assets/industrialwires/recipes/wires/wire/wire_hv.json diff --git a/src/main/resources/assets/industrialwires/recipes/wire_tin.json b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_tin.json similarity index 60% rename from src/main/resources/assets/industrialwires/recipes/wire_tin.json rename to src/main/resources/assets/industrialwires/recipes/wires/wire/wire_tin.json index 12162b3..804f823 100644 --- a/src/main/resources/assets/industrialwires/recipes/wire_tin.json +++ b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_tin.json @@ -16,8 +16,17 @@ }, "conditions": [ { - "type": "forge:mod_loaded", - "modid": "ic2" + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_tin_ins.json b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_tin_ins.json new file mode 100644 index 0000000..29b4fa4 --- /dev/null +++ b/src/main/resources/assets/industrialwires/recipes/wires/wire/wire_tin_ins.json @@ -0,0 +1,32 @@ +{ + "type": "industrialwires:wire_coil", + "cables": [ + { + "length": 1, + "ingredient": { + "type": "industrialwires:ic2_item", + "name": "cable", + "variant": "type:tin,insulation:1" + } + } + ], + "coil": { + "item": "industrialwires:ic2_wire_coil", + "data": 5 + }, + "conditions": [ + { + "type": "forge:or", + "values": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + }, + { + "type": "forge:mod_loaded", + "modid": "techreborn" + } + ] + } + ] +} \ No newline at end of file