+ Added 4 types of custom RTG pellets.

+ Added 3 new materials for the custom pellets.
% Created StringUtils.java and migrated Super/Subscript formatting functions to it.

2 files changed, 24 insertions, 23 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 6b21fbbf0a..2426757a05 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -33,6 +33,7 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.*;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
+import gtPlusPlus.core.util.StringUtils;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.debug.DEBUG_INIT;
 import gtPlusPlus.core.util.fluid.FluidUtils;
@@ -473,7 +474,7 @@ public final class ModItems {
 
 		//Zirconium
 		//Cinter Pellet.
-		itemZirconiumChlorideCinterPellet = new CoreItem("itemZirconiumPellet", "Zirconium Pellet ["+MaterialUtils.subscript("ZrCl4")+"]", tabMisc).setTextureName(CORE.MODID + ":itemShard");
+		itemZirconiumChlorideCinterPellet = new CoreItem("itemZirconiumPellet", "Zirconium Pellet ["+StringUtils.subscript("ZrCl4")+"]", tabMisc).setTextureName(CORE.MODID + ":itemShard");
 		GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet));
 		//Zirconium Chloride
 		dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index 8dc9eb8c3c..5eae18f2b1 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -7,10 +7,10 @@ import java.util.List;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.StringUtils;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
-import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -34,7 +34,7 @@ public class BaseItemDustUnique extends Item{
 		this.setCreativeTab(tabMisc);
 		this.colour = colour;
 		this.materialName = materialName;
-		this.chemicalNotation = MaterialUtils.subscript(materialName);
+		this.chemicalNotation = StringUtils.subscript(materialName);
 		this.sRadiation = ItemUtils.getRadioactivityLevel(materialName);
 		GameRegistry.registerItem(this, unlocalizedName);
 
@@ -114,61 +114,61 @@ public class BaseItemDustUnique extends Item{
 	}
 
 	static boolean containsSubScript(final String s){
-		if (s.contains(MaterialUtils.superscript("1"))) {
+		if (s.contains(StringUtils.superscript("1"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.superscript("2"))) {
+		if (s.contains(StringUtils.superscript("2"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.superscript("3"))) {
+		if (s.contains(StringUtils.superscript("3"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.superscript("4"))) {
+		if (s.contains(StringUtils.superscript("4"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.superscript("5"))) {
+		if (s.contains(StringUtils.superscript("5"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.superscript("6"))) {
+		if (s.contains(StringUtils.superscript("6"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.superscript("7"))) {
+		if (s.contains(StringUtils.superscript("7"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.superscript("8"))) {
+		if (s.contains(StringUtils.superscript("8"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.superscript("9"))) {
+		if (s.contains(StringUtils.superscript("9"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.subscript("1"))) {
+		if (s.contains(StringUtils.subscript("1"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.subscript("2"))) {
+		if (s.contains(StringUtils.subscript("2"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.subscript("3"))) {
+		if (s.contains(StringUtils.subscript("3"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.subscript("4"))) {
+		if (s.contains(StringUtils.subscript("4"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.subscript("5"))) {
+		if (s.contains(StringUtils.subscript("5"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.subscript("6"))) {
+		if (s.contains(StringUtils.subscript("6"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.subscript("7"))) {
+		if (s.contains(StringUtils.subscript("7"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.subscript("8"))) {
+		if (s.contains(StringUtils.subscript("8"))) {
 			return true;
 		}
-		if (s.contains(MaterialUtils.subscript("9"))) {
+		if (s.contains(StringUtils.subscript("9"))) {
 			return true;
 		}
-		final String r = MaterialUtils.subscript(s);
+		final String r = StringUtils.subscript(s);
 		if (r.contains(("1"))) {
 			return false;
 		}
@@ -200,7 +200,7 @@ public class BaseItemDustUnique extends Item{
 	}
 
 	public final String getMaterialName() {
-		return MaterialUtils.subscript(this.materialName);
+		return StringUtils.subscript(this.materialName);
 	}
 
 	@Override