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 b3c74c5e6..8344cc6f4 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, "plates/$id"), ResourceLocation("forge", "ingots/$id"), ResourceLocation("forge", "plates/$id"), count, diff --git a/src/main/java/ru/dbotthepony/mc/otm/Registry.java b/src/main/java/ru/dbotthepony/mc/otm/Registry.java index cda514dcd..d859081d7 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/Registry.java +++ b/src/main/java/ru/dbotthepony/mc/otm/Registry.java @@ -125,9 +125,9 @@ public class Registry { public static final ResourceLocation DRIVE_VIEWER = loc("drive_viewer"); // есть рецепт public static final ResourceLocation DRIVE_RACK = loc("drive_rack"); // нужен рецепт (после улучшений) public static final ResourceLocation ITEM_MONITOR = loc("item_monitor"); // нужен рецепт (после улучшений) - public static final ResourceLocation ENERGY_COUNTER = loc("energy_counter"); // нужен рецепт - public static final ResourceLocation CHEMICAL_GENERATOR = loc("chemical_generator"); // нужен рецепт - public static final ResourceLocation PLATE_PRESS = loc("plate_press"); // нужен рецепт + public static final ResourceLocation ENERGY_COUNTER = loc("energy_counter"); // есть рецепт + public static final ResourceLocation CHEMICAL_GENERATOR = loc("chemical_generator"); // есть рецепт + public static final ResourceLocation PLATE_PRESS = loc("plate_press"); // есть рецепт public static final ResourceLocation DEBUG_EXPLOSION_SMALL = loc("debug_explosion_small"); diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/gold_wiring.json b/src/main/resources/data/overdrive_that_matters/recipes/components/gold_wiring.json index d474f8448..d6f0ca235 100644 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/gold_wiring.json +++ b/src/main/resources/data/overdrive_that_matters/recipes/components/gold_wiring.json @@ -19,6 +19,6 @@ "result": { "item": "overdrive_that_matters:gold_wiring", - "count": 16 + "count": 8 } } \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe.json new file mode 100644 index 000000000..993ec9a4e --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": [ + "II ", + "IS ", + " S " + ], + + "key": { + "S": {"tag": "forge:rods/wooden"}, + "I": {"tag": "forge:ingots/tritanium"} + }, + + "result": { + "item": "overdrive_that_matters:tritanium_axe", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe_alt.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe_alt.json new file mode 100644 index 000000000..fb348002b --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_axe_alt.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": [ + " II", + " SI", + " S " + ], + + "key": { + "S": {"tag": "forge:rods/wooden"}, + "I": {"tag": "forge:ingots/tritanium"} + }, + + "result": { + "item": "overdrive_that_matters:tritanium_axe", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_hoe.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_hoe.json new file mode 100644 index 000000000..c08f497a0 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": [ + "II ", + " S ", + " S " + ], + + "key": { + "S": {"tag": "forge:rods/wooden"}, + "I": {"tag": "forge:ingots/tritanium"} + }, + + "result": { + "item": "overdrive_that_matters:tritanium_hoe", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_pickaxe.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_pickaxe.json new file mode 100644 index 000000000..eb3d9d7a0 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": [ + "III", + " S ", + " S " + ], + + "key": { + "S": {"tag": "forge:rods/wooden"}, + "I": {"tag": "forge:ingots/tritanium"} + }, + + "result": { + "item": "overdrive_that_matters:tritanium_pickaxe", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_shovel.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_shovel.json new file mode 100644 index 000000000..d6084d99b --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": [ + " I ", + " S ", + " S " + ], + + "key": { + "S": {"tag": "forge:rods/wooden"}, + "I": {"tag": "forge:ingots/tritanium"} + }, + + "result": { + "item": "overdrive_that_matters:tritanium_shovel", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_sword.json b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_sword.json new file mode 100644 index 000000000..fa0a58b97 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/recipes/items/tritanium_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": [ + " I ", + " I ", + " S " + ], + + "key": { + "S": {"tag": "forge:rods/wooden"}, + "I": {"tag": "forge:ingots/tritanium"} + }, + + "result": { + "item": "overdrive_that_matters:tritanium_sword", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/machines/chemical_generator.json b/src/main/resources/data/overdrive_that_matters/recipes/machines/chemical_generator.json new file mode 100644 index 000000000..97f69538a --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/recipes/machines/chemical_generator.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": [ + " B ", + "IFI", + "E E" + ], + + "key": { + "F": {"item": "minecraft:furnace"}, + "I": {"tag": "forge:ingots/iron"}, + "E": {"item": "overdrive_that_matters:electric_parts"}, + "B": {"item": "overdrive_that_matters:energy_bus"} + }, + + "result": { + "item": "overdrive_that_matters:chemical_generator", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/machines/plate_press.json b/src/main/resources/data/overdrive_that_matters/recipes/machines/plate_press.json new file mode 100644 index 000000000..6278d483c --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/recipes/machines/plate_press.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + + "pattern": [ + " E ", + "TFT", + "P P" + ], + + "key": { + "P": {"item": "minecraft:piston"}, + "T": {"tag": "forge:ingots/tritanium"}, + "E": {"item": "overdrive_that_matters:electric_parts"}, + "F": {"item": "overdrive_that_matters:machine_frame"} + }, + + "result": { + "item": "overdrive_that_matters:plate_press", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/recipes/plates/circuit_plating.json b/src/main/resources/data/overdrive_that_matters/recipes/plates/circuit_plating.json new file mode 100644 index 000000000..afe37fe11 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/recipes/plates/circuit_plating.json @@ -0,0 +1,10 @@ +{ + "type": "overdrive_that_matters:plate_press", + "input": { + "tag": "forge:sand" + }, + "result": { + "item": "overdrive_that_matters:circuit_plating" + }, + "work_time": 120 +} \ No newline at end of file