+ New texture for the slow builders ring.

+ Added the Alkalus Disk.
$ Fixed Frame Box Assembler Recipes.
$ Fixed Missing 7Li material.
$ Fixed Tiered Tanks not showing their capacity in the tooltip.
$ Fixed tooltips for alloys containing Bronze or Steel.
$ Fixed Clay Pipe Extruder Recipes.
- Removed a handful of Plasma cells for misc. materials.
% Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements.
% Cleaned up The Entire Project.

2 files changed, 104 insertions, 102 deletions

diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java b/src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java
index 5674082c4a..b09c9dd795 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidGT6.java
@@ -6,25 +6,25 @@ 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
+	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
+		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));
-    }
+		this.setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID+ ":" + "fluids/fluid." + this.mTextureName));
+	}
 }
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index 8163648c41..882f3f1eb4 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -17,56 +17,56 @@ import net.minecraftforge.fluids.*;
 
 public class FluidUtils {
 
-	public static FluidStack getFluidStack(String fluidName, int amount){
+	public static FluidStack getFluidStack(final String fluidName, final int amount){
 		Utils.LOG_WARNING("Trying to get a fluid stack of "+fluidName);
 		try {
 			return FluidRegistry.getFluidStack(fluidName, amount).copy();
-		} 
-		catch (Throwable e){
+		}
+		catch (final Throwable e){
 			return null;
 		}
 
 	}
 
-	public static FluidStack getFluidStack(FluidStack vmoltenFluid, int fluidAmount) {
+	public static FluidStack getFluidStack(final FluidStack vmoltenFluid, final 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){
+		}
+		catch (final Throwable e){
 			return null;
 		}
 	}
 
-	public static FluidStack getFluidStack(Fluid vFluid, int fluidAmount) {
+	public static FluidStack getFluidStack(final Fluid vFluid, final int fluidAmount) {
 		Utils.LOG_WARNING("Trying to get a fluid stack of "+vFluid.getName());
 		try {
 			return FluidRegistry.getFluidStack(vFluid.getName(), fluidAmount).copy();
-		} 
-		catch (Throwable e){
+		}
+		catch (final Throwable e){
 			return null;
 		}
 	}
 
-	public static FluidStack[] getFluidStackArray(String fluidName, int amount){
+	public static FluidStack[] getFluidStackArray(final String fluidName, final int amount){
 		Utils.LOG_WARNING("Trying to get a fluid stack of "+fluidName);
 		try {
-			FluidStack[] singleFluid = {FluidRegistry.getFluidStack(fluidName, amount)};
+			final FluidStack[] singleFluid = {FluidRegistry.getFluidStack(fluidName, amount)};
 			return singleFluid;
-		} 
-		catch (Throwable e){
+		}
+		catch (final Throwable e){
 			return null;
 		}
 
 	}
 
-	public static FluidStack[] getFluidStackArray(FluidStack fluidName, int amount){
+	public static FluidStack[] getFluidStackArray(final FluidStack fluidName, final int amount){
 		Utils.LOG_WARNING("Trying to get a fluid stack of "+fluidName);
 		try {
-			FluidStack[] singleFluid = {FluidRegistry.getFluidStack(fluidName.getLocalizedName(), amount)};
+			final FluidStack[] singleFluid = {FluidRegistry.getFluidStack(fluidName.getLocalizedName(), amount)};
 			return singleFluid;
-		} 
-		catch (Throwable e){
+		}
+		catch (final Throwable e){
 			return null;
 		}
 
@@ -80,10 +80,10 @@ public class FluidUtils {
 	 * @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){
+	public static Fluid generateFluid(final String displayName, final String fluidName, final int tempK, final short[] rgba ,final int aState){
 		Fluid generatedFluid = null;
 		switch (aState) {
 		case 0: {
@@ -108,17 +108,17 @@ public class FluidUtils {
 		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.getMeltingPointC();
+	public static Fluid generateFluid(final Material material ,final int aState){
+		final int tempK = material.getMeltingPointC();
 		Fluid generatedFluid = null;
 		switch (aState) {
 		case 0: {
@@ -144,9 +144,9 @@ public class FluidUtils {
 	}
 
 
-	public static Fluid addAutogeneratedMoltenFluid(String materialNameFormatted, short[] rgba, int MeltingPoint) {
+	public static Fluid addAutogeneratedMoltenFluid(final String materialNameFormatted, final short[] rgba, final int MeltingPoint) {
 		return addFluid("molten." + materialNameFormatted.toLowerCase(), "molten.autogenerated", "Molten " + materialNameFormatted, null, rgba, 1, (MeltingPoint <= 0L) ? 1000L : MeltingPoint, null, null, 0);
-	}	
+	}
 
 	public static Fluid addAutogeneratedMoltenFluid(final GT_Materials aMaterial) {
 		return addFluid("molten." + aMaterial.name().toLowerCase(), "molten.autogenerated", "Molten " + aMaterial.name(), aMaterial, aMaterial.mMoltenRGBa, 1, (aMaterial.mMeltingPoint <= 0L) ? 1000L : aMaterial.mMeltingPoint, null, null, 0);
@@ -195,7 +195,7 @@ public class FluidUtils {
 		else {
 			rFluid = FluidRegistry.getFluid(aName);
 		}
-		if (rFluid.getTemperature() == new Fluid("test").getTemperature() || rFluid.getTemperature() <= 0) {
+		if ((rFluid.getTemperature() == new Fluid("test").getTemperature()) || (rFluid.getTemperature() <= 0)) {
 			rFluid.setTemperature((int) (aTemperatureK));
 		}
 		if (aMaterial != null) {
@@ -214,7 +214,7 @@ public class FluidUtils {
 			}
 			}
 		}
-		if (aFullContainer != null && aEmptyContainer != null && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
+		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;
@@ -223,48 +223,48 @@ public class FluidUtils {
 	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 addGTFluidNonMolten(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("fluid."+aName, "fluid.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount);
 	}
-	
-	 public static Fluid addGTPlasma(Material aMaterial) {
-		 if (aMaterial.getLocalizedName().toLowerCase().contains("clay")){
-			 return null;
-		 }
-		 Utils.LOG_INFO("Generating a "+aMaterial.getLocalizedName()+" Plasma Cell");
-		 if (aMaterial.vComponentCount != 1){			 
-			 Utils.LOG_INFO("Compound made from: ");
-			 for (MaterialStack x : aMaterial.getComposites()){
-				 Utils.LOG_INFO(x.getStackMaterial().getLocalizedName());
-			 }			 
-			 Utils.LOG_INFO("Material is a composite, not generating plasma.");
-			 return null;
-		 }
-		 
-		 ItemStack temp = null;
-		//Generate a Cell if we need to
-			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+aMaterial.getUnlocalizedName(), 1) == null){
-				Item temp2 = new BaseItemPlasmaCell(aMaterial);
-				temp = aMaterial.getPlasmaCell(1);
-			}
-			else {
-				temp = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+aMaterial.getUnlocalizedName(), 1);
-			}
-			if (temp != null){
-	        return addGTFluid(
-	        		"plasma." + Utils.sanitizeString(aMaterial.getLocalizedName().toLowerCase()),
-	        		"plasma.autogenerated",
-	        		aMaterial.getLocalizedName() + " Plasma",
-	                aMaterial.getRGBA(),
-	                3,
-	                10000,
-	                temp,
-	                ItemList.Cell_Empty.get(1L, new Object[0]),
-	                1000);
+
+	public static Fluid addGTPlasma(final Material aMaterial) {
+		if (aMaterial.getLocalizedName().toLowerCase().contains("clay")){
+			return null;
+		}
+		Utils.LOG_INFO("Generating a "+aMaterial.getLocalizedName()+" Plasma Cell");
+		if (aMaterial.vComponentCount != 1){
+			Utils.LOG_INFO("Compound made from: ");
+			for (final MaterialStack x : aMaterial.getComposites()){
+				Utils.LOG_INFO(x.getStackMaterial().getLocalizedName());
 			}
+			Utils.LOG_INFO("Material is a composite, not generating plasma.");
 			return null;
-	    }
+		}
+
+		ItemStack temp = null;
+		//Generate a Cell if we need to
+		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+aMaterial.getUnlocalizedName(), 1) == null){
+			final Item temp2 = new BaseItemPlasmaCell(aMaterial);
+			temp = aMaterial.getPlasmaCell(1);
+		}
+		else {
+			temp = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+aMaterial.getUnlocalizedName(), 1);
+		}
+		if (temp != null){
+			return addGTFluid(
+					"plasma." + Utils.sanitizeString(aMaterial.getLocalizedName().toLowerCase()),
+					"plasma.autogenerated",
+					aMaterial.getLocalizedName() + " Plasma",
+					aMaterial.getRGBA(),
+					3,
+					10000,
+					temp,
+					ItemList.Cell_Empty.get(1L, new Object[0]),
+					1000);
+		}
+		return null;
+	}
 
 	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());
@@ -301,21 +301,21 @@ public class FluidUtils {
 		else {
 			rFluid = FluidRegistry.getFluid(aName);
 		}
-		if (rFluid.getTemperature() == new Fluid("test").getTemperature() || rFluid.getTemperature() <= 0) {
+		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)) {
+		}
+		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;
+		return (aStack != null) && (aStack instanceof ItemStack) && (((ItemStack)aStack).getItem() != null) && (((ItemStack)aStack).stackSize >= 0);
 	}
 
 	public static boolean invalid(final Object aStack) {
-		return aStack == null || !(aStack instanceof ItemStack) || ((ItemStack)aStack).getItem() == null || ((ItemStack)aStack).stackSize < 0;
+		return (aStack == null) || !(aStack instanceof ItemStack) || (((ItemStack)aStack).getItem() == null) || (((ItemStack)aStack).stackSize < 0);
 	}
 
 	public static boolean equal(final ItemStack aStack1, final ItemStack aStack2) {
@@ -323,11 +323,11 @@ public class FluidUtils {
 	}
 
 	public static boolean equal(final ItemStack aStack1, final ItemStack aStack2, final boolean aIgnoreNBT) {
-		return aStack1 != null && aStack2 != null && equal_(aStack1, aStack2, aIgnoreNBT);
+		return (aStack1 != null) && (aStack2 != null) && equal_(aStack1, aStack2, aIgnoreNBT);
 	}
 
 	public static boolean equal_(final ItemStack aStack1, final ItemStack aStack2, final boolean aIgnoreNBT) {
-		return aStack1.getItem() == aStack2.getItem() && (aIgnoreNBT || (aStack1.getTagCompound() == null == (aStack2.getTagCompound() == null) && (aStack1.getTagCompound() == null || aStack1.getTagCompound().equals((Object)aStack2.getTagCompound())))) && (meta(aStack1) == meta(aStack2) || meta(aStack1) == 32767 || meta(aStack2) == 32767);
+		return (aStack1.getItem() == aStack2.getItem()) && (aIgnoreNBT || ((aStack1.getTagCompound() == null == (aStack2.getTagCompound() == null)) && ((aStack1.getTagCompound() == null) || aStack1.getTagCompound().equals(aStack2.getTagCompound())))) && ((meta(aStack1) == meta(aStack2)) || (meta(aStack1) == 32767) || (meta(aStack2) == 32767));
 	}
 
 	public static ItemStack copy(final Object... aStacks) {
@@ -352,7 +352,7 @@ public class FluidUtils {
 	}
 
 	public static ItemStack meta(final ItemStack aStack, final long aMeta) {
-		Items.feather.setDamage(aStack, (int)(short)aMeta);
+		Items.feather.setDamage(aStack, (short)aMeta);
 		return aStack;
 	}
 
@@ -375,7 +375,7 @@ public class FluidUtils {
 		if (equal(aStack, ItemList.Cell_Empty.get(1), true)) {
 			return null;
 		}
-		if (aCheckIFluidContainerItems && aStack.getItem() instanceof IFluidContainerItem && ((IFluidContainerItem)aStack.getItem()).getCapacity(aStack) > 0) {
+		if (aCheckIFluidContainerItems && (aStack.getItem() instanceof IFluidContainerItem) && (((IFluidContainerItem)aStack.getItem()).getCapacity(aStack) > 0)) {
 			final ItemStack tStack = amount(1L, aStack);
 			((IFluidContainerItem)aStack.getItem()).drain(tStack, Integer.MAX_VALUE, true);
 			if (!equal(aStack, tStack)) {
@@ -391,21 +391,22 @@ public class FluidUtils {
 
 	public static ItemStack container(final ItemStack aStack, final boolean aCheckIFluidContainerItems, final int aStacksize) {
 		return amount(aStacksize, container(aStack, aCheckIFluidContainerItems));
-	}	
+	}
 
-	public final static Fluid generateFluid(String unlocalizedName, String localizedName, int MeltingPoint, short[] RGBA){
-		if (FluidUtils.getFluidStack("molten"+"."+unlocalizedName.toLowerCase(), 1) == null && ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1) != null){
+	public final static Fluid generateFluid(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA){
+		if ((FluidUtils.getFluidStack("molten"+"."+unlocalizedName.toLowerCase(), 1) == null) && (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1) != null)){
 			Utils.LOG_WARNING("Generating our own fluid.");
 
 			//Generate a Cell if we need to
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){
 				@SuppressWarnings("unused")
+				final
 				Item temp = new BaseItemComponent(unlocalizedName, localizedName, RGBA);
 			}
 
-			Fluid gtFluid = FluidUtils.addGTFluid(
+			final Fluid gtFluid = FluidUtils.addGTFluid(
 					unlocalizedName,
-					"Molten "+localizedName,		
+					"Molten "+localizedName,
 					RGBA,
 					4,
 					MeltingPoint,
@@ -427,22 +428,23 @@ public class FluidUtils {
 		return null;
 	}
 
-	public final static Fluid generateFluidNonMolten(String unlocalizedName, String localizedName, int MeltingPoint, short[] RGBA, ItemStack dustStack, ItemStack dustStack2){
+	public final static Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA, ItemStack dustStack, final ItemStack dustStack2){
 		if (dustStack == null){
 			dustStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1);
-		}		
-		if (FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null && (dustStack != null || dustStack2 != null)){
+		}
+		if ((FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null) && ((dustStack != null) || (dustStack2 != null))){
 			Utils.LOG_WARNING("Generating our own fluid.");
 
 			//Generate a Cell if we need to
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){
 				@SuppressWarnings("unused")
+				final
 				Item temp = new BaseItemComponent(unlocalizedName, localizedName, RGBA);
 			}
 
-			Fluid gtFluid = FluidUtils.addGTFluidNonMolten(
+			final Fluid gtFluid = FluidUtils.addGTFluidNonMolten(
 					unlocalizedName,
-					localizedName,		
+					localizedName,
 					RGBA,
 					4,
 					MeltingPoint,