Fix #15; completely overhaul the sound system to mirror Minecraft usage

This commit is contained in:
Dave Smith committed 2019-03-06 13:53:59 -07:00
1 parent d2b905dcdc
commit c78ae6dd1d
37 files changed
+632 -1419

No files matched your search

@@ -18,35 +18,22 @@ public class PacketFlamethrowerData implements IMessageHandler<FlamethrowerDataM
public IMessage onMessage(FlamethrowerDataMessage message, MessageContext context)
{
EntityPlayer player = PacketHandler.getPlayer(context);
PacketHandler.handlePacket(() ->
{
if(message.packetType == FlamethrowerPacket.UPDATE)
{
if(message.value)
{
Mekanism.flamethrowerActive.add(message.username);
}
else {
Mekanism.flamethrowerActive.remove(message.username);
}
if(!player.world.isRemote)
{
Mekanism.packetHandler.sendToDimension(new FlamethrowerDataMessage(FlamethrowerPacket.UPDATE, message.currentHand, message.username, message.value), player.world.provider.getDimension());
}
}
else if(message.packetType == FlamethrowerPacket.MODE)
{
ItemStack stack = player.getHeldItem(message.currentHand);
if (message.packetType == FlamethrowerPacket.UPDATE) {
Mekanism.playerState.setFlamethrowerState(message.username, message.value);
// If we got this packet on the server, resend out to all clients in same dimension
// TODO: Why is this a dimensional thing?!
if (!player.world.isRemote) {
Mekanism.packetHandler.sendToDimension(message, player.world.provider.getDimension());
}
} else if (message.packetType == FlamethrowerPacket.MODE) {
ItemStack stack = player.getHeldItem(message.currentHand);
if (!stack.isEmpty() && stack.getItem() instanceof ItemFlamethrower) {
((ItemFlamethrower) stack.getItem()).incrementMode(stack);
}
}
if(!stack.isEmpty() && stack.getItem() instanceof ItemFlamethrower)
{
((ItemFlamethrower)stack.getItem()).incrementMode(stack);
}
}
}, player);
return null;
}