From 42d766bd2d14db5ecc4168ebbf2f00c73f059054 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue, 28 Jan 2020 01:37:59 +0100 Subject: [PATCH] Crafting the Machines - Edited and added missing Machine recipes suiting the new material chain --- .../create/recipes/crafting_shaped/basin.json | 22 ++++++++++ .../recipes/crafting_shaped/belt_funnel.json | 35 ++++++++-------- .../recipes/crafting_shaped/belt_tunnel.json | 28 +++++++++++++ .../recipes/crafting_shaped/brass_hand.json | 26 ++++++++++++ .../recipes/crafting_shaped/contact.json | 35 ++++++++-------- .../{ => contraptions}/belt_connector.json | 0 .../cart_assembler.json} | 24 +++++------ .../{ => contraptions}/clutch.json | 21 ++++------ .../{ => contraptions}/cogwheel.json | 0 .../{ => contraptions}/crushing_wheel.json | 0 .../deployer.json} | 25 +++++------ .../{ => contraptions}/drill.json | 19 ++++----- .../{ => contraptions}/encased_belt.json | 17 ++++---- .../{ => contraptions}/encased_fan.json | 11 +++-- .../{ => contraptions}/encased_shaft.json | 13 ++---- .../{ => contraptions}/gearbox.json | 19 ++++----- .../{ => contraptions}/gearshift.json | 21 ++++------ .../{ => contraptions}/harvester.json | 16 ++++---- .../{ => contraptions}/large_cogwheel.json | 0 .../contraptions/mechanical_bearing.json | 32 +++++++++++++++ .../contraptions/mechanical_crafter.json | 36 ++++++++++++++++ .../contraptions/mechanical_mixer.json | 32 +++++++++++++++ .../contraptions/mechanical_piston.json | 32 +++++++++++++++ .../{ => contraptions}/mechanical_press.json | 22 +++++----- .../{ => contraptions}/piston_pole.json | 0 .../{ => contraptions}/rotation_chassis.json | 11 ++--- .../crafting_shaped/contraptions/saw.json | 29 +++++++++++++ .../{ => contraptions}/shaft.json | 0 .../contraptions/speed_gauge.json | 28 +++++++++++++ .../sticky_mechanical_piston.json | 0 .../translation_chassis.json | 11 ++--- .../{ => contraptions}/turntable.json | 0 .../{ => contraptions}/water_wheel.json | 0 .../crafting_shaped/entity_detector.json | 34 +++++++-------- .../recipes/crafting_shaped/extractor.json | 41 +++++++++---------- .../recipes/crafting_shaped/flexcrate.json | 16 +++----- .../recipes/crafting_shaped/propeller.json | 4 +- .../recipes/crafting_shaped/stockswitch.json | 37 ++++++++--------- .../recipes/crafting_shaped/transposer.json | 24 +++++++++++ .../create/recipes/crafting_shaped/whisk.json | 26 ++++++++++++ .../recipes/crafting_shapeless/extractor.json | 18 ++++++++ .../crafting_shapeless/linked_transposer.json | 21 ++++++++++ .../crafting_shapeless/speed_gauge.json | 18 ++++++++ .../crafting_shapeless/stress_gauge.json | 18 ++++++++ .../translation_chassis.json | 18 ++++++++ .../translation_chassis_secondary.json | 18 ++++++++ .../crafting_shapeless/transposer.json | 18 ++++++++ 47 files changed, 644 insertions(+), 232 deletions(-) create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/basin.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/belt_tunnel.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/brass_hand.json rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/belt_connector.json (100%) rename src/main/resources/data/create/recipes/crafting_shaped/{mechanical_bearing.json => contraptions/cart_assembler.json} (55%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/clutch.json (56%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/cogwheel.json (100%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/crushing_wheel.json (100%) rename src/main/resources/data/create/recipes/crafting_shaped/{mechanical_piston.json => contraptions/deployer.json} (54%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/drill.json (63%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/encased_belt.json (59%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/encased_fan.json (82%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/encased_shaft.json (61%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/gearbox.json (59%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/gearshift.json (57%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/harvester.json (62%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/large_cogwheel.json (100%) create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_bearing.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_crafter.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_mixer.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/mechanical_press.json (63%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/piston_pole.json (100%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/rotation_chassis.json (78%) create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/contraptions/saw.json rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/shaft.json (100%) create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/sticky_mechanical_piston.json (100%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/translation_chassis.json (78%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/turntable.json (100%) rename src/main/resources/data/create/recipes/crafting_shaped/{ => contraptions}/water_wheel.json (100%) create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/transposer.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/whisk.json create mode 100644 src/main/resources/data/create/recipes/crafting_shapeless/extractor.json create mode 100644 src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json create mode 100644 src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json create mode 100644 src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json create mode 100644 src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis.json create mode 100644 src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis_secondary.json create mode 100644 src/main/resources/data/create/recipes/crafting_shapeless/transposer.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/basin.json b/src/main/resources/data/create/recipes/crafting_shaped/basin.json new file mode 100644 index 000000000..37566ac76 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/basin.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "A A", + "AAA" + ], + "key": { + "A": { + "item": "create:andesite_alloy" + } + }, + "result": { + "item": "create:basin", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json b/src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json index 5d659ecf2..c9ff5ab82 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json @@ -1,21 +1,24 @@ { "type": "crafting_shaped", - "pattern": [ - "NN", - "PD", - "PD" - ], - "key": { - "D": { - "item": "minecraft:dried_kelp" - }, - "N": { - "item": "create:brass_sheet" - }, - "P": { - "tag": "minecraft:planks" - } - }, + "pattern": [ + " B ", + "SCS", + "ICI" + ], + "key": { + "S": { + "tag": "forge:plates/brass" + }, + "B": { + "item": "create:electron_tube" + }, + "C": { + "item": "minecraft:dried_kelp" + }, + "I": { + "tag": "minecraft:planks" + } + }, "result": { "item": "create:belt_funnel", "count": 4 diff --git a/src/main/resources/data/create/recipes/crafting_shaped/belt_tunnel.json b/src/main/resources/data/create/recipes/crafting_shaped/belt_tunnel.json new file mode 100644 index 000000000..cb0b166d5 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/belt_tunnel.json @@ -0,0 +1,28 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "BBB", + "PAP" + ], + "key": { + "A": { + "item": "minecraft:dried_kelp" + }, + "P": { + "tag": "forge:plates/brass" + }, + "B": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "create:belt_tunnel", + "count": 4 + }, + "conditions": [ + { + "type": "create:module", + "module": "logistics" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/brass_hand.json b/src/main/resources/data/create/recipes/crafting_shaped/brass_hand.json new file mode 100644 index 000000000..07a869e8e --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/brass_hand.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + " A ", + "III", + " I " + ], + "key": { + "A": { + "item": "create:andesite_alloy" + }, + "I": { + "tag": "forge:plates/brass" + } + }, + "result": { + "item": "create:brass_hand", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contact.json b/src/main/resources/data/create/recipes/crafting_shaped/contact.json index 3cf985688..b7eb73a63 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contact.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contact.json @@ -1,24 +1,21 @@ { "type": "crafting_shaped", - "pattern": [ - "GAG", - "PRP", - "GPG" - ], - "key": { - "P": { - "tag": "minecraft:planks" - }, - "A": { - "item": "create:andesite_alloy" - }, - "R": { - "item": "minecraft:redstone" - }, - "G": { - "item": "create:brass_sheet" - } - }, + "pattern": [ + "SCS", + " B ", + "SCS" + ], + "key": { + "S": { + "tag": "forge:dusts/redstone" + }, + "B": { + "tag": "forge:ingots/iron" + }, + "C": { + "item": "create:brass_casing" + } + }, "result": { "item": "create:contact", "count": 2 diff --git a/src/main/resources/data/create/recipes/crafting_shaped/belt_connector.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/belt_connector.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/belt_connector.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/belt_connector.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/mechanical_bearing.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cart_assembler.json similarity index 55% rename from src/main/resources/data/create/recipes/crafting_shaped/mechanical_bearing.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/cart_assembler.json index fca8c1441..8f49c240d 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/mechanical_bearing.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cart_assembler.json @@ -1,26 +1,26 @@ { "type": "crafting_shaped", "pattern": [ - "PPP", - "CIC", - "CGC" + " L ", + "CRC", + "LTL" ], "key": { - "I": { - "item": "minecraft:iron_ingot" + "L": { + "tag": "minecraft:logs" }, - "G": { - "item": "create:shaft" + "R": { + "tag": "forge:dusts/redstone" + }, + "T": { + "item": "minecraft:rail" }, "C": { - "item": "minecraft:cobblestone" - }, - "P": { - "tag": "minecraft:logs" + "item": "create:andesite_alloy" } }, "result": { - "item": "create:mechanical_bearing", + "item": "create:cart_assembler", "count": 1 }, "conditions": [ diff --git a/src/main/resources/data/create/recipes/crafting_shaped/clutch.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/clutch.json similarity index 56% rename from src/main/resources/data/create/recipes/crafting_shaped/clutch.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/clutch.json index b0db25466..59dfdca44 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/clutch.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/clutch.json @@ -1,22 +1,19 @@ { "type": "crafting_shaped", "pattern": [ - "ABA", - "RSR", - "ABA" + " B ", + "SCS", + " B " ], "key": { - "B": { - "tag": "minecraft:planks" - }, - "A": { - "item": "create:iron_sheet" - }, - "S": { + "S": { "item": "create:shaft" }, - "R": { - "item": "minecraft:redstone" + "B": { + "tag": "forge:dusts/redstone" + }, + "C": { + "item": "create:andesite_casing" } }, "result": { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/cogwheel.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/cogwheel.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/cogwheel.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/cogwheel.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/crushing_wheel.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/crushing_wheel.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/crushing_wheel.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/crushing_wheel.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/mechanical_piston.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/deployer.json similarity index 54% rename from src/main/resources/data/create/recipes/crafting_shaped/mechanical_piston.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/deployer.json index 9b26427c8..2200161ab 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/mechanical_piston.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/deployer.json @@ -1,26 +1,27 @@ { "type": "crafting_shaped", + "type": "crafting_shaped", "pattern": [ - "PPP", - "CIC", - "CGC" + " B ", + "SCS", + " I " ], "key": { - "I": { - "item": "minecraft:iron_ingot" - }, - "G": { + "S": { "item": "create:cogwheel" }, - "C": { - "item": "minecraft:cobblestone" + "B": { + "item": "create:electron_tube" }, - "P": { - "tag": "minecraft:planks" + "C": { + "item": "create:andesite_casing" + }, + "I": { + "item": "create:brass_hand" } }, "result": { - "item": "create:mechanical_piston", + "item": "create:deployer", "count": 1 }, "conditions": [ diff --git a/src/main/resources/data/create/recipes/crafting_shaped/drill.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/drill.json similarity index 63% rename from src/main/resources/data/create/recipes/crafting_shaped/drill.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/drill.json index 89e3171b7..b3a1cf66c 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/drill.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/drill.json @@ -1,22 +1,19 @@ { "type": "crafting_shaped", "pattern": [ - " AA", - "CIA", - "SC " + " A ", + "AIA", + " C " ], "key": { - "A": { - "item": "create:andesite_alloy" + "C": { + "item": "create:andesite_casing" }, "I": { - "item": "minecraft:iron_block" + "tag": "forge:ingots/iron" }, - "S": { - "item": "create:shaft" - }, - "C": { - "item": "minecraft:cobblestone" + "A": { + "item": "create:andesite_alloy" } }, "result": { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/encased_belt.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_belt.json similarity index 59% rename from src/main/resources/data/create/recipes/crafting_shaped/encased_belt.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_belt.json index a847f724a..5707231e4 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/encased_belt.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_belt.json @@ -1,24 +1,21 @@ { "type": "crafting_shaped", "pattern": [ - "ABA", - "BSB", - "ABA" + " C ", + "CBC", + " C " ], "key": { - "B": { - "tag": "minecraft:planks" + "C": { + "item": "create:andesite_casing" }, - "A": { - "item": "create:andesite_alloy" - }, - "S": { + "B": { "item": "create:belt_connector" } }, "result": { "item": "create:encased_belt", - "count": 2 + "count": 4 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/encased_fan.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_fan.json similarity index 82% rename from src/main/resources/data/create/recipes/crafting_shaped/encased_fan.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_fan.json index de734be39..c053bcec2 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/encased_fan.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_fan.json @@ -1,18 +1,21 @@ { "type": "crafting_shaped", "pattern": [ - "ABA", - "RSR", - "ABA" + " S ", + "RAR", + "BPB" ], "key": { "B": { "item": "minecraft:iron_bars" + }, + "S": { + "item": "create:shaft" }, "A": { "item": "create:andesite_alloy" }, - "S": { + "P": { "item": "create:propeller" }, "R": { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/encased_shaft.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_shaft.json similarity index 61% rename from src/main/resources/data/create/recipes/crafting_shaped/encased_shaft.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_shaft.json index 8f72180ac..070c61406 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/encased_shaft.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/encased_shaft.json @@ -1,16 +1,11 @@ { "type": "crafting_shaped", "pattern": [ - "ABA", - "BSB", - "ABA" + "CS" ], "key": { - "B": { - "tag": "minecraft:planks" - }, - "A": { - "item": "create:andesite_alloy" + "C": { + "item": "create:andesite_casing" }, "S": { "item": "create:shaft" @@ -18,7 +13,7 @@ }, "result": { "item": "create:encased_shaft", - "count": 2 + "count": 1 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/gearbox.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearbox.json similarity index 59% rename from src/main/resources/data/create/recipes/crafting_shaped/gearbox.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearbox.json index 02421be9f..700454a33 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/gearbox.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearbox.json @@ -1,24 +1,21 @@ { "type": "crafting_shaped", "pattern": [ - "ABA", - "BSB", - "ABA" + " B ", + "BCB", + " B " ], "key": { - "B": { + "C": { + "item": "create:andesite_casing" + }, + "B": { "item": "create:cogwheel" - }, - "A": { - "item": "create:andesite_alloy" - }, - "S": { - "tag": "minecraft:planks" } }, "result": { "item": "create:gearbox", - "count": 2 + "count": 1 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/gearshift.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearshift.json similarity index 57% rename from src/main/resources/data/create/recipes/crafting_shaped/gearshift.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearshift.json index 7ce1869f4..fa2064208 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/gearshift.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/gearshift.json @@ -1,22 +1,19 @@ { "type": "crafting_shaped", "pattern": [ - "ABA", - "RSR", - "ABA" + " B ", + "SCS", + " B " ], "key": { - "B": { - "tag": "minecraft:planks" - }, - "A": { - "item": "create:iron_sheet" - }, - "S": { + "S": { "item": "create:cogwheel" }, - "R": { - "item": "minecraft:redstone" + "B": { + "tag": "forge:dusts/redstone" + }, + "C": { + "item": "create:andesite_casing" } }, "result": { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/harvester.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/harvester.json similarity index 62% rename from src/main/resources/data/create/recipes/crafting_shaped/harvester.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/harvester.json index deb1bef86..6902f99e5 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/harvester.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/harvester.json @@ -1,19 +1,19 @@ { "type": "crafting_shaped", "pattern": [ - " I ", - "IAI", - "CCC" + "AIA", + "AIA", + " C " ], "key": { - "A": { - "item": "create:iron_sheet" + "C": { + "item": "create:andesite_casing" }, "I": { - "item": "minecraft:iron_nugget" + "tag": "forge:plates/iron" }, - "C": { - "item": "minecraft:cobblestone" + "A": { + "item": "create:andesite_alloy" } }, "result": { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/large_cogwheel.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/large_cogwheel.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/large_cogwheel.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/large_cogwheel.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_bearing.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_bearing.json new file mode 100644 index 000000000..9baee3fba --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_bearing.json @@ -0,0 +1,32 @@ +{ + "type": "crafting_shaped", + "pattern": [ + " B ", + "SCS", + " I " + ], + "key": { + "S": { + "item": "create:andesite_alloy" + }, + "B": { + "item": "create:turntable" + }, + "C": { + "item": "create:andesite_casing" + }, + "I": { + "item": "create:shaft" + } + }, + "result": { + "item": "create:mechanical_bearing", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_crafter.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_crafter.json new file mode 100644 index 000000000..8414d2989 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_crafter.json @@ -0,0 +1,36 @@ +{ + "type": "crafting_shaped", + "type": "crafting_shaped", + "pattern": [ + "BRB", + "ISI", + " C " + ], + "key": { + "S": { + "item": "create:cogwheel" + }, + "B": { + "item": "create:electron_tube" + }, + "R": { + "item": "minecraft:crafting_table" + }, + "C": { + "item": "create:brass_casing" + }, + "I": { + "tag": "forge:plates/brass" + } + }, + "result": { + "item": "create:mechanical_crafter", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_mixer.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_mixer.json new file mode 100644 index 000000000..4e706eff0 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_mixer.json @@ -0,0 +1,32 @@ +{ + "type": "crafting_shaped", + "pattern": [ + " B ", + "SCS", + " I " + ], + "key": { + "S": { + "item": "create:cogwheel" + }, + "B": { + "item": "create:electron_tube" + }, + "C": { + "item": "create:andesite_casing" + }, + "I": { + "item": "create:whisk" + } + }, + "result": { + "item": "create:mechanical_mixer", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json new file mode 100644 index 000000000..0c7f5dff1 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json @@ -0,0 +1,32 @@ +{ + "type": "crafting_shaped", + "pattern": [ + " B ", + "SCS", + " I " + ], + "key": { + "S": { + "item": "create:cogwheel" + }, + "B": { + "tag": "minecraft:wooden_slabs" + }, + "C": { + "item": "create:andesite_casing" + }, + "I": { + "item": "create:piston_pole" + } + }, + "result": { + "item": "create:mechanical_piston", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/mechanical_press.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_press.json similarity index 63% rename from src/main/resources/data/create/recipes/crafting_shaped/mechanical_press.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_press.json index 65b2257ec..8abcad784 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/mechanical_press.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_press.json @@ -1,25 +1,23 @@ { "type": "crafting_shaped", + "type": "crafting_shaped", "pattern": [ - "APA", - "BCB", - "AIA" + " B ", + "SCS", + " I " ], "key": { - "B": { - "tag": "minecraft:planks" + "S": { + "item": "create:cogwheel" }, - "A": { + "B": { "item": "create:andesite_alloy" }, - "P": { - "item": "create:piston_pole" + "C": { + "item": "create:andesite_casing" }, "I": { - "item": "minecraft:iron_block" - }, - "C": { - "item": "create:cogwheel" + "tag": "forge:storage_blocks/iron" } }, "result": { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/piston_pole.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_pole.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/piston_pole.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_pole.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/rotation_chassis.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_chassis.json similarity index 78% rename from src/main/resources/data/create/recipes/crafting_shaped/rotation_chassis.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_chassis.json index 0364d573e..9f44fd865 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/rotation_chassis.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/rotation_chassis.json @@ -1,24 +1,21 @@ { "type": "crafting_shaped", "pattern": [ - "ALA", + " L ", "PLP", - "ALA" + " L " ], "key": { "L": { "tag": "minecraft:logs" - }, - "A": { - "item": "create:andesite_alloy" }, "P": { - "tag": "minecraft:planks" + "item": "create:andesite_alloy" } }, "result": { "item": "create:rotation_chassis", - "count": 4 + "count": 3 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/saw.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/saw.json new file mode 100644 index 000000000..b4f344a01 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/saw.json @@ -0,0 +1,29 @@ +{ + "type": "crafting_shaped", + "pattern": [ + " A ", + "AIA", + " C " + ], + "key": { + "C": { + "item": "create:andesite_casing" + }, + "I": { + "tag": "forge:ingots/iron" + }, + "A": { + "tag": "forge:plates/iron" + } + }, + "result": { + "item": "create:saw", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/shaft.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/shaft.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/shaft.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/shaft.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json new file mode 100644 index 000000000..6e9fa457e --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json @@ -0,0 +1,28 @@ +{ + "type": "crafting_shaped", + "pattern": [ + " C ", + "SAS" + ], + "key": { + "A": { + "item": "create:andesite_casing" + }, + "S": { + "item": "create:shaft" + }, + "C": { + "item": "minecraft:compass" + } + }, + "result": { + "item": "create:speed_gauge", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/sticky_mechanical_piston.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/sticky_mechanical_piston.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/sticky_mechanical_piston.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/sticky_mechanical_piston.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/translation_chassis.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/translation_chassis.json similarity index 78% rename from src/main/resources/data/create/recipes/crafting_shaped/translation_chassis.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/translation_chassis.json index af0ed423e..b7fe8a47b 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/translation_chassis.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/translation_chassis.json @@ -1,24 +1,21 @@ { "type": "crafting_shaped", "pattern": [ - "APA", + " P ", "LLL", - "APA" + " P " ], "key": { "L": { "tag": "minecraft:logs" - }, - "A": { - "item": "create:andesite_alloy" }, "P": { - "tag": "minecraft:planks" + "item": "create:andesite_alloy" } }, "result": { "item": "create:translation_chassis", - "count": 4 + "count": 3 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/turntable.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/turntable.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/turntable.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/turntable.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/water_wheel.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/water_wheel.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/water_wheel.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/water_wheel.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json b/src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json index cceb64d85..6d43bae93 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json @@ -1,21 +1,23 @@ { "type": "crafting_shaped", - "pattern": [ - "ABA", - "BSB", - "ABA" - ], - "key": { - "B": { - "tag": "minecraft:planks" - }, - "A": { - "item": "create:brass_sheet" - }, - "S": { - "item": "minecraft:observer" - } - }, + "pattern": [ + "RCI", + " B " + ], + "key": { + "R": { + "tag": "forge:dusts/redstone" + }, + "I": { + "tag": "forge:ingots/iron" + }, + "C": { + "item": "minecraft:observer" + }, + "B": { + "item": "create:brass_casing" + } + }, "result": { "item": "create:entity_detector", "count": 1 diff --git a/src/main/resources/data/create/recipes/crafting_shaped/extractor.json b/src/main/resources/data/create/recipes/crafting_shaped/extractor.json index bc8e2da2e..880b840a3 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/extractor.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/extractor.json @@ -1,27 +1,24 @@ { "type": "crafting_shaped", - "pattern": [ - "GN", - "RD", - "PN" - ], - "key": { - "G": { - "item": "minecraft:gold_ingot" - }, - "R": { - "item": "minecraft:redstone" - }, - "D": { - "item": "minecraft:dried_kelp" - }, - "N": { - "item": "create:brass_sheet" - }, - "P": { - "tag": "minecraft:planks" - } - }, + "pattern": [ + " B ", + "SCS", + " I " + ], + "key": { + "S": { + "tag": "forge:plates/brass" + }, + "B": { + "item": "create:electron_tube" + }, + "C": { + "item": "minecraft:dried_kelp" + }, + "I": { + "tag": "minecraft:planks" + } + }, "result": { "item": "create:extractor", "count": 4 diff --git a/src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json b/src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json index 8b782c248..f9a00f72c 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json @@ -1,24 +1,18 @@ { "type": "crafting_shaped", "pattern": [ - "ABA", - "BSB", - "ABA" + "BBB", + "B B", + "BBB" ], "key": { "B": { - "tag": "minecraft:planks" - }, - "A": { - "item": "create:brass_sheet" - }, - "S": { - "item": "minecraft:chest" + "item": "create:brass_casing" } }, "result": { "item": "create:flexcrate", - "count": 2 + "count": 4 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/propeller.json b/src/main/resources/data/create/recipes/crafting_shaped/propeller.json index cd8364a24..d9f00b1ef 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/propeller.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/propeller.json @@ -7,10 +7,10 @@ ], "key": { "I": { - "item": "create:iron_sheet" + "tag": "forge:plates/iron" }, "S": { - "item": "create:shaft" + "item": "create:andesite_alloy" } }, "result": { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json b/src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json index fca75c680..e8a404612 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json @@ -1,24 +1,23 @@ { "type": "crafting_shaped", - "pattern": [ - "GAG", - "PRP", - "GPG" - ], - "key": { - "P": { - "tag": "minecraft:planks" - }, - "A": { - "item": "minecraft:heavy_weighted_pressure_plate" - }, - "R": { - "item": "minecraft:comparator" - }, - "G": { - "item": "create:brass_sheet" - } - }, + "pattern": [ + "RCI", + " B " + ], + "key": { + "R": { + "tag": "forge:dusts/redstone" + }, + "I": { + "tag": "forge:ingots/iron" + }, + "C": { + "item": "minecraft:comparator" + }, + "B": { + "item": "create:brass_casing" + } + }, "result": { "item": "create:stockswitch", "count": 1 diff --git a/src/main/resources/data/create/recipes/crafting_shaped/transposer.json b/src/main/resources/data/create/recipes/crafting_shaped/transposer.json new file mode 100644 index 000000000..1d3261ee7 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/transposer.json @@ -0,0 +1,24 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SP" + ], + "key": { + "P": { + "item": "create:belt_funnel" + }, + "S": { + "item": "create:extractor" + } + }, + "result": { + "item": "create:transposer", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "logistics" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/whisk.json b/src/main/resources/data/create/recipes/crafting_shaped/whisk.json new file mode 100644 index 000000000..eb7ae0279 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/whisk.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + " A ", + "IAI", + "III" + ], + "key": { + "A": { + "item": "create:andesite_alloy" + }, + "I": { + "tag": "forge:plates/iron" + } + }, + "result": { + "item": "create:whisk", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/extractor.json b/src/main/resources/data/create/recipes/crafting_shapeless/extractor.json new file mode 100644 index 000000000..c4b7df012 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shapeless/extractor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:linked_extractor" + } + ], + "result": { + "item": "create:extractor", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "logistics" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json b/src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json new file mode 100644 index 000000000..8e5a2f3db --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shapeless/linked_transposer.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:transposer" + }, + { + "item": "minecraft:redstone_torch" + } + ], + "result": { + "item": "create:linked_transposer", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "logistics" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json b/src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json new file mode 100644 index 000000000..d97e61b7c --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json @@ -0,0 +1,18 @@ +{ + "type": "crafting_shapeless", + "ingredients": [ + { + "item": "create:stress_gauge" + } + ], + "result": { + "item": "create:speed_gauge", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json b/src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json new file mode 100644 index 000000000..43c0c6b34 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json @@ -0,0 +1,18 @@ +{ + "type": "crafting_shapeless", + "ingredients": [ + { + "item": "create:speed_gauge" + } + ], + "result": { + "item": "create:stress_gauge", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis.json b/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis.json new file mode 100644 index 000000000..7973191ec --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis.json @@ -0,0 +1,18 @@ +{ + "type": "crafting_shapeless", + "ingredients": [ + { + "item": "create:translation_chassis_secondary" + } + ], + "result": { + "item": "create:translation_chassis", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis_secondary.json b/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis_secondary.json new file mode 100644 index 000000000..0169469a4 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shapeless/translation_chassis_secondary.json @@ -0,0 +1,18 @@ +{ + "type": "crafting_shapeless", + "ingredients": [ + { + "item": "create:translation_chassis" + } + ], + "result": { + "item": "create:translation_chassis_secondary", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "contraptions" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/transposer.json b/src/main/resources/data/create/recipes/crafting_shapeless/transposer.json new file mode 100644 index 000000000..79d9a5d30 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shapeless/transposer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:linked_transposer" + } + ], + "result": { + "item": "create:transposer", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "logistics" + } + ] +} \ No newline at end of file