aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util/fluid
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-08-08 12:33:29 +1000
committerAlkalus <draknyte1@hotmail.com>2017-08-08 12:33:29 +1000
commita9f01d80456b3b4e0694e520467dab5a4eb5cfb8 (patch)
tree092149d242e80158dfdaf5ff703400d74926708e /src/Java/gtPlusPlus/core/util/fluid
parent78170f6176af2b595e7feb8acf4ed390babeb088 (diff)
downloadGT5-Unofficial-a9f01d80456b3b4e0694e520467dab5a4eb5cfb8.tar.gz
GT5-Unofficial-a9f01d80456b3b4e0694e520467dab5a4eb5cfb8.tar.bz2
GT5-Unofficial-a9f01d80456b3b4e0694e520467dab5a4eb5cfb8.zip
% Tried fixing Sulfur Dioxide.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util/fluid')
-rw-r--r--src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java31
1 files changed, 31 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index 1539488501..b820e674aa 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -227,6 +227,10 @@ public class FluidUtils {
public static Fluid addGTFluidNonMolten(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount) {
return addGTFluid("fluid."+aName, "fluid.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount);
}
+
+ public static Fluid addGTFluidNoPrefix(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount) {
+ return addGTFluid(aName, "fluid.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount);
+ }
public static Fluid addGTPlasma(final Material aMaterial) {
if (aMaterial.getLocalizedName().toLowerCase().contains("clay") || aMaterial.getComposites().size()>1 || aMaterial.getLocalizedName().toLowerCase().contains("wrought")){
@@ -478,5 +482,32 @@ public class FluidUtils {
Utils.LOG_INFO("FLUID GENERATION FAILED FOR "+localizedName);
return null;
}
+
+ public final static Fluid generateFluidNoPrefix(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA){
+ if ((FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null)/* && ((dustStack != null) || (dustStack2 != null))*/){
+ Utils.LOG_WARNING("Generating our own fluid.");
+
+ //Generate a Cell if we need to
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){
+ @SuppressWarnings("unused")
+ final
+ Item temp = new BaseItemComponent(unlocalizedName, localizedName, RGBA);
+ }
+
+ final Fluid gtFluid = FluidUtils.addGTFluidNoPrefix(
+ unlocalizedName,
+ localizedName,
+ RGBA,
+ 4,
+ MeltingPoint,
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1),
+ ItemList.Cell_Empty.get(1L, new Object[0]),
+ 1000);
+
+ return gtFluid;
+ }
+ Utils.LOG_INFO("FLUID GENERATION FAILED FOR "+localizedName);
+ return null; }
+
}