From c1ff78d3524393baaef29325334fb29b676caf97 Mon Sep 17 00:00:00 2001 From: ayutac Date: Sun, 4 Jun 2023 06:16:54 +0200 Subject: [PATCH] Added a few ind. grind recipes to datagen --- .../IndustrialGrinderRecipesProvider.groovy | 64 +++++++++++++++++++ .../ancient_debris_with_water.json | 32 ---------- .../bauxite_ore_with_water.json | 32 ---------- .../cinnabar_ore_with_water.json | 32 ---------- .../coal_ore_with_water.json | 32 ---------- .../ancient_debris_with_mercury.json | 24 ------- .../ancient_debris_with_water.json | 24 ------- .../bauxite_ore_with_water.json | 23 ------- .../cinnabar_ore_with_water.json | 27 -------- .../coal_ore_with_mercury.json | 20 ------ .../coal_ore_with_water.json | 20 ------ 11 files changed, 64 insertions(+), 266 deletions(-) delete mode 100644 src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/ancient_debris_with_water.json delete mode 100644 src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/bauxite_ore_with_water.json delete mode 100644 src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/cinnabar_ore_with_water.json delete mode 100644 src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/coal_ore_with_water.json delete mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_mercury.json delete mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_water.json delete mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/bauxite_ore_with_water.json delete mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/cinnabar_ore_with_water.json delete mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/coal_ore_with_mercury.json delete mode 100644 src/main/resources/data/techreborn/recipes/industrial_grinder/coal_ore_with_water.json diff --git a/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_grinder/IndustrialGrinderRecipesProvider.groovy b/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_grinder/IndustrialGrinderRecipesProvider.groovy index ed186a738..9232ccb3f 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_grinder/IndustrialGrinderRecipesProvider.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_grinder/IndustrialGrinderRecipesProvider.groovy @@ -62,6 +62,7 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { generateAxe() generatePickaxe() generateTrimTemplates() + generateOres() } void generateBoots() { @@ -379,4 +380,67 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { criterion getCriterionName(trim), getCriterionConditions(trim) } } + + void generateOres() { + offerIndustrialGrinderRecipe { + ingredients Items.ANCIENT_DEBRIS + outputs stack(Items.NETHERITE_SCRAP, 2), stack(Items.GOLD_NUGGET, 5) + power 64 + time 100 + fluidAmount 1000L + fluid Fluids.WATER + source "ancient_debris_with_water" + criterion getCriterionName(Items.ANCIENT_DEBRIS), getCriterionConditions(Items.ANCIENT_DEBRIS) + } + offerIndustrialGrinderRecipe { + ingredients Items.ANCIENT_DEBRIS + outputs stack(Items.NETHERITE_SCRAP, 3), stack(Items.GOLD_NUGGET, 3) + power 64 + time 100 + fluidAmount 1000L + fluid ModFluids.MERCURY.getFluid() + source "ancient_debris_with_mercury" + criterion getCriterionName(Items.ANCIENT_DEBRIS), getCriterionConditions(Items.ANCIENT_DEBRIS) + } + offerIndustrialGrinderRecipe { + ingredients TRContent.Ores.BAUXITE.asTag() + outputs stack(TRContent.Dusts.BAUXITE, 4), TRContent.Dusts.ALUMINUM + power 64 + time 100 + fluidAmount 1000L + fluid Fluids.WATER + source "bauxite_ore_with_water" + criterion getCriterionName(TRContent.Dusts.BAUXITE.asTag()), getCriterionConditions(TRContent.Dusts.BAUXITE.asTag()) + } + offerIndustrialGrinderRecipe { + ingredients TRContent.Ores.CINNABAR.asTag() + outputs stack(TRContent.Dusts.CINNABAR, 5), stack(TRContent.SmallDusts.REDSTONE, 2), TRContent.SmallDusts.GLOWSTONE + power 64 + time 100 + fluidAmount 1000L + fluid Fluids.WATER + source "cinnabar_ore_with_water" + criterion getCriterionName(TRContent.Dusts.CINNABAR.asTag()), getCriterionConditions(TRContent.Dusts.CINNABAR.asTag()) + } + offerIndustrialGrinderRecipe { + ingredients tag("c:coal_ores") + outputs stack(Items.COAL, 3) + power 64 + time 100 + fluidAmount 1000L + fluid Fluids.WATER + source "coal_ore_with_water" + criterion getCriterionName(tag("c:coal_ores")), getCriterionConditions(tag("c:coal_ores")) + } + offerIndustrialGrinderRecipe { + ingredients tag("c:coal_ores") + outputs stack(Items.COAL, 4) + power 64 + time 100 + fluidAmount 1000L + fluid ModFluids.MERCURY.getFluid() + source "coal_ore_with_mercury" + criterion getCriterionName(tag("c:coal_ores")), getCriterionConditions(tag("c:coal_ores")) + } + } } diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/ancient_debris_with_water.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/ancient_debris_with_water.json deleted file mode 100644 index 208649449..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/ancient_debris_with_water.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/ancient_debris_with_water" - ] - }, - "criteria": { - "has_ancient_debris": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:ancient_debris"] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/ancient_debris_with_water" - } - } - }, - "requirements": [ - [ - "has_ancient_debris", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/bauxite_ore_with_water.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/bauxite_ore_with_water.json deleted file mode 100644 index 70213be85..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/bauxite_ore_with_water.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/bauxite_ore_with_water" - ] - }, - "criteria": { - "has_bauxite_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:bauxite_ores" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/bauxite_ore_with_water" - } - } - }, - "requirements": [ - [ - "has_bauxite_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/cinnabar_ore_with_water.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/cinnabar_ore_with_water.json deleted file mode 100644 index a18d6b110..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/cinnabar_ore_with_water.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/cinnabar_ore_with_water" - ] - }, - "criteria": { - "has_cinnabar_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:cinnabar_ores" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/cinnabar_ore_with_water" - } - } - }, - "requirements": [ - [ - "has_cinnabar_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/coal_ore_with_water.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/coal_ore_with_water.json deleted file mode 100644 index 0c3448d76..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/coal_ore_with_water.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/coal_ore_with_water" - ] - }, - "criteria": { - "has_coal_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:coal_ores" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/coal_ore_with_water" - } - } - }, - "requirements": [ - [ - "has_coal_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_mercury.json deleted file mode 100644 index 83069c9ce..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_mercury.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "techreborn:mercury", - "amount": 1000 - }, - "ingredients": [ - { - "item": "minecraft:ancient_debris" - } - ], - "results": [ - { - "item": "minecraft:netherite_scrap", - "count": 3 - }, - { - "item": "minecraft:gold_nugget", - "count": 3 - } - ] -} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_water.json deleted file mode 100644 index 8a5338c55..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/ancient_debris_with_water.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "ingredients": [ - { - "item": "minecraft:ancient_debris" - } - ], - "results": [ - { - "item": "minecraft:netherite_scrap", - "count": 2 - }, - { - "item": "minecraft:gold_nugget", - "count": 5 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/bauxite_ore_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/bauxite_ore_with_water.json deleted file mode 100644 index 7da647fa2..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/bauxite_ore_with_water.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "ingredients": [ - { - "tag": "c:bauxite_ores" - } - ], - "results": [ - { - "item": "techreborn:bauxite_dust", - "count": 4 - }, - { - "item": "techreborn:aluminum_dust" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/cinnabar_ore_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/cinnabar_ore_with_water.json deleted file mode 100644 index e957a2f20..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/cinnabar_ore_with_water.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "ingredients": [ - { - "tag": "c:cinnabar_ores" - } - ], - "results": [ - { - "item": "techreborn:cinnabar_dust", - "count": 5 - }, - { - "item": "techreborn:redstone_small_dust", - "count": 2 - }, - { - "item": "techreborn:glowstone_small_dust" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/coal_ore_with_mercury.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/coal_ore_with_mercury.json deleted file mode 100644 index 3c7d694af..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/coal_ore_with_mercury.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "techreborn:mercury", - "amount": 1000 - }, - "ingredients": [ - { - "tag": "c:coal_ores" - } - ], - "results": [ - { - "item": "minecraft:coal", - "count": 4 - } - ] -} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/coal_ore_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/coal_ore_with_water.json deleted file mode 100644 index 9b0b8e34e..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/coal_ore_with_water.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "ingredients": [ - { - "tag": "c:coal_ores" - } - ], - "results": [ - { - "item": "minecraft:coal", - "count": 3 - } - ] -}