mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Fix #64; remove unnecessary keybindings for voice server
This commit is contained in:
1 parent
f6b13ec731
commit
4e9c5a9956
4 files changed
+1
-9
No files matched your search
@@ -50,19 +50,16 @@ public class MekanismKeyHandler extends MekKeyHandler {
|
||||
Keyboard.KEY_G, keybindCategory);
|
||||
public static KeyBinding freeRunnerModeSwitchKey = new KeyBinding("Mekanism " + LangUtils.localize("key.feetMode"),
|
||||
Keyboard.KEY_H, keybindCategory);
|
||||
public static KeyBinding voiceKey = new KeyBinding("Mekanism " + LangUtils.localize("key.voice"), Keyboard.KEY_U,
|
||||
keybindCategory);
|
||||
public static KeyBinding sneakKey = Minecraft.getMinecraft().gameSettings.keyBindSneak;
|
||||
public static KeyBinding jumpKey = Minecraft.getMinecraft().gameSettings.keyBindJump;
|
||||
|
||||
public MekanismKeyHandler() {
|
||||
super(new KeyBinding[]{modeSwitchKey, armorModeSwitchKey, freeRunnerModeSwitchKey, voiceKey},
|
||||
super(new KeyBinding[]{modeSwitchKey, armorModeSwitchKey, freeRunnerModeSwitchKey},
|
||||
new boolean[]{false, false, true});
|
||||
|
||||
ClientRegistry.registerKeyBinding(modeSwitchKey);
|
||||
ClientRegistry.registerKeyBinding(armorModeSwitchKey);
|
||||
ClientRegistry.registerKeyBinding(freeRunnerModeSwitchKey);
|
||||
ClientRegistry.registerKeyBinding(voiceKey);
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@@ -279,8 +279,6 @@ public class CommonProxy implements IGuiProvider {
|
||||
.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble();
|
||||
general.DISASSEMBLER_USAGE = Mekanism.configuration
|
||||
.get(Configuration.CATEGORY_GENERAL, "DisassemblerEnergyUsage", 10).getInt();
|
||||
general.VOICE_PORT = Mekanism.configuration
|
||||
.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt();
|
||||
//If this is less than 1, upgrades make machines worse. If less than 0, I don't even know.
|
||||
general.maxUpgradeMultiplier = Mekanism.configuration
|
||||
.get(Configuration.CATEGORY_GENERAL, "UpgradeModifier", 10, null, 1, Integer.MAX_VALUE).getInt();
|
||||
|
||||
@@ -24,7 +24,6 @@ public class MekanismConfig {
|
||||
public static int saltPerChunk = 2;
|
||||
public static int obsidianTNTDelay = 100;
|
||||
public static int UPDATE_DELAY = 10;
|
||||
public static int VOICE_PORT = 36123;
|
||||
public static int maxUpgradeMultiplier = 10;
|
||||
public static int userWorldGenVersion = 0;
|
||||
public static double ENERGY_PER_REDSTONE = 10000;
|
||||
|
||||
@@ -48,7 +48,6 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
dataStream.writeInt(general.ETHENE_BURN_TIME);
|
||||
dataStream.writeDouble(general.ENERGY_PER_REDSTONE);
|
||||
dataStream.writeDouble(general.DISASSEMBLER_USAGE);
|
||||
dataStream.writeInt(general.VOICE_PORT);
|
||||
dataStream.writeInt(general.maxUpgradeMultiplier);
|
||||
dataStream.writeInt(general.energyUnit.ordinal());
|
||||
dataStream.writeDouble(general.minerSilkMultiplier);
|
||||
@@ -144,7 +143,6 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
|
||||
general.ETHENE_BURN_TIME = dataStream.readInt();
|
||||
general.ENERGY_PER_REDSTONE = dataStream.readDouble();
|
||||
general.DISASSEMBLER_USAGE = dataStream.readDouble();
|
||||
general.VOICE_PORT = dataStream.readInt();
|
||||
general.maxUpgradeMultiplier = dataStream.readInt();
|
||||
general.energyUnit = EnergyType.values()[dataStream.readInt()];
|
||||
general.minerSilkMultiplier = dataStream.readDouble();
|
||||
|
||||
Reference in new issue
Block a user