From a2bb34ead053fb45967932ec99079dc6d6eb1bf2 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 7 Aug 2019 14:19:09 +0300 Subject: [PATCH] Fluid Replicator recipes done. Need rei support for fluid --- src/main/java/techreborn/init/ModFluids.java | 24 ++++---- .../init/recipes/FluidReplicatorRecipes.java | 56 ------------------- src/main/java/techreborn/rei/ReiPlugin.java | 3 + .../recipes/fluid_replicator/beryllium.json | 16 ++++++ .../recipes/fluid_replicator/calcium.json | 16 ++++++ .../recipes/fluid_replicator/carbon.json | 16 ++++++ .../fluid_replicator/carbon_fiber.json | 16 ++++++ .../recipes/fluid_replicator/chlorite.json | 16 ++++++ .../recipes/fluid_replicator/glyceryl.json | 16 ++++++ .../recipes/fluid_replicator/hydrogen.json | 16 ++++++ .../recipes/fluid_replicator/mercury.json | 16 ++++++ .../recipes/fluid_replicator/methane.json | 16 ++++++ 12 files changed, 159 insertions(+), 68 deletions(-) delete mode 100644 src/main/java/techreborn/init/recipes/FluidReplicatorRecipes.java create mode 100644 src/main/resources/data/techreborn/recipes/fluid_replicator/beryllium.json create mode 100644 src/main/resources/data/techreborn/recipes/fluid_replicator/calcium.json create mode 100644 src/main/resources/data/techreborn/recipes/fluid_replicator/carbon.json create mode 100644 src/main/resources/data/techreborn/recipes/fluid_replicator/carbon_fiber.json create mode 100644 src/main/resources/data/techreborn/recipes/fluid_replicator/chlorite.json create mode 100644 src/main/resources/data/techreborn/recipes/fluid_replicator/glyceryl.json create mode 100644 src/main/resources/data/techreborn/recipes/fluid_replicator/hydrogen.json create mode 100644 src/main/resources/data/techreborn/recipes/fluid_replicator/mercury.json create mode 100644 src/main/resources/data/techreborn/recipes/fluid_replicator/methane.json diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 83696d45f..733bc9068 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -37,8 +37,13 @@ public enum ModFluids { BERYLIUM, CALCIUM, CALCIUM_CARBONATE, + CARBON, + CARBON_FIBER, CHLORITE, + COMPRESSED_AIR, DEUTERIUM, + DIESEL, + ELECTROLYZED_WATER, GLYCERYL, HELIUM, HELIUM_3, @@ -47,27 +52,22 @@ public enum ModFluids { LITHIUM, MERCURY, METHANE, + NITRO_CARBON, + NITRO_DIESEL, NITROCOAL_FUEL, NITROFUEL, NITROGEN, NITROGENDIOXIDE, + OIL, POTASSIUM, SILICON, SODIUM, - SODIUMPERSULFATE, - TRITIUM, - WOLFRAMIUM, - CARBON, - CARBON_FIBER, - NITRO_CARBON, - SULFUR, SODIUM_SULFIDE, - DIESEL, - NITRO_DIESEL, - OIL, + SODIUMPERSULFATE, + SULFUR, SULFURIC_ACID, - COMPRESSED_AIR, - ELECTROLYZED_WATER; + TRITIUM, + WOLFRAMIUM; private RebornFluid stillFluid; private RebornFluid flowingFluid; diff --git a/src/main/java/techreborn/init/recipes/FluidReplicatorRecipes.java b/src/main/java/techreborn/init/recipes/FluidReplicatorRecipes.java deleted file mode 100644 index 4cafebff8..000000000 --- a/src/main/java/techreborn/init/recipes/FluidReplicatorRecipes.java +++ /dev/null @@ -1,56 +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; - -/** - * @author drcrazy - * - */ -public class FluidReplicatorRecipes { - - /* TODO 1.13 :D - - public static void init() { - - register(2, ModFluids.CARBON, 100, 20); - register(2, ModFluids.CALCIUM, 100, 20); - register(2, ModFluids.CARBON_FIBER, 100, 20); - register(2, ModFluids.HYDROGEN, 100, 20); - register(4, ModFluids.MERCURY, 200, 20); - register(4, ModFluids.METHANE, 200, 20); - register(8, ModFluids.GLYCERYL, 200, 20); - register(10, ModFluids.BERYLLIUM, 200, 20); - register(10, ModFluids.CHLORITE, 200, 20); - } - - static void register(int input, Fluid output, int ticks, int euPerTick) { - if(output == null || input < 1 || ticks < 1 || euPerTick < 1){ - return; - } - FluidReplicatorRecipeList.addRecipe(new FluidReplicatorRecipe(input, output, ticks, euPerTick)); - } - - */ -} diff --git a/src/main/java/techreborn/rei/ReiPlugin.java b/src/main/java/techreborn/rei/ReiPlugin.java index 5e01d6f06..32a60b641 100644 --- a/src/main/java/techreborn/rei/ReiPlugin.java +++ b/src/main/java/techreborn/rei/ReiPlugin.java @@ -35,6 +35,7 @@ import reborncore.common.crafting.RebornRecipeType; import reborncore.common.crafting.RecipeManager; import techreborn.TechReborn; import techreborn.api.recipe.recipes.BlastFurnaceRecipe; +import techreborn.api.recipe.recipes.FluidReplicatorRecipe; import techreborn.api.recipe.recipes.IndustrialGrinderRecipe; import techreborn.api.recipe.recipes.IndustrialSawmillRecipe; import techreborn.init.ModRecipes; @@ -85,6 +86,7 @@ public class ReiPlugin implements REIPluginEntry { recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.COMPRESSOR, 1)); recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.DISTILLATION_TOWER, 3)); recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.EXTRACTOR, 1)); + recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.FLUID_REPLICATOR, 1)); recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.GRINDER, 1)); recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.IMPLOSION_COMPRESSOR)); recipeHelper.registerCategory(new MachineRecipeCategory(ModRecipes.INDUSTRIAL_ELECTROLYZER, 4)); @@ -111,6 +113,7 @@ public class ReiPlugin implements REIPluginEntry { recipeHelper.registerWorkingStations(ModRecipes.COMPRESSOR.getName(), new ItemStack(Machine.COMPRESSOR.asItem())); recipeHelper.registerWorkingStations(ModRecipes.DISTILLATION_TOWER.getName(), new ItemStack(Machine.DISTILLATION_TOWER.asItem())); recipeHelper.registerWorkingStations(ModRecipes.EXTRACTOR.getName(), new ItemStack(Machine.EXTRACTOR.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.FLUID_REPLICATOR.getName(), new ItemStack(Machine.FLUID_REPLICATOR.asItem())); recipeHelper.registerWorkingStations(ModRecipes.GRINDER.getName(), new ItemStack(Machine.GRINDER.asItem())); recipeHelper.registerWorkingStations(ModRecipes.IMPLOSION_COMPRESSOR.getName(), new ItemStack(Machine.IMPLOSION_COMPRESSOR.asItem())); recipeHelper.registerWorkingStations(ModRecipes.INDUSTRIAL_ELECTROLYZER.getName(), new ItemStack(Machine.INDUSTRIAL_ELECTROLYZER.asItem())); diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/beryllium.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/beryllium.json new file mode 100644 index 000000000..837ea84fd --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/beryllium.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:fluid_replicator", + "power": 20, + "time": 200, + "tank": { + "fluid": "techreborn:beryllium", + "amount": 1000 + }, + "ingredients": [ + { + "item": "techreborn:uu_matter", + "count": 10 + } + ], + "results": [] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/calcium.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/calcium.json new file mode 100644 index 000000000..b9d8259b0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/calcium.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:fluid_replicator", + "power": 20, + "time": 100, + "tank": { + "fluid": "techreborn:calcium", + "amount": 1000 + }, + "ingredients": [ + { + "item": "techreborn:uu_matter", + "count": 2 + } + ], + "results": [] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/carbon.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/carbon.json new file mode 100644 index 000000000..7d53fcf79 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/carbon.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:fluid_replicator", + "power": 20, + "time": 100, + "tank": { + "fluid": "techreborn:carbon", + "amount": 1000 + }, + "ingredients": [ + { + "item": "techreborn:uu_matter", + "count": 2 + } + ], + "results": [] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/carbon_fiber.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/carbon_fiber.json new file mode 100644 index 000000000..b8a651232 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/carbon_fiber.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:fluid_replicator", + "power": 20, + "time": 100, + "tank": { + "fluid": "techreborn:carbonfiber", + "amount": 1000 + }, + "ingredients": [ + { + "item": "techreborn:uu_matter", + "count": 2 + } + ], + "results": [] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/chlorite.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/chlorite.json new file mode 100644 index 000000000..b045b3f72 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/chlorite.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:fluid_replicator", + "power": 20, + "time": 200, + "tank": { + "fluid": "techreborn:chlorite", + "amount": 1000 + }, + "ingredients": [ + { + "item": "techreborn:uu_matter", + "count": 10 + } + ], + "results": [] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/glyceryl.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/glyceryl.json new file mode 100644 index 000000000..d133221b8 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/glyceryl.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:fluid_replicator", + "power": 20, + "time": 200, + "tank": { + "fluid": "techreborn:glyceryl", + "amount": 1000 + }, + "ingredients": [ + { + "item": "techreborn:uu_matter", + "count": 8 + } + ], + "results": [] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/hydrogen.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/hydrogen.json new file mode 100644 index 000000000..514e95c5d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/hydrogen.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:fluid_replicator", + "power": 20, + "time": 100, + "tank": { + "fluid": "techreborn:hydrogen", + "amount": 1000 + }, + "ingredients": [ + { + "item": "techreborn:uu_matter", + "count": 2 + } + ], + "results": [] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/mercury.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/mercury.json new file mode 100644 index 000000000..2be941676 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/mercury.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:fluid_replicator", + "power": 20, + "time": 200, + "tank": { + "fluid": "techreborn:mercury", + "amount": 1000 + }, + "ingredients": [ + { + "item": "techreborn:uu_matter", + "count": 4 + } + ], + "results": [] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/fluid_replicator/methane.json b/src/main/resources/data/techreborn/recipes/fluid_replicator/methane.json new file mode 100644 index 000000000..b649be3e0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/fluid_replicator/methane.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:fluid_replicator", + "power": 20, + "time": 200, + "tank": { + "fluid": "techreborn:methane", + "amount": 1000 + }, + "ingredients": [ + { + "item": "techreborn:uu_matter", + "count": 4 + } + ], + "results": [] +} \ No newline at end of file