From cc91888c4a6ca8782fcdb2febb9adbeb3fc1e053 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 25 Jul 2019 15:59:43 +0300 Subject: [PATCH] More alloys --- .../init/recipes/AlloySmelterRecipes.java | 41 ------------------- .../bronze_ingot_from_dust_alt.json | 20 +++++++++ .../bronze_ingot_from_dust_alt_alt.json | 20 +++++++++ .../recipes/alloy_smelter/electrum_ingot.json | 19 +++++++++ .../electrum_ingot_from_dust.json | 19 +++++++++ .../electrum_ingot_from_dust_alt.json | 19 +++++++++ .../electrum_ingot_from_dust_alt_alt.json | 19 +++++++++ .../recipes/alloy_smelter/invar_ingot.json | 20 +++++++++ .../alloy_smelter/invar_ingot_from_dust.json | 20 +++++++++ .../invar_ingot_from_dust_alt.json | 20 +++++++++ .../invar_ingot_from_dust_alt_alt.json | 20 +++++++++ 11 files changed, 196 insertions(+), 41 deletions(-) create mode 100644 src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt.json create mode 100644 src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt_alt.json create mode 100644 src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot.json create mode 100644 src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust_alt.json create mode 100644 src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust_alt_alt.json create mode 100644 src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot.json create mode 100644 src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust.json create mode 100644 src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt.json create mode 100644 src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt_alt.json diff --git a/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java b/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java index f794c94ea..e5b3cc2e8 100644 --- a/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java +++ b/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java @@ -34,47 +34,6 @@ public class AlloySmelterRecipes extends RecipeMethods { /* -// OreRecipeInput ingotCopper3 = new OreRecipeInput("ingotCopper", 3); -// OreRecipeInput dustCopper3 = new OreRecipeInput("dustCopper", 3); - -// // Bronze -//// TODO: Fix Recipe - -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(ingotCopper3, "dustTin", -// ItemIngots.getIngotByName("bronze", 4), 200, 16)); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(dustCopper3, "ingotTin", -// ItemIngots.getIngotByName("bronze", 4), 200, 16)); - -// -// // Electrum -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), "ingotSilver", -// ItemIngots.getIngotByName("electrum", 2), 200, 16)); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(new ItemStack(Items.GOLD_INGOT, 1), "dustSilver", -// ItemIngots.getIngotByName("electrum", 2), 200, 16)); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe("dustGold", "ingotSilver", -// ItemIngots.getIngotByName("electrum", 2), 200, 16)); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe("dustGold", "dustSilver", -// ItemIngots.getIngotByName("electrum", 2), 200, 16)); -// -// // Invar -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 2), "ingotNickel", -// ItemIngots.getIngotByName("invar", 3), 200, 16)); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 2), "dustNickel", -// ItemIngots.getIngotByName("invar", 3), 200, 16)); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(new OreRecipeInput("dustIron", 2), "ingotNickel", -// ItemIngots.getIngotByName("invar", 3), 200, 16)); -// RecipeHandler.addRecipe( -// new AlloySmelterRecipe(new OreRecipeInput("dustIron", 2), "dustNickel", -// ItemIngots.getIngotByName("invar", 3), 200, 16)); // // // Brass // if (OreUtil.doesOreExistAndValid("ingotBrass")) { diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt.json new file mode 100644 index 000000000..a719c7e3c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "techreborn:tin_dust" + }, + { + "item": "techreborn:copper_ingot", + "count": 3 + } + ], + "results" : [ + { + "item": "techreborn:bronze_ingot", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt_alt.json new file mode 100644 index 000000000..cf5d74b08 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/bronze_ingot_from_dust_alt_alt.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "techreborn:tin_ingot" + }, + { + "item": "techreborn:copper_dust", + "count": 3 + } + ], + "results" : [ + { + "item": "techreborn:bronze_ingot", + "count": 4 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot.json new file mode 100644 index 000000000..c5f19055b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "minecraft:gold_ingot" + }, + { + "item": "techreborn:silver_ingot" + } + ], + "results" : [ + { + "item": "techreborn:electrum_ingot", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust.json new file mode 100644 index 000000000..9ea147d81 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "techreborn:gold_dust" + }, + { + "item": "techreborn:silver_dust" + } + ], + "results" : [ + { + "item": "techreborn:electrum_ingot", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust_alt.json new file mode 100644 index 000000000..4e42a641b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust_alt.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "minecraft:gold_ingot" + }, + { + "item": "techreborn:silver_dust" + } + ], + "results" : [ + { + "item": "techreborn:electrum_ingot", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust_alt_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust_alt_alt.json new file mode 100644 index 000000000..a83921d9b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/electrum_ingot_from_dust_alt_alt.json @@ -0,0 +1,19 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "techreborn:gold_dust" + }, + { + "item": "techreborn:silver_ingot" + } + ], + "results" : [ + { + "item": "techreborn:electrum_ingot", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot.json new file mode 100644 index 000000000..be679e8ff --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "minecraft:iron_ingot", + "count": 2 + }, + { + "item": "techreborn:nickel_ingot" + } + ], + "results" : [ + { + "item": "techreborn:invar_ingot", + "count": 3 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust.json new file mode 100644 index 000000000..d8f6fdee0 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "techreborn:iron_dust", + "count": 2 + }, + { + "item": "techreborn:nickel_dust" + } + ], + "results" : [ + { + "item": "techreborn:invar_ingot", + "count": 3 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt.json new file mode 100644 index 000000000..748050159 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "minecraft:iron_ingot", + "count": 2 + }, + { + "item": "techreborn:nickel_dust" + } + ], + "results" : [ + { + "item": "techreborn:invar_ingot", + "count": 3 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt_alt.json b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt_alt.json new file mode 100644 index 000000000..440f5cbae --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/alloy_smelter/invar_ingot_from_dust_alt_alt.json @@ -0,0 +1,20 @@ +{ + "type": "techreborn:alloy_smelter", + "power": 16, + "time": 200, + "ingredients" : [ + { + "item": "techreborn:iron_dust", + "count": 2 + }, + { + "item": "techreborn:nickel_ingot" + } + ], + "results" : [ + { + "item": "techreborn:invar_ingot", + "count": 3 + } + ] +} \ No newline at end of file