From af0fde5a27ba28b744d56085e1399ed95d4c5ee9 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Thu, 1 Dec 2016 02:07:37 +1000 Subject: + Basic Fire Maker. (1/4 change to light a fire, can also set you on fire if it fails) + Maceration recipes for the non-TC shards into non-TC shard dust. (Which GT then oreDicts into it's own, for making Energy Crystal) + Recipes for the Multi-tank Controller and it's frame blocks. (Fixes #40) + 4 new pipe types. Now there are 5 sizes of Tungsten, Dark Steel, Lead and Clay. - Hydrogen Blobs no longer get registered as dustHydrogen. (Broke many things without intention) $ Hopefully made a fix to the Multi-Tank, where it would reset it's storage multiplier to 0 or 1 when a world reloaded. % Enabled a previously disabled logging feature. + Put extra logging into getItemStackOfAmountFromOreDictNoBroken() during debug mode. $ Cleaned up ReflectionUtils.java and added a new method getMethodName() which will show where a method was called from. --- src/Java/gtPlusPlus/core/recipe/RECIPES_General.java | 6 ++++++ src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index 532187c793..0f95c7e1d1 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.recipe; +import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.LoadedMods; @@ -73,6 +74,11 @@ public class RECIPES_General { RECIPE_LapisDust, ItemUtils.getSimpleStack(ModItems.shardDull), RECIPE_LapisDust, RECIPE_LapisDust, RECIPE_LapisDust, RECIPE_LapisDust, ItemUtils.getSimpleStack(ModItems.shardAqua)); + + GT_ModHandler.addPulverisationRecipe(ItemUtils.getSimpleStack(ModItems.shardAer), ItemUtils.getSimpleStack(ModItems.dustAer, 2)); + GT_ModHandler.addPulverisationRecipe(ItemUtils.getSimpleStack(ModItems.shardIgnis), ItemUtils.getSimpleStack(ModItems.dustIgnis, 2)); + GT_ModHandler.addPulverisationRecipe(ItemUtils.getSimpleStack(ModItems.shardTerra), ItemUtils.getSimpleStack(ModItems.dustTerra, 2)); + GT_ModHandler.addPulverisationRecipe(ItemUtils.getSimpleStack(ModItems.shardAqua), ItemUtils.getSimpleStack(ModItems.dustAqua, 2)); } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index ea02dfbc74..a536ef68ed 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -47,6 +47,9 @@ public class RECIPES_Machines { //Industrial Wire Factory static ItemStack RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1); static ItemStack RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1); + //Industrial Multi Tank + static ItemStack RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1); + static ItemStack RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(1); //Industrial Matter Fabricator static ItemStack RECIPE_IndustrialMatterFabController = GregtechItemList.Industrial_MassFab.get(1); static ItemStack RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(1); @@ -122,7 +125,7 @@ public class RECIPES_Machines { static String rodTier11 = "stickNeutronium"; static String pipeTier1 = "pipeHuge"+"Potin"; - static String pipeTier2 = "pipeHuge"+"Steel"; + static String pipeTier2 = "pipeHuge"+"DarkSteel"; static String pipeTier3 = "pipeHuge"+"StainlessSteel"; static String pipeTier4 = "pipeHuge"+"Titanium"; static String pipeTier5 = "pipeHuge"+"TungstenSteel"; @@ -668,7 +671,18 @@ public class RECIPES_Machines { GregtechItemList.GT_FluidTank_MAX.get(1)); - + //Industrial Multi Tank Casing + RecipeUtils.addShapedGregtechRecipe( + "stickGrisium", "plateGrisium", "stickGrisium", + "plateGrisium", "frameGtGrisium", "plateGrisium", + "plateGrisium", "plateGrisium", "plateGrisium", + RECIPE_IndustrialMultiTankFrame); + //Industrial Multi Tank + RecipeUtils.addShapedGregtechRecipe( + "pipeHugeDarkSteel", "gearGrisium", "pipeHugeDarkSteel", + circuitTier4, RECIPE_IndustrialMultiTankFrame, circuitTier4, + "plateDoubleGrisium", "rotorGrisium", "plateDoubleGrisium", + RECIPE_IndustrialMultiTankController); //Blast Smelter -- cgit