From b817b2840c8a6e69266df63cb424ae206f788a3b Mon Sep 17 00:00:00 2001
From: Ben Spiers <ben.spiers22@gmail.com>
Date: Thu, 19 Mar 2015 00:36:29 +0000
Subject: [PATCH] Fix Generator Tiles' client/server sidedness

---
 .../tile/TileEntityAdvancedElectricMachine.java |  3 +--
 .../common/tile/TileEntityElectricMachine.java  |  2 +-
 .../common/tile/TileEntityGenerator.java        | 11 -----------
 .../reactor/TileEntityReactorController.java    | 17 +++++++++++++----
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
index 85bacb2f7..b1613b2a9 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
@@ -108,10 +108,9 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
 		//Electric
 		factory.electricityStored = electricityStored;
 		factory.ic2Registered = ic2Registered;
-		
+
 		//Noisy
 		factory.soundURL = soundURL;
-		factory.sound = sound;
 		
 		//Machine
 		factory.progress[0] = operatingTicks;
diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
index 3d51b8705..e6d8ee69e 100644
--- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
@@ -83,7 +83,7 @@ public abstract class TileEntityElectricMachine<RECIPE extends BasicMachineRecip
 		
 		//Noisy
 		factory.soundURL = soundURL;
-		factory.sound = sound;
+
 		
 		//Machine
 		factory.progress[0] = operatingTicks;
diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
index c72693ced..a74a84c40 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
@@ -116,17 +116,6 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i
 		return EnumSet.of(ForgeDirection.getOrientation(facing));
 	}
 
-	@Override
-	public void validate()
-	{
-		super.validate();
-
-		if(worldObj.isRemote)
-		{
-			sound = new TileSound(this, this);
-		}
-	}
-
 	/**
 	 * Whether or not this generator can operate.
 	 * @return if the generator can operate
diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
index 246164a0a..80eb3ebbf 100644
--- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
+++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
@@ -108,10 +108,9 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen
 	{
 		super.onUpdate();
 		
-		if(worldObj.isRemote && shouldPlaySound() && SoundHandler.canRestartSound(getSound()) && client.enableMachineSounds)
+		if(worldObj.isRemote)
 		{
-			getSound().reset();
-			SoundHandler.playSound(getSound());
+			updateSound();
 		}
 
 		if(isFormed())
@@ -126,7 +125,17 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen
 			}
 		}
 	}
-	
+
+	@SideOnly(Side.CLIENT)
+	public void updateSound()
+	{
+		if(shouldPlaySound() && SoundHandler.canRestartSound(getSound()) && client.enableMachineSounds)
+		{
+			getSound().reset();
+			SoundHandler.playSound(getSound());
+		}
+	}
+
 	@Override
 	public void onChunkUnload()
 	{