Merge branch 'master' of https://github.com/draknyte1/GTplusplus

2 files changed, 90 insertions, 2 deletions

diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java b/src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java
new file mode 100644
index 0000000000..5674082c4a
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java
@@ -0,0 +1,30 @@
+package gtPlusPlus.core.util.fluid;
+
+import gregtech.api.GregTech_API;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraftforge.fluids.Fluid;
+
+public class FluidGT6 extends Fluid implements Runnable
+{
+    private final short[] mRGBa;
+    public final String mTextureName;
+    
+    public FluidGT6(final String aName, final String aTextureName, final short[] aRGBa) {
+        super(aName);
+        this.mRGBa = aRGBa;
+        this.mTextureName = aTextureName;
+        if (GregTech_API.sGTBlockIconload != null) {
+        	GregTech_API.sGTBlockIconload.add(this);
+        }
+    }
+    
+    @Override
+	public int getColor() {
+        return Math.max(0, Math.min(255, this.mRGBa[0])) << 16 | Math.max(0, Math.min(255, this.mRGBa[1])) << 8 | Math.max(0, Math.min(255, this.mRGBa[2]));
+    }
+    
+    @Override
+	public void run() {
+        this.setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID+ ":" + "fluids/fluid." + mTextureName));
+    }
+}
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index e576eba8f5..83b0bfd65d 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -28,6 +28,16 @@ public class FluidUtils {
 		}
 
 	}
+	
+	public static FluidStack getFluidStack(FluidStack vmoltenFluid, int fluidAmount) {
+		Utils.LOG_WARNING("Trying to get a fluid stack of "+vmoltenFluid.getFluid().getName());
+		try {
+			return FluidRegistry.getFluidStack(vmoltenFluid.getFluid().getName(), fluidAmount).copy();
+		} 
+		catch (Throwable e){
+			return null;
+		}
+	}
 
 	public static FluidStack[] getFluidStackArray(String fluidName, int amount){
 		Utils.LOG_WARNING("Trying to get a fluid stack of "+fluidName);
@@ -99,7 +109,7 @@ public class FluidUtils {
 	 * @return short[]
 	 */
 	public static Fluid generateFluid(Material material ,int aState){
-		int tempK = material.getMeltingPoint_C();
+		int tempK = material.getMeltingPointC();
 		Fluid generatedFluid = null;
 		switch (aState) {
 		case 0: {
@@ -200,6 +210,54 @@ public class FluidUtils {
 		}
 		return rFluid;
 	}
+	
+	public static Fluid addGTFluid(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("molten."+aName, "molten.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount);
+	}
+	
+	public static Fluid addGTFluid(String aName, final String aTexture, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount) {
+		aName = Utils.sanitizeString(aName.toLowerCase());
+		Fluid rFluid = new FluidGT6(aName, aTexture, (aRGBa != null) ? aRGBa : Dyes._NULL.getRGBA());
+		GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), (aLocalized == null) ? aName : aLocalized);
+		if (FluidRegistry.registerFluid(rFluid)) {
+			switch (aState) {
+			case 0: {
+				rFluid.setGaseous(false);
+				rFluid.setViscosity(10000);
+				break;
+			}
+			case 1:
+			case 4: {
+				rFluid.setGaseous(false);
+				rFluid.setViscosity(1000);
+				break;
+			}
+			case 2: {
+				rFluid.setGaseous(true);
+				rFluid.setDensity(-100);
+				rFluid.setViscosity(200);
+				break;
+			}
+			case 3: {
+				rFluid.setGaseous(true);
+				rFluid.setDensity(-10000);
+				rFluid.setViscosity(10);
+				rFluid.setLuminosity(15);
+				break;
+			}
+			}
+		}
+		else {
+			rFluid = FluidRegistry.getFluid(aName);
+		}
+		if (rFluid.getTemperature() == new Fluid("test").getTemperature() || rFluid.getTemperature() <= 0) {
+			rFluid.setTemperature((int) (aTemperatureK));
+		}		
+		if (aFullContainer != null && aEmptyContainer != null && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
+			GT_Values.RA.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount));
+		}
+		return rFluid;
+	}
 
 	public static boolean valid(final Object aStack) {
 		return aStack != null && aStack instanceof ItemStack && ((ItemStack)aStack).getItem() != null && ((ItemStack)aStack).stackSize >= 0;
@@ -282,6 +340,6 @@ public class FluidUtils {
 
 	public static ItemStack container(final ItemStack aStack, final boolean aCheckIFluidContainerItems, final int aStacksize) {
 		return amount(aStacksize, container(aStack, aCheckIFluidContainerItems));
-	}
+	}	
 
 }