From 27862b0a280cdae2b9e3f0e92ae472c49490c4fc Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 12 Dec 2016 15:29:25 +0000 Subject: [PATCH 1/4] Add some more recipes listed in #818 --- src/main/java/techreborn/init/ModRecipes.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 37579ab3b..4a4775d88 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -945,6 +945,21 @@ public class ModRecipes { .addShapedOreRecipe(ItemParts.getPartByName("dataOrb"), "DDD", "DSD", "DDD", 'D', ItemParts.getPartByName("dataStorageCircuit"), 'S', ItemParts.getPartByName("dataStorageCircuit")); + CraftingHelper + .addShapedOreRecipe(new ItemStack(ModItems.electricTreetap), "TB", " ", + 'T', new ItemStack(ModItems.treeTap), 'B', new ItemStack(ModItems.reBattery)); + + CraftingHelper + .addShapedOreRecipe(new ItemStack(ModItems.nanosaber), "DC ", "DC ", "GLG", + 'L', new ItemStack(ModItems.lapotronCrystal), 'C', ItemPlates.getPlateByName("carbon"), 'D', "plateDiamond", + 'G', ItemDustsSmall.getSmallDustByName("glowstone")); + + CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("diamondGrindingHead", 2), "TST", "SBS", "TST", 'T', + "plateDiamond", 'S', "plateSteel", 'B', "blockDiamond"); + + CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("coolantSimple", 2), " T ", "TWT", " T ", 'T', + "ingotTin", 'W', new ItemStack(Items.WATER_BUCKET)); + Core.logHelper.info("Shapped Recipes Added"); } From 29f40e1f98248d84d32465bc6ab2b701ef61ecb5 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 12 Dec 2016 15:53:04 +0000 Subject: [PATCH 2/4] Add plate recipes based of ore dic --- src/main/java/techreborn/init/ModRecipes.java | 45 ++++++++----------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 4a4775d88..5f018eeec 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -68,6 +68,8 @@ public class ModRecipes { public static ItemStack diamondJackhammerStack = new ItemStack(diamondJackhammer, 1, OreDictionary.WILDCARD_VALUE); public static void init() { + //Gonna rescan to make sure we have an uptodate list + OreUtil.scanForOres(); //Done again incase we loaded before QuantumStorage CompatManager.isQuantumStorageLoaded = Loader.isModLoaded("quantumstorage"); addShapelessRecipes(); @@ -359,27 +361,23 @@ public class ModRecipes { RecipeHandler.addRecipe( new CompressorRecipe(ItemParts.getPartByName("carbonmesh"), ItemPlates.getPlateByName("carbon"), 400, 2)); + + for(String ore : OreUtil.oreNames){ + System.out.println(ore); + System.out.println("plate" + OreUtil.capitalizeFirstLetter(ore)); + if(OreUtil.doesOreExistAndValid("plate" + OreUtil.capitalizeFirstLetter(ore)) && OreUtil.doesOreExistAndValid("ingot" + OreUtil.capitalizeFirstLetter(ore))){ + RecipeHandler.addRecipe( + new CompressorRecipe(OreUtil.getStackFromName("ingot" + OreUtil.capitalizeFirstLetter(ore), 9), OreUtil.getStackFromName("plate" + OreUtil.capitalizeFirstLetter(ore), 1), 300, + 4)); + } + + if(OreUtil.hasPlate(ore) && OreUtil.hasBlock(ore)){ + RecipeHandler.addRecipe( + new CompressorRecipe(OreUtil.getStackFromName("block" + OreUtil.capitalizeFirstLetter(ore), 1), OreUtil.getStackFromName("plate" + OreUtil.capitalizeFirstLetter(ore), 1), 300, + 4)); + } + } - RecipeHandler.addRecipe( - new CompressorRecipe(new ItemStack(Items.IRON_INGOT), ItemPlates.getPlateByName("iron"), 400, 2)); - RecipeHandler.addRecipe( - new CompressorRecipe(ItemIngots.getIngotByName("copper"), ItemPlates.getPlateByName("copper"), 400, - 2)); - RecipeHandler.addRecipe( - new CompressorRecipe(ItemIngots.getIngotByName("tin"), ItemPlates.getPlateByName("tin"), 400, 2)); - RecipeHandler.addRecipe( - new CompressorRecipe(ItemIngots.getIngotByName("aluminum"), ItemPlates.getPlateByName("aluminum"), 400, - 2)); - RecipeHandler.addRecipe( - new CompressorRecipe(ItemIngots.getIngotByName("brass"), ItemPlates.getPlateByName("brass"), 400, 2)); - RecipeHandler.addRecipe( - new CompressorRecipe(ItemIngots.getIngotByName("bronze"), ItemPlates.getPlateByName("bronze"), 400, - 2)); - RecipeHandler.addRecipe( - new CompressorRecipe(ItemIngots.getIngotByName("lead"), ItemPlates.getPlateByName("lead"), 400, 2)); - RecipeHandler.addRecipe( - new CompressorRecipe(ItemIngots.getIngotByName("silver"), ItemPlates.getPlateByName("silver"), 400, - 2)); } static void addExtractorRecipes() { @@ -1204,13 +1202,6 @@ public class ModRecipes { ItemStack arditeStack = OreDictionary.getOres("ingotArdite").get(0); arditeStack.stackSize = 1; RecipeHandler.addRecipe(new AlloySmelterRecipe(cobaltStack, arditeStack, manyullynStack, 200, 16)); - RecipeHandler.addRecipe( - new AlloySmelterRecipe(cobaltStack, ItemDusts.getDustByName("ardite", 1), manyullynStack, 200, 16)); - RecipeHandler.addRecipe( - new AlloySmelterRecipe(ItemDusts.getDustByName("cobalt", 1), arditeStack, manyullynStack, 200, 16)); - RecipeHandler.addRecipe( - new AlloySmelterRecipe(ItemDusts.getDustByName("cobalt", 1), ItemDusts.getDustByName("ardite", 1), - manyullynStack, 200, 16)); } // Conductive Iron From 0d7e26e74a4c605f05f7dac64f958573dfc9ac93 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 12 Dec 2016 17:54:20 +0000 Subject: [PATCH 3/4] Remove log, and add small dusts to ore dict --- src/main/java/techreborn/init/ModRecipes.java | 2 -- src/main/java/techreborn/init/OreDict.java | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 5f018eeec..0aff4c1e9 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -363,8 +363,6 @@ public class ModRecipes { 2)); for(String ore : OreUtil.oreNames){ - System.out.println(ore); - System.out.println("plate" + OreUtil.capitalizeFirstLetter(ore)); if(OreUtil.doesOreExistAndValid("plate" + OreUtil.capitalizeFirstLetter(ore)) && OreUtil.doesOreExistAndValid("ingot" + OreUtil.capitalizeFirstLetter(ore))){ RecipeHandler.addRecipe( new CompressorRecipe(OreUtil.getStackFromName("ingot" + OreUtil.capitalizeFirstLetter(ore), 9), OreUtil.getStackFromName("plate" + OreUtil.capitalizeFirstLetter(ore), 1), 300, diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index ff537a32f..ddc237c8f 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -121,6 +121,13 @@ public class OreDict { OreDictionary.registerOre(oreDictName, ItemDusts.getDustByName(type)); } + for (String type : ItemDustsSmall.types) { + if (type.equals(ModItems.META_PLACEHOLDER)) + continue; //Aware of placeholders! + String oreDictName = "dustSmall" + OreDictUtils.toFirstUpper(type); + OreDictionary.registerOre(oreDictName, ItemDusts.getDustByName(type)); + } + for (String type : ItemNuggets.types) { if (type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders! From 40852ca113705b7f0a8f3291a667c2871eeaebf9 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 13 Dec 2016 11:48:21 +0000 Subject: [PATCH 4/4] Bump version, #releaseBuild --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 46cd3cc70..891f739f6 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ configurations { } -version = "1.4.14" +version = "1.4.15" def ENV = System.getenv() if (ENV.BUILD_NUMBER) {