After much client code isolation, there should be no more issues on the server side with sounds

This commit is contained in:
Aidan C. Brady committed 2015-03-18 13:26:12 -04:00
1 parent 12b6b4610b
commit 339e048a4e
9 files changed
+103 -41

No files matched your search

@@ -20,8 +20,6 @@ import mekanism.api.gas.IGasItem;
import mekanism.api.gas.ITubeConnection;
import mekanism.api.transmitters.TransmissionType;
import mekanism.api.util.StackUtils;
import mekanism.client.sound.IResettableSound;
import mekanism.client.sound.TileSound;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
@@ -33,6 +31,7 @@ import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.base.SoundWrapper;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
@@ -106,7 +105,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
public boolean upgraded;
public IResettableSound[] sounds = new IResettableSound[RecipeType.values().length];
public SoundWrapper[] sounds = new SoundWrapper[RecipeType.values().length];
/** This machine's current RedstoneControl type. */
public RedstoneControl controlType = RedstoneControl.DISABLED;
@@ -923,7 +922,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
}
@Override
public IResettableSound getSound()
public SoundWrapper getSound()
{
return sounds[recipeType.ordinal()];
}
@@ -933,7 +932,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
{
for(RecipeType type : RecipeType.values())
{
sounds[type.ordinal()] = new TileSound(this, this, type.getSound());
sounds[type.ordinal()] = new SoundWrapper(this, this, type.getSound());
}
}