From a1674cb8a802a70d6f600ed6ed507edffd90401c Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 30 Jul 2019 21:16:44 +0100 Subject: [PATCH] More recipes ported --- .../java/techreborn/init/RecipeTemplate.java | 13 +- .../recipes/DistillationTowerRecipes.java | 105 ---------- .../init/recipes/ExtractorRecipes.java | 70 ------- .../init/recipes/FusionReactorRecipes.java | 21 +- .../recipes/IndustrialCentrifugeRecipes.java | 180 ------------------ .../init/recipes/RecipeMethods.java | 118 ++++++++---- .../centrifuge/auto/andradite_dust.json | 25 +++ .../recipes/centrifuge/auto/ashes_dust.json | 16 ++ .../recipes/centrifuge/auto/calcite_dust.json | 19 ++ .../recipes/centrifuge/auto/carbon.json | 23 +++ .../centrifuge/auto/copper_small_dust.json | 20 ++ .../centrifuge/auto/copper_small_dust_1.json | 19 ++ .../centrifuge/auto/copper_small_dust_2.json | 19 ++ .../recipes/centrifuge/auto/deuterium.json | 23 +++ .../centrifuge/auto/ender_pearl_dust.json | 20 ++ .../recipes/centrifuge/auto/gold_ingot.json | 26 +++ .../recipes/centrifuge/auto/gold_ingot_1.json | 26 +++ .../recipes/centrifuge/auto/gold_nugget.json | 26 +++ .../centrifuge/auto/gold_nugget_1.json | 27 +++ .../centrifuge/auto/gold_small_dust.json | 20 ++ .../centrifuge/auto/gold_small_dust_1.json | 19 ++ .../recipes/centrifuge/auto/helium3.json | 37 ++++ .../recipes/centrifuge/auto/helium3_1.json | 23 +++ .../centrifuge/auto/iridium_nugget.json | 20 ++ .../centrifuge/auto/iron_small_dust.json | 22 +++ .../centrifuge/auto/lazurite_dust.json | 27 +++ .../centrifuge/auto/lead_small_dust.json | 16 ++ .../centrifuge/auto/magnesium_dust.json | 19 ++ .../recipes/centrifuge/auto/methane.json | 23 +++ .../recipes/centrifuge/auto/methane_1.json | 23 +++ .../recipes/centrifuge/auto/methane_10.json | 23 +++ .../recipes/centrifuge/auto/methane_11.json | 23 +++ .../recipes/centrifuge/auto/methane_12.json | 23 +++ .../recipes/centrifuge/auto/methane_13.json | 23 +++ .../recipes/centrifuge/auto/methane_14.json | 23 +++ .../recipes/centrifuge/auto/methane_15.json | 23 +++ .../recipes/centrifuge/auto/methane_16.json | 23 +++ .../recipes/centrifuge/auto/methane_17.json | 23 +++ .../recipes/centrifuge/auto/methane_18.json | 23 +++ .../recipes/centrifuge/auto/methane_19.json | 23 +++ .../recipes/centrifuge/auto/methane_2.json | 23 +++ .../recipes/centrifuge/auto/methane_20.json | 23 +++ .../recipes/centrifuge/auto/methane_21.json | 23 +++ .../recipes/centrifuge/auto/methane_22.json | 23 +++ .../recipes/centrifuge/auto/methane_23.json | 23 +++ .../recipes/centrifuge/auto/methane_24.json | 23 +++ .../recipes/centrifuge/auto/methane_25.json | 23 +++ .../recipes/centrifuge/auto/methane_26.json | 23 +++ .../recipes/centrifuge/auto/methane_27.json | 23 +++ .../recipes/centrifuge/auto/methane_28.json | 23 +++ .../recipes/centrifuge/auto/methane_29.json | 23 +++ .../recipes/centrifuge/auto/methane_3.json | 23 +++ .../recipes/centrifuge/auto/methane_30.json | 23 +++ .../recipes/centrifuge/auto/methane_31.json | 23 +++ .../recipes/centrifuge/auto/methane_4.json | 23 +++ .../recipes/centrifuge/auto/methane_5.json | 23 +++ .../recipes/centrifuge/auto/methane_6.json | 23 +++ .../recipes/centrifuge/auto/methane_7.json | 23 +++ .../recipes/centrifuge/auto/methane_8.json | 23 +++ .../recipes/centrifuge/auto/methane_9.json | 23 +++ .../recipes/centrifuge/auto/peridot_dust.json | 28 +++ .../recipes/centrifuge/auto/pyrope_dust.json | 25 +++ .../recipes/centrifuge/auto/redstone.json | 34 ++++ .../recipes/centrifuge/auto/redstone_1.json | 32 ++++ .../recipes/centrifuge/auto/rubber.json | 17 ++ .../recipes/centrifuge/auto/sand.json | 24 +++ .../recipes/centrifuge/auto/sand_1.json | 28 +++ .../recipes/centrifuge/auto/sand_2.json | 28 +++ .../recipes/centrifuge/auto/sand_3.json | 34 ++++ .../recipes/centrifuge/auto/sap.json | 35 ++++ .../recipes/centrifuge/auto/silicon.json | 40 ++++ .../centrifuge/auto/silver_small_dust.json | 16 ++ .../recipes/centrifuge/auto/sulfur_dust.json | 19 ++ .../recipes/centrifuge/auto/tin_ingot.json | 27 +++ .../centrifuge/auto/tin_small_dust.json | 19 ++ .../centrifuge/auto/tin_small_dust_1.json | 15 ++ .../recipes/centrifuge/auto/tritium.json | 23 +++ .../centrifuge/auto/zinc_small_dust.json | 19 ++ .../extractor/auto/light_blue_dye.json | 16 ++ .../extractor/auto/light_gray_dye.json | 16 ++ .../extractor/auto/light_gray_dye_1.json | 16 ++ .../extractor/auto/light_gray_dye_2.json | 16 ++ .../recipes/extractor/auto/magenta_dye.json | 16 ++ .../recipes/extractor/auto/magenta_dye_1.json | 16 ++ .../recipes/extractor/auto/orange_dye.json | 16 ++ .../recipes/extractor/auto/pink_dye.json | 16 ++ .../recipes/extractor/auto/pink_dye_1.json | 16 ++ .../recipes/extractor/auto/red_dye.json | 16 ++ .../recipes/extractor/auto/red_dye_1.json | 16 ++ .../recipes/extractor/auto/red_dye_2.json | 16 ++ .../recipes/extractor/auto/rubber.json | 15 ++ .../recipes/extractor/auto/rubber_1.json | 15 ++ .../recipes/extractor/auto/rubber_2.json | 16 ++ .../recipes/extractor/auto/rubber_3.json | 16 ++ .../recipes/extractor/auto/stick.json | 15 ++ .../recipes/extractor/auto/wheat_seeds.json | 15 ++ .../recipes/extractor/auto/wheat_seeds_1.json | 15 ++ .../recipes/extractor/auto/yellow_dye.json | 16 ++ .../recipes/extractor/auto/yellow_dye_1.json | 16 ++ .../recipes/extractor/empty_cell.json | 15 ++ 100 files changed, 2139 insertions(+), 405 deletions(-) delete mode 100644 src/main/java/techreborn/init/recipes/DistillationTowerRecipes.java delete mode 100644 src/main/java/techreborn/init/recipes/ExtractorRecipes.java delete mode 100644 src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/andradite_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/ashes_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/calcite_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/carbon.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_1.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_2.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/deuterium.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/ender_pearl_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot_1.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget_1.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust_1.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3_1.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/iridium_nugget.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/iron_small_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/lazurite_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/lead_small_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/magnesium_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_1.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_10.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_11.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_12.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_13.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_14.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_15.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_16.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_17.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_18.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_19.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_2.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_20.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_21.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_22.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_23.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_24.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_25.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_26.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_27.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_28.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_29.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_3.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_30.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_31.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_4.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_5.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_6.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_7.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_8.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_9.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/peridot_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/pyrope_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone_1.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/rubber.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/sand.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_1.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_2.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_3.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/sap.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/silicon.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/silver_small_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/sulfur_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_ingot.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust_1.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/tritium.json create mode 100644 src/main/resources/data/techreborn/recipes/centrifuge/auto/zinc_small_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/light_blue_dye.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_1.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_2.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye_1.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/orange_dye.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye_1.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/red_dye.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_1.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_2.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/rubber.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/rubber_1.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/rubber_2.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/rubber_3.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/stick.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds_1.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye_1.json create mode 100644 src/main/resources/data/techreborn/recipes/extractor/empty_cell.json diff --git a/src/main/java/techreborn/init/RecipeTemplate.java b/src/main/java/techreborn/init/RecipeTemplate.java index a1b0c1e31..92ff97d30 100644 --- a/src/main/java/techreborn/init/RecipeTemplate.java +++ b/src/main/java/techreborn/init/RecipeTemplate.java @@ -21,6 +21,8 @@ import net.minecraft.text.LiteralText; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.Validate; +import techreborn.items.ItemDynamicCell; import java.io.File; import java.io.IOException; @@ -229,7 +231,7 @@ public class RecipeTemplate { Function toIngredient = stack -> { JsonObject jsonObject = new JsonObject(); - if(stack.getItem() == TRContent.CELL){ + if(stack.getItem() == TRContent.CELL && TRContent.CELL.getFluid(stack) != Fluids.EMPTY){ jsonObject.addProperty("fluid", Registry.FLUID.getId(TRContent.CELL.getFluid(stack)).toString()); jsonObject.addProperty("holder", "techreborn:cell"); } else { @@ -237,10 +239,14 @@ public class RecipeTemplate { if(stack.getCount() > 1){ jsonObject.addProperty("count", stack.getCount()); } + if(stack.getItem() instanceof ItemDynamicCell){ + //Force it to be an empty cell + jsonObject.addProperty("nbt", "null"); + } } return jsonObject; }; - inputs.forEach(stack -> ingredients.add(toIngredient.apply(stack))); + inputs.stream().peek(Validate::notNull).forEach(stack -> ingredients.add(toIngredient.apply(stack))); object.add("ingredients", ingredients); } @@ -275,6 +281,9 @@ public class RecipeTemplate { String name = Registry.ITEM.getId(outputs.get(0).getItem()).getPath(); if(outputs.get(0).getItem() == TRContent.CELL){ name = Registry.FLUID.getId(TRContent.CELL.getFluid(outputs.get(0))).getPath(); + if(name.equals("empty")){ + name = "empty_cell"; + } } String extraPath = auto ? "/auto/" : "/"; diff --git a/src/main/java/techreborn/init/recipes/DistillationTowerRecipes.java b/src/main/java/techreborn/init/recipes/DistillationTowerRecipes.java deleted file mode 100644 index dcdbbe255..000000000 --- a/src/main/java/techreborn/init/recipes/DistillationTowerRecipes.java +++ /dev/null @@ -1,105 +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; -import techreborn.init.ModFluids; -import techreborn.items.ItemDynamicCell; - - -import java.security.InvalidParameterException; - -/** - * @author drcrazy - * - */ -public class DistillationTowerRecipes extends RecipeMethods { - - public static void init() { - register(ItemDynamicCell.getCellWithFluid(ModFluids.OIL.getFluid(), 16), 1400, 13, getMaterial("diesel", 16, Type.CELL), getMaterial("sulfuricAcid", 16, Type.CELL), getMaterial("glyceryl", Type.CELL)); - } - - static void register(ItemStack input, int ticks, int euPerTick, boolean oreDict, ItemStack... outputs) { - ItemStack output1; - ItemStack output2 = null; - ItemStack output3 = null; - ItemStack output4 = null; - - if (outputs.length == 3) { - output1 = outputs[0]; - output2 = outputs[1]; - output3 = outputs[2]; - } else if (outputs.length == 2) { - output1 = outputs[0]; - output2 = outputs[1]; - } else if (outputs.length == 1) { - output1 = outputs[0]; - } else if (outputs.length == 4) { - output1 = outputs[0]; - output2 = outputs[1]; - output3 = outputs[2]; - output4 = outputs[3]; - } else { - throw new InvalidParameterException("Invalid number of Distillation tower outputs: " + outputs); - } - - int cellCount = 0; - for (ItemStack stack : outputs) { - if (stack.getItem() instanceof ItemDynamicCell) { - cellCount += stack.getCount(); - } - } - - if (input.getItem() instanceof ItemDynamicCell) { - int inputCount = input.getCount(); - if (cellCount < inputCount) { - if (output2 == null) { - output2 = ItemDynamicCell.getEmptyCell(inputCount - cellCount); - } else if (output3 == null) { - output3 = ItemDynamicCell.getEmptyCell(inputCount - cellCount); - } else if (output4 == null) { - output4 = ItemDynamicCell.getEmptyCell(inputCount - cellCount); - } - } - cellCount -= inputCount; - } - - if (cellCount < 0) { cellCount = 0; } - - ItemStack cells = null; - if (cellCount > 0) { - if (cellCount > 64) { - throw new InvalidParameterException("Invalid Distillation tower outputs: " + outputs + "(Recipe requires > 64 cells)"); - } - cells = ItemDynamicCell.getEmptyCell(cellCount); - } - // RecipeHandler.addRecipe(Reference.DistiLLATION_TOWER_RECIPE, new DistillationTowerRecipe(input, cells, output1, output2, output3, output4, ticks, euPerTick, oreDict)); - } - - static void register(ItemStack input, int ticks, int euPerTick, ItemStack... outputs) { - register(input, ticks, euPerTick, true, outputs); - } - -} diff --git a/src/main/java/techreborn/init/recipes/ExtractorRecipes.java b/src/main/java/techreborn/init/recipes/ExtractorRecipes.java deleted file mode 100644 index c4bc9dffb..000000000 --- a/src/main/java/techreborn/init/recipes/ExtractorRecipes.java +++ /dev/null @@ -1,70 +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; - -/** - * Created by Prospector - */ -public class ExtractorRecipes extends RecipeMethods { - /* TODO 1.13 :D - public static void init() { - register(getStack(TRContent.RUBBER_SAPLING), TRContent.Parts.RUBBER.getStack(), false); - register(getStack(TRContent.RUBBER_LOG), TRContent.Parts.RUBBER.getStack(), false); - register(getStack(Items.SLIME_BALL), TRContent.Parts.RUBBER.getStack(2), false); - register(TRContent.Parts.SAP.getStack(), TRContent.Parts.RUBBER.getStack(3), false); - register(getStack(Blocks.RED_TULIP), getStack(Items.ROSE_RED, 2), false); - register(getStack(Blocks.POPPY), getStack(Items.ROSE_RED, 2), false); - register(getStack(Blocks.ROSE_BUSH), getStack(Items.ROSE_RED, 4), false); - register(getStack(Blocks.BLUE_ORCHID), getStack(Items.LIGHT_BLUE_DYE, 2), false); - register(getStack(Blocks.AZURE_BLUET), getStack(Items.LIGHT_GRAY_DYE, 2), false); - register(getStack(Blocks.OXEYE_DAISY), getStack(Items.LIGHT_GRAY_DYE, 2), false); - register(getStack(Blocks.WHITE_TULIP), getStack(Items.LIGHT_GRAY_DYE, 2), false); - register(getStack(Blocks.ALLIUM), getStack(Items.MAGENTA_DYE, 2), false); - register(getStack(Blocks.LILAC), getStack(Items.MAGENTA_DYE, 4), false); - register(getStack(Blocks.ORANGE_TULIP), getStack(Items.ORANGE_DYE, 2), false); - register(getStack(Blocks.PINK_TULIP), getStack(Items.PINK_DYE, 2), false); - register(getStack(Blocks.PEONY), getStack(Items.PINK_DYE, 4), false); - register(getStack(Blocks.DANDELION), getStack(Items.DANDELION_YELLOW, 2), false); - register(getStack(Blocks.SUNFLOWER), getStack(Items.DANDELION_YELLOW, 2), false); - register(getStack(Blocks.TALL_GRASS), getStack(Items.WHEAT_SEEDS), false); - register(getStack(Blocks.LARGE_FERN), getStack(Items.WHEAT_SEEDS), false); - register(getStack(Blocks.DEAD_BUSH), getStack(Items.STICK)); - for (int i = 1; i < 15; i++) - register(getStack(Blocks.WOOL, 1, i), getStack(Blocks.WOOL, 1, 0), false); - for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { - register(DynamicCell.getCellWithFluid(fluid), DynamicCell.getEmptyCell(1), false); - } - } - - static void register(ItemStack input, ItemStack output) { - register(input, output, true); - } - - static void register(ItemStack input, ItemStack output, boolean oreDict) { - RecipeHandler.addRecipe(Reference.EXTRACTOR_RECIPE, new ExtractorRecipe(input, output, 400, 2, oreDict)); - } - - */ -} diff --git a/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java b/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java index 22339cd67..9fc1e4848 100644 --- a/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java +++ b/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java @@ -24,20 +24,23 @@ package techreborn.init.recipes; +import net.minecraft.item.ItemStack; +import techreborn.api.reactor.FusionReactorRecipe; +import techreborn.api.reactor.FusionReactorRecipeHelper; +import techreborn.init.ModFluids; +import techreborn.init.TRContent; +import techreborn.items.ItemDynamicCell; + /** * @author drcrazy * */ public class FusionReactorRecipes extends RecipeMethods { public static void init() { -// FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("helium3"), -// ItemCells.getCellByName("deuterium"), ItemCells.getCellByName("heliumplasma"), 40000000, 32768, 1024)); -// FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("tritium"), -// ItemCells.getCellByName("deuterium"), ItemCells.getCellByName("helium3"), 60000000, 16384, 2048)); -// FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("wolframium"), -// ItemCells.getCellByName("Berylium"), TRContent.Dusts.PLATINUM.getStack(), 80000000, -2048, 1024)); - // TODO: Fix recipe -// FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemCells.getCellByName("wolframium"), -// ItemCells.getCellByName("lithium"), BlockOre.getOreByName("iridium"), 90000000, -2048, 1024)); + + FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemDynamicCell.getCellWithFluid(ModFluids.HELIUM_3.getFluid()), ItemDynamicCell.getCellWithFluid(ModFluids.DEUTERIUM.getFluid()), ItemDynamicCell.getCellWithFluid(ModFluids.HELIUMPLASMA.getFluid()), 40000000, 32768, 1024)); + FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemDynamicCell.getCellWithFluid(ModFluids.TRITIUM.getFluid()), ItemDynamicCell.getCellWithFluid(ModFluids.DEUTERIUM.getFluid()), ItemDynamicCell.getCellWithFluid(ModFluids.HELIUM_3.getFluid()), 60000000, 16384, 2048)); + FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemDynamicCell.getCellWithFluid(ModFluids.WOLFRAMIUM.getFluid()), ItemDynamicCell.getCellWithFluid(ModFluids.BERYLIUM.getFluid()), TRContent.Dusts.PLATINUM.getStack(), 80000000, -2048, 1024)); + FusionReactorRecipeHelper.registerRecipe(new FusionReactorRecipe(ItemDynamicCell.getCellWithFluid(ModFluids.WOLFRAMIUM.getFluid()), ItemDynamicCell.getCellWithFluid(ModFluids.LITHIUM.getFluid()), new ItemStack(TRContent.Ores.IRIDIUM.asItem()), 90000000, -2048, 1024)); } } diff --git a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java deleted file mode 100644 index 8258892ea..000000000 --- a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java +++ /dev/null @@ -1,180 +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.block.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import techreborn.items.ItemDynamicCell; - -import java.security.InvalidParameterException; - -/** - * Created by Prospector - */ -public class IndustrialCentrifugeRecipes extends RecipeMethods { - public static void init() { - - register(getStack(Blocks.DIRT, 16), 2500, getStack(Blocks.SAND, 8), getStack(Items.CLAY_BALL), getStack(Blocks.GRAVEL, 2)); - register(getStack(Blocks.GRASS, 16), 2500, getStack(Blocks.SAND, 8), getStack(Items.CLAY_BALL), getStack(Blocks.GRAVEL, 2), getStack(Items.WHEAT_SEEDS, 4)); - register(getStack(Blocks.MYCELIUM, 8), 1640, getStack(Blocks.SAND, 4), getStack(Items.CLAY_BALL), getStack(Blocks.BROWN_MUSHROOM, 2), getStack(Blocks.RED_MUSHROOM, 2)); - register(getStack(Items.GOLDEN_APPLE), 5000, getStack(Items.GOLD_INGOT, 6), getMaterial("methane", Type.CELL)); - register(getStack(Items.ENCHANTED_GOLDEN_APPLE), 5000, getStack(Items.GOLD_INGOT, 64), getMaterial("methane", Type.CELL)); - register(getStack(Items.GOLDEN_CARROT), 5000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); - register(getStack(Items.GLISTERING_MELON_SLICE, 8), 5000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); - register(getStack(Items.APPLE, 32), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.MUSHROOM_STEW, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.BREAD, 64), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.PORKCHOP, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.COOKED_PORKCHOP, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.BEEF, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.COOKED_BEEF, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.CHICKEN, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.COOKED_CHICKEN, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.MUTTON, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.COOKED_MUTTON, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.RABBIT, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.COOKED_RABBIT, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.COD, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.COOKED_COD, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.SALMON, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.COOKED_SALMON, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.MELON_SLICE, 64), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Blocks.PUMPKIN, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.ROTTEN_FLESH, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.SPIDER_EYE, 32), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.CARROT, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.POTATO, 16), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.POISONOUS_POTATO, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.BAKED_POTATO, 24), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.BEETROOT, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.COOKIE, 64), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Blocks.BROWN_MUSHROOM_BLOCK, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Blocks.RED_MUSHROOM_BLOCK, 12), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Blocks.BROWN_MUSHROOM, 32), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Blocks.RED_MUSHROOM, 32), 5000, getMaterial("methane", Type.CELL)); - register(getStack(Items.NETHER_WART, 32), 5000, getMaterial("methane", Type.CELL)); -//TODO: Fixme -// register(getMaterial("sap", 4, Type.PART), 1300, getMaterial("rubber", 14, Type.PART)); -// register(getStack(ModBlocks.RUBBER_LOG, 16), 5000, false, getMaterial("sap", 8, Type.PART), getMaterial("methane", Type.CELL), getMaterial("carbon", 4, Type.CELL)); -// register(getStack(Blocks.SOUL_SAND, 16), 2500, getStack(Blocks.SAND, 10), getMaterial("saltpeter", 4, Type.DUST), getMaterial("coal", Type.DUST), getMaterial("oil", Type.CELL)); -// register(getOre("dustBronze"), 1500, getMaterial("copper", 6, Type.SMALL_DUST), getMaterial("tin", 2, Type.SMALL_DUST)); -// register(getOre("dustIron", 2), 1500, getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); -// register(getOre("dustSilver", 2), 2400, getMaterial("lead", Type.SMALL_DUST)); -// register(getOre("dustLead", 2), 2400, getMaterial("silver", Type.SMALL_DUST)); -// register(getOre("dustTin", 2), 210, getMaterial("zinc", Type.SMALL_DUST), getMaterial("iron", Type.SMALL_DUST)); -// register(getOre("dustElectrum"), 960, getMaterial("gold", 2, Type.SMALL_DUST), getMaterial("silver", 2, Type.SMALL_DUST)); -// register(getOre("dustZinc"), 1040, getMaterial("tin", Type.SMALL_DUST)); -// register(getOre("dustBrass"), 1500, getMaterial("copper", 3, Type.SMALL_DUST), getMaterial("zinc", Type.SMALL_DUST)); -// register(getOre("dustPlatinum", 2), 3000, getMaterial("iridium", 2, Type.NUGGET), getMaterial("nickel", Type.SMALL_DUST)); -// register(getOre("dustNickel", 3), 3440, getMaterial("iron", Type.SMALL_DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("copper", Type.SMALL_DUST)); -// register(getOre("dustGold", 3), 2400, getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); -// register(getOre("dustCopper", 3), 2400, getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); -// register(getOre("dustRedstone", 32), 2200, getMaterial("silicon", 3, Type.CELL), getMaterial("pyrite", 16, Type.DUST), getMaterial("ruby", 3, Type.DUST), getMaterial("mercury", 10, Type.CELL)); -// register(getOre("dustGlowstone", 16), 2500, getStack(Items.REDSTONE, 8), getMaterial("sulfur", Type.CELL), getMaterial("helium", Type.CELL)); -// register(getStack(Items.DYE, 4, 4), 1500, false, getMaterial("lazurite", 3, Type.DUST), getMaterial("pyrite", Type.SMALL_DUST), getMaterial("calcite", Type.SMALL_DUST), getMaterial("sodalite", 2, Type.SMALL_DUST)); -// register(getOre("dustEnderEye", 2), 1840, getMaterial("ender_pearl", 2, Type.DUST), getStack(Items.BLAZE_POWDER)); -// register(getOre("dustNetherrack", 16), 2400, getStack(Items.REDSTONE), getMaterial("sulfur", Type.CELL), getMaterial("coal", Type.DUST), getStack(Items.GOLD_NUGGET)); -// register(getOre("dustEndstone", 16), 4800, getMaterial("helium3", Type.CELL), getMaterial("helium", Type.CELL), getMaterial("tungsten", Type.SMALL_DUST), getStack(Blocks.SAND, 12)); -// register(getOre("dustRedGarnet", 16), 3000, getMaterial("pyrope", 3, Type.DUST), getMaterial("almandine", 5, Type.DUST), getMaterial("spessartine", 8, Type.DUST)); -// register(getOre("dustYellowGarnet", 16), 3500, getMaterial("andradite", 5, Type.DUST), getMaterial("grossular", 8, Type.DUST), getMaterial("uvarovite", 3, Type.DUST)); -// register(getOre("dustDarkAshes", 2), 240, getMaterial("ashes", 1, Type.DUST)); -// register(getOre("dustAshes", 2), 240, getMaterial("carbon", Type.CELL)); -// register(getOre("dustMarble"), 1040, getMaterial("magnesium", Type.DUST), getMaterial("calcite", 7, Type.DUST)); -// register(getOre("dustBasalt", 16), 2040, getMaterial("peridot", Type.DUST), getMaterial("calcite", 3, Type.DUST), getMaterial("flint", 8, Type.DUST), getMaterial("dark_ashes", 4, Type.DUST)); -// register(getMaterial("lava", 16, Type.CELL), 1500, getMaterial("tin", 6, Type.INGOT), getMaterial("copper", 4, Type.INGOT), getMaterial("electrum", Type.INGOT), getMaterial("tungsten", Type.SMALL_DUST)); - register(getMaterial("hydrogen", 4, Type.CELL), 3000, getMaterial("deuterium", Type.CELL)); - register(getMaterial("deuterium", 4, Type.CELL), 3000, getMaterial("tritium", Type.CELL)); - register(getMaterial("helium", 16, Type.CELL), 5000, getMaterial("helium3", Type.CELL)); -// register(getMaterial("calciumcarbonate", Type.CELL), 40, getMaterial("calcite", Type.DUST)); -// register(getMaterial("sulfur", Type.CELL), 40, getMaterial("sulfur", Type.DUST)); - } - - static void register(Object input, int ticks, boolean oreDict, ItemStack... outputs) { - ItemStack output1; - ItemStack output2 = null; - ItemStack output3 = null; - ItemStack output4 = null; - - if (outputs.length == 3) { - output1 = outputs[0]; - output2 = outputs[1]; - output3 = outputs[2]; - } else if (outputs.length == 2) { - output1 = outputs[0]; - output2 = outputs[1]; - } else if (outputs.length == 1) { - output1 = outputs[0]; - } else if (outputs.length == 4) { - output1 = outputs[0]; - output2 = outputs[1]; - output3 = outputs[2]; - output4 = outputs[3]; - } else { - throw new InvalidParameterException("Invalid industrial centrifuge outputs: " + outputs); - } - - int cellCount = 0; - for (ItemStack stack : outputs) { - if (stack.getItem() instanceof ItemDynamicCell) { - cellCount += stack.getCount(); - } - - } - - if (input instanceof ItemStack) { - if (((ItemStack) input).getItem() instanceof ItemDynamicCell) { - int inputCount = ((ItemStack) input).getCount(); - if (cellCount < inputCount) { - if (output2 == null) { - output2 = ItemDynamicCell.getEmptyCell(inputCount - cellCount); - } else if (output3 == null) { - output3 = ItemDynamicCell.getEmptyCell(inputCount - cellCount); - } else if (output4 == null) { - output4 = ItemDynamicCell.getEmptyCell(inputCount - cellCount); - } - } - cellCount -= inputCount; - - } - } - - if (cellCount < 0) { - cellCount = 0; - } - ItemStack cells = null; - if (cellCount > 0) { - if (cellCount > 64) { - throw new InvalidParameterException("Invalid industrial centrifuge outputs: " + outputs + "(Recipe requires > 64 cells)"); - } - cells = ItemDynamicCell.getEmptyCell(cellCount); - } - //RecipeHandler.addRecipe(Reference.CENTRIFUGE_RECIPE, new CentrifugeRecipe(input, cells, output1, output2, output3, output4, ticks, 5, oreDict)); - } - - static void register(Object input, int ticks, ItemStack... outputs) { - register(input, ticks, true, outputs); - } -} diff --git a/src/main/java/techreborn/init/recipes/RecipeMethods.java b/src/main/java/techreborn/init/recipes/RecipeMethods.java index 58ba9c183..fd494bafb 100644 --- a/src/main/java/techreborn/init/recipes/RecipeMethods.java +++ b/src/main/java/techreborn/init/recipes/RecipeMethods.java @@ -25,46 +25,84 @@ package techreborn.init.recipes; import net.minecraft.block.Block; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.Fluids; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import net.minecraft.recipe.Ingredient; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; import reborncore.common.util.StringUtils; +import techreborn.items.ItemDynamicCell; /** * Created by Prospector */ public abstract class RecipeMethods { public static ItemStack getMaterial(String name, int count, Type type) { -// if (type == Type.DUST) { -// return ItemDusts.getDustByName(name, count); -// } else if (type == Type.SMALL_DUST) { -// return ItemDustsSmall.getSmallDustByName(name, count); -// } else if (type == Type.INGOT) { -// return ItemIngots.getIngotByName(name, count); -// } else if (type == Type.GEM) { -// return ItemGems.getGemByName(name, count); -// TODO: fix recipe -// } else if (type == Type.PLATE) { -// return ItemPlates.getPlateByName(name, count); -// } else if (type == Type.NUGGET) { -// return ItemNuggets.getNuggetByName(name, count); -// } else -// if (type == Type.CELL) { -// return ItemCells.getCellByName(name, count); -// } else if (type == Type.PART) { -// return ItemParts.getPartByName(name, count); -// } else if (type == Type.CABLE) { -// return BlockCable.getCableByName(name, count); -// } else if (type == Type.MACHINE_FRAME) { -// return BlockMachineFrames.getFrameByName(name, count); -// } else if (type == Type.MACHINE_CASING) { -// return BlockMachineCasing.getStackByName(name, count); -// } else if (type == Type.UPGRADE) { -// return ItemUpgrades.getUpgradeByName(name, count); -// } else if (type == Type.ORE) { -// return BlockOre.getOreByName(name, count); -// } - return ItemStack.EMPTY; + name = name.toLowerCase(); + if(type == Type.CELL){ + + Fluid fluid = Registry.FLUID.get(new Identifier("techreborn", name.toLowerCase())); + if(name.equals("water")){ + fluid = Fluids.WATER; + } + if(name.equals("lava")){ + fluid = Fluids.LAVA; + } + + if(fluid == Fluids.EMPTY){ + throw new RuntimeException("could not find fluid " + name); + } + return ItemDynamicCell.getCellWithFluid(fluid, count); + } + + if(type == Type.INGOT){ + return find(name + "_ingot", count); + } + + if(type == Type.DUST){ + return find(name + "_dust", count); + } + + if(type == Type.PLATE){ + return find(name + "_plate", count); + } + + if(type == Type.NUGGET){ + return find(name + "_nugget", count); + } + + if(type == Type.SMALL_DUST){ + return find(name + "_small_dust", count); + } + + if(type == Type.ORE){ + return find(name + "_ore", count); + } + + if(type == Type.PART){ + return find(name, count); + } + + throw new UnsupportedOperationException(type.name()); + } + + private static ItemStack find(String path, int count){ + Identifier identifier = new Identifier(path); + Item item = Registry.ITEM.get(identifier); + if(item != Items.AIR){ + return new ItemStack(item, count); + } + + identifier = new Identifier("techreborn", path); + item = Registry.ITEM.get(identifier); + if(item != Items.AIR){ + return new ItemStack(item, count); + } + + throw new UnsupportedOperationException("Could not find" + path); } static Object getMaterialObjectFromType(String name, Type type) { @@ -98,23 +136,25 @@ public abstract class RecipeMethods { return getMaterial(name, 1, type); } - public static Object getMaterialObject(String name, Type type) { - return getMaterialObjectFromType(name, type); - } - @Deprecated public static ItemStack getOre(String name, int count) { - throw new UnsupportedOperationException("Use tags"); + if(name.equals("dustRedstone")){ + return new ItemStack(Items.REDSTONE, count); + } + if(name.startsWith("dust")){ + return getMaterial(name.replace("dust", ""), count, Type.DUST); + } + return getMaterial(name, count, Type.ORE); } @Deprecated public static ItemStack getOre(String name) { - throw new UnsupportedOperationException("Use tags"); + return getOre(name, 1); } @Deprecated public static boolean oresExist(String... names) { - throw new UnsupportedOperationException("Use tags"); + return false; } public static ItemStack getStack(Item item) { @@ -132,7 +172,7 @@ public abstract class RecipeMethods { @Deprecated public static ItemStack getStack(Item item, int count, boolean wildcard) { - throw new UnsupportedOperationException("Use tags"); + return new ItemStack(item, count); } public static ItemStack getStack(Block block) { @@ -140,7 +180,7 @@ public abstract class RecipeMethods { } public static ItemStack getStack(Block block, int count) { - return getStack(block, count); + return new ItemStack(block, count); } public static ItemStack getStack(Block block, boolean wildcard) { diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/andradite_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/andradite_dust.json new file mode 100644 index 000000000..61c6440a5 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/andradite_dust.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:centrifuge", + "power": 3500, + "time": 5, + "ingredients": [ + { + "item": "techreborn:yellow_garnet_dust", + "count": 16 + } + ], + "results": [ + { + "item": "techreborn:andradite_dust", + "count": 5 + }, + { + "item": "techreborn:grossular_dust", + "count": 8 + }, + { + "item": "techreborn:uvarovite_dust", + "count": 3 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/ashes_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/ashes_dust.json new file mode 100644 index 000000000..5a50e1918 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/ashes_dust.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:centrifuge", + "power": 240, + "time": 5, + "ingredients": [ + { + "item": "techreborn:dark_ashes_dust", + "count": 2 + } + ], + "results": [ + { + "item": "techreborn:ashes_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/calcite_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/calcite_dust.json new file mode 100644 index 000000000..bf0453296 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/calcite_dust.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:centrifuge", + "power": 40, + "time": 5, + "ingredients": [ + { + "fluid": "techreborn:calciumcarbonate", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:calcite_dust" + }, + { + "item": "techreborn:cell" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/carbon.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/carbon.json new file mode 100644 index 000000000..83e098d1e --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/carbon.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 240, + "time": 5, + "ingredients": [ + { + "item": "techreborn:ashes_dust", + "count": 2 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:carbon" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust.json new file mode 100644 index 000000000..38efac2e6 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:centrifuge", + "power": 1500, + "time": 5, + "ingredients": [ + { + "item": "techreborn:bronze_dust" + } + ], + "results": [ + { + "item": "techreborn:copper_small_dust", + "count": 6 + }, + { + "item": "techreborn:tin_small_dust", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_1.json new file mode 100644 index 000000000..225c8d138 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_1.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:centrifuge", + "power": 1500, + "time": 5, + "ingredients": [ + { + "item": "techreborn:brass_dust" + } + ], + "results": [ + { + "item": "techreborn:copper_small_dust", + "count": 3 + }, + { + "item": "techreborn:zinc_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_2.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_2.json new file mode 100644 index 000000000..9dcc06c58 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_2.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:centrifuge", + "power": 2400, + "time": 5, + "ingredients": [ + { + "item": "techreborn:gold_dust", + "count": 3 + } + ], + "results": [ + { + "item": "techreborn:copper_small_dust" + }, + { + "item": "techreborn:nickel_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/deuterium.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/deuterium.json new file mode 100644 index 000000000..5dd0c4b44 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/deuterium.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 3000, + "time": 5, + "ingredients": [ + { + "fluid": "techreborn:hydrogen", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:deuterium" + } + }, + { + "item": "techreborn:cell", + "count": 3 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/ender_pearl_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/ender_pearl_dust.json new file mode 100644 index 000000000..8ed2bdc04 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/ender_pearl_dust.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:centrifuge", + "power": 1840, + "time": 5, + "ingredients": [ + { + "item": "techreborn:ender_eye_dust", + "count": 2 + } + ], + "results": [ + { + "item": "techreborn:ender_pearl_dust", + "count": 2 + }, + { + "item": "minecraft:blaze_powder" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot.json new file mode 100644 index 000000000..2b1eba1f7 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot.json @@ -0,0 +1,26 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:golden_apple" + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "minecraft:gold_ingot", + "count": 6 + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot_1.json new file mode 100644 index 000000000..68efe4a26 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot_1.json @@ -0,0 +1,26 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:enchanted_golden_apple" + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "minecraft:gold_ingot", + "count": 64 + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget.json new file mode 100644 index 000000000..b04d10eb1 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget.json @@ -0,0 +1,26 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:golden_carrot" + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "minecraft:gold_nugget", + "count": 6 + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget_1.json new file mode 100644 index 000000000..384b4270f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget_1.json @@ -0,0 +1,27 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:glistering_melon_slice", + "count": 8 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "minecraft:gold_nugget", + "count": 6 + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust.json new file mode 100644 index 000000000..2833d3124 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:centrifuge", + "power": 960, + "time": 5, + "ingredients": [ + { + "item": "techreborn:electrum_dust" + } + ], + "results": [ + { + "item": "techreborn:gold_small_dust", + "count": 2 + }, + { + "item": "techreborn:silver_small_dust", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust_1.json new file mode 100644 index 000000000..a70cedf63 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust_1.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:centrifuge", + "power": 2400, + "time": 5, + "ingredients": [ + { + "item": "techreborn:copper_dust", + "count": 3 + } + ], + "results": [ + { + "item": "techreborn:gold_small_dust" + }, + { + "item": "techreborn:nickel_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3.json new file mode 100644 index 000000000..9e01b3c07 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3.json @@ -0,0 +1,37 @@ +{ + "type": "techreborn:centrifuge", + "power": 4800, + "time": 5, + "ingredients": [ + { + "item": "techreborn:endstone_dust", + "count": 16 + }, + { + "item": "techreborn:cell", + "count": 2, + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:helium3" + } + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:helium" + } + }, + { + "item": "techreborn:tungsten_small_dust" + }, + { + "item": "minecraft:sand", + "count": 12 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3_1.json new file mode 100644 index 000000000..66e5d1035 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3_1.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "fluid": "techreborn:helium", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:helium3" + } + }, + { + "item": "techreborn:cell", + "count": 15 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/iridium_nugget.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/iridium_nugget.json new file mode 100644 index 000000000..a84d978f7 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/iridium_nugget.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:centrifuge", + "power": 3000, + "time": 5, + "ingredients": [ + { + "item": "techreborn:platinum_dust", + "count": 2 + } + ], + "results": [ + { + "item": "techreborn:iridium_nugget", + "count": 2 + }, + { + "item": "techreborn:nickel_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/iron_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/iron_small_dust.json new file mode 100644 index 000000000..d2a248930 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/iron_small_dust.json @@ -0,0 +1,22 @@ +{ + "type": "techreborn:centrifuge", + "power": 3440, + "time": 5, + "ingredients": [ + { + "item": "techreborn:nickel_dust", + "count": 3 + } + ], + "results": [ + { + "item": "techreborn:iron_small_dust" + }, + { + "item": "techreborn:gold_small_dust" + }, + { + "item": "techreborn:copper_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/lazurite_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/lazurite_dust.json new file mode 100644 index 000000000..5a9733bb4 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/lazurite_dust.json @@ -0,0 +1,27 @@ +{ + "type": "techreborn:centrifuge", + "power": 1500, + "time": 5, + "ingredients": [ + { + "item": "minecraft:lapis_lazuli", + "count": 4 + } + ], + "results": [ + { + "item": "techreborn:lazurite_dust", + "count": 3 + }, + { + "item": "techreborn:pyrite_small_dust" + }, + { + "item": "techreborn:calcite_small_dust" + }, + { + "item": "techreborn:sodalite_small_dust", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/lead_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/lead_small_dust.json new file mode 100644 index 000000000..9839fce31 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/lead_small_dust.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:centrifuge", + "power": 2400, + "time": 5, + "ingredients": [ + { + "item": "techreborn:silver_dust", + "count": 2 + } + ], + "results": [ + { + "item": "techreborn:lead_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/magnesium_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/magnesium_dust.json new file mode 100644 index 000000000..b662fe5af --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/magnesium_dust.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:centrifuge", + "power": 1040, + "time": 5, + "ingredients": [ + { + "item": "techreborn:marble_dust" + } + ], + "results": [ + { + "item": "techreborn:magnesium_dust" + }, + { + "item": "techreborn:calcite_dust", + "count": 7 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane.json new file mode 100644 index 000000000..5bddada2e --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:apple", + "count": 32 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_1.json new file mode 100644 index 000000000..1b973b128 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_1.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:mushroom_stew", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_10.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_10.json new file mode 100644 index 000000000..5838136bc --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_10.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:cooked_mutton", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_11.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_11.json new file mode 100644 index 000000000..7cd7647e1 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_11.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:rabbit", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_12.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_12.json new file mode 100644 index 000000000..ea096e583 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_12.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:cooked_rabbit", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_13.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_13.json new file mode 100644 index 000000000..7af8aad82 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_13.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:cod", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_14.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_14.json new file mode 100644 index 000000000..782de110c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_14.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:cooked_cod", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_15.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_15.json new file mode 100644 index 000000000..0093ac178 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_15.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:salmon", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_16.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_16.json new file mode 100644 index 000000000..9d40633ad --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_16.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:cooked_salmon", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_17.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_17.json new file mode 100644 index 000000000..11e958daf --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_17.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:melon_slice", + "count": 64 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_18.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_18.json new file mode 100644 index 000000000..9daaeabdd --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_18.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:pumpkin", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_19.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_19.json new file mode 100644 index 000000000..7ebad67c9 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_19.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:rotten_flesh", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_2.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_2.json new file mode 100644 index 000000000..9d475d01b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_2.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:bread", + "count": 64 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_20.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_20.json new file mode 100644 index 000000000..16bf44bba --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_20.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:spider_eye", + "count": 32 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_21.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_21.json new file mode 100644 index 000000000..077984268 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_21.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:carrot", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_22.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_22.json new file mode 100644 index 000000000..41ad99c9f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_22.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:potato", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_23.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_23.json new file mode 100644 index 000000000..8368c7db0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_23.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:poisonous_potato", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_24.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_24.json new file mode 100644 index 000000000..2010df864 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_24.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:baked_potato", + "count": 24 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_25.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_25.json new file mode 100644 index 000000000..e1dacc494 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_25.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:beetroot", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_26.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_26.json new file mode 100644 index 000000000..a4cbc0a96 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_26.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:cookie", + "count": 64 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_27.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_27.json new file mode 100644 index 000000000..4a53e61c0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_27.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:brown_mushroom_block", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_28.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_28.json new file mode 100644 index 000000000..3b5900607 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_28.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:red_mushroom_block", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_29.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_29.json new file mode 100644 index 000000000..cccf3de0f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_29.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:brown_mushroom", + "count": 32 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_3.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_3.json new file mode 100644 index 000000000..2f5c41b6f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_3.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:porkchop", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_30.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_30.json new file mode 100644 index 000000000..fb7059307 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_30.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:red_mushroom", + "count": 32 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_31.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_31.json new file mode 100644 index 000000000..b4434be18 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_31.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:nether_wart", + "count": 32 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_4.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_4.json new file mode 100644 index 000000000..232c7f9af --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_4.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:cooked_porkchop", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_5.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_5.json new file mode 100644 index 000000000..98ccebdc0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_5.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:beef", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_6.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_6.json new file mode 100644 index 000000000..2356dcc49 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_6.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:cooked_beef", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_7.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_7.json new file mode 100644 index 000000000..9d4872c22 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_7.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:chicken", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_8.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_8.json new file mode 100644 index 000000000..ff5d79efe --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_8.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:cooked_chicken", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_9.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_9.json new file mode 100644 index 000000000..268fd4271 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_9.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "minecraft:mutton", + "count": 12 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/peridot_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/peridot_dust.json new file mode 100644 index 000000000..c6c92646c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/peridot_dust.json @@ -0,0 +1,28 @@ +{ + "type": "techreborn:centrifuge", + "power": 2040, + "time": 5, + "ingredients": [ + { + "item": "techreborn:basalt_dust", + "count": 16 + } + ], + "results": [ + { + "item": "techreborn:peridot_dust" + }, + { + "item": "techreborn:calcite_dust", + "count": 3 + }, + { + "item": "techreborn:flint_dust", + "count": 8 + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/pyrope_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/pyrope_dust.json new file mode 100644 index 000000000..e4867d98b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/pyrope_dust.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:centrifuge", + "power": 3000, + "time": 5, + "ingredients": [ + { + "item": "techreborn:red_garnet_dust", + "count": 16 + } + ], + "results": [ + { + "item": "techreborn:pyrope_dust", + "count": 3 + }, + { + "item": "techreborn:almandine_dust", + "count": 5 + }, + { + "item": "techreborn:spessartine_dust", + "count": 8 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone.json new file mode 100644 index 000000000..fc2b02b83 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone.json @@ -0,0 +1,34 @@ +{ + "type": "techreborn:centrifuge", + "power": 2500, + "time": 5, + "ingredients": [ + { + "item": "minecraft:glowstone_dust", + "count": 16 + }, + { + "item": "techreborn:cell", + "count": 2, + "nbt": "null" + } + ], + "results": [ + { + "item": "minecraft:redstone", + "count": 8 + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:sulfur" + } + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:helium" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone_1.json new file mode 100644 index 000000000..eae594081 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone_1.json @@ -0,0 +1,32 @@ +{ + "type": "techreborn:centrifuge", + "power": 2400, + "time": 5, + "ingredients": [ + { + "item": "techreborn:netherrack_dust", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "minecraft:redstone" + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:sulfur" + } + }, + { + "item": "techreborn:coal_dust" + }, + { + "item": "minecraft:gold_nugget" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/rubber.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/rubber.json new file mode 100644 index 000000000..50871c6ed --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/rubber.json @@ -0,0 +1,17 @@ +{ + "type": "techreborn:centrifuge", + "power": 1300, + "time": 5, + "ingredients": [ + { + "item": "techreborn:sap", + "count": 4 + } + ], + "results": [ + { + "item": "techreborn:rubber", + "count": 14 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand.json new file mode 100644 index 000000000..99b6d3ed6 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:centrifuge", + "power": 2500, + "time": 5, + "ingredients": [ + { + "item": "minecraft:dirt", + "count": 16 + } + ], + "results": [ + { + "item": "minecraft:sand", + "count": 8 + }, + { + "item": "minecraft:clay_ball" + }, + { + "item": "minecraft:gravel", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_1.json new file mode 100644 index 000000000..1b879b4e0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_1.json @@ -0,0 +1,28 @@ +{ + "type": "techreborn:centrifuge", + "power": 2500, + "time": 5, + "ingredients": [ + { + "item": "minecraft:grass", + "count": 16 + } + ], + "results": [ + { + "item": "minecraft:sand", + "count": 8 + }, + { + "item": "minecraft:clay_ball" + }, + { + "item": "minecraft:gravel", + "count": 2 + }, + { + "item": "minecraft:wheat_seeds", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_2.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_2.json new file mode 100644 index 000000000..c21d1ef30 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_2.json @@ -0,0 +1,28 @@ +{ + "type": "techreborn:centrifuge", + "power": 1640, + "time": 5, + "ingredients": [ + { + "item": "minecraft:mycelium", + "count": 8 + } + ], + "results": [ + { + "item": "minecraft:sand", + "count": 4 + }, + { + "item": "minecraft:clay_ball" + }, + { + "item": "minecraft:brown_mushroom", + "count": 2 + }, + { + "item": "minecraft:red_mushroom", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_3.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_3.json new file mode 100644 index 000000000..fa360bccd --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_3.json @@ -0,0 +1,34 @@ +{ + "type": "techreborn:centrifuge", + "power": 2500, + "time": 5, + "ingredients": [ + { + "item": "minecraft:soul_sand", + "count": 16 + }, + { + "item": "techreborn:cell", + "nbt": "null" + } + ], + "results": [ + { + "item": "minecraft:sand", + "count": 10 + }, + { + "item": "techreborn:saltpeter_dust", + "count": 4 + }, + { + "item": "techreborn:coal_dust" + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:oil" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sap.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sap.json new file mode 100644 index 000000000..c0221f686 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sap.json @@ -0,0 +1,35 @@ +{ + "type": "techreborn:centrifuge", + "power": 5000, + "time": 5, + "ingredients": [ + { + "item": "techreborn:rubber_log", + "count": 16 + }, + { + "item": "techreborn:cell", + "count": 5, + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:sap", + "count": 8 + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:methane" + } + }, + { + "item": "techreborn:cell", + "count": 4, + "tag": { + "fluid": "techreborn:carbon" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/silicon.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/silicon.json new file mode 100644 index 000000000..8548bb60f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/silicon.json @@ -0,0 +1,40 @@ +{ + "type": "techreborn:centrifuge", + "power": 2200, + "time": 5, + "ingredients": [ + { + "item": "minecraft:redstone", + "count": 32 + }, + { + "item": "techreborn:cell", + "count": 13, + "nbt": "null" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 3, + "tag": { + "fluid": "techreborn:silicon" + } + }, + { + "item": "techreborn:pyrite_dust", + "count": 16 + }, + { + "item": "techreborn:ruby_dust", + "count": 3 + }, + { + "item": "techreborn:cell", + "count": 10, + "tag": { + "fluid": "techreborn:mercury" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/silver_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/silver_small_dust.json new file mode 100644 index 000000000..8379ac884 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/silver_small_dust.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:centrifuge", + "power": 2400, + "time": 5, + "ingredients": [ + { + "item": "techreborn:lead_dust", + "count": 2 + } + ], + "results": [ + { + "item": "techreborn:silver_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sulfur_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sulfur_dust.json new file mode 100644 index 000000000..25a85505b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/sulfur_dust.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:centrifuge", + "power": 40, + "time": 5, + "ingredients": [ + { + "fluid": "techreborn:sulfur", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:sulfur_dust" + }, + { + "item": "techreborn:cell" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_ingot.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_ingot.json new file mode 100644 index 000000000..c060d73ff --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_ingot.json @@ -0,0 +1,27 @@ +{ + "type": "techreborn:centrifuge", + "power": 1500, + "time": 5, + "ingredients": [ + { + "fluid": "minecraft:lava", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:tin_ingot", + "count": 6 + }, + { + "item": "techreborn:copper_ingot", + "count": 4 + }, + { + "item": "techreborn:electrum_ingot" + }, + { + "item": "techreborn:tungsten_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust.json new file mode 100644 index 000000000..a653fe466 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:centrifuge", + "power": 1500, + "time": 5, + "ingredients": [ + { + "item": "techreborn:iron_dust", + "count": 2 + } + ], + "results": [ + { + "item": "techreborn:tin_small_dust" + }, + { + "item": "techreborn:nickel_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust_1.json new file mode 100644 index 000000000..34ffe74f5 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust_1.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:centrifuge", + "power": 1040, + "time": 5, + "ingredients": [ + { + "item": "techreborn:zinc_dust" + } + ], + "results": [ + { + "item": "techreborn:tin_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/tritium.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/tritium.json new file mode 100644 index 000000000..5ad058725 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/tritium.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:centrifuge", + "power": 3000, + "time": 5, + "ingredients": [ + { + "fluid": "techreborn:deuterium", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:tritium" + } + }, + { + "item": "techreborn:cell", + "count": 3 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/zinc_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/auto/zinc_small_dust.json new file mode 100644 index 000000000..206a05923 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/centrifuge/auto/zinc_small_dust.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:centrifuge", + "power": 210, + "time": 5, + "ingredients": [ + { + "item": "techreborn:tin_dust", + "count": 2 + } + ], + "results": [ + { + "item": "techreborn:zinc_small_dust" + }, + { + "item": "techreborn:iron_small_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/light_blue_dye.json b/src/main/resources/data/techreborn/recipes/extractor/auto/light_blue_dye.json new file mode 100644 index 000000000..69d3eb718 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/light_blue_dye.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:blue_orchid" + } + ], + "results": [ + { + "item": "minecraft:light_blue_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye.json b/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye.json new file mode 100644 index 000000000..383388d96 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:azure_bluet" + } + ], + "results": [ + { + "item": "minecraft:light_gray_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_1.json b/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_1.json new file mode 100644 index 000000000..cf967f2a3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_1.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:oxeye_daisy" + } + ], + "results": [ + { + "item": "minecraft:light_gray_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_2.json b/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_2.json new file mode 100644 index 000000000..d76502921 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/light_gray_dye_2.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:white_tulip" + } + ], + "results": [ + { + "item": "minecraft:light_gray_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye.json b/src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye.json new file mode 100644 index 000000000..35621d6fc --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:allium" + } + ], + "results": [ + { + "item": "minecraft:magenta_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye_1.json b/src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye_1.json new file mode 100644 index 000000000..a2599a5f9 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/magenta_dye_1.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:lilac" + } + ], + "results": [ + { + "item": "minecraft:magenta_dye", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/orange_dye.json b/src/main/resources/data/techreborn/recipes/extractor/auto/orange_dye.json new file mode 100644 index 000000000..c71cf39ff --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/orange_dye.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:orange_tulip" + } + ], + "results": [ + { + "item": "minecraft:orange_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye.json b/src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye.json new file mode 100644 index 000000000..e11d04b28 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:pink_tulip" + } + ], + "results": [ + { + "item": "minecraft:pink_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye_1.json b/src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye_1.json new file mode 100644 index 000000000..14a8785d3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/pink_dye_1.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:peony" + } + ], + "results": [ + { + "item": "minecraft:pink_dye", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye.json b/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye.json new file mode 100644 index 000000000..1bbb374c1 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:red_tulip" + } + ], + "results": [ + { + "item": "minecraft:red_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_1.json b/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_1.json new file mode 100644 index 000000000..08ccbc4b3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_1.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:poppy" + } + ], + "results": [ + { + "item": "minecraft:red_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_2.json b/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_2.json new file mode 100644 index 000000000..1c1c65b89 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/red_dye_2.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:rose_bush" + } + ], + "results": [ + { + "item": "minecraft:red_dye", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/rubber.json b/src/main/resources/data/techreborn/recipes/extractor/auto/rubber.json new file mode 100644 index 000000000..ce1302c31 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/rubber.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "techreborn:rubber_sapling" + } + ], + "results": [ + { + "item": "techreborn:rubber" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/rubber_1.json b/src/main/resources/data/techreborn/recipes/extractor/auto/rubber_1.json new file mode 100644 index 000000000..a51978939 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/rubber_1.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "techreborn:rubber_log" + } + ], + "results": [ + { + "item": "techreborn:rubber" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/rubber_2.json b/src/main/resources/data/techreborn/recipes/extractor/auto/rubber_2.json new file mode 100644 index 000000000..278040b0c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/rubber_2.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:slime_ball" + } + ], + "results": [ + { + "item": "techreborn:rubber", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/rubber_3.json b/src/main/resources/data/techreborn/recipes/extractor/auto/rubber_3.json new file mode 100644 index 000000000..dc6170f1c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/rubber_3.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "techreborn:sap" + } + ], + "results": [ + { + "item": "techreborn:rubber", + "count": 3 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/stick.json b/src/main/resources/data/techreborn/recipes/extractor/auto/stick.json new file mode 100644 index 000000000..28f01b8d1 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/stick.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:dead_bush" + } + ], + "results": [ + { + "item": "minecraft:stick" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds.json b/src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds.json new file mode 100644 index 000000000..6e11f47ae --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:tall_grass" + } + ], + "results": [ + { + "item": "minecraft:wheat_seeds" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds_1.json b/src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds_1.json new file mode 100644 index 000000000..18f942f9f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/wheat_seeds_1.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:large_fern" + } + ], + "results": [ + { + "item": "minecraft:wheat_seeds" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye.json b/src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye.json new file mode 100644 index 000000000..d8432b425 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:dandelion" + } + ], + "results": [ + { + "item": "minecraft:yellow_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye_1.json b/src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye_1.json new file mode 100644 index 000000000..b93924ae6 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/auto/yellow_dye_1.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "minecraft:sunflower" + } + ], + "results": [ + { + "item": "minecraft:yellow_dye", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/extractor/empty_cell.json b/src/main/resources/data/techreborn/recipes/extractor/empty_cell.json new file mode 100644 index 000000000..c772c7545 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/extractor/empty_cell.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:extractor", + "power": 10, + "time": 150, + "ingredients": [ + { + "item": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell" + } + ] +} \ No newline at end of file