From aca0692cecf654b2baae931b3fc0349156b9c2a8 Mon Sep 17 00:00:00 2001
From: Aidan Brady <aidancbrady@aol.com>
Date: Wed, 4 Dec 2013 17:22:00 -0500
Subject: [PATCH] Fix a few jetpack things

---
 common/mekanism/client/model/ModelJetpack.java  |  2 ++
 common/mekanism/client/sound/JetpackSound.java  | 17 ++++++++++++++++-
 common/mekanism/common/CommonPlayerTracker.java | 10 ++--------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/common/mekanism/client/model/ModelJetpack.java b/common/mekanism/client/model/ModelJetpack.java
index 20b009866..ec2eeb72f 100644
--- a/common/mekanism/client/model/ModelJetpack.java
+++ b/common/mekanism/client/model/ModelJetpack.java
@@ -177,12 +177,14 @@ public class ModelJetpack extends ModelBase
 		GL11.glPushMatrix();
 		MekanismRenderer.blendOn();
 		MekanismRenderer.glowOn();
+		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glColor4f(1, 1, 1, 0.2F);
 		
 		WingbladeL.render(size);
 		WingbladeR.render(size);
 		
 		GL11.glColor4f(1, 1, 1, 1);
+		GL11.glDisable(GL11.GL_CULL_FACE);
 		MekanismRenderer.glowOff();
 		MekanismRenderer.blendOff();
 		GL11.glPopMatrix();
diff --git a/common/mekanism/client/sound/JetpackSound.java b/common/mekanism/client/sound/JetpackSound.java
index b24e37482..dd49774d2 100644
--- a/common/mekanism/client/sound/JetpackSound.java
+++ b/common/mekanism/client/sound/JetpackSound.java
@@ -12,6 +12,8 @@ public class JetpackSound extends Sound
 	/** The TileEntity this sound is associated with. */
 	public EntityPlayer player;
 	
+	public int ticksSincePlay = 0;
+	
 	public JetpackSound(String id, String sound, EntityPlayer entity)
 	{
 		super(id, sound, entity, new Vector3(entity));
@@ -22,7 +24,7 @@ public class JetpackSound extends Sound
 	@Override
 	public float getMultiplier()
 	{
-		return 1;
+		return Math.min(1, ((float)ticksSincePlay/20F))*0.3F;
 	}
 	
 	@Override
@@ -30,6 +32,14 @@ public class JetpackSound extends Sound
 	{
 		return new Vector3(player);
 	}
+	
+	@Override
+	public void play()
+	{
+		super.play();
+		
+		ticksSincePlay = 0;
+	}
     
 	@Override
 	public boolean update(World world)
@@ -59,6 +69,11 @@ public class JetpackSound extends Sound
 			}
 		}
 		
+		if(isPlaying)
+		{
+			ticksSincePlay++;
+		}
+		
 		return true;
 	}
 	
diff --git a/common/mekanism/common/CommonPlayerTracker.java b/common/mekanism/common/CommonPlayerTracker.java
index 428b8f394..675251a5d 100644
--- a/common/mekanism/common/CommonPlayerTracker.java
+++ b/common/mekanism/common/CommonPlayerTracker.java
@@ -5,10 +5,7 @@ import cpw.mods.fml.common.IPlayerTracker;
 public class CommonPlayerTracker implements IPlayerTracker
 {
 	@Override
-	public void onPlayerLogin(EntityPlayer player)
-	{
-		
-	}
+	public void onPlayerLogin(EntityPlayer player) {}
 
 	@Override
 	public void onPlayerLogout(EntityPlayer player)
@@ -17,10 +14,7 @@ public class CommonPlayerTracker implements IPlayerTracker
 	}
 
 	@Override
-	public void onPlayerChangedDimension(EntityPlayer player)
-	{
-		
-	}
+	public void onPlayerChangedDimension(EntityPlayer player) {}
 
 	@Override
 	public void onPlayerRespawn(EntityPlayer player) {}