mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-20 03:59:37 +00:00
Sanify keybinds somewhat.
ClientTickHandler was getting way out of hand.
This commit is contained in:
1 parent
ec1c02d2e5
commit
54328ceb35
3 files changed
+120
-152
No files matched your search
@@ -1,15 +1,40 @@
|
||||
package mekanism.client;
|
||||
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.api.util.StackUtils;
|
||||
import mekanism.client.sound.SoundHandler;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.item.ItemBlockMachine;
|
||||
import mekanism.common.item.ItemConfigurator;
|
||||
import mekanism.common.item.ItemElectricBow;
|
||||
import mekanism.common.item.ItemJetpack;
|
||||
import mekanism.common.item.ItemJetpack.JetpackMode;
|
||||
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.PacketJetpackData.JetpackDataMessage;
|
||||
import mekanism.common.network.PacketJetpackData.JetpackPacket;
|
||||
import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage;
|
||||
import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage;
|
||||
import mekanism.common.network.PacketScubaTankData.ScubaTankPacket;
|
||||
import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
||||
import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.Type;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -19,37 +44,108 @@ public class MekanismKeyHandler extends MekKeyHandler
|
||||
{
|
||||
public static final String keybindCategory = "Mekanism";
|
||||
public static KeyBinding modeSwitchKey = new KeyBinding("Mekanism " + MekanismUtils.localize("key.mode"), Keyboard.KEY_M, keybindCategory);
|
||||
public static KeyBinding armorModeSwitchKey = new KeyBinding("Mekanism " + MekanismUtils.localize("key.armorMode"), Keyboard.KEY_F, keybindCategory);
|
||||
public static KeyBinding voiceKey = new KeyBinding("Mekanism " + MekanismUtils.localize("key.voice"), Keyboard.KEY_U, keybindCategory);
|
||||
|
||||
public MekanismKeyHandler()
|
||||
{
|
||||
super(new KeyBinding[] {modeSwitchKey, voiceKey}, new boolean[] {false, false});
|
||||
super(new KeyBinding[] {modeSwitchKey, armorModeSwitchKey, voiceKey}, new boolean[] {false, false, true});
|
||||
|
||||
ClientRegistry.registerKeyBinding(modeSwitchKey);
|
||||
ClientRegistry.registerKeyBinding(armorModeSwitchKey);
|
||||
ClientRegistry.registerKeyBinding(voiceKey);
|
||||
|
||||
FMLCommonHandler.instance().bus().register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onTick(ClientTickEvent event)
|
||||
public void onTick(KeyInputEvent event)
|
||||
{
|
||||
if(event.side == Side.CLIENT)
|
||||
keyTick(Type.CLIENT, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void keyDown(Type types, KeyBinding kb, boolean tickEnd, boolean isRepeat)
|
||||
{
|
||||
Mekanism.logger.info(isRepeat ? "Repeating" : "Not Repeating");
|
||||
if(kb == modeSwitchKey)
|
||||
{
|
||||
if(event.phase == Phase.START)
|
||||
EntityPlayer player = FMLClientHandler.instance().getClient().thePlayer;
|
||||
ItemStack toolStack = player.getCurrentEquippedItem();
|
||||
|
||||
Item item = StackUtils.getItem(toolStack);
|
||||
if(player.isSneaking() && item instanceof ItemConfigurator)
|
||||
{
|
||||
keyTick(event.type, false);
|
||||
ItemConfigurator configurator = (ItemConfigurator) item;
|
||||
|
||||
configurator.setState(toolStack, (byte) (configurator.getState(toolStack) < 3 ? configurator.getState(toolStack) + 1 : 0));
|
||||
Mekanism.packetHandler.sendToServer(new ConfiguratorStateMessage(configurator.getState(toolStack)));
|
||||
player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.configureState") + ": " + configurator.getColor(configurator.getState(toolStack)) + configurator.getStateDisplay(configurator.getState(toolStack))));
|
||||
}
|
||||
else if(event.phase == Phase.END)
|
||||
else if(player.isSneaking() && item instanceof ItemElectricBow)
|
||||
{
|
||||
keyTick(event.type, true);
|
||||
ItemElectricBow bow = (ItemElectricBow) item;
|
||||
|
||||
bow.setFireState(toolStack, !bow.getFireState(toolStack));
|
||||
Mekanism.packetHandler.sendToServer(new ElectricBowStateMessage(bow.getFireState(toolStack)));
|
||||
player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.fireMode") + ": " + (bow.getFireState(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transYesNo(bow.getFireState(toolStack))));
|
||||
}
|
||||
else if(player.isSneaking() && item instanceof ItemBlockMachine)
|
||||
{
|
||||
ItemBlockMachine machine = (ItemBlockMachine) item;
|
||||
|
||||
if(MachineType.get(toolStack) == MachineType.PORTABLE_TANK)
|
||||
{
|
||||
machine.setBucketMode(toolStack, !machine.getBucketMode(toolStack));
|
||||
Mekanism.packetHandler.sendToServer(new PortableTankStateMessage(machine.getBucketMode(toolStack)));
|
||||
player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.portableTank.bucketMode") + ": " + (machine.getBucketMode(toolStack) ? (EnumColor.DARK_GREEN + "ON") : (EnumColor.DARK_RED + "OFF"))));
|
||||
}
|
||||
}
|
||||
else if(player.isSneaking() && item instanceof ItemWalkieTalkie)
|
||||
{
|
||||
ItemWalkieTalkie wt = (ItemWalkieTalkie) item;
|
||||
|
||||
if(wt.getOn(toolStack))
|
||||
{
|
||||
int newChan = wt.getChannel(toolStack) < 9 ? wt.getChannel(toolStack) + 1 : 1;
|
||||
wt.setChannel(toolStack, newChan);
|
||||
Mekanism.packetHandler.sendToServer(new WalkieTalkieStateMessage(newChan));
|
||||
SoundHandler.playSound("mekanism:etc.Ding");
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(kb == armorModeSwitchKey)
|
||||
{
|
||||
EntityPlayer player = FMLClientHandler.instance().getClient().thePlayer;
|
||||
ItemStack chestStack = player.getCurrentArmor(2);
|
||||
Item chestItem = StackUtils.getItem(chestStack);
|
||||
|
||||
if(chestItem instanceof ItemJetpack)
|
||||
{
|
||||
ItemJetpack jetpack = (ItemJetpack)chestItem;
|
||||
|
||||
if(player.isSneaking())
|
||||
{
|
||||
jetpack.setMode(chestStack, JetpackMode.DISABLED);
|
||||
}
|
||||
else {
|
||||
jetpack.incrementMode(chestStack);
|
||||
}
|
||||
|
||||
Mekanism.packetHandler.sendToServer(new JetpackDataMessage(JetpackPacket.MODE, null, player.isSneaking()));
|
||||
SoundHandler.playSound("mekanism:etc.Hydraulic");
|
||||
}
|
||||
else if(chestItem instanceof ItemScubaTank)
|
||||
{
|
||||
ItemScubaTank scubaTank = (ItemScubaTank)chestItem;
|
||||
|
||||
scubaTank.toggleFlowing(chestStack);
|
||||
Mekanism.packetHandler.sendToServer(new ScubaTankDataMessage(ScubaTankPacket.MODE, null, false));
|
||||
SoundHandler.playSound("mekanism:etc.Hydraulic");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void keyDown(Type types, KeyBinding kb, boolean tickEnd, boolean isRepeat) {}
|
||||
|
||||
@Override
|
||||
public void keyUp(Type types, KeyBinding kb, boolean tickEnd) {}
|
||||
}
|
||||
Reference in new issue
Block a user