diff --git a/src/main/java/techreborn/blocks/GenericMachineBlock.java b/src/main/java/techreborn/blocks/GenericMachineBlock.java index 81774d1dc..4015653b2 100644 --- a/src/main/java/techreborn/blocks/GenericMachineBlock.java +++ b/src/main/java/techreborn/blocks/GenericMachineBlock.java @@ -1,6 +1,27 @@ -/** - * +/* + * 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.blocks; import java.util.function.Supplier; diff --git a/src/main/java/techreborn/init/RecipeTemplate.java b/src/main/java/techreborn/init/RecipeTemplate.java index 92ff97d30..ad3fbbe3f 100644 --- a/src/main/java/techreborn/init/RecipeTemplate.java +++ b/src/main/java/techreborn/init/RecipeTemplate.java @@ -1,3 +1,27 @@ +/* + * 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; import com.google.gson.GsonBuilder; diff --git a/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java index 584909b42..86ebd088e 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java @@ -36,7 +36,7 @@ public class IndustrialElectrolyzerRecipes extends RecipeMethods { register(getStack(Items.DYE, 3, 15), 20, 106, false, getMaterial("calcium", Type.CELL)); register(getStack(Items.SUGAR, 32), 200, 32, getMaterial("carbon", 2, Type.CELL), getMaterial("water", 5, Type.CELL)); // TODO: Fix recipe -// register(getStack(Items.BLAZE_POWDER, 4), 300, 25, getMaterial("dark_ashes", Type.DUST), getMaterial("sulfur", Type.DUST)); + register(getStack(Blocks.SAND, 16), 1000, 25, getMaterial("silicon", Type.CELL), getMaterial("compressedair", Type.CELL)); // register(getOre("dustClay", 8), 200, 50, getMaterial("lithium", Type.CELL), getMaterial("silicon", 2, Type.CELL), getMaterial("aluminum", 2, Type.DUST), getMaterial("sodium", 2, Type.CELL)); // register(getOre("dustCoal"), 40, 50, getMaterial("carbon", 2, Type.CELL)); diff --git a/src/main/java/techreborn/rei/ReiPlugin.java b/src/main/java/techreborn/rei/ReiPlugin.java index 54bc41b0e..03dcaf67e 100644 --- a/src/main/java/techreborn/rei/ReiPlugin.java +++ b/src/main/java/techreborn/rei/ReiPlugin.java @@ -96,6 +96,7 @@ public class ReiPlugin implements REIPluginEntry { recipeHelper.registerWorkingStations(ModRecipes.EXTRACTOR.getName(), new ItemStack(Machine.EXTRACTOR.asItem())); recipeHelper.registerWorkingStations(ModRecipes.GRINDER.getName(), new ItemStack(Machine.GRINDER.asItem())); recipeHelper.registerWorkingStations(ModRecipes.IMPLOSION_COMPRESSOR.getName(), new ItemStack(Machine.IMPLOSION_COMPRESSOR.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.INDUSTRIAL_ELECTROLYZER.getName(), new ItemStack(Machine.INDUSTRIAL_ELECTROLYZER.asItem())); recipeHelper.registerWorkingStations(ModRecipes.INDUSTRIAL_SAWMILL.getName(), new ItemStack(Machine.INDUSTRIAL_SAWMILL.asItem())); recipeHelper.registerWorkingStations(ModRecipes.VACUUM_FREEZER.getName(), new ItemStack(Machine.VACUUM_FREEZER.asItem())); } diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/ahes_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/ashes_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/ahes_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/ashes_dust.json diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/blaze_powder.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/blaze_powder.json new file mode 100644 index 000000000..0de52aade --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/blaze_powder.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:industrial_electrolyzer", + "power": 25, + "time": 300, + "ingredients": [ + { + "item": "minecraft:blaze_powder", + "count": 4 + } + ], + "results": [ + { + "item": "techreborn:dark_ashes_dust" + }, + { + "item": "techreborn:sulfur_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json new file mode 100644 index 000000000..fb5717fe9 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/industrial_electrolyzer/sand.json @@ -0,0 +1,26 @@ +{ + "type": "techreborn:industrial_electrolyzer", + "power": 25, + "time": 1000, + "ingredients": [ + { + "item": "minecraft:sand", + "count": 16 + }, + { + "item": "techreborn:cell", + "count": 2, + "nbt": "null" + } + ], + "results": [ + { + "fluid": "techreborn:silicon", + "holder": "techreborn:cell" + }, + { + "fluid": "techreborn:compressedair", + "holder": "techreborn:cell" + } + ] +} \ No newline at end of file