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

Major Flamethrower work - finished networking and implemented active state management. Active sound effects work, too.

Browse Source
This commit is contained in:
Aidan C. Brady committed 2014-07-17 17:18:53 -04:00
1 parent c9f569fd4a
commit 2f4d545fb5
10 files changed
+131 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/client/ClientTickHandler.java
+29
View File
@@ -30,6 +30,7 @@ import mekanism.common.item.ItemScubaTank;
import mekanism.common.item.ItemWalkieTalkie;
import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage;
import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage;
import mekanism.common.network.PacketFlamethrowerActive.FlamethrowerActiveMessage;
import mekanism.common.network.PacketJetpackData.JetpackDataMessage;
import mekanism.common.network.PacketJetpackData.JetpackPacket;
import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage;
@@ -357,6 +358,21 @@ public class ClientTickHandler
mc.thePlayer.stepHeight = 0.5F;
}
}
if(isFlamethrowerOn(mc.thePlayer) != Mekanism.flamethrowerActive.contains(mc.thePlayer.getCommandSenderName()))
{
ItemFlamethrower flamethrower = (ItemFlamethrower)mc.thePlayer.getCurrentEquippedItem().getItem();
if(isFlamethrowerOn(mc.thePlayer))
{
Mekanism.flamethrowerActive.add(mc.thePlayer.getCommandSenderName());
}
else {
Mekanism.flamethrowerActive.remove(mc.thePlayer);
}
Mekanism.packetHandler.sendToServer(new FlamethrowerActiveMessage(isFlamethrowerOn(mc.thePlayer)));
}
if(Mekanism.jetpackOn.contains(mc.thePlayer.getCommandSenderName()) != isJetpackOn(mc.thePlayer))
{
@@ -563,6 +579,19 @@ public class ClientTickHandler
return false;
}
public static boolean isFlamethrowerOn(EntityPlayer player)
{
if(hasFlamethrower(player))
{
if(mc.gameSettings.keyBindUseItem.getIsKeyPressed())
{
return true;
}
}
return false;
}
public static boolean hasFlamethrower(EntityPlayer player)
{
if(player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemFlamethrower)