Merge branch 'GTNewHorizons:master' into master

1 files changed, 31 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java
new file mode 100644
index 0000000000..2535046792
--- /dev/null
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java
@@ -0,0 +1,31 @@
+package gtPlusPlus.api.objects.minecraft;
+
+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." + this.mTextureName));
+	}
+}