upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-13 16:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some work on flamethrower sounds, also refactored sound system to allow for multiple sounds from a single object reference (to allow flamethrower and jetpack sounds to work simultaneously)

Browse Source
This commit is contained in:
Aidan C. Brady committed 2014-07-16 16:59:45 -04:00
1 parent 6e5eca9d4e
commit be7ea115b6
9 files changed
+181 -76
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/client/ClientTickHandler.java
+16 -9
View File
@@ -387,22 +387,26 @@ public class ClientTickHandler
{
for(String username : Mekanism.jetpackOn)
{
if(mc.theWorld.getPlayerEntityByName(username) != null)
EntityPlayer player = mc.theWorld.getPlayerEntityByName(username);
if(player != null)
{
if(MekanismClient.audioHandler.getFrom(mc.theWorld.getPlayerEntityByName(username)) == null)
if(MekanismClient.audioHandler.getMap(player) == null)
{
new JetpackSound(MekanismClient.audioHandler.getIdentifier(), mc.theWorld.getPlayerEntityByName(username));
new JetpackSound(MekanismClient.audioHandler.getIdentifier(player), player);
}
}
}
for(String username : Mekanism.gasmaskOn)
{
if(mc.theWorld.getPlayerEntityByName(username) != null)
EntityPlayer player = mc.theWorld.getPlayerEntityByName(username);
if(player != null)
{
if(MekanismClient.audioHandler.getFrom(mc.theWorld.getPlayerEntityByName(username)) == null)
if(MekanismClient.audioHandler.getMap(player) == null)
{
new GasMaskSound(MekanismClient.audioHandler.getIdentifier(), mc.theWorld.getPlayerEntityByName(username));
new GasMaskSound(MekanismClient.audioHandler.getIdentifier(player), player);
}
}
}
@@ -411,7 +415,10 @@ public class ClientTickHandler
{
if(hasFlamethrower(player))
{
new FlamethrowerSound(MekanismClient.audioHandler.getIdentifier(), player);
if(MekanismClient.audioHandler.getMap(player) == null)
{
new FlamethrowerSound(MekanismClient.audioHandler.getIdentifier(player), player);
}
}
}
}
@@ -546,7 +553,7 @@ public class ClientTickHandler
public static boolean hasFlamethrower(EntityPlayer player)
{
if(player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemJetpack)
if(player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemFlamethrower)
{
ItemFlamethrower flamethrower = (ItemFlamethrower)player.getCurrentEquippedItem().getItem();
@@ -563,7 +570,7 @@ public class ClientTickHandler
{
if(MekanismClient.audioHandler != null)
{
synchronized(MekanismClient.audioHandler.sounds)
synchronized(MekanismClient.audioHandler.soundMaps)
{
MekanismClient.audioHandler.onTick();
}