Bulk update back to sanity

1 files changed, 13 insertions, 30 deletions

diff --git a/YWD/src/main/java/fyresmodjam/entities/renderers/RenderMysteryPotion.java b/YWD/src/main/java/fyresmodjam/entities/renderers/RenderMysteryPotion.java
index ea79e25..43d2c55 100755
--- a/YWD/src/main/java/fyresmodjam/entities/renderers/RenderMysteryPotion.java
+++ b/YWD/src/main/java/fyresmodjam/entities/renderers/RenderMysteryPotion.java
@@ -26,37 +26,27 @@ public class RenderMysteryPotion extends Render {
 	}

 

 	@Override

-	public void doRender(Entity par1Entity, double par2, double par4,

-			double par6, float par8, float par9) {

+	public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) {

 		IIcon icon = (par1Entity instanceof EntityMysteryPotion)

-				? field_94151_a.getIconFromDamage(

-						par1Entity.getDataWatcher()

-								.getWatchableObjectInt(

-										24))

+				? field_94151_a.getIconFromDamage(par1Entity.getDataWatcher().getWatchableObjectInt(24))

 				: field_94151_a.getIconFromDamage(0);

 

 		if (icon != null) {

 			GL11.glPushMatrix();

-			GL11.glTranslatef((float) par2, (float) par4,

-					(float) par6);

+			GL11.glTranslatef((float) par2, (float) par4, (float) par6);

 			GL11.glEnable(GL12.GL_RESCALE_NORMAL);

 			GL11.glScalef(0.5F, 0.5F, 0.5F);

 			bindEntityTexture(par1Entity);

 			Tessellator tessellator = Tessellator.instance;

 

-			if (icon == ItemPotion

-					.func_94589_d("bottle_splash")) {

-				int i = PotionHelper.func_77915_a(

-						((EntityPotion) par1Entity)

-								.getPotionDamage(),

-						false);

+			if (icon == ItemPotion.func_94589_d("bottle_splash")) {

+				int i = PotionHelper.func_77915_a(((EntityPotion) par1Entity).getPotionDamage(), false);

 				float f2 = (i >> 16 & 255) / 255.0F;

 				float f3 = (i >> 8 & 255) / 255.0F;

 				float f4 = (i & 255) / 255.0F;

 				GL11.glColor3f(f2, f3, f4);

 				GL11.glPushMatrix();

-				func_77026_a(tessellator, ItemPotion

-						.func_94589_d("overlay"));

+				func_77026_a(tessellator, ItemPotion.func_94589_d("overlay"));

 				GL11.glPopMatrix();

 				GL11.glColor3f(1.0F, 1.0F, 1.0F);

 			}

@@ -72,8 +62,7 @@ public class RenderMysteryPotion extends Render {
 		return TextureMap.locationItemsTexture;

 	}

 

-	private void func_77026_a(Tessellator par1Tessellator,

-			IIcon par2Icon) {

+	private void func_77026_a(Tessellator par1Tessellator, IIcon par2Icon) {

 		float f = par2Icon.getMinU();

 		float f1 = par2Icon.getMaxU();

 		float f2 = par2Icon.getMinV();

@@ -81,20 +70,14 @@ public class RenderMysteryPotion extends Render {
 		float f4 = 1.0F;

 		float f5 = 0.5F;

 		float f6 = 0.25F;

-		GL11.glRotatef(180.0F - renderManager.playerViewY, 0.0F,

-				1.0F, 0.0F);

-		GL11.glRotatef(-renderManager.playerViewX, 1.0F, 0.0F,

-				0.0F);

+		GL11.glRotatef(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F);

+		GL11.glRotatef(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F);

 		par1Tessellator.startDrawingQuads();

 		par1Tessellator.setNormal(0.0F, 1.0F, 0.0F);

-		par1Tessellator.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D,

-				f, f3);

-		par1Tessellator.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D,

-				f1, f3);

-		par1Tessellator.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1,

-				f2);

-		par1Tessellator.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D,

-				f, f2);

+		par1Tessellator.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3);

+		par1Tessellator.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3);

+		par1Tessellator.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2);

+		par1Tessellator.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2);

 		par1Tessellator.draw();

 	}

 }