keybind related cleanups

src/main/java/gregtech/GregTechMod.java

@@ -18,7 +18,7 @@
 import gregtech.api.util.AnnotatedMaterialHandlerLoader;
 import gregtech.api.util.GTLog;
 import gregtech.api.util.NBTUtil;
-import gregtech.api.util.input.Keybinds;
+import gregtech.api.util.input.KeyBinds;
 import gregtech.api.worldgen.config.WorldGenRegistry;
 import gregtech.common.*;
 import gregtech.common.blocks.MetaBlocks;
@@ -116,7 +116,7 @@ public void onPreInit(FMLPreInitializationEvent event) {
         AnnotatedComponentHandlerLoader.discoverAndLoadAnnotatedComponentHandlers(event.getAsmData());
 
         proxy.onPreLoad();
-        Keybinds.register();
+        KeyBinds.register();
     }
 
     @Mod.EventHandler

src/main/java/gregtech/api/items/armor/ArmorUtils.java

@@ -6,7 +6,7 @@
 import gregtech.api.util.ItemStackKey;
 import gregtech.api.util.input.EnumKey;
 import gregtech.api.util.input.Key;
-import gregtech.api.util.input.Keybinds;
+import gregtech.api.util.input.KeyBinds;
 import gregtech.common.ConfigHolder;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
@@ -135,10 +135,10 @@ public static ActionResult<ItemStack> canEat(EntityPlayer player, ItemStack food
      */
     public static boolean isKeyDown(EntityPlayer player, EnumKey type) {
         if (SIDE.isClient()) {
-            return Keybinds.REGISTERY.get(type.getID()).state;
+            return KeyBinds.REGISTRY.get(type.getID()).state;
         } else {
-            if (Keybinds.PLAYER_KEYS.get(player) == null) return false;
-            List<Key> playerKeys = Keybinds.PLAYER_KEYS.get(player);
+            if (KeyBinds.PLAYER_KEYS.get(player) == null) return false;
+            List<Key> playerKeys = KeyBinds.PLAYER_KEYS.get(player);
             if (playerKeys.isEmpty()) return false;
             return playerKeys.get(type.getID()).state;
         }

src/main/java/gregtech/api/net/KeysPacket.java

@@ -3,7 +3,7 @@
 
 import gregtech.api.util.input.EnumKey;
 import gregtech.api.util.input.Key;
-import gregtech.api.util.input.Keybinds;
+import gregtech.api.util.input.KeyBinds;
 import io.netty.buffer.ByteBuf;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 
@@ -35,7 +35,7 @@ public void toBytes(ByteBuf buf) {
     @Override
     public void fromBytes(ByteBuf buf) {
         keys = new ArrayList<>();
-        for (int i = 0; i < Keybinds.REGISTERY.size(); i++) {
+        for (int i = 0; i < KeyBinds.REGISTRY.size(); i++) {
             int id = buf.readByte();
             Key current = new Key(EnumKey.getKeyByID(id));
             current.state = buf.readBoolean();

src/main/java/gregtech/api/net/KeysUpdateHandler.java

@@ -2,7 +2,7 @@
 
 
 import gregtech.api.util.input.Key;
-import gregtech.api.util.input.Keybinds;
+import gregtech.api.util.input.KeyBinds;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
@@ -17,10 +17,10 @@ public IMessage onMessage(KeysPacket message, MessageContext ctx) {
         EntityPlayerMP player = ctx.getServerHandler().player;
         List<Key> keys = message.getList();
         if (keys.isEmpty()) return null;
-        if (Keybinds.PLAYER_KEYS.containsKey(player)) {
-            Keybinds.PLAYER_KEYS.replace(player, keys);
+        if (KeyBinds.PLAYER_KEYS.containsKey(player)) {
+            KeyBinds.PLAYER_KEYS.replace(player, keys);
         } else {
-            Keybinds.PLAYER_KEYS.put(player, keys);
+            KeyBinds.PLAYER_KEYS.put(player, keys);
         }
         return null;
     }

src/main/java/gregtech/api/util/input/EnumKey.java

@@ -5,6 +5,7 @@
 import javax.annotation.Nullable;
 
 public enum EnumKey {
+
     MENU("ALT Menu", Keyboard.KEY_LMENU, Key.KEYS_CATEGORY),
     MODE_SWITCH("Mode Switch", Keyboard.KEY_M, Key.KEYS_CATEGORY),
     FORWARD(null, 0, null),
@@ -41,5 +42,4 @@ private void setID() {
     public int getID() {
         return this.ID;
     }
-
 }

src/main/java/gregtech/api/util/input/Key.java

@@ -5,12 +5,14 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class Key {
-    @SideOnly(Side.CLIENT)
-    private KeyBinding binding;
+
     public final EnumKey KEY;
     public boolean state;
     public static final String KEYS_CATEGORY = "gregtech";
 
+    @SideOnly(Side.CLIENT)
+    private KeyBinding binding;
+
     public Key(EnumKey type) {
         this.KEY = type;
         this.state = false;

src/main/java/gregtech/api/util/input/Keybinds.java → src/main/java/gregtech/api/util/input/KeyBinds.java

@@ -11,10 +11,10 @@
 
 import java.util.*;
 
+public class KeyBinds {
 
-public class Keybinds {
-    // Just registery of all used keys
-    public static final List<Key> REGISTERY = new ArrayList<>();
+    // Registry of all used keys
+    public static final List<Key> REGISTRY = new ArrayList<>();
     // Logical server-sided variable, where is state of any keys from players
     public static final Map<EntityPlayer, List<Key>> PLAYER_KEYS = new HashMap<>();
 
@@ -34,7 +34,7 @@ public static void initBinds() {
 
     @SideOnly(Side.CLIENT)
     public static void registerClient() {
-        for (Key key : REGISTERY) {
+        for (Key key : REGISTRY) {
             if (!ArrayUtils.contains(Minecraft.getMinecraft().gameSettings.keyBindings, key.getBind()))
                 ClientRegistry.registerKeyBinding(key.getBind());
         }
@@ -43,9 +43,9 @@ public static void registerClient() {
     public static void register() {
         for (EnumKey type : EnumKey.values()) {
             if (ArmorUtils.SIDE.isClient()) {
-                REGISTERY.add(new Key(type, bindings.get(type.getID())));
+                REGISTRY.add(new Key(type, bindings.get(type.getID())));
             } else {
-                REGISTERY.add(new Key(type));
+                REGISTRY.add(new Key(type));
             }
         }
     }

src/main/java/gregtech/common/ClientProxy.java

@@ -14,7 +14,7 @@
 import gregtech.api.util.FluidTooltipUtil;
 import gregtech.api.util.GTLog;
 import gregtech.api.util.ModCompatibility;
-import gregtech.api.util.input.Keybinds;
+import gregtech.api.util.input.KeyBinds;
 import gregtech.common.blocks.*;
 import gregtech.common.covers.facade.FacadeRenderer;
 import gregtech.common.items.MetaItems;
@@ -103,7 +103,7 @@ public class ClientProxy extends CommonProxy {
 
     public void onPreLoad() {
         super.onPreLoad();
-        Keybinds.initBinds();
+        KeyBinds.initBinds();
         MetaTileEntityRenderer.preInit();
         CableRenderer.preInit();
         FluidPipeRenderer.preInit();
@@ -117,7 +117,7 @@ public void onPreLoad() {
 
     @Override
     public void onLoad() {
-        Keybinds.registerClient();
+        KeyBinds.registerClient();
         super.onLoad();
         registerColors();
     }

src/main/java/gregtech/common/EventHandlers.java

@@ -11,7 +11,7 @@
 import gregtech.api.net.KeysPacket;
 import gregtech.api.net.NetworkHandler;
 import gregtech.api.util.input.Key;
-import gregtech.api.util.input.Keybinds;
+import gregtech.api.util.input.KeyBinds;
 import gregtech.common.items.armor.PowerlessJetpack;
 import gregtech.common.items.MetaItems;
 import net.minecraft.entity.EntityLivingBase;
@@ -118,14 +118,14 @@ public static void onRender(final TickEvent.RenderTickEvent event) {
     public static void onKeyInput(InputEvent.KeyInputEvent event) {
         if (ArmorUtils.SIDE.isClient()) {
             boolean needNewPacket = false;
-            for (Key key : Keybinds.REGISTERY) {
+            for (Key key : KeyBinds.REGISTRY) {
                 boolean keyState = key.getBind().isKeyDown();
                 if (key.state != keyState) {
                     key.state = keyState;
                     needNewPacket = true;
                 }
             }
-            if (needNewPacket) NetworkHandler.INSTANCE.sendToServer(new KeysPacket(Keybinds.REGISTERY));
+            if (needNewPacket) NetworkHandler.INSTANCE.sendToServer(new KeysPacket(KeyBinds.REGISTRY));
         }
     }