From 24ec9194502c79895ae722e70bdbac5badbbb32c Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 14 Jan 2022 18:01:34 +0700 Subject: [PATCH] Update recipes --- .../datagen/recipes/MatteryRecipeProvider.kt | 2 +- .../recipes/components/copper_wiring.json | 2 +- .../recipes/components/copper_wiring_alt.json | 2 +- .../recipes/components/iron_plate.json | 17 ----------------- .../recipes/components/tritanium_plate.json | 17 ----------------- .../recipes/machines/drive_viewer.json | 1 + .../recipes/machines/energy_counter.json | 5 ++--- .../recipes/machines/matter_capacitor_bank.json | 6 ++---- .../recipes/machines/matter_scanner.json | 1 - .../recipes/machines/pattern_storage.json | 1 - 10 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 src/main/resources/data/overdrive_that_matters/recipes/components/iron_plate.json delete mode 100644 src/main/resources/data/overdrive_that_matters/recipes/components/tritanium_plate.json diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt index 5e4394097..b3c74c5e6 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt @@ -26,7 +26,7 @@ class MatteryRecipeProvider(generatorIn: DataGenerator) : RecipeProvider(generat fun plate(id: String, count: Int = 1, workTicks: Int = 200) { lambda { it, callback -> callback.accept(PlatePressShallowFinishedRecipe( - ResourceLocation(DataGen.MOD_ID, "plate_$id"), + ResourceLocation(DataGen.MOD_ID, "plate/$id"), ResourceLocation("forge", "ingots/$id"), ResourceLocation("forge", "plates/$id"), count, diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring.json b/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring.json index cc19db8f4..e2e685ca6 100644 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring.json +++ b/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring.json @@ -19,6 +19,6 @@ "result": { "item": "overdrive_that_matters:copper_wiring", - "count": 16 + "count": 8 } } \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring_alt.json b/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring_alt.json index ae01d2c10..ef952e851 100644 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring_alt.json +++ b/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring_alt.json @@ -19,6 +19,6 @@ "result": { "item": "overdrive_that_matters:copper_wiring", - "count": 4 + "count": 8 } } \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/iron_plate.json b/src/main/resources/data/overdrive_that_matters/recipes/components/iron_plate.json deleted file mode 100644 index e506f273a..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/iron_plate.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - - "ingredients": [ - { - "tag": "forge:ingots/iron" - }, - { - "tag": "forge:ingots/iron" - } - ], - - "result": { - "item": "overdrive_that_matters:iron_plate", - "count": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/tritanium_plate.json b/src/main/resources/data/overdrive_that_matters/recipes/components/tritanium_plate.json deleted file mode 100644 index 43f0fa222..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/tritanium_plate.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - - "ingredients": [ - { - "tag": "forge:ingots/tritanium" - }, - { - "tag": "forge:ingots/tritanium" - } - ], - - "result": { - "item": "overdrive_that_matters:tritanium_plate", - "count": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/machines/drive_viewer.json b/src/main/resources/data/overdrive_that_matters/recipes/machines/drive_viewer.json index d3f652d70..7ab4c9da4 100644 --- a/src/main/resources/data/overdrive_that_matters/recipes/machines/drive_viewer.json +++ b/src/main/resources/data/overdrive_that_matters/recipes/machines/drive_viewer.json @@ -11,6 +11,7 @@ "P": {"tag": "forge:plates/iron"}, "D": {"tag": "forge:dusts/glowstone"}, "C": {"tag": "forge:circuits/basic"}, + "G": {"tag": "forge:glass"}, "I": {"item": "overdrive_that_matters:matter_io_port"}, "F": {"item": "overdrive_that_matters:machine_frame"} }, diff --git a/src/main/resources/data/overdrive_that_matters/recipes/machines/energy_counter.json b/src/main/resources/data/overdrive_that_matters/recipes/machines/energy_counter.json index e9680cf36..3cb6bbdf3 100644 --- a/src/main/resources/data/overdrive_that_matters/recipes/machines/energy_counter.json +++ b/src/main/resources/data/overdrive_that_matters/recipes/machines/energy_counter.json @@ -3,14 +3,13 @@ "pattern": [ "PIP", - "CGg", + "CSg", "PIP" ], "key": { - "F": {"item": "overdrive_that_matters:machine_frame"}, "I": {"item": "overdrive_that_matters:energy_bus"}, - "G": {"tag": "forge:dusts/glowstone"}, + "S": {"tag": "forge:dusts/glowstone"}, "g": {"tag": "forge:glass_panes"}, "C": {"tag": "forge:circuits/basic"}, "P": {"tag": "forge:plates/iron"} diff --git a/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_capacitor_bank.json b/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_capacitor_bank.json index d37e3c7c3..86766bb26 100644 --- a/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_capacitor_bank.json +++ b/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_capacitor_bank.json @@ -11,14 +11,12 @@ "G": {"tag": "forge:glass"}, "I": {"item": "overdrive_that_matters:matter_io_port"}, "F": {"item": "overdrive_that_matters:machine_frame"}, - "P": {"item": "overdrive_that_matters:matter_capacitor_parts"}, "-": {"item": "overdrive_that_matters:matter_cable"}, - "T": {"tag": "forge:plates/iron"}, - "C": {"tag": "forge:circuits/basic"} + "T": {"tag": "forge:plates/iron"} }, "result": { - "item": "overdrive_that_matters:matter_replicator", + "item": "overdrive_that_matters:matter_capacitor_bank", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_scanner.json b/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_scanner.json index 3b702138f..b624900ca 100644 --- a/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_scanner.json +++ b/src/main/resources/data/overdrive_that_matters/recipes/machines/matter_scanner.json @@ -10,7 +10,6 @@ "key": { "M": {"item": "overdrive_that_matters:matter_transform_matrix"}, "F": {"item": "overdrive_that_matters:machine_frame"}, - "P": {"item": "overdrive_that_matters:matter_capacitor_parts"}, "-": {"item": "overdrive_that_matters:matter_cable"}, "T": {"tag": "forge:plates/iron"}, "C": {"tag": "forge:circuits/basic"}, diff --git a/src/main/resources/data/overdrive_that_matters/recipes/machines/pattern_storage.json b/src/main/resources/data/overdrive_that_matters/recipes/machines/pattern_storage.json index 0f389891b..cd6b6a919 100644 --- a/src/main/resources/data/overdrive_that_matters/recipes/machines/pattern_storage.json +++ b/src/main/resources/data/overdrive_that_matters/recipes/machines/pattern_storage.json @@ -10,7 +10,6 @@ "key": { "G": {"tag": "forge:glass"}, "F": {"item": "overdrive_that_matters:machine_frame"}, - "P": {"item": "overdrive_that_matters:matter_capacitor_parts"}, "-": {"item": "overdrive_that_matters:matter_cable"}, "T": {"tag": "forge:plates/iron"}, "C": {"tag": "forge:circuits/basic"}