3 files changed, 92 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/api/enums/Quality.java b/src/Java/gtPlusPlus/api/enums/Quality.java
new file mode 100644
index 0000000000..0c59cd58fb
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/enums/Quality.java
@@ -0,0 +1,61 @@
+package gtPlusPlus.api.enums;
+
+import gtPlusPlus.core.util.math.MathUtils;
+import net.minecraft.util.EnumChatFormatting;
+
+public enum Quality {
+
+	// Magic Blue
+	// Rare Yellow
+	// Set Green
+	// Unique Gold/Purple
+	// Trade-off Brown
+
+	POOR("Poor", EnumChatFormatting.GRAY), COMMON("Common", EnumChatFormatting.WHITE), UNCOMMON("Uncommon",
+			EnumChatFormatting.DARK_GREEN), MAGIC("Magic", EnumChatFormatting.BLUE), RARE("Rare",
+					EnumChatFormatting.YELLOW), UNIQUE("Unique", EnumChatFormatting.GOLD), ARTIFACT("Artifact",
+							EnumChatFormatting.AQUA), SET("Set Piece", EnumChatFormatting.GREEN), TRADEOFF("Trade-off",
+									EnumChatFormatting.DARK_RED), EPIC("Epic", EnumChatFormatting.LIGHT_PURPLE);
+
+	private String LOOT;
+	private EnumChatFormatting COLOUR;
+
+	private Quality(final String lootTier, final EnumChatFormatting tooltipColour) {
+		this.LOOT = lootTier;
+		this.COLOUR = tooltipColour;
+	}
+
+	public String getQuality() {
+		return this.LOOT;
+	}
+
+	protected EnumChatFormatting getColour() {
+		return this.COLOUR;
+	}
+
+	public String formatted() {
+		return this.COLOUR + this.LOOT;
+	}
+
+	public static Quality getRandomQuality() {
+		final int lootChance = MathUtils.randInt(0, 100);
+		if (lootChance <= 10) {
+			return Quality.POOR;
+		} else if (lootChance <= 45) {
+			return Quality.COMMON;
+		} else if (lootChance <= 65) {
+			return Quality.UNCOMMON;
+		} else if (lootChance <= 82) {
+			return Quality.MAGIC;
+		} else if (lootChance <= 92) {
+			return Quality.EPIC;
+		} else if (lootChance <= 97) {
+			return Quality.RARE;
+		} else if (lootChance <= 99) {
+			return Quality.ARTIFACT;
+		} else {
+			return null;
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java
index bb30727992..b1398f1367 100644
--- a/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java
+++ b/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java
@@ -3,7 +3,7 @@ package gtPlusPlus.api.helpers;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.item.ItemStack;
 
 public class MaterialHelper {
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java
new file mode 100644
index 0000000000..d5922242f4
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java
@@ -0,0 +1,30 @@
+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));
+	}
+}