diff --git a/src/datagen/groovy/techreborn/datagen/recipes/machine/assembling_machine/AssemblingMachineRecipesProvider.groovy b/src/datagen/groovy/techreborn/datagen/recipes/machine/assembling_machine/AssemblingMachineRecipesProvider.groovy index 192a6f980..ca9578ce4 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/machine/assembling_machine/AssemblingMachineRecipesProvider.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/machine/assembling_machine/AssemblingMachineRecipesProvider.groovy @@ -30,6 +30,7 @@ import net.minecraft.item.Items import net.minecraft.registry.RegistryWrapper import net.minecraft.registry.tag.ItemTags import techreborn.datagen.recipes.TechRebornRecipesProvider +import techreborn.init.TRContent import java.util.concurrent.CompletableFuture @@ -42,6 +43,8 @@ class AssemblingMachineRecipesProvider extends TechRebornRecipesProvider { @Override void generateRecipes() { generateBed() + generateMiscTR() + generateMiscVanilla() } void generateBed() { @@ -74,4 +77,66 @@ class AssemblingMachineRecipesProvider extends TechRebornRecipesProvider { } } + void generateMiscTR() { + offerAssemblingMachineRecipe { + ingredients TRContent.Plates.PLATINUM.asTag(), TRContent.Parts.ADVANCED_CIRCUIT + outputs TRContent.Parts.INDUSTRIAL_CIRCUIT + power 20 + time 200 + criterion getCriterionName(TRContent.Plates.PLATINUM.asTag()), getCriterionConditions(TRContent.Plates.PLATINUM.asTag()) + } + offerAssemblingMachineRecipe { + ingredients TRContent.Parts.DATA_STORAGE_CORE, TRContent.Parts.INDUSTRIAL_CIRCUIT + outputs TRContent.Parts.DATA_STORAGE_CHIP + power 20 + time 200 + criterion getCriterionName(TRContent.Parts.DATA_STORAGE_CORE), getCriterionConditions(TRContent.Parts.DATA_STORAGE_CORE) + } + offerAssemblingMachineRecipe { + ingredients TRContent.LAPOTRON_CRYSTAL, TRContent.Parts.INDUSTRIAL_CIRCUIT + outputs TRContent.Parts.ENERGY_FLOW_CHIP + power 20 + time 200 + criterion getCriterionName(TRContent.LAPOTRON_CRYSTAL), getCriterionConditions(TRContent.LAPOTRON_CRYSTAL) + } + offerAssemblingMachineRecipe { + ingredients stack(TRContent.Parts.SYNTHETIC_REDSTONE_CRYSTAL, 2), TRContent.Plates.SILICON.asTag() + outputs TRContent.ENERGY_CRYSTAL + power 40 + time 200 + criterion getCriterionName(TRContent.Parts.SYNTHETIC_REDSTONE_CRYSTAL), getCriterionConditions(TRContent.Parts.SYNTHETIC_REDSTONE_CRYSTAL) + } + offerAssemblingMachineRecipe { + ingredients TRContent.Machine.SOLID_FUEL_GENERATOR, TRContent.Plates.MAGNALIUM + outputs TRContent.Machine.WIND_MILL + power 20 + time 700 + criterion getCriterionName(TRContent.Plates.MAGNALIUM), getCriterionConditions(TRContent.Plates.MAGNALIUM) + } + } + + void generateMiscVanilla() { + offerAssemblingMachineRecipe { + ingredients stack(Items.PHANTOM_MEMBRANE, 16), stack(Items.END_ROD, 3) + outputs Items.ELYTRA + power 20 + time 500 + criterion getCriterionName(Items.END_ROD), getCriterionConditions(Items.END_ROD) + } + offerAssemblingMachineRecipe { + ingredients stack(Items.TORCH, 10), stack(Items.IRON_INGOT, 8) + outputs stack(Items.LANTERN, 10) + power 20 + time 200 + criterion getCriterionName(Items.TORCH), getCriterionConditions(Items.TORCH) + } + offerAssemblingMachineRecipe { + ingredients stack(Items.SOUL_TORCH, 10), stack(Items.IRON_INGOT, 8) + outputs stack(Items.SOUL_LANTERN, 10) + power 20 + time 200 + criterion getCriterionName(Items.SOUL_TORCH), getCriterionConditions(Items.SOUL_TORCH) + } + } + } diff --git a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/data_storage_chip.json b/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/data_storage_chip.json deleted file mode 100644 index 145b1506a..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/data_storage_chip.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:assembling_machine/data_storage_chip" - ] - }, - "criteria": { - "has_data_storage_core": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:data_storage_core"] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:assembling_machine/data_storage_chip" - } - } - }, - "requirements": [ - [ - "has_data_storage_core", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/elytra.json b/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/elytra.json deleted file mode 100644 index 62be68138..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/elytra.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:assembling_machine/elytra" - ] - }, - "criteria": { - "has_end_rod": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:end_rod"] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:assembling_machine/elytra" - } - } - }, - "requirements": [ - [ - "has_end_rod", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/energy_crystal.json b/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/energy_crystal.json deleted file mode 100644 index b067f69d3..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/energy_crystal.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:assembling_machine/energy_crystal" - ] - }, - "criteria": { - "has_redstone_crystal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:synthetic_redstone_crystal"] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:assembling_machine/energy_crystal" - } - } - }, - "requirements": [ - [ - "has_redstone_crystal", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/energy_flow_chip.json b/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/energy_flow_chip.json deleted file mode 100644 index 08db5bb5c..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/energy_flow_chip.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:assembling_machine/energy_flow_chip" - ] - }, - "criteria": { - "has_lapotron_crystal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:lapotron_crystal"] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:assembling_machine/energy_flow_chip" - } - } - }, - "requirements": [ - [ - "has_lapotron_crystal", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/industrial_circuit.json b/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/industrial_circuit.json deleted file mode 100644 index 433115ca0..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/industrial_circuit.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:assembling_machine/industrial_circuit" - ] - }, - "criteria": { - "has_platinum_plate": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:platinum_plates" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:assembling_machine/industrial_circuit" - } - } - }, - "requirements": [ - [ - "has_platinum_plate", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/lantern.json b/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/lantern.json deleted file mode 100644 index 27e9789cf..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/lantern.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:assembling_machine/lantern" - ] - }, - "criteria": { - "has_torch": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:torch"] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:assembling_machine/lantern" - } - } - }, - "requirements": [ - [ - "has_torch", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/soul_lantern.json b/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/soul_lantern.json deleted file mode 100644 index 8b98b4168..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/soul_lantern.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:assembling_machine/soul_lantern" - ] - }, - "criteria": { - "has_soul_torch": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:soul_torch"] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:assembling_machine/soul_lantern" - } - } - }, - "requirements": [ - [ - "has_soul_torch", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/wind_mill.json b/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/wind_mill.json deleted file mode 100644 index e12f935e0..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/assembling_machine/wind_mill.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:assembling_machine/wind_mill" - ] - }, - "criteria": { - "has_magnalium_plate": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["techreborn:magnalium_plate"] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:assembling_machine/wind_mill" - } - } - }, - "requirements": [ - [ - "has_magnalium_plate", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/assembling_machine/data_storage_chip.json b/src/main/resources/data/techreborn/recipes/assembling_machine/data_storage_chip.json deleted file mode 100644 index 92ff54a8d..000000000 --- a/src/main/resources/data/techreborn/recipes/assembling_machine/data_storage_chip.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "techreborn:assembling_machine", - "power": 20, - "time": 200, - "ingredients": [ - { - "item": "techreborn:industrial_circuit" - }, - { - "item": "techreborn:data_storage_core" - } - ], - "results": [ - { - "item": "techreborn:data_storage_chip" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/assembling_machine/elytra.json b/src/main/resources/data/techreborn/recipes/assembling_machine/elytra.json deleted file mode 100644 index 0731a32ac..000000000 --- a/src/main/resources/data/techreborn/recipes/assembling_machine/elytra.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:assembling_machine", - "power": 20, - "time": 500, - "ingredients": [ - { - "item": "minecraft:phantom_membrane", - "count": 16 - }, - { - "item": "minecraft:end_rod", - "count": 3 - } - ], - "results": [ - { - "item": "minecraft:elytra" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/assembling_machine/energy_crystal.json b/src/main/resources/data/techreborn/recipes/assembling_machine/energy_crystal.json deleted file mode 100644 index 36316b5fe..000000000 --- a/src/main/resources/data/techreborn/recipes/assembling_machine/energy_crystal.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "techreborn:assembling_machine", - "power": 40, - "time": 200, - "ingredients": [ - { - "tag": "c:silicon_plates" - }, - { - "item": "techreborn:synthetic_redstone_crystal", - "count": 2 - } - ], - "results": [ - { - "item": "techreborn:energy_crystal" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/assembling_machine/energy_flow_chip.json b/src/main/resources/data/techreborn/recipes/assembling_machine/energy_flow_chip.json deleted file mode 100644 index 13d81ebca..000000000 --- a/src/main/resources/data/techreborn/recipes/assembling_machine/energy_flow_chip.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "techreborn:assembling_machine", - "power": 20, - "time": 200, - "ingredients": [ - { - "item": "techreborn:industrial_circuit" - }, - { - "item": "techreborn:lapotron_crystal" - } - ], - "results": [ - { - "item": "techreborn:energy_flow_chip" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/assembling_machine/industrial_circuit.json b/src/main/resources/data/techreborn/recipes/assembling_machine/industrial_circuit.json deleted file mode 100644 index a6148c9ec..000000000 --- a/src/main/resources/data/techreborn/recipes/assembling_machine/industrial_circuit.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "techreborn:assembling_machine", - "power": 20, - "time": 200, - "ingredients": [ - { - "item": "techreborn:advanced_circuit" - }, - { - "tag": "c:platinum_plates" - } - ], - "results": [ - { - "item": "techreborn:industrial_circuit" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/assembling_machine/lantern.json b/src/main/resources/data/techreborn/recipes/assembling_machine/lantern.json deleted file mode 100644 index 79aa8859a..000000000 --- a/src/main/resources/data/techreborn/recipes/assembling_machine/lantern.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "techreborn:assembling_machine", - "power": 20, - "time": 200, - "ingredients": [ - { - "item": "minecraft:torch", - "count": 10 - }, - { - "item": "minecraft:iron_ingot", - "count": 8 - } - ], - "results": [ - { - "item": "minecraft:lantern", - "count": 10 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/assembling_machine/soul_lantern.json b/src/main/resources/data/techreborn/recipes/assembling_machine/soul_lantern.json deleted file mode 100644 index f55e67ecd..000000000 --- a/src/main/resources/data/techreborn/recipes/assembling_machine/soul_lantern.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "techreborn:assembling_machine", - "power": 20, - "time": 200, - "ingredients": [ - { - "item": "minecraft:soul_torch", - "count": 10 - }, - { - "item": "minecraft:iron_ingot", - "count": 8 - } - ], - "results": [ - { - "item": "minecraft:soul_lantern", - "count": 10 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/assembling_machine/wind_mill.json b/src/main/resources/data/techreborn/recipes/assembling_machine/wind_mill.json deleted file mode 100644 index f44fdb8aa..000000000 --- a/src/main/resources/data/techreborn/recipes/assembling_machine/wind_mill.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "techreborn:assembling_machine", - "power": 20, - "time": 700, - "ingredients": [ - { - "item": "techreborn:solid_fuel_generator" - }, - { - "item": "techreborn:magnalium_plate" - } - ], - "results": [ - { - "item": "techreborn:wind_mill" - } - ] -} \ No newline at end of file