+ 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.

3 files changed, 174 insertions, 174 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/render/CapeHandler.java b/src/Java/gtPlusPlus/core/handler/render/CapeHandler.java
index f5e87ff512..f86e1ff160 100644
--- a/src/Java/gtPlusPlus/core/handler/render/CapeHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/render/CapeHandler.java
@@ -1,12 +1,13 @@
 package gtPlusPlus.core.handler.render;
 
+import java.util.Collection;
+
+import org.lwjgl.opengl.GL11;
+
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
-
-import java.util.Collection;
-
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.entity.RenderManager;
@@ -16,105 +17,104 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 
-import org.lwjgl.opengl.GL11;
-
 public class CapeHandler extends RenderPlayer {
-		private final ResourceLocation[] mCapes = {
-				new ResourceLocation(CORE.MODID+":textures/TesterCape.png"),
-				new ResourceLocation(CORE.MODID+":textures/Draknyte1.png"),
-				new ResourceLocation("gregtech:textures/GregoriusCape.png") };
-		private final Collection<String> mCapeList;
+	private final ResourceLocation[] mCapes = {
+			new ResourceLocation(CORE.MODID+":textures/TesterCape.png"),
+			new ResourceLocation(CORE.MODID+":textures/Draknyte1.png"),
+			new ResourceLocation("gregtech:textures/GregoriusCape.png") };
+	private final Collection<String> mCapeList;
 
-		public CapeHandler(Collection<String> aCapeList) {
-			this.mCapeList = aCapeList;
-			setRenderManager(RenderManager.instance);
-		}
+	public CapeHandler(final Collection<String> aCapeList) {
+		this.mCapeList = aCapeList;
+		this.setRenderManager(RenderManager.instance);
+	}
 
-		public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) {
-			AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer;
-			if (GT_Utility.getFullInvisibility(aPlayer)) {
-				aEvent.setCanceled(true);
-				return;
+	public void receiveRenderSpecialsEvent(final RenderPlayerEvent.Specials.Pre aEvent) {
+		final AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer;
+		if (GT_Utility.getFullInvisibility(aPlayer)) {
+			aEvent.setCanceled(true);
+			return;
+		}
+		final float aPartialTicks = aEvent.partialRenderTick;
+		if (aPlayer.isInvisible()) {
+			return;
+		}
+		if (GT_Utility.getPotion(aPlayer,
+				Integer.valueOf(Potion.invisibility.id).intValue())) {
+			return;
+		}
+		try {
+			ResourceLocation tResource = null;
+			if (aPlayer.getDisplayName().equalsIgnoreCase("XW3B")) {
+				tResource = this.mCapes[0];
 			}
-			float aPartialTicks = aEvent.partialRenderTick;
-			if (aPlayer.isInvisible()) {
-				return;
+			if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase())) {
+				tResource = this.mCapes[0];
 			}
-			if (GT_Utility.getPotion(aPlayer,
-					Integer.valueOf(Potion.invisibility.id).intValue())) {
-				return;
+			if (aPlayer.getDisplayName().equalsIgnoreCase("Draknyte1")) {
+				tResource = this.mCapes[1];
 			}
-			try {
-				ResourceLocation tResource = null;
-				if (aPlayer.getDisplayName().equalsIgnoreCase("XW3B")) {
-					tResource = this.mCapes[0];
-				}
-				if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase())) {
-					tResource = this.mCapes[0];
+			if (aPlayer.getDisplayName().equalsIgnoreCase("GregoriusT")) {
+				tResource = this.mCapes[2];
+			}
+			if ((tResource != null) && (!(aPlayer.getHideCape()))) {
+				this.bindTexture(tResource);
+				GL11.glPushMatrix();
+				GL11.glTranslatef(0.0F, 0.0F, 0.125F);
+				final double d0 = (aPlayer.field_71091_bM
+						+ ((aPlayer.field_71094_bP - aPlayer.field_71091_bM)
+								* aPartialTicks))
+						- (aPlayer.prevPosX + ((aPlayer.posX - aPlayer.prevPosX)
+								* aPartialTicks));
+				final double d1 = (aPlayer.field_71096_bN
+						+ ((aPlayer.field_71095_bQ - aPlayer.field_71096_bN)
+								* aPartialTicks))
+						- (aPlayer.prevPosY + ((aPlayer.posY - aPlayer.prevPosY)
+								* aPartialTicks));
+				final double d2 = (aPlayer.field_71097_bO
+						+ ((aPlayer.field_71085_bR - aPlayer.field_71097_bO)
+								* aPartialTicks))
+						- (aPlayer.prevPosZ + ((aPlayer.posZ - aPlayer.prevPosZ)
+								* aPartialTicks));
+				final float f6 = aPlayer.prevRenderYawOffset
+						+ ((aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset)
+								* aPartialTicks);
+				final double d3 = MathHelper.sin((f6 * CORE.PI) / 180.0F);
+				final double d4 = -MathHelper.cos((f6 * CORE.PI) / 180.0F);
+				float f7 = (float) d1 * 10.0F;
+				float f8 = (float) ((d0 * d3) + (d2 * d4)) * 100.0F;
+				final float f9 = (float) ((d0 * d4) - (d2 * d3)) * 100.0F;
+				if (f7 < -6.0F) {
+					f7 = -6.0F;
 				}
-				if (aPlayer.getDisplayName().equalsIgnoreCase("Draknyte1")) {
-					tResource = this.mCapes[1];
+				if (f7 > 32.0F) {
+					f7 = 32.0F;
 				}
-				if (aPlayer.getDisplayName().equalsIgnoreCase("GregoriusT")) {
-					tResource = this.mCapes[2];
+				if (f8 < 0.0F) {
+					f8 = 0.0F;
 				}
-				if ((tResource != null) && (!(aPlayer.getHideCape()))) {
-					bindTexture(tResource);
-					GL11.glPushMatrix();
-					GL11.glTranslatef(0.0F, 0.0F, 0.125F);
-					double d0 = aPlayer.field_71091_bM
-							+ (aPlayer.field_71094_bP - aPlayer.field_71091_bM)
-							* aPartialTicks
-							- (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX)
-									* aPartialTicks);
-					double d1 = aPlayer.field_71096_bN
-							+ (aPlayer.field_71095_bQ - aPlayer.field_71096_bN)
-							* aPartialTicks
-							- (aPlayer.prevPosY + (aPlayer.posY - aPlayer.prevPosY)
-									* aPartialTicks);
-					double d2 = aPlayer.field_71097_bO
-							+ (aPlayer.field_71085_bR - aPlayer.field_71097_bO)
-							* aPartialTicks
-							- (aPlayer.prevPosZ + (aPlayer.posZ - aPlayer.prevPosZ)
-									* aPartialTicks);
-					float f6 = aPlayer.prevRenderYawOffset
-							+ (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset)
-							* aPartialTicks;
-					double d3 = MathHelper.sin(f6 * CORE.PI / 180.0F);
-					double d4 = -MathHelper.cos(f6 * CORE.PI / 180.0F);
-					float f7 = (float) d1 * 10.0F;
-					float f8 = (float) (d0 * d3 + d2 * d4) * 100.0F;
-					float f9 = (float) (d0 * d4 - (d2 * d3)) * 100.0F;
-					if (f7 < -6.0F) {
-						f7 = -6.0F;
-					}
-					if (f7 > 32.0F) {
-						f7 = 32.0F;
-					}
-					if (f8 < 0.0F) {
-						f8 = 0.0F;
-					}
-					float f10 = aPlayer.prevCameraYaw
-							+ (aPlayer.cameraYaw - aPlayer.prevCameraYaw)
-							* aPartialTicks;
-					f7 += MathHelper
-							.sin((aPlayer.prevDistanceWalkedModified + (aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified)
-									* aPartialTicks) * 6.0F)
-							* 32.0F * f10;
-					if (aPlayer.isSneaking()) {
-						f7 += 25.0F;
-					}
-					GL11.glRotatef(6.0F + f8 / 2.0F + f7, 1.0F, 0.0F, 0.0F);
-					GL11.glRotatef(f9 / 2.0F, 0.0F, 0.0F, 1.0F);
-					GL11.glRotatef(-f9 / 2.0F, 0.0F, 1.0F, 0.0F);
-					GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
-					((ModelBiped) this.mainModel).renderCloak(0.0625F);
-					GL11.glPopMatrix();
+				final float f10 = aPlayer.prevCameraYaw
+						+ ((aPlayer.cameraYaw - aPlayer.prevCameraYaw)
+								* aPartialTicks);
+				f7 += MathHelper
+						.sin((aPlayer.prevDistanceWalkedModified + ((aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified)
+								* aPartialTicks)) * 6.0F)
+						* 32.0F * f10;
+				if (aPlayer.isSneaking()) {
+					f7 += 25.0F;
 				}
-			} catch (Throwable e) {
-				if (GT_Values.D1)
-					e.printStackTrace(GT_Log.err);
+				GL11.glRotatef(6.0F + (f8 / 2.0F) + f7, 1.0F, 0.0F, 0.0F);
+				GL11.glRotatef(f9 / 2.0F, 0.0F, 0.0F, 1.0F);
+				GL11.glRotatef(-f9 / 2.0F, 0.0F, 1.0F, 0.0F);
+				GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
+				((ModelBiped) this.mainModel).renderCloak(0.0625F);
+				GL11.glPopMatrix();
+			}
+		} catch (final Throwable e) {
+			if (GT_Values.D1) {
+				e.printStackTrace(GT_Log.err);
 			}
 		}
-	
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/handler/render/FirepitModel.java b/src/Java/gtPlusPlus/core/handler/render/FirepitModel.java
index 9bad3d2f4e..845576e023 100644
--- a/src/Java/gtPlusPlus/core/handler/render/FirepitModel.java
+++ b/src/Java/gtPlusPlus/core/handler/render/FirepitModel.java
@@ -25,86 +25,86 @@ public class FirepitModel extends ModelBase
 
 	public FirepitModel()
 	{
-		textureWidth = 16;
-		textureHeight = 16;
-
-		Side_A = new ModelRenderer(this, 0, 0);
-		Side_A.addBox(0F, 0F, 0F, 12, 6, 1);
-		Side_A.setRotationPoint(-6F, 18F, -6F);
-		Side_A.setTextureSize(16, 16);
-		Side_A.mirror = true;
-		setRotation(Side_A, -0.3148822F, 0F, 0F);
+		this.textureWidth = 16;
+		this.textureHeight = 16;
+
+		this.Side_A = new ModelRenderer(this, 0, 0);
+		this.Side_A.addBox(0F, 0F, 0F, 12, 6, 1);
+		this.Side_A.setRotationPoint(-6F, 18F, -6F);
+		this.Side_A.setTextureSize(16, 16);
+		this.Side_A.mirror = true;
+		setRotation(this.Side_A, -0.3148822F, 0F, 0F);
 		//Side_A.mirror = false;
 
-		Side_B = new ModelRenderer(this, 0, 0);
-		Side_B.addBox(0F, 0F, 0F, 12, 6, 1);
-		Side_B.setRotationPoint(-6F, 18F, 6F);
-		Side_B.setTextureSize(16, 16);
-		Side_B.mirror = true;
-		setRotation(Side_B, -0.3148822F, (CORE.PI/2), 0F);
-
-		Side_C = new ModelRenderer(this, 0, 0);
-		Side_C.addBox(0F, 0F, 0F, 12, 6, 1);
-		Side_C.setRotationPoint(6F, 18F, 6F);
-		Side_C.setTextureSize(16, 16);
-		Side_C.mirror = true;
-		setRotation(Side_C, -0.3148822F, CORE.PI, 0F);
+		this.Side_B = new ModelRenderer(this, 0, 0);
+		this.Side_B.addBox(0F, 0F, 0F, 12, 6, 1);
+		this.Side_B.setRotationPoint(-6F, 18F, 6F);
+		this.Side_B.setTextureSize(16, 16);
+		this.Side_B.mirror = true;
+		setRotation(this.Side_B, -0.3148822F, (CORE.PI/2), 0F);
+
+		this.Side_C = new ModelRenderer(this, 0, 0);
+		this.Side_C.addBox(0F, 0F, 0F, 12, 6, 1);
+		this.Side_C.setRotationPoint(6F, 18F, 6F);
+		this.Side_C.setTextureSize(16, 16);
+		this.Side_C.mirror = true;
+		setRotation(this.Side_C, -0.3148822F, CORE.PI, 0F);
 		//Side_C.mirror = false;
 
-		Side_D = new ModelRenderer(this, 0, 0);
-		Side_D.addBox(0F, 0F, 0F, 12, 6, 1);
-		Side_D.setRotationPoint(6F, 18F, -6F);
-		Side_D.setTextureSize(16, 16);
-		Side_D.mirror = true;
-		setRotation(Side_D, -0.3148822F, 4.712389F, 0F);
-
-		Log1 = new ModelRenderer(this, 0, 10);
-		Log1.addBox(0F, 0F, 0F, 14, 2, 2);
-		Log1.setRotationPoint(4F, 10F, -4F);
-		Log1.setTextureSize(16, 16);
-		Log1.mirror = true;
-		setRotation(Log1, 0F, 0F, (CORE.PI/2));
-
-		Log2 = new ModelRenderer(this, -2, 10);
-		Log2.addBox(0F, 0F, 0F, 14, 2, 2);
-		Log2.setRotationPoint(-4F, 10F, -4F);
-		Log2.setTextureSize(16, 16);
-		Log2.mirror = true;
-		setRotation(Log2, (CORE.PI/2), 0F, (CORE.PI/2));
+		this.Side_D = new ModelRenderer(this, 0, 0);
+		this.Side_D.addBox(0F, 0F, 0F, 12, 6, 1);
+		this.Side_D.setRotationPoint(6F, 18F, -6F);
+		this.Side_D.setTextureSize(16, 16);
+		this.Side_D.mirror = true;
+		setRotation(this.Side_D, -0.3148822F, 4.712389F, 0F);
+
+		this.Log1 = new ModelRenderer(this, 0, 10);
+		this.Log1.addBox(0F, 0F, 0F, 14, 2, 2);
+		this.Log1.setRotationPoint(4F, 10F, -4F);
+		this.Log1.setTextureSize(16, 16);
+		this.Log1.mirror = true;
+		setRotation(this.Log1, 0F, 0F, (CORE.PI/2));
+
+		this.Log2 = new ModelRenderer(this, -2, 10);
+		this.Log2.addBox(0F, 0F, 0F, 14, 2, 2);
+		this.Log2.setRotationPoint(-4F, 10F, -4F);
+		this.Log2.setTextureSize(16, 16);
+		this.Log2.mirror = true;
+		setRotation(this.Log2, (CORE.PI/2), 0F, (CORE.PI/2));
 		//Log2.mirror = false;
 
-		Log3 = new ModelRenderer(this, 0, 10);
-		Log3.addBox(0F, 0F, 0F, 14, 2, 2);
-		Log3.setRotationPoint(-4F, 10F, 4F);
-		Log3.setTextureSize(16, 16);
-		Log3.mirror = true;
-		setRotation(Log3, CORE.PI, 0F, (CORE.PI/2));
-
-		Log4 = new ModelRenderer(this, -2, 10);
-		Log4.addBox(0F, 0F, 0F, 14, 2, 2);
-		Log4.setRotationPoint(4F, 10F, 4F);
-		Log4.setTextureSize(16, 16);
-		Log4.mirror = true;
-		setRotation(Log4, 4.712389F, 0F, (CORE.PI/2));
+		this.Log3 = new ModelRenderer(this, 0, 10);
+		this.Log3.addBox(0F, 0F, 0F, 14, 2, 2);
+		this.Log3.setRotationPoint(-4F, 10F, 4F);
+		this.Log3.setTextureSize(16, 16);
+		this.Log3.mirror = true;
+		setRotation(this.Log3, CORE.PI, 0F, (CORE.PI/2));
+
+		this.Log4 = new ModelRenderer(this, -2, 10);
+		this.Log4.addBox(0F, 0F, 0F, 14, 2, 2);
+		this.Log4.setRotationPoint(4F, 10F, 4F);
+		this.Log4.setTextureSize(16, 16);
+		this.Log4.mirror = true;
+		setRotation(this.Log4, 4.712389F, 0F, (CORE.PI/2));
 		//Log4.mirror = false;
 	}
 
 	@Override
-	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
+	public void render(final Entity entity, final float f, final float f1, final float f2, final float f3, final float f4, final float f5)
 	{
 		super.render(entity, f, f1, f2, f3, f4, f5);
-		setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-		Side_A.render(f5);
-		Side_B.render(f5);
-		Side_C.render(f5);
-		Side_D.render(f5);
-		Log1.render(f5);
-		Log2.render(f5);
-		Log3.render(f5);
-		Log4.render(f5);
+		this.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+		this.Side_A.render(f5);
+		this.Side_B.render(f5);
+		this.Side_C.render(f5);
+		this.Side_D.render(f5);
+		this.Log1.render(f5);
+		this.Log2.render(f5);
+		this.Log3.render(f5);
+		this.Log4.render(f5);
 	}
 
-	private static void setRotation(ModelRenderer model, float x, float y, float z)
+	private static void setRotation(final ModelRenderer model, final float x, final float y, final float z)
 	{
 		model.rotateAngleX = x;
 		model.rotateAngleY = y;
@@ -112,7 +112,7 @@ public class FirepitModel extends ModelBase
 	}
 
 	@Override
-	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
+	public void setRotationAngles(final float f, final float f1, final float f2, final float f3, final float f4, final float f5, final Entity entity)
 	{
 		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
 	}
diff --git a/src/Java/gtPlusPlus/core/handler/render/FirepitRender.java b/src/Java/gtPlusPlus/core/handler/render/FirepitRender.java
index 5a02de77b5..7b8d23e25b 100644
--- a/src/Java/gtPlusPlus/core/handler/render/FirepitRender.java
+++ b/src/Java/gtPlusPlus/core/handler/render/FirepitRender.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.handler.render;
 
+import org.lwjgl.opengl.GL11;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
@@ -8,31 +10,29 @@ import net.minecraft.entity.Entity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-
-import org.lwjgl.opengl.GL11;
 public class FirepitRender extends TileEntitySpecialRenderer{
 	ResourceLocation texture = new ResourceLocation("miscutils" + ":"+ "textures/blocks/FirePit/mossyFirepit.png");
 
-	private FirepitModel model;
+	private final FirepitModel model;
 
 	public FirepitRender(){
 		this.model = new FirepitModel();
 	}
 
-	private void adjustRotatePivotViaMeta(World world, int x, int y, int z) {
-		int meta = world.getBlockMetadata(x, y, z);
+	private void adjustRotatePivotViaMeta(final World world, final int x, final int y, final int z) {
+		final int meta = world.getBlockMetadata(x, y, z);
 		GL11.glPushMatrix();
 		GL11.glRotatef(meta * (-90), 0.0F, 0.0F, 1.0F);
 		GL11.glPopMatrix();
 	}
 
 	@Override
-	public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float i) {
+	public void renderTileEntityAt(final TileEntity entity, final double x, final double y, final double z, final float i) {
 		GL11.glPushMatrix();
 		GL11.glTranslatef((float)x + 0.1F, (float)y + 1.0F, (float)z + 0.5F);
 		GL11.glRotatef(180, 0F, 0F, 1F);
 
-		this.bindTexture(texture);
+		this.bindTexture(this.texture);
 		GL11.glPushMatrix();
 		this.model.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
 		GL11.glTranslatef(1.0f, 1.0f, 1.0f);
@@ -40,16 +40,16 @@ public class FirepitRender extends TileEntitySpecialRenderer{
 		GL11.glPopMatrix();
 	}
 
-	//Set the lighting stuff, so it changes it's brightness properly.      
-	private void adjustLightFixture(World world, int i, int j, int k, Block block) {
-		Tessellator tess = Tessellator.instance;
+	//Set the lighting stuff, so it changes it's brightness properly.
+	private void adjustLightFixture(final World world, final int i, final int j, final int k, final Block block) {
+		final Tessellator tess = Tessellator.instance;
 		//float brightness = block.getBlockBrightness(world, i, j, k);
 		//As of MC 1.7+ block.getBlockBrightness() has become block.getLightValue():
-		float brightness = block.getLightValue(world, i, j, k);
-		int skyLight = world.getLightBrightnessForSkyBlocks(i, j, k, 0);
-		int modulousModifier = skyLight % 65536;
-		int divModifier = skyLight / 65536;
+		final float brightness = block.getLightValue(world, i, j, k);
+		final int skyLight = world.getLightBrightnessForSkyBlocks(i, j, k, 0);
+		final int modulousModifier = skyLight % 65536;
+		final int divModifier = skyLight / 65536;
 		tess.setColorOpaque_F(brightness, brightness, brightness);
-		OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit,  (float) modulousModifier,  divModifier);
+		OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit,  modulousModifier,  divModifier);
 	}
 }