v1.1

1 files changed, 5 insertions, 33 deletions

diff --git a/src/main/java/me/shedaniel/library/KeyBindManager.java b/src/main/java/me/shedaniel/library/KeyBindManager.java
index 8eb0bad20..bbce1b3f6 100755
--- a/src/main/java/me/shedaniel/library/KeyBindManager.java
+++ b/src/main/java/me/shedaniel/library/KeyBindManager.java
@@ -1,52 +1,24 @@
 package me.shedaniel.library;
 
-import me.shedaniel.listenerdefinitions.KeybindHandler;
-import me.shedaniel.listenerdefinitions.PreLoadOptions;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.settings.KeyBinding;
-import org.apache.commons.lang3.ArrayUtils;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * Created by James on 8/7/2018.
  */
-public class KeyBindManager implements PreLoadOptions, KeybindHandler {
+public class KeyBindManager {
     
-    private static boolean optionsLoaded = false;
-    private static List<KeyBinding> bindingsToAdd = new ArrayList<>();
     private static Map<KeyBinding, Sink> bindingFunctions = new HashMap<>();
     
     public static KeyBinding createKeybinding(String bindingName, int key, String categoryName, Sink function) {
-        KeyBinding newBinding;
-        newBinding = new KeyBinding(bindingName, key, categoryName);
-        if (optionsLoaded) {
-            ArrayUtils.add(MinecraftClient.getInstance().options.keysAll, newBinding);
-        } else {
-            bindingsToAdd.add(newBinding);
-        }
+        KeyBinding newBinding = new KeyBinding(bindingName, key, categoryName);
         bindingFunctions.put(newBinding, function);
-        addCategoryIfMissing(categoryName);
         return newBinding;
     }
     
-    private static void addCategoryIfMissing(String categoryName) {
-        /*if (!KeyBinding.CATEGORY_ORDER.containsKey(categoryName)){
-            KeyBinding.CATEGORY_ORDER.put(categoryName,KeyBinding.CATEGORY_ORDER.size()+1);
-        }*/
-    }
-    
-    @Override
-    public List<KeyBinding> loadOptions() {
-        optionsLoaded = true;
-        return bindingsToAdd;
-    }
-    
-    @Override
-    public void processKeybinds() {
-        bindingFunctions.keySet().stream().filter(KeyBinding::method_1434).forEach(f -> bindingFunctions.get(f).Sink()); //isPressed
-    }
-    
     public static boolean processGuiKeybinds(int typedChar) {
         Optional<KeyBinding> binding = bindingFunctions.keySet().stream().filter(f -> f.getDefaultKeyCode().getKeyCode() == typedChar).findFirst();
         if (binding.isPresent()) {