From 398d74dedc17d121a09e20fcb5a5dcca3550b17c Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 31 Jul 2019 17:24:36 +0300 Subject: [PATCH] Implosion Compressor recipes --- src/main/java/techreborn/init/ModRecipes.java | 1 - .../init/recipes/AlloySmelterRecipes.java | 155 ------------------ .../recipes/ImplosionCompressorRecipes.java | 78 --------- .../recipes/implosion_compressor/diamond.json | 25 +++ .../recipes/implosion_compressor/emerald.json | 25 +++ .../iridium_alloy_plate.json | 23 +++ .../implosion_compressor/peridot_gem.json | 25 +++ .../implosion_compressor/red_garnet_dust.json | 25 +++ .../implosion_compressor/red_garnet_gem.json | 25 +++ .../implosion_compressor/ruby_gem.json | 25 +++ .../implosion_compressor/sapphire_gem.json | 25 +++ .../yellow_garnet_gem.json | 25 +++ 12 files changed, 223 insertions(+), 234 deletions(-) delete mode 100644 src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java delete mode 100644 src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/diamond.json create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/emerald.json create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/iridium_alloy_plate.json create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/peridot_gem.json create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/red_garnet_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/red_garnet_gem.json create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/ruby_gem.json create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/sapphire_gem.json create mode 100644 src/main/resources/data/techreborn/recipes/implosion_compressor/yellow_garnet_gem.json diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index cfd80403e..bb2418ec9 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -67,7 +67,6 @@ public class ModRecipes { IndustrialGrinderRecipes.init(); IndustrialElectrolyzerRecipes.init(); - ImplosionCompressorRecipes.init(); ScrapboxRecipes.init(); FusionReactorRecipes.init(); diff --git a/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java b/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java deleted file mode 100644 index 6a0879388..000000000 --- a/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java +++ /dev/null @@ -1,155 +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 AlloySmelterRecipes extends RecipeMethods { - - public static void init() { - - /* - - // Red Alloy -// if (OreUtil.doesOreExistAndValid("ingotRedAlloy")) { - ItemStack redAlloyStack = getOre("ingotRedAlloy"); - redAlloyStack.setCount(1); -// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, -// new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 4), ItemIngots.getIngotByName("copper", 1), -// redAlloyStack, 200, 16)); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 4), new ItemStack(Items.IRON_INGOT, 1), - redAlloyStack, 200, 16)); -// } - - // Blue Alloy -// if (oresExist("ingotBlueAlloy", "dustTeslatite")) { -// ItemStack blueAlloyStack = getOre("ingotBlueAlloy"); -// blueAlloyStack.setCount(1); -// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(getOre("dustTeslatite", 4), -// ItemIngots.getIngotByName("silver", 1), blueAlloyStack, 200, 16)); - } - - // Blue Alloy -// if (OreUtil.doesOreExistAndValid("ingotPurpleAlloy") && OreUtil.doesOreExistAndValid("dustInfusedTeslatite")) { -// ItemStack purpleAlloyStack = getOre("ingotPurpleAlloy"); -// purpleAlloyStack.setCount(1); -// ItemStack infusedTeslatiteStack = getOre("ingotPurpleAlloy"); -// infusedTeslatiteStack.setCount(8); -// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemIngots.getIngotByName("redAlloy", 1), -// ItemIngots.getIngotByName("blueAlloy", 1), purpleAlloyStack, 200, 16)); -// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, -// new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), infusedTeslatiteStack, purpleAlloyStack, -// 200, 16)); - } - - // Aluminum Brass - if (OreUtil.doesOreExistAndValid("ingotAluminumBrass")) { -// ItemStack aluminumBrassStack = getOre("ingotAluminumBrass"); -// aluminumBrassStack.setCount(4); -// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), -// ItemIngots.getIngotByName("aluminum", 1), aluminumBrassStack, 200, 16)); -// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), -// ItemDusts.getDustByName("aluminum", 1), aluminumBrassStack, 200, 16)); -// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), -// ItemIngots.getIngotByName("aluminum", 1), aluminumBrassStack, 200, 16)); -// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, -// new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemDusts.getDustByName("aluminum", 1), -// aluminumBrassStack, 200, 16)); - } - - // Manyullyn - if (OreUtil.doesOreExistAndValid("ingotManyullyn") && OreUtil.doesOreExistAndValid("ingotCobalt") && OreUtil - .doesOreExistAndValid("ingotArdite")) { - ItemStack manyullynStack = getOre("ingotManyullyn"); - manyullynStack.setCount(1); - ItemStack cobaltStack = getOre("ingotCobalt"); - cobaltStack.setCount(1); - ItemStack arditeStack = getOre("ingotArdite"); - arditeStack.setCount(1); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, new AlloySmelterRecipe(cobaltStack, arditeStack, manyullynStack, 200, 16)); - } - - // Conductive Iron - if (OreUtil.doesOreExistAndValid("ingotConductiveIron")) { - ItemStack conductiveIronStack = getOre("ingotConductiveIron"); - conductiveIronStack.setCount(1); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 1), new ItemStack(Items.IRON_INGOT, 1), - conductiveIronStack, 200, 16)); - } - - // Redstone Alloy - if (OreUtil.doesOreExistAndValid("ingotRedstoneAlloy") && OreUtil.doesOreExistAndValid("itemSilicon")) { - ItemStack redstoneAlloyStack = getOre("ingotRedstoneAlloy"); - redstoneAlloyStack.setCount(1); - ItemStack siliconStack = getOre("itemSilicon"); - siliconStack.setCount(1); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 1), siliconStack, redstoneAlloyStack, 200, - 16)); - } - - // Pulsating Iron - if (OreUtil.doesOreExistAndValid("ingotPhasedIron")) { - ItemStack pulsatingIronStack = getOre("ingotPhasedIron"); - pulsatingIronStack.setCount(1); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), new ItemStack(Items.ENDER_PEARL, 1), - pulsatingIronStack, 200, 16)); -// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, -// new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), ItemDusts.getDustByName("ender_pearl", 1), -// pulsatingIronStack, 200, 16)); - } - - // Vibrant Alloy - if (OreUtil.doesOreExistAndValid("ingotEnergeticAlloy") && OreUtil.doesOreExistAndValid("ingotPhasedGold")) { - ItemStack energeticAlloyStack = getOre("ingotEnergeticAlloy"); - energeticAlloyStack.setCount(1); - ItemStack vibrantAlloyStack = getOre("ingotPhasedGold"); - vibrantAlloyStack.setCount(1); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(energeticAlloyStack, new ItemStack(Items.ENDER_PEARL, 1), vibrantAlloyStack, - 200, 16)); -// RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, -// new AlloySmelterRecipe(energeticAlloyStack, ItemDusts.getDustByName("ender_pearl", 1), -// vibrantAlloyStack, 200, 16)); - } - - // Soularium - if (OreUtil.doesOreExistAndValid("ingotSoularium")) { - ItemStack soulariumStack = getOre("ingotSoularium"); - soulariumStack.setCount(1); - RecipeHandler.addRecipe(Reference.ALLOY_SMELTER_RECIPE, - new AlloySmelterRecipe(new ItemStack(Blocks.SOUL_SAND, 1), new ItemStack(Items.GOLD_INGOT, 1), - soulariumStack, 200, 16)); - } - - */ - } - -} diff --git a/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java b/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java deleted file mode 100644 index 57681a841..000000000 --- a/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java +++ /dev/null @@ -1,78 +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 java.security.InvalidParameterException; - -/** - * Created by Prospector - */ -public class ImplosionCompressorRecipes extends RecipeMethods { - public static void init() { -// TODO: fix recipe -// register(getOre("dustDiamond", 4), getStack(Items.DIAMOND, 3), 16); -// register(getOre("dustEmerald", 4), getStack(Items.EMERALD, 3), 12); -// register(getOre("ingotIridiumAlloy"), getMaterial("iridium_alloy", Type.PLATE), 4); -// register(getOre("dustRuby", 4), getMaterial("ruby", 3, Type.GEM), 12); -// register(getOre("dustSapphire", 4), getMaterial("sapphire", 3, Type.GEM), 12); -// register(getOre("dustPeridot", 4), getMaterial("peridot", 3, Type.GEM), 12); -// register(getOre("dustRedGarnet", 4), getMaterial("red_garnet", 3, Type.GEM), 8); -// register(getOre("dustYellowGarnet", 4), getMaterial("yellow_garnet", 3, Type.GEM), 8); -// if (oresExist("dustApatite", "gemApatite")) { -// register(getOre("dustApatite", 4), getOre("gemApatite", 3), 12); -// } -// -// if (oresExist("dustCertusQuartz", "crystalCertusQuartz")) { -// register(getOre("dustCertusQuartz", 4), getOre("crystalCertusQuartz", 3), 12); -// } -// if (oresExist("dustAmethyst", "gemAmethyst")) { -// register(getOre("dustAmethyst", 4), getOre("gemAmethyst", 3), 12); -// } -// -// if (oresExist("dustTopaz", "gemTopaz")) { -// register(getOre("dustTopaz", 4), getOre("gemTopaz", 3), 12); -// } -// -// if (oresExist("dustTanzanite", "gemTanzanite")) { -// register(getOre("dustTanzanite", 4), getOre("gemTanzanite", 3), 12); -// } -// -// if (oresExist("dustMalachite", "gemMalachite")) { -// register(getOre("dustMalachite", 4), getOre("gemMalachite", 3), 12); -// } - -// register(getOre("blockRedstone", 9), getOre("dustRedGarnet", 4), 4); - } - - static void register(ItemStack input, ItemStack output, int darkAshes) { - if (darkAshes < 1 || darkAshes > 64) { - throw new InvalidParameterException("Invalid implosion compressor darkAshes input: " + darkAshes); - } - - //RecipeHandler.addRecipe(Reference.IMPLOSION_COMPRESSOR_RECIPE, new ImplosionCompressorRecipe(input, getStack(Blocks.TNT, 16), output, getMaterial("dark_ashes", darkAshes, Type.DUST), 20, 32)); - } -} diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/diamond.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/diamond.json new file mode 100644 index 000000000..e702d91c6 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/diamond.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 32, + "time": 20, + "ingredients" : [ + { + "item": "minecraft:tnt", + "count": 16 + }, + { + "item": "techreborn:diamond_dust", + "count": 4 + } + ], + "results" : [ + { + "item": "minecraft:diamond", + "count": 3 + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 16 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/emerald.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/emerald.json new file mode 100644 index 000000000..168e90c13 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/emerald.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 32, + "time": 20, + "ingredients" : [ + { + "item": "minecraft:tnt", + "count": 16 + }, + { + "item": "techreborn:emerald_dust", + "count": 4 + } + ], + "results" : [ + { + "item": "minecraft:emerald", + "count": 3 + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 12 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/iridium_alloy_plate.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/iridium_alloy_plate.json new file mode 100644 index 000000000..db8484534 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/iridium_alloy_plate.json @@ -0,0 +1,23 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 32, + "time": 20, + "ingredients" : [ + { + "item": "minecraft:tnt", + "count": 16 + }, + { + "item": "techreborn:iridium_alloy_ingot" + } + ], + "results" : [ + { + "item": "techreborn:iridium_alloy_plate" + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/peridot_gem.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/peridot_gem.json new file mode 100644 index 000000000..9ba59f902 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/peridot_gem.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 32, + "time": 20, + "ingredients" : [ + { + "item": "minecraft:tnt", + "count": 16 + }, + { + "item": "techreborn:peridot_dust", + "count": 4 + } + ], + "results" : [ + { + "item": "techreborn:peridot_gem", + "count": 3 + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 12 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/red_garnet_dust.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/red_garnet_dust.json new file mode 100644 index 000000000..0b61da1f4 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/red_garnet_dust.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 32, + "time": 20, + "ingredients" : [ + { + "item": "minecraft:tnt", + "count": 16 + }, + { + "item": "minecraft:redstone_block", + "count": 9 + } + ], + "results" : [ + { + "item": "techreborn:red_garnet_dust", + "count": 4 + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/red_garnet_gem.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/red_garnet_gem.json new file mode 100644 index 000000000..52feac746 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/red_garnet_gem.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 32, + "time": 20, + "ingredients" : [ + { + "item": "minecraft:tnt", + "count": 16 + }, + { + "item": "techreborn:red_garnet_dust", + "count": 4 + } + ], + "results" : [ + { + "item": "techreborn:red_garnet_gem", + "count": 3 + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 8 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/ruby_gem.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/ruby_gem.json new file mode 100644 index 000000000..fcf5a5e67 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/ruby_gem.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 32, + "time": 20, + "ingredients" : [ + { + "item": "minecraft:tnt", + "count": 16 + }, + { + "item": "techreborn:ruby_dust", + "count": 4 + } + ], + "results" : [ + { + "item": "techreborn:ruby_gem", + "count": 3 + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 12 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/sapphire_gem.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/sapphire_gem.json new file mode 100644 index 000000000..dccdfbb9b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/sapphire_gem.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 32, + "time": 20, + "ingredients" : [ + { + "item": "minecraft:tnt", + "count": 16 + }, + { + "item": "techreborn:sapphire_dust", + "count": 4 + } + ], + "results" : [ + { + "item": "techreborn:sapphire_gem", + "count": 3 + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 12 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/implosion_compressor/yellow_garnet_gem.json b/src/main/resources/data/techreborn/recipes/implosion_compressor/yellow_garnet_gem.json new file mode 100644 index 000000000..559d237b2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/implosion_compressor/yellow_garnet_gem.json @@ -0,0 +1,25 @@ +{ + "type": "techreborn:implosion_compressor", + "power": 32, + "time": 20, + "ingredients" : [ + { + "item": "minecraft:tnt", + "count": 16 + }, + { + "item": "techreborn:yellow_garnet_dust", + "count": 4 + } + ], + "results" : [ + { + "item": "techreborn:yellow_garnet_gem", + "count": 3 + }, + { + "item": "techreborn:dark_ashes_dust", + "count": 8 + } + ] +} \ No newline at end of file