diff --git a/src/main/java/techreborn/init/RecipeTemplate.java b/src/main/java/techreborn/init/RecipeTemplate.java index cafab40b4..a1b0c1e31 100644 --- a/src/main/java/techreborn/init/RecipeTemplate.java +++ b/src/main/java/techreborn/init/RecipeTemplate.java @@ -87,8 +87,8 @@ public class RecipeTemplate { } - boolean compressor = true; - boolean grinder = true; + boolean compressor = false; + boolean grinder = false; boolean sawmill = false; if(compressor){ diff --git a/src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.java b/src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.java deleted file mode 100644 index 57ee8dcb9..000000000 --- a/src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.init.recipes; - -import net.minecraft.item.ItemStack; - -/** - * @author drcrazy - * - */ -public class ChemicalReactorRecipes extends RecipeMethods { - public static void init(){ - - - //Cells recipes. One cell should be cooked in 20 seconds - register(getMaterial("carbon", Type.CELL), getMaterial("calcium", Type.CELL), getMaterial("calciumCarbonate", 2, Type.CELL), 800); - register(getMaterial("carbon", Type.CELL), getMaterial("hydrogen", 4, Type.CELL), getMaterial("methane", 5, Type.CELL), 2000); - register(getMaterial("carbon", Type.CELL), getMaterial("nitrogen", Type.CELL), getMaterial("nitrocarbon", 2, Type.CELL), 800); - register(getMaterial("nitrocarbon", Type.CELL), getMaterial("water", Type.CELL), getMaterial("glyceryl", 2, Type.CELL), 600); - register(getMaterial("glyceryl", Type.CELL), getMaterial("diesel", 4, Type.CELL), getMaterial("nitroDiesel", 5, Type.CELL), 250); - register(getMaterial("glyceryl", Type.CELL), getMaterial("carbon", 4, Type.CELL), getMaterial("nitrocoalFuel", 5, Type.CELL), 250); - register(getMaterial("sulfur", Type.CELL), getMaterial("water", 2, Type.CELL), getMaterial("sulfuricAcid", 3, Type.CELL), 1200); - register(getMaterial("sulfur", Type.CELL), getMaterial("sodium", Type.CELL), getMaterial("sodiumSulfide", 2, Type.CELL), 800); - register(getMaterial("sodiumSulfide", Type.CELL), getMaterial("compressedair", Type.CELL), getMaterial("sodiumPersulfate", 2, Type.CELL), 800); - register(getMaterial("compressedair", Type.CELL), getMaterial("hydrogen", 2, Type.CELL), getMaterial("water", Type.CELL), 400); - register(getMaterial("compressedair", 2, Type.CELL), getMaterial("nitrogen", Type.CELL), getMaterial("nitrogenDioxide", Type.CELL), 400); - register(getMaterial("oil", Type.CELL), getMaterial("nitrogen", Type.CELL), getMaterial("nitrofuel", 2, Type.CELL), 800); - - } - - public static void register(ItemStack in1, ItemStack in2, ItemStack out, int tickTime, int euPerTick){ - // RecipeHandler.addRecipe(Reference.CHEMICAL_REACTOR_RECIPE, new ChemicalReactorRecipe(in1, in2, out, tickTime, euPerTick)); - } - - public static void register (ItemStack in1, ItemStack in2, ItemStack out, int tickTime){ - register(in1, in2, out, tickTime, 30); - } - -} \ No newline at end of file diff --git a/src/main/java/techreborn/items/ItemDynamicCell.java b/src/main/java/techreborn/items/ItemDynamicCell.java index ef9dd01e6..cda5078c1 100644 --- a/src/main/java/techreborn/items/ItemDynamicCell.java +++ b/src/main/java/techreborn/items/ItemDynamicCell.java @@ -49,7 +49,7 @@ import techreborn.utils.FluidUtils; public class ItemDynamicCell extends Item implements ItemFluidInfo { public ItemDynamicCell() { - super(new Item.Settings().maxCount(1).group(TechReborn.ITEMGROUP)); + super(new Item.Settings().group(TechReborn.ITEMGROUP)); } @Override diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/calciumcarbonate.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/calciumcarbonate.json new file mode 100644 index 000000000..938031bf8 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/calciumcarbonate.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 800, + "ingredients": [ + { + "fluid": "techreborn:carbon", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:calcium", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 2, + "tag": { + "fluid": "techreborn:calciumcarbonate" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/glyceryl.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/glyceryl.json new file mode 100644 index 000000000..27465ce55 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/glyceryl.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 600, + "ingredients": [ + { + "fluid": "techreborn:nitrocarbon", + "holder": "techreborn:cell" + }, + { + "fluid": "minecraft:water", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 2, + "tag": { + "fluid": "techreborn:glyceryl" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/methane.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/methane.json new file mode 100644 index 000000000..3eccef475 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/methane.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 2000, + "ingredients": [ + { + "fluid": "techreborn:carbon", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:hydrogen", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 5, + "tag": { + "fluid": "techreborn:methane" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocarbon.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocarbon.json new file mode 100644 index 000000000..3ea6ef6f2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocarbon.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 800, + "ingredients": [ + { + "fluid": "techreborn:carbon", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:nitrogen", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 2, + "tag": { + "fluid": "techreborn:nitrocarbon" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocoalfuel.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocoalfuel.json new file mode 100644 index 000000000..1b72c6726 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrocoalfuel.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 250, + "ingredients": [ + { + "fluid": "techreborn:glyceryl", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:carbon", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 5, + "tag": { + "fluid": "techreborn:nitrocoalfuel" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrodiesel.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrodiesel.json new file mode 100644 index 000000000..9463e821e --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrodiesel.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 250, + "ingredients": [ + { + "fluid": "techreborn:glyceryl", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:diesel", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 5, + "tag": { + "fluid": "techreborn:nitrodiesel" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrofuel.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrofuel.json new file mode 100644 index 000000000..db2b6c4c3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrofuel.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 800, + "ingredients": [ + { + "fluid": "techreborn:oil", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:nitrogen", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 2, + "tag": { + "fluid": "techreborn:nitrofuel" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrogendioxide.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrogendioxide.json new file mode 100644 index 000000000..e4d903c02 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/nitrogendioxide.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "fluid": "techreborn:compressedair", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:nitrogen", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:nitrogendioxide" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumpersulfate.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumpersulfate.json new file mode 100644 index 000000000..e720a3039 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumpersulfate.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 800, + "ingredients": [ + { + "fluid": "techreborn:sodiumsulfide", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:compressedair", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 2, + "tag": { + "fluid": "techreborn:sodiumpersulfate" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumsulfide.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumsulfide.json new file mode 100644 index 000000000..654d1c5db --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sodiumsulfide.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 800, + "ingredients": [ + { + "fluid": "techreborn:sulfur", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:sodium", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 2, + "tag": { + "fluid": "techreborn:sodiumsulfide" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sulfuricacid.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sulfuricacid.json new file mode 100644 index 000000000..7b7bfa1b7 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/sulfuricacid.json @@ -0,0 +1,24 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 1200, + "ingredients": [ + { + "fluid": "techreborn:sulfur", + "holder": "techreborn:cell" + }, + { + "fluid": "minecraft:water", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 3, + "tag": { + "fluid": "techreborn:sulfuricacid" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/water.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/water.json new file mode 100644 index 000000000..d1b5e132e --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/chemical_reactor/auto/water.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:chemical_reactor", + "power": 30, + "time": 400, + "ingredients": [ + { + "fluid": "techreborn:compressedair", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:hydrogen", + "holder": "techreborn:cell" + } + ], + "results": [ + { + "item": "techreborn:cell", + "tag": { + "fluid": "minecraft:water" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/chemical_reactor/calciumcarbonate.json b/src/main/resources/data/techreborn/recipes/chemical_reactor/calciumcarbonate.json deleted file mode 100644 index 2a57db9c3..000000000 --- a/src/main/resources/data/techreborn/recipes/chemical_reactor/calciumcarbonate.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "techreborn:chemical_reactor", - "power": 30, - "time": 800, - "ingredients": [ - { - "fluid": "techreborn:carbon", - "holder": "techreborn:cell" - }, - { - "fluid": "techreborn:calcium", - "holder": "techreborn:cell" - } - ], - "results": [ - { - "item": "techreborn:cell", - "count": 2, - "tag": { - "fluid": "techreborn:calciumcarbonate" - } - } - ] -} diff --git a/src/main/resources/data/techreborn/recipes/distillation_tower/diesel.json b/src/main/resources/data/techreborn/recipes/distillation_tower/diesel.json new file mode 100644 index 000000000..98660a072 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/distillation_tower/diesel.json @@ -0,0 +1,39 @@ +{ + "type": "techreborn:distillation_tower", + "power": 20, + "time": 400, + "ingredients": [ + { + "item": "techreborn:cell", + "count": 17, + "tag": "null" + }, + { + "fluid": "techreborn:oil", + "holder": "techreborn:cell", + "count": 16 + } + ], + "results": [ + { + "item": "techreborn:cell", + "count": 16, + "tag": { + "fluid": "techreborn:diesel" + } + }, + { + "item": "techreborn:cell", + "count": 16, + "tag": { + "fluid": "techreborn:sulfuricacid" + } + }, + { + "item": "techreborn:cell", + "tag": { + "fluid": "techreborn:glyceryl" + } + } + ] +} \ No newline at end of file