diff options
Diffstat (limited to 'src/Java')
3 files changed, 37 insertions, 13 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java index 26860ebad3..80b48913d5 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -7,6 +7,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.entity.EntityUtils; import gtPlusPlus.core.util.item.ItemUtils; @@ -164,7 +165,7 @@ public class BaseItemComponent extends Item{ //list.add(EnumChatFormatting.GRAY+"A " + materialName + " Ring."); } if (this.componentMaterial != null){ - if (!this.componentMaterial.vChemicalFormula.equals("??") && !this.componentMaterial.vChemicalFormula.equals("?")) { + if (!this.componentMaterial.vChemicalFormula.equals("??") && !this.componentMaterial.vChemicalFormula.equals("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) { list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula)); } diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java index 87830ab493..c6043a1b3d 100644 --- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java +++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java @@ -25,6 +25,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) }); + //ThF4 public static final Material THORIUM_TETRAFLUORIDE = new Material( "Thorium Tetrafluoride", //Material Name MaterialState.LIQUID, //State @@ -40,6 +41,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) }); + //ThF6 public static final Material THORIUM_HEXAFLUORIDE = new Material( "Thorium Hexafluoride", //Material Name MaterialState.LIQUID, //State @@ -56,6 +58,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().FLUORINE, 12) }); + //UF4 public static final Material URANIUM_TETRAFLUORIDE = new Material( "Uranium Tetrafluoride", //Material Name MaterialState.LIQUID, //State @@ -71,6 +74,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) }); + //UF6 public static final Material URANIUM_HEXAFLUORIDE = new Material( "Uranium Hexafluoride", //Material Name MaterialState.LIQUID, //State @@ -86,8 +90,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) }); - // - + //ZrF4 public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material( "Zirconium Tetrafluoride", //Material Name MaterialState.LIQUID, //State @@ -103,6 +106,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) }); + //BeF2 public static final Material BERYLLIUM_FLUORIDE = new Material( "Beryllium Fluoride", //Material Name MaterialState.LIQUID, //State @@ -118,6 +122,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) }); + //LiF public static final Material LITHIUM_FLUORIDE = new Material( "Lithium Fluoride", //Material Name MaterialState.LIQUID, //State @@ -136,6 +141,7 @@ public class FLUORIDES { //LFTR sub components + //OH public static final Material HYDROXIDE = new Material( "Hydroxide", //Material Name MaterialState.PURE_LIQUID, //State @@ -151,6 +157,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1) }); + //NH3 public static final Material AMMONIA = new Material( "Ammonia", //Material Name MaterialState.PURE_LIQUID, //State @@ -166,6 +173,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3) }); + //NH4 public static final Material AMMONIUM = new Material( "Ammonium", //Material Name MaterialState.PURE_LIQUID, //State @@ -181,6 +189,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4) }); + //(NH4)HF2 public static final Material AMMONIUM_BIFLUORIDE = new Material( "Ammonium Bifluoride", //Material Name MaterialState.PURE_LIQUID, //State @@ -197,6 +206,7 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) }); + //Be(OH)2 public static final Material BERYLLIUM_HYDROXIDE = new Material( "Beryllium Hydroxide", //Material Name MaterialState.PURE_LIQUID, //State @@ -212,6 +222,7 @@ public class FLUORIDES { new MaterialStack(FLUORIDES.HYDROXIDE, 2) }); + // (NH4)2Be(OH)2 / (NH4)2BeF4 public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material( "Ammonium Tetrafluoroberyllate", //Material Name MaterialState.PURE_LIQUID, //State diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 959513e62a..c74603abc1 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -632,6 +632,26 @@ public class RECIPES_GREGTECH { 230); //EU }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + + //Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O + try { + CORE.RA.addDehydratorRecipe( + new ItemStack[]{ + ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) + }, //Item input (Array, up to 2) + null, //Fluid input (slot 1) + FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), //Fluid output (slot 2) + new ItemStack[]{ + ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2) + }, //Output Array of Items - Upto 9, + new int[]{0, 0, 0}, + 32*20, //Time in ticks + 64); //EU + + + }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} //(NH4)2BeF4 → 2 NH3 + 2 HF + BeF2 try { @@ -648,7 +668,7 @@ public class RECIPES_GREGTECH { }, //Output Array of Items - Upto 9, new int[]{0, 0, 0}, 5*60*20, //Time in ticks - 120); //EU + 120); //EU }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} @@ -1002,17 +1022,9 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7), GT_Values.NI, FluidUtils.getFluidStack("hydroxide", 1000), - FluidUtils.getFluidStack("berylliumhydroxide", 2008), + FluidUtils.getFluidStack("berylliumhydroxide", 2000), GT_Values.NI, 8*20); - //Ammonium Tetrafluoroberyllate - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 1), - GT_Values.NF, - FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), - 32*20); } private static void blastFurnaceRecipes(){ |