Tweaked ItemBlocks for Fluids

Tweaked names for Fluids
Tweaked Textures and colouring for Fluids

1 files changed, 52 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index fff0cbad71..e576eba8f5 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -5,6 +5,7 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_LanguageManager;
 import gtPlusPlus.core.fluids.GenericFluid;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import net.minecraft.init.Items;
@@ -52,25 +53,71 @@ public class FluidUtils {
 
 	}
 	
-	public static Fluid generateFluid(String fluidName, int tempK, short[] rgba ,byte aState){
+	
+	/**
+	 * @param String displayName
+	 * @param String fluidName
+	 * @param int meltingPointC Temp
+	 * @param short[] rgba
+	 * @param byte state
+	 * States: 0 (Solid), 1 (Fluid), 2(Gas), 3(Plasma) 4(Fuel I think? Don't use.)
+	 * 
+	 * @return short[]
+	 */
+	public static Fluid generateFluid(String displayName, String fluidName, int tempK, short[] rgba ,int aState){
+		Fluid generatedFluid = null;
+		switch (aState) {
+		case 0: {
+			generatedFluid = new GenericFluid(displayName, fluidName, 0, 100, tempK, 10000, false, rgba);
+			break;
+		}
+		default:
+		case 1:
+		case 4: {
+			generatedFluid = new GenericFluid(displayName, fluidName, 0, 100, tempK, 1000, false, rgba);
+			break;
+		}
+		case 2: {
+			generatedFluid = new GenericFluid(displayName, fluidName, 0, -100, tempK, 200, true, rgba);
+			break;
+		}
+		case 3: {
+			generatedFluid = new GenericFluid(displayName, fluidName, 15, -10000, tempK, 10, true, rgba);
+			break;
+		}
+		}
+		return generatedFluid;
+	}
+	/**
+	 * 
+	 * @param String fluidName
+	 * @param int meltingPointC Temp
+	 * @param short[] rgba
+	 * @param byte state
+	 * States: 0 (Solid), 1 (Fluid), 2(Gas), 3(Plasma) 4(Fuel I think? Don't use.)
+	 * 
+	 * @return short[]
+	 */
+	public static Fluid generateFluid(Material material ,int aState){
+		int tempK = material.getMeltingPoint_C();
 		Fluid generatedFluid = null;
 		switch (aState) {
 		case 0: {
-			generatedFluid = new GenericFluid(fluidName, 0, 100, tempK, 10000, false, rgba);
+			generatedFluid = new GenericFluid(material, 0, 100, tempK, 10000, false);
 			break;
 		}
 		default:
 		case 1:
 		case 4: {
-			generatedFluid = new GenericFluid(fluidName, 0, 100, tempK, 1000, false, rgba);
+			generatedFluid = new GenericFluid(material, 0, 100, tempK, 1000, false);
 			break;
 		}
 		case 2: {
-			generatedFluid = new GenericFluid(fluidName, 0, -100, tempK, 200, true, rgba);
+			generatedFluid = new GenericFluid(material, 0, -100, tempK, 200, true);
 			break;
 		}
 		case 3: {
-			generatedFluid = new GenericFluid(fluidName, 15, -10000, tempK, 10, true, rgba);
+			generatedFluid = new GenericFluid(material, 15, -10000, tempK, 10, true);
 			break;
 		}
 		}