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 565812278..c66d77bd9 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 @@ -401,12 +401,15 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { } void generateOres() { + final int orePower = 64 + final int oreTime = 100 + final long oreAmount = 1000L offerIndustrialGrinderRecipe { ingredients Items.ANCIENT_DEBRIS outputs stack(Items.NETHERITE_SCRAP, 2), stack(Items.GOLD_NUGGET, 5) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "ancient_debris_with_water" criterion getCriterionName(Items.ANCIENT_DEBRIS), getCriterionConditions(Items.ANCIENT_DEBRIS) @@ -414,9 +417,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients Items.ANCIENT_DEBRIS outputs stack(Items.NETHERITE_SCRAP, 3), stack(Items.GOLD_NUGGET, 3) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.MERCURY.getFluid() source "ancient_debris_with_mercury" criterion getCriterionName(Items.ANCIENT_DEBRIS), getCriterionConditions(Items.ANCIENT_DEBRIS) @@ -424,9 +427,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients TRContent.Ores.BAUXITE.asTag() outputs stack(TRContent.Dusts.BAUXITE, 4), TRContent.Dusts.ALUMINUM - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "bauxite_ore_with_water" criterion getCriterionName(TRContent.Ores.BAUXITE.asTag()), getCriterionConditions(TRContent.Ores.BAUXITE.asTag()) @@ -434,9 +437,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { 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 + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "cinnabar_ore_with_water" criterion getCriterionName(TRContent.Ores.CINNABAR.asTag()), getCriterionConditions(TRContent.Ores.CINNABAR.asTag()) @@ -444,9 +447,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:coal_ores") outputs stack(Items.COAL, 3) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "coal_ore_with_water" criterion getCriterionName(tag("c:coal_ores")), getCriterionConditions(tag("c:coal_ores")) @@ -454,9 +457,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:coal_ores") outputs stack(Items.COAL, 4) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.MERCURY.getFluid() source "coal_ore_with_mercury" criterion getCriterionName(tag("c:coal_ores")), getCriterionConditions(tag("c:coal_ores")) @@ -464,9 +467,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:copper_ores") outputs stack(Items.RAW_COPPER, 2), stack(Items.GOLD_NUGGET, 3) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "copper_ore_with_water" criterion getCriterionName(tag("c:copper_ores")), getCriterionConditions(tag("c:copper_ores")) @@ -474,9 +477,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:copper_ores") outputs stack(Items.RAW_COPPER, 3), stack(Items.GOLD_NUGGET, 3) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.MERCURY.getFluid() source "copper_ore_with_mercury" criterion getCriterionName(tag("c:copper_ores")), getCriterionConditions(tag("c:copper_ores")) @@ -484,9 +487,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:copper_ores") outputs stack(Items.RAW_COPPER, 2), Items.RAW_GOLD, TRContent.Dusts.NICKEL - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.SODIUM_PERSULFATE.getFluid() source "copper_ore_with_sodium_persulfate" criterion getCriterionName(tag("c:copper_ores")), getCriterionConditions(tag("c:copper_ores")) @@ -494,9 +497,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:diamond_ores") outputs Items.DIAMOND, stack(TRContent.SmallDusts.DIAMOND, 6), TRContent.Dusts.COAL - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "diamond_ore_with_water" criterion getCriterionName(tag("c:diamond_ores")), getCriterionConditions(tag("c:diamond_ores")) @@ -504,9 +507,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:diamond_ores") outputs stack(Items.DIAMOND, 2), stack(TRContent.SmallDusts.DIAMOND, 3) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.MERCURY.getFluid() source "diamond_ore_with_mercury" criterion getCriterionName(tag("c:diamond_ores")), getCriterionConditions(tag("c:diamond_ores")) @@ -514,9 +517,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:emerald_ores") outputs Items.EMERALD, stack(TRContent.SmallDusts.EMERALD, 6) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "emerald_ore_with_water" criterion getCriterionName(tag("c:emerald_ores")), getCriterionConditions(tag("c:emerald_ores")) @@ -524,9 +527,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:emerald_ores") outputs stack(Items.EMERALD, 2), stack(TRContent.SmallDusts.EMERALD, 3) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.MERCURY.getFluid() source "emerald_ore_with_mercury" criterion getCriterionName(tag("c:emerald_ores")), getCriterionConditions(tag("c:emerald_ores")) @@ -534,9 +537,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients TRContent.Ores.GALENA.asTag() outputs stack(TRContent.Dusts.GALENA, 2), TRContent.Dusts.SULFUR - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "galena_ore_with_water" criterion getCriterionName(TRContent.Dusts.GALENA.asTag()), getCriterionConditions(TRContent.Dusts.GALENA.asTag()) @@ -544,9 +547,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients TRContent.Ores.GALENA.asTag() outputs stack(TRContent.Dusts.GALENA, 2), TRContent.Dusts.SULFUR, TRContent.RawMetals.SILVER - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.MERCURY.getFluid() source "galena_ore_with_mercury" criterion getCriterionName(TRContent.Ores.GALENA.asTag()), getCriterionConditions(TRContent.Ores.GALENA.asTag()) @@ -554,9 +557,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("minecraft:gold_ores") outputs stack(Items.RAW_GOLD, 2), stack(TRContent.Nuggets.COPPER, 3), stack(TRContent.Nuggets.NICKEL) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "gold_ore_with_water" criterion getCriterionName(tag("minecraft:gold_ores")), getCriterionConditions(tag("minecraft:gold_ores")) @@ -564,9 +567,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:gold_ores") outputs stack(Items.RAW_GOLD, 3), stack(TRContent.Nuggets.COPPER, 3), stack(TRContent.Nuggets.NICKEL) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.MERCURY.getFluid() source "gold_ore_with_mercury" criterion getCriterionName(tag("minecraft:gold_ores")), getCriterionConditions(tag("minecraft:gold_ores")) @@ -574,9 +577,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:gold_ores") outputs stack(Items.RAW_GOLD, 2), Items.RAW_COPPER, TRContent.Dusts.NICKEL - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.SODIUM_PERSULFATE.getFluid() source "gold_ore_with_sodium_persulfate" criterion getCriterionName(tag("minecraft:gold_ores")), getCriterionConditions(tag("minecraft:gold_ores")) @@ -584,9 +587,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients TRContent.Ores.IRIDIUM.asTag() outputs TRContent.RawMetals.IRIDIUM, stack(TRContent.SmallDusts.PLATINUM, 2) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "iridium_ore_with_water" criterion getCriterionName(TRContent.Ores.IRIDIUM.asTag()), getCriterionConditions(TRContent.Ores.IRIDIUM.asTag()) @@ -594,9 +597,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients TRContent.Ores.IRIDIUM.asTag() outputs stack(TRContent.RawMetals.IRIDIUM, 2), stack(TRContent.SmallDusts.PLATINUM, 2) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.MERCURY.getFluid() source "iridium_ore_with_mercury" criterion getCriterionName(TRContent.Ores.IRIDIUM.asTag()), getCriterionConditions(TRContent.Ores.IRIDIUM.asTag()) @@ -604,9 +607,9 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients TRContent.Ores.IRIDIUM.asTag() outputs TRContent.RawMetals.IRIDIUM, TRContent.Dusts.PLATINUM - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid ModFluids.SODIUM_PERSULFATE.getFluid() source "iridium_ore_with_sodium_persulfate" criterion getCriterionName(TRContent.Ores.IRIDIUM.asTag()), getCriterionConditions(TRContent.Ores.IRIDIUM.asTag()) @@ -614,12 +617,92 @@ class IndustrialGrinderRecipesProvider extends TechRebornRecipesProvider { offerIndustrialGrinderRecipe { ingredients tag("c:iron_ores") outputs stack(Items.RAW_IRON, 3), stack(TRContent.Nuggets.TIN, 3), stack(TRContent.Nuggets.NICKEL, 3) - power 64 - time 100 - fluidAmount 1000L + power orePower + time oreTime + fluidAmount oreAmount fluid Fluids.WATER source "iron_ore_with_water" criterion getCriterionName(tag("c:iron_ores")), getCriterionConditions(tag("c:iron_ores")) } + offerIndustrialGrinderRecipe { + ingredients tag("c:lapis_ores") + outputs stack(Items.LAPIS_LAZULI, 12), stack(TRContent.Dusts.LAZURITE, 3) + power orePower + time oreTime + fluidAmount oreAmount + fluid Fluids.WATER + source "lapis_ore_with_water" + criterion getCriterionName(tag("c:lapis_ores")), getCriterionConditions(tag("c:lapis_ores")) + } + offerIndustrialGrinderRecipe { + ingredients TRContent.Ores.LEAD.asTag() + outputs stack(TRContent.RawMetals.LEAD, 2), stack(TRContent.SmallDusts.GALENA, 2) + power orePower + time oreTime + fluidAmount oreAmount + fluid Fluids.WATER + source "lead_ore_with_water" + criterion getCriterionName(TRContent.Ores.LEAD.asTag()), getCriterionConditions(TRContent.Ores.LEAD.asTag()) + } + offerIndustrialGrinderRecipe { + ingredients Items.NETHER_QUARTZ_ORE + outputs stack(Items.QUARTZ, 2), stack(TRContent.SmallDusts.SULFUR, 2) + power orePower + time oreTime + fluidAmount oreAmount + fluid Fluids.WATER + source "nether_quartz_ore_with_water" + criterion getCriterionName(Items.NETHER_QUARTZ_ORE), getCriterionConditions(Items.NETHER_QUARTZ_ORE) + } + offerIndustrialGrinderRecipe { + ingredients TRContent.Ores.PERIDOT.asTag() + outputs TRContent.Gems.PERIDOT, stack(TRContent.SmallDusts.PERIDOT, 6), stack(TRContent.SmallDusts.EMERALD, 2) + power orePower + time oreTime + fluidAmount oreAmount + fluid Fluids.WATER + source "peridot_ore_with_water" + criterion getCriterionName(TRContent.Ores.PERIDOT.asTag()), getCriterionConditions(TRContent.Ores.PERIDOT.asTag()) + } + offerIndustrialGrinderRecipe { + ingredients TRContent.Ores.PYRITE.asTag() + outputs stack(TRContent.Dusts.PYRITE, 5), stack(TRContent.Dusts.SULFUR, 2) + power orePower + time oreTime + fluidAmount oreAmount + fluid Fluids.WATER + source "pyrite_ore_with_water" + criterion getCriterionName(TRContent.Ores.PYRITE.asTag()), getCriterionConditions(TRContent.Ores.PYRITE.asTag()) + } + offerIndustrialGrinderRecipe { + ingredients tag("c:redstone_ores") + outputs stack(Items.REDSTONE, 10), stack(TRContent.SmallDusts.GLOWSTONE, 2) + power orePower + time oreTime + fluidAmount oreAmount + fluid Fluids.WATER + source "redstone_ore_with_water" + criterion getCriterionName(tag("c:redstone_ores")), getCriterionConditions(tag("c:redstone_ores")) + } + offerIndustrialGrinderRecipe { + ingredients TRContent.Ores.RUBY.asTag() + outputs TRContent.Gems.RUBY, stack(TRContent.SmallDusts.RUBY, 6), stack(TRContent.SmallDusts.RED_GARNET, 2) + power orePower + time oreTime + fluidAmount oreAmount + fluid Fluids.WATER + source "ruby_ore_with_water" + criterion getCriterionName(TRContent.Ores.RUBY.asTag()), getCriterionConditions(TRContent.Ores.RUBY.asTag()) + } + offerIndustrialGrinderRecipe { + ingredients TRContent.Ores.SAPPHIRE.asTag() + outputs TRContent.Gems.SAPPHIRE, stack(TRContent.SmallDusts.SAPPHIRE, 6), stack(TRContent.SmallDusts.PERIDOT, 2) + power orePower + time oreTime + fluidAmount oreAmount + fluid Fluids.WATER + source "sapphire_ore_with_water" + criterion getCriterionName(TRContent.Ores.SAPPHIRE.asTag()), getCriterionConditions(TRContent.Ores.SAPPHIRE.asTag()) + } } } diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/lapis_ore.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/lapis_ore.json deleted file mode 100644 index 33866512b..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/lapis_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/lapis_ore" - ] - }, - "criteria": { - "has_lapis_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:lapis_ores" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/lapis_ore" - } - } - }, - "requirements": [ - [ - "has_lapis_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/lead_ore_with_water.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/lead_ore_with_water.json deleted file mode 100644 index 526a96e38..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/lead_ore_with_water.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/lead_ore_with_water" - ] - }, - "criteria": { - "has_lead_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:lead_ores" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/lead_ore_with_water" - } - } - }, - "requirements": [ - [ - "has_lead_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/nether_quartz_ore.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/nether_quartz_ore.json deleted file mode 100644 index 75af8bc4c..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/nether_quartz_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/nether_quartz_ore" - ] - }, - "criteria": { - "has_nether_quartz_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": ["minecraft:nether_quartz_ore"] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/nether_quartz_ore" - } - } - }, - "requirements": [ - [ - "has_nether_quartz_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/peridot_ore_with_water.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/peridot_ore_with_water.json deleted file mode 100644 index 7ba050aaa..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/peridot_ore_with_water.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/peridot_ore_with_water" - ] - }, - "criteria": { - "has_peridot_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:peridot_ores" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/peridot_ore_with_water" - } - } - }, - "requirements": [ - [ - "has_peridot_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/pyrite_ore_with_water.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/pyrite_ore_with_water.json deleted file mode 100644 index 889d4ad27..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/pyrite_ore_with_water.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/pyrite_ore_with_water" - ] - }, - "criteria": { - "has_pyrite_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:pyrite_ores" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/pyrite_ore_with_water" - } - } - }, - "requirements": [ - [ - "has_pyrite_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/redstone_ore.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/redstone_ore.json deleted file mode 100644 index 4ebc65016..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/redstone_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/redstone_ore" - ] - }, - "criteria": { - "has_redstone_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:redstone_ores" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/redstone_ore" - } - } - }, - "requirements": [ - [ - "has_redstone_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/ruby_ore_with_water.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/ruby_ore_with_water.json deleted file mode 100644 index 1ebaa8fc0..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/ruby_ore_with_water.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/ruby_ore_with_water" - ] - }, - "criteria": { - "has_ruby_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:ruby_ores" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/ruby_ore_with_water" - } - } - }, - "requirements": [ - [ - "has_ruby_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/sapphire_ore_with_water.json b/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/sapphire_ore_with_water.json deleted file mode 100644 index cbae3a0c8..000000000 --- a/src/main/resources/data/techreborn/advancements/recipes/industrial_grinder/sapphire_ore_with_water.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "techreborn:industrial_grinder/sapphire_ore_with_water" - ] - }, - "criteria": { - "has_sapphire_ore": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "c:sapphire_ores" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "techreborn:industrial_grinder/sapphire_ore_with_water" - } - } - }, - "requirements": [ - [ - "has_sapphire_ore", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/lapis_ore.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/lapis_ore.json deleted file mode 100644 index 78003b61a..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/lapis_ore.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "ingredients": [ - { - "tag": "c:lapis_ores" - } - ], - "results": [ - { - "item": "minecraft:lapis_lazuli", - "count": 12 - }, - { - "item": "techreborn:lazurite_dust", - "count": 3 - } - ] -} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/lead_ore_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/lead_ore_with_water.json deleted file mode 100644 index 23677e4e1..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/lead_ore_with_water.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "ingredients": [ - { - "tag": "c:lead_ores" - } - ], - "results": [ - { - "item": "techreborn:raw_lead", - "count": 2 - }, - { - "item": "techreborn:galena_small_dust", - "count": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/nether_quartz_ore.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/nether_quartz_ore.json deleted file mode 100644 index 7e23f366b..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/nether_quartz_ore.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "ingredients": [ - { - "item": "minecraft:nether_quartz_ore" - } - ], - "results": [ - { - "item": "minecraft:quartz", - "count": 2 - }, - { - "item": "techreborn:sulfur_small_dust", - "count": 2 - } - ] -} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/peridot_ore_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/peridot_ore_with_water.json deleted file mode 100644 index f132009c6..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/peridot_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:peridot_ores" - } - ], - "results": [ - { - "item": "techreborn:peridot_gem" - }, - { - "item": "techreborn:peridot_small_dust", - "count": 6 - }, - { - "item": "techreborn:emerald_small_dust", - "count": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/pyrite_ore_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/pyrite_ore_with_water.json deleted file mode 100644 index 41c4a9e72..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/pyrite_ore_with_water.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "ingredients": [ - { - "tag": "c:pyrite_ores" - } - ], - "results": [ - { - "item": "techreborn:pyrite_dust", - "count": 5 - }, - { - "item": "techreborn:sulfur_dust", - "count": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/redstone_ore.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/redstone_ore.json deleted file mode 100644 index 317c9cd90..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/redstone_ore.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "techreborn:industrial_grinder", - "power": 64, - "time": 100, - "tank": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "ingredients": [ - { - "tag": "c:redstone_ores" - } - ], - "results": [ - { - "item": "minecraft:redstone", - "count": 10 - }, - { - "item": "techreborn:glowstone_small_dust", - "count": 2 - } - ] -} diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/ruby_ore_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/ruby_ore_with_water.json deleted file mode 100644 index 415c5a7e5..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/ruby_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:ruby_ores" - } - ], - "results": [ - { - "item": "techreborn:ruby_gem" - }, - { - "item": "techreborn:ruby_small_dust", - "count": 6 - }, - { - "item": "techreborn:red_garnet_small_dust", - "count": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_grinder/sapphire_ore_with_water.json b/src/main/resources/data/techreborn/recipes/industrial_grinder/sapphire_ore_with_water.json deleted file mode 100644 index d94927eb3..000000000 --- a/src/main/resources/data/techreborn/recipes/industrial_grinder/sapphire_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:sapphire_ores" - } - ], - "results": [ - { - "item": "techreborn:sapphire_gem" - }, - { - "item": "techreborn:sapphire_small_dust", - "count": 6 - }, - { - "item": "techreborn:peridot_small_dust", - "count": 2 - } - ] -} \ No newline at end of file