diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-10 17:00:42 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-10 17:00:42 +1000 |
| commit | 8931cf08cc1710c018bc332974306d623dfac03f (patch) | |
| tree | 6fb59caf22fd46f8074919ea6158a6fca857aed1 /src/Java/gtPlusPlus/core/recipe | |
| parent | a5ab04af307c9ff03a47461afeadc5256d97fd89 (diff) | |
| download | GT5-Unofficial-8931cf08cc1710c018bc332974306d623dfac03f.tar.gz GT5-Unofficial-8931cf08cc1710c018bc332974306d623dfac03f.tar.bz2 GT5-Unofficial-8931cf08cc1710c018bc332974306d623dfac03f.zip | |
+ Added the first proper chemical dehydrator recipes, for Lithium carbonate.
+ Added methods to UtilsItems to check if something is radioactive and how radioactive it is 0-3.
- Removed all old dehydrator recipes used in testing.
- Removed some old hard-coded items now generated by the material handler. (No items will be lost, as I doubt anyone ever obtained them.)
$ Fixed some broken textures after refactoring the entire project a few commits ago.
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 67 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 2 |
2 files changed, 15 insertions, 54 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index addeb8b74a..02b7f1bbc8 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -114,7 +114,7 @@ public class RECIPES_GREGTECH { private static void dehydratorRecipes(){ Utils.LOG_INFO("Loading Recipes for Chemical Dehydrator."); - try { + /*try { //Makes Lithium Carbonate CORE.RA.addDehydratorRecipe( @@ -127,62 +127,23 @@ public class RECIPES_GREGTECH { }, //Output Array of Items - Upto 9 10*20, //Time in ticks 30); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}*/ try { - CORE.RA.addDehydratorRecipe( - UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 1), //Item input (slot 1) - FluidUtils.getFluidStack("sulfuriclithium", 1000), //Fluid Input + UtilsItems.getItemStackOfAmountFromOreDict("dustLepidolite", 20), //Item input (slot 1) + UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 12), //Item input (slot 2) + FluidUtils.getFluidStack("sulfuricacid", 10000), //Fluid input (slot 1) + FluidUtils.getFluidStack("sulfuriclithium", 10000), //Fluid output (slot 1) new ItemStack[]{ - UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1) - }, //Output Array of Items - Upto 9 - 10*20, //Time in ticks - 30); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - try { - CORE.RA.addDehydratorRecipe( - UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 1), //Item input (slot 1) - UtilsItems.getItemStackOfAmountFromOreDict("cellWater", 1), //Item input (slot 2) - new ItemStack[]{ - UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1) - }, //Output Array of Items - Upto 9 - 10*20, //Time in ticks - 30); //EU - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - try { - CORE.RA.addDehydratorRecipe( - UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 1), - null, - FluidUtils.getFluidStack("sulfuriclithium", 1000), - new ItemStack[]{ - UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1) - }, //Output Array of Items - Upto 9 - FluidUtils.getFluidStack("water", 1000), - 10*20, //Time in ticks - 30); //EU - - }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - - try { - CORE.RA.addDehydratorRecipe( - null, //Item input (slot 1) - null, //Item input (slot 2) - FluidUtils.getFluidStack("sulfuriclithium", 1000), //Fluid input (slot 1) - null, //Fluid output (slot 1) - new ItemStack[]{ - UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1), - UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1) - }, //Output Array of Items - Upto 9, + UtilsItems.getItemStackOfAmountFromOreDict("dustPotassium", 1), + UtilsItems.getItemStackOfAmountFromOreDict("dustAluminium", 4), + UtilsItems.getItemStackOfAmountFromOreDict("cellOxygen", 10), + UtilsItems.getItemStackOfAmountFromOreDict("cellFluorine", 2), + UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), //LithiumCarbonate + }, //Output Array of Items - Upto 9, new int[]{0}, - 10*20, //Time in ticks - 30); //EU + 90*20, //Time in ticks + 2000); //EU }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java index 2f97d7e7ff..0ff5ce44c3 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java @@ -16,7 +16,7 @@ public class RECIPES_Tools { public static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe); public static ItemStack RECIPE_StaballoyAxe = new ItemStack(ModItems.itemStaballoyAxe); public static ItemStack RECIPE_SandstoneHammer = new ItemStack(ModItems.itemSandstoneHammer); - public static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy); + //public static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy); public static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2); public static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4); |
