From 4e9c5a9956c998f07ff7ee01afd4ca0aad3ca003 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Sun, 17 Mar 2019 11:40:06 -0600 Subject: [PATCH] Fix #64; remove unnecessary keybindings for voice server --- src/main/java/mekanism/client/MekanismKeyHandler.java | 5 +---- src/main/java/mekanism/common/CommonProxy.java | 2 -- src/main/java/mekanism/common/config/MekanismConfig.java | 1 - src/main/java/mekanism/common/network/PacketConfigSync.java | 2 -- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index d79816feb..7f49c7cd5 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -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); } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index bed613439..8e0971dee 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -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(); diff --git a/src/main/java/mekanism/common/config/MekanismConfig.java b/src/main/java/mekanism/common/config/MekanismConfig.java index 4d0ab7fb4..692377b91 100644 --- a/src/main/java/mekanism/common/config/MekanismConfig.java +++ b/src/main/java/mekanism/common/config/MekanismConfig.java @@ -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; diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 5f7262638..74fb9e89e 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -48,7 +48,6 @@ public class PacketConfigSync implements IMessageHandler