From 4c8581ad49c6cb62b36dd26af05a4a7ae55ed2d1 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 2 Aug 2019 02:32:34 +0300 Subject: [PATCH] Grinder recipes review --- .../init/recipes/CompressorRecipes.java | 87 ------------------- src/main/java/techreborn/rei/ReiPlugin.java | 15 +++- .../recipes/compressor/iridium_plate.json | 15 ++++ .../compressor/iridium_plate_from_block.json | 16 ++++ .../grinder/{auto => }/aluminum_dust.json | 0 .../grinder/{auto => }/bauxite_dust.json | 0 .../grinder/{auto => }/brass_dust.json | 0 .../grinder/{auto => }/bronze_dust.json | 0 .../grinder/{auto => }/chrome_dust.json | 0 ..._dust.json => cinnabar_dust_from_ore.json} | 0 ...ust_1.json => copper_dust_from_ingot.json} | 0 ...er_dust.json => copper_dust_from_ore.json} | 0 .../recipes/grinder/diamond_dust.json | 15 ++++ .../grinder/{auto => }/electrum_dust.json | 0 .../recipes/grinder/emerald_dust.json | 15 ++++ .../grinder/{gravel.json => flint.json} | 0 .../grinder/{auto => }/galena_dust.json | 0 ..._dust_1.json => gold_dust_from_ingot.json} | 0 ...gold_dust.json => gold_dust_from_ore.json} | 0 .../grinder/{auto => }/invar_dust.json | 0 ..._dust_1.json => iron_dust_from_ingot.json} | 0 ...iron_dust.json => iron_dust_from_ore.json} | 0 .../{lapis_ore.json => lapis_lazuli.json} | 0 ..._dust_1.json => lead_dust_from_ingot.json} | 0 ...lead_dust.json => lead_dust_from_ore.json} | 0 ..._dust.json => nickel_dust_from_ingot.json} | 0 ...dust_1.json => peridot_dust_from_gem.json} | 0 ...t_dust.json => peridot_dust_from_ore.json} | 0 .../grinder/{auto => }/platinum_dust.json | 0 .../recipes/grinder/prismarine_crystals.json | 15 ++++ ...te_dust.json => pyrite_dust_from_ore.json} | 0 ...ust.json => red_garnet_dust_from_gem.json} | 0 ...by_dust_1.json => ruby_dust_from_gem.json} | 0 ...ruby_dust.json => ruby_dust_from_ore.json} | 0 .../grinder/{cobblestone.json => sand.json} | 0 ...ust_1.json => sapphire_dust_from_gem.json} | 0 ..._dust.json => sapphire_dust_from_ore.json} | 0 ...ust_1.json => silver_dust_from_ingot.json} | 0 ...er_dust.json => silver_dust_from_ore.json} | 0 ..._dust.json => sodalite_dust_from_ore.json} | 0 ...ust.json => sphalerite_dust_from_ore.json} | 0 .../grinder/{auto => }/steel_dust.json | 0 ...n_dust_1.json => tin_dust_from_ingot.json} | 0 .../tin_dust.json => tin_dust_from_ore.json} | 0 .../grinder/{auto => }/titanium_dust.json | 0 .../grinder/{auto => }/tungsten_dust.json | 0 ....json => yellow_garnet_dust_from_gem.json} | 0 .../recipes/grinder/{auto => }/zinc_dust.json | 0 48 files changed, 88 insertions(+), 90 deletions(-) delete mode 100644 src/main/java/techreborn/init/recipes/CompressorRecipes.java create mode 100644 src/main/resources/data/techreborn/recipes/compressor/iridium_plate.json create mode 100644 src/main/resources/data/techreborn/recipes/compressor/iridium_plate_from_block.json rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/aluminum_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/bauxite_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/brass_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/bronze_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/chrome_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/cinnabar_dust.json => cinnabar_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/copper_dust_1.json => copper_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/copper_dust.json => copper_dust_from_ore.json} (100%) create mode 100644 src/main/resources/data/techreborn/recipes/grinder/diamond_dust.json rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/electrum_dust.json (100%) create mode 100644 src/main/resources/data/techreborn/recipes/grinder/emerald_dust.json rename src/main/resources/data/techreborn/recipes/grinder/{gravel.json => flint.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/galena_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/gold_dust_1.json => gold_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/gold_dust.json => gold_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/invar_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/iron_dust_1.json => iron_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/iron_dust.json => iron_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{lapis_ore.json => lapis_lazuli.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/lead_dust_1.json => lead_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/lead_dust.json => lead_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/nickel_dust.json => nickel_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/peridot_dust_1.json => peridot_dust_from_gem.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/peridot_dust.json => peridot_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/platinum_dust.json (100%) create mode 100644 src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals.json rename src/main/resources/data/techreborn/recipes/grinder/{auto/pyrite_dust.json => pyrite_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/red_garnet_dust.json => red_garnet_dust_from_gem.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/ruby_dust_1.json => ruby_dust_from_gem.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/ruby_dust.json => ruby_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{cobblestone.json => sand.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/sapphire_dust_1.json => sapphire_dust_from_gem.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/sapphire_dust.json => sapphire_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/silver_dust_1.json => silver_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/silver_dust.json => silver_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/sodalite_dust.json => sodalite_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/sphalerite_dust.json => sphalerite_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/steel_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/tin_dust_1.json => tin_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/tin_dust.json => tin_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/titanium_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/tungsten_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/yellow_garnet_dust.json => yellow_garnet_dust_from_gem.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/zinc_dust.json (100%) diff --git a/src/main/java/techreborn/init/recipes/CompressorRecipes.java b/src/main/java/techreborn/init/recipes/CompressorRecipes.java deleted file mode 100644 index e60b5c511..000000000 --- a/src/main/java/techreborn/init/recipes/CompressorRecipes.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.init.recipes; - -import net.minecraft.item.ItemStack; - - -/** - * @author drcrazy - * - */ -public class CompressorRecipes extends RecipeMethods { - - public static void init() { -// register(ItemIngots.getIngotByName("advanced_alloy"), ItemPlates.getPlateByName("advanced_alloy"), 400, 20); -// register(IC2Duplicates.CARBON_MESH.getStackBasedOnConfig(), ItemPlates.getPlateByName("carbon"), 400, 2); -// register(OreUtil.getStackFromName("plankWood"), OreUtil.getStackFromName("plateWood")); -// register(OreUtil.getStackFromName("dustLazurite"), ItemPlates.getPlateByName("lazurite")); -// register(OreUtil.getStackFromName("obsidian"), ItemPlates.getPlateByName("obsidian", 9)); -// register(OreUtil.getStackFromName("dustObsidian"), ItemPlates.getPlateByName("obsidian")); -// register(OreUtil.getStackFromName("dustYellowGarnet"), ItemPlates.getPlateByName("YellowGarnet")); -// register(OreUtil.getStackFromName("blockYellowGarnet"), ItemPlates.getPlateByName("YellowGarnet", 9)); -// register(OreUtil.getStackFromName("dustRedGarnet"), ItemPlates.getPlateByName("RedGarnet")); -// register(OreUtil.getStackFromName("blockRedGarnet"), ItemPlates.getPlateByName("RedGarnet", 9)); -// register("ingotRefinedIron", ItemPlates.getPlateByName("RefinedIron")); -// -// ItemStack plate; -// for (String ore : OreUtil.oreNames) { -// if (ore.equals("iridium")) { -// continue; -// } -// if (!OreUtil.hasPlate(ore)) { -// continue; -// } -// -// try { -// plate = ItemPlates.getPlateByName(ore, 1); -// } catch (InvalidParameterException e) { -// plate = OreUtil.getStackFromName("plate" + OreUtil.capitalizeFirstLetter(ore)); -// } -// if (plate.isEmpty()) { -// continue; -// } -// if (OreUtil.hasIngot(ore)) { -// register(OreUtil.getStackFromName("ingot" + OreUtil.capitalizeFirstLetter(ore)), plate); -// } -// if (OreUtil.hasGem(ore) && OreUtil.hasDust(ore)) { -// register(OreUtil.getStackFromName("dust" + OreUtil.capitalizeFirstLetter(ore)), plate); -// } -// if (OreUtil.hasBlock(ore)) { -// ItemStack morePlates = plate.copy(); -// morePlates.setCount(9); -// register(OreUtil.getStackFromName("block" + OreUtil.capitalizeFirstLetter(ore)), morePlates); -// } -// } - } - - static void register(Object input, ItemStack output) { - register(input, output, 300, 4); - } - - static void register(Object input, ItemStack output, int tickTime, int euPerTick) { - //RecipeHandler.addRecipe(new CompressorRecipe(input, output, tickTime, euPerTick)); - } -} diff --git a/src/main/java/techreborn/rei/ReiPlugin.java b/src/main/java/techreborn/rei/ReiPlugin.java index 24c395c7e..65c91fd1e 100644 --- a/src/main/java/techreborn/rei/ReiPlugin.java +++ b/src/main/java/techreborn/rei/ReiPlugin.java @@ -53,9 +53,12 @@ public class ReiPlugin implements REIPluginEntry { iconMap.put(ModRecipes.CENTRIFUGE, Machine.INDUSTRIAL_CENTRIFUGE); iconMap.put(ModRecipes.CHEMICAL_REACTOR, Machine.CHEMICAL_REACTOR); iconMap.put(ModRecipes.COMPRESSOR, Machine.COMPRESSOR); + iconMap.put(ModRecipes.DISTILLATION_TOWER, Machine.DISTILLATION_TOWER); + iconMap.put(ModRecipes.EXTRACTOR, Machine.EXTRACTOR); iconMap.put(ModRecipes.GRINDER, Machine.GRINDER); - - //TODO add the others here + iconMap.put(ModRecipes.IMPLOSION_COMPRESSOR, Machine.IMPLOSION_COMPRESSOR); + iconMap.put(ModRecipes.INDUSTRIAL_SAWMILL, Machine.INDUSTRIAL_SAWMILL); + iconMap.put(ModRecipes.VACUUM_FREEZER, Machine.VACUUM_FREEZER); } @Override @@ -78,11 +81,17 @@ public class ReiPlugin implements REIPluginEntry { recipeHelper.registerWorkingStations(ModRecipes.ALLOY_SMELTER.getName(), new ItemStack[] { new ItemStack(Machine.ALLOY_SMELTER.asItem()), new ItemStack(Machine.IRON_ALLOY_FURNACE.asItem())}); - recipeHelper.registerWorkingStations(ModRecipes.GRINDER.getName(), new ItemStack(Machine.GRINDER.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.BLAST_FURNACE.getName(), new ItemStack(Machine.INDUSTRIAL_BLAST_FURNACE.asItem())); recipeHelper.registerWorkingStations(ModRecipes.CENTRIFUGE.getName(), new ItemStack(Machine.INDUSTRIAL_CENTRIFUGE.asItem())); recipeHelper.registerWorkingStations(ModRecipes.CHEMICAL_REACTOR.getName(), new ItemStack(Machine.CHEMICAL_REACTOR.asItem())); recipeHelper.registerWorkingStations(ModRecipes.COMPRESSOR.getName(), new ItemStack(Machine.COMPRESSOR.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.DISTILLATION_TOWER.getName(), new ItemStack(Machine.DISTILLATION_TOWER.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.EXTRACTOR.getName(), new ItemStack(Machine.EXTRACTOR.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.GRINDER.getName(), new ItemStack(Machine.GRINDER.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.IMPLOSION_COMPRESSOR.getName(), new ItemStack(Machine.IMPLOSION_COMPRESSOR.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.INDUSTRIAL_SAWMILL.getName(), new ItemStack(Machine.INDUSTRIAL_SAWMILL.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.VACUUM_FREEZER.getName(), new ItemStack(Machine.VACUUM_FREEZER.asItem())); } private void registerMachineRecipe(RecipeHelper recipeHelper, RebornRecipeType recipeType){ diff --git a/src/main/resources/data/techreborn/recipes/compressor/iridium_plate.json b/src/main/resources/data/techreborn/recipes/compressor/iridium_plate.json new file mode 100644 index 000000000..158953919 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/compressor/iridium_plate.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:compressor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "techreborn:iridium_ingot" + } + ], + "results": [ + { + "item": "techreborn:iridium_plate" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/iridium_plate_from_block.json b/src/main/resources/data/techreborn/recipes/compressor/iridium_plate_from_block.json new file mode 100644 index 000000000..1d908f61f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/compressor/iridium_plate_from_block.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:compressor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "techreborn:iridium_storage_block" + } + ], + "results": [ + { + "item": "techreborn:iridium_plate", + "count": 9 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/aluminum_dust.json b/src/main/resources/data/techreborn/recipes/grinder/aluminum_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/aluminum_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/aluminum_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/bauxite_dust.json b/src/main/resources/data/techreborn/recipes/grinder/bauxite_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/bauxite_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/bauxite_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/brass_dust.json b/src/main/resources/data/techreborn/recipes/grinder/brass_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/brass_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/brass_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/bronze_dust.json b/src/main/resources/data/techreborn/recipes/grinder/bronze_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/bronze_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/bronze_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/chrome_dust.json b/src/main/resources/data/techreborn/recipes/grinder/chrome_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/chrome_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/chrome_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/cinnabar_dust.json b/src/main/resources/data/techreborn/recipes/grinder/cinnabar_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/cinnabar_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/cinnabar_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/copper_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/copper_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/copper_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/copper_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/copper_dust.json b/src/main/resources/data/techreborn/recipes/grinder/copper_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/copper_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/copper_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/diamond_dust.json b/src/main/resources/data/techreborn/recipes/grinder/diamond_dust.json new file mode 100644 index 000000000..a7ac24bdb --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/diamond_dust.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 30, + "time": 270, + "ingredients": [ + { + "item": "minecraft:diamond" + } + ], + "results": [ + { + "item": "techreborn:diamond_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/electrum_dust.json b/src/main/resources/data/techreborn/recipes/grinder/electrum_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/electrum_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/electrum_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/emerald_dust.json b/src/main/resources/data/techreborn/recipes/grinder/emerald_dust.json new file mode 100644 index 000000000..3630082fd --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/emerald_dust.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 30, + "time": 270, + "ingredients": [ + { + "item": "minecraft:emerald" + } + ], + "results": [ + { + "item": "techreborn:emerald_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/gravel.json b/src/main/resources/data/techreborn/recipes/grinder/flint.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/gravel.json rename to src/main/resources/data/techreborn/recipes/grinder/flint.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/galena_dust.json b/src/main/resources/data/techreborn/recipes/grinder/galena_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/galena_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/galena_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/gold_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/gold_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/gold_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/gold_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/gold_dust.json b/src/main/resources/data/techreborn/recipes/grinder/gold_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/gold_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/gold_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/invar_dust.json b/src/main/resources/data/techreborn/recipes/grinder/invar_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/invar_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/invar_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/iron_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/iron_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/iron_dust.json b/src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/iron_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/lapis_ore.json b/src/main/resources/data/techreborn/recipes/grinder/lapis_lazuli.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/lapis_ore.json rename to src/main/resources/data/techreborn/recipes/grinder/lapis_lazuli.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/lead_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/lead_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/lead_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/lead_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/lead_dust.json b/src/main/resources/data/techreborn/recipes/grinder/lead_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/lead_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/lead_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/nickel_dust.json b/src/main/resources/data/techreborn/recipes/grinder/nickel_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/nickel_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/nickel_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/peridot_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/peridot_dust_from_gem.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/peridot_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/peridot_dust_from_gem.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/peridot_dust.json b/src/main/resources/data/techreborn/recipes/grinder/peridot_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/peridot_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/peridot_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/platinum_dust.json b/src/main/resources/data/techreborn/recipes/grinder/platinum_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/platinum_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/platinum_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals.json b/src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals.json new file mode 100644 index 000000000..c1939d1b9 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 200, + "time": 22, + "ingredients": [ + { + "item": "minecraft:prismarine_shard" + } + ], + "results": [ + { + "item": "minecraft:prismarine_crystals" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/pyrite_dust.json b/src/main/resources/data/techreborn/recipes/grinder/pyrite_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/pyrite_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/pyrite_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/red_garnet_dust.json b/src/main/resources/data/techreborn/recipes/grinder/red_garnet_dust_from_gem.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/red_garnet_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/red_garnet_dust_from_gem.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/ruby_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/ruby_dust_from_gem.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/ruby_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/ruby_dust_from_gem.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/ruby_dust.json b/src/main/resources/data/techreborn/recipes/grinder/ruby_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/ruby_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/ruby_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/cobblestone.json b/src/main/resources/data/techreborn/recipes/grinder/sand.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/cobblestone.json rename to src/main/resources/data/techreborn/recipes/grinder/sand.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/sapphire_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/sapphire_dust_from_gem.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/sapphire_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/sapphire_dust_from_gem.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/sapphire_dust.json b/src/main/resources/data/techreborn/recipes/grinder/sapphire_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/sapphire_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/sapphire_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/silver_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/silver_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/silver_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/silver_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/silver_dust.json b/src/main/resources/data/techreborn/recipes/grinder/silver_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/silver_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/silver_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/sodalite_dust.json b/src/main/resources/data/techreborn/recipes/grinder/sodalite_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/sodalite_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/sodalite_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/sphalerite_dust.json b/src/main/resources/data/techreborn/recipes/grinder/sphalerite_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/sphalerite_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/sphalerite_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/steel_dust.json b/src/main/resources/data/techreborn/recipes/grinder/steel_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/steel_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/steel_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/tin_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/tin_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/tin_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/tin_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/tin_dust.json b/src/main/resources/data/techreborn/recipes/grinder/tin_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/tin_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/tin_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/titanium_dust.json b/src/main/resources/data/techreborn/recipes/grinder/titanium_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/titanium_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/titanium_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/tungsten_dust.json b/src/main/resources/data/techreborn/recipes/grinder/tungsten_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/tungsten_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/tungsten_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/yellow_garnet_dust.json b/src/main/resources/data/techreborn/recipes/grinder/yellow_garnet_dust_from_gem.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/yellow_garnet_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/yellow_garnet_dust_from_gem.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/zinc_dust.json b/src/main/resources/data/techreborn/recipes/grinder/zinc_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/zinc_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/zinc_dust.json