From 98b9e33820abdcb3ba8e209626aa07b5ddd3d3ac Mon Sep 17 00:00:00 2001
From: Space Walker <spacedoesrs@gmail.com>
Date: Wed, 27 May 2026 20:09:32 +0200
Subject: [PATCH] [keybinds] implement V2

---
 libraries/keybinds/README.md                  | 38 +++++---
 .../osl/keybinds/api/KeyBindingEvents.java    |  3 +
 .../osl/keybinds/api/KeybindEvents.java       | 34 +++++++
 .../osl/keybinds/api/KeybindRegistry.java     | 38 ++++++++
 .../keybinds/impl/KeybindRegistryImpl.java    | 76 +++++++++++++++
 .../impl/mixin/client/GameOptionsMixin.java   | 39 +-------
 .../impl/mixin/client/KeyBindingAccessor.java | 17 ++++
 .../main/resources/osl.keybinds.mixins.json   |  3 +-
 .../osl/keybinds/api/KeyBindingEvents.java    |  3 +
 .../osl/keybinds/api/KeybindEvents.java       | 34 +++++++
 .../osl/keybinds/api/KeybindRegistry.java     | 38 ++++++++
 .../keybinds/impl/KeybindRegistryImpl.java    | 83 ++++++++++++++++
 .../impl/mixin/client/GameOptionsMixin.java   | 49 +---------
 .../impl/mixin/client/KeyBindingAccessor.java |  8 +-
 .../osl/keybinds/api/KeyBindingEvents.java    |  3 +
 .../osl/keybinds/api/KeybindEvents.java       | 34 +++++++
 .../osl/keybinds/api/KeybindRegistry.java     | 51 ++++++++++
 .../keybinds/impl/KeybindRegistryImpl.java    | 95 +++++++++++++++++++
 .../impl/mixin/client/GameOptionsMixin.java   | 56 +----------
 .../impl/mixin/client/KeyBindingAccessor.java |  8 +-
 .../src/main/resources/fabric.mod.json        |  1 +
 .../main/resources/osl.keybinds.classtweaker  |  3 +
 .../osl/keybinds/api/KeyBindingEvents.java    |  3 +
 .../osl/keybinds/api/KeybindEvents.java       | 34 +++++++
 .../osl/keybinds/api/KeybindRegistry.java     | 39 ++++++++
 .../api/keybind/KeyBindingExtension.java      |  7 ++
 .../keybinds/impl/KeybindRegistryImpl.java    | 87 +++++++++++++++++
 .../impl/access/KeyBindingAccess.java         |  7 ++
 .../impl/keybind/KeyBindingExtensionImpl.java | 11 +++
 .../impl/mixin/client/GameOptionsMixin.java   | 39 +-------
 .../impl/mixin/client/KeyBindingMixin.java    | 26 +++++
 .../src/main/resources/fabric.mod.json        |  1 +
 .../main/resources/osl.keybinds.classtweaker  |  3 +
 .../main/resources/osl.keybinds.mixins.json   |  3 +-
 .../osl/keybinds/api/KeyBindingEvents.java    |  3 +
 .../osl/keybinds/api/KeybindEvents.java       | 34 +++++++
 .../osl/keybinds/api/KeybindRegistry.java     | 39 ++++++++
 .../api/keybind/KeyBindingExtension.java      |  7 ++
 .../keybinds/impl/KeybindRegistryImpl.java    | 87 +++++++++++++++++
 .../impl/access/KeyBindingAccess.java         |  7 ++
 .../impl/keybind/KeyBindingExtensionImpl.java | 11 +++
 .../impl/mixin/client/GameOptionsMixin.java   | 39 +-------
 .../impl/mixin/client/KeyBindingMixin.java    | 26 +++++
 .../src/main/resources/fabric.mod.json        |  1 +
 .../main/resources/osl.keybinds.classtweaker  |  3 +
 .../main/resources/osl.keybinds.mixins.json   |  3 +-
 46 files changed, 1011 insertions(+), 223 deletions(-)
 create mode 100644 libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
 create mode 100644 libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
 create mode 100644 libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
 create mode 100644 libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java
 create mode 100644 libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
 create mode 100644 libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
 create mode 100644 libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
 create mode 100644 libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
 create mode 100644 libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
 create mode 100644 libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
 create mode 100644 libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/resources/osl.keybinds.classtweaker
 create mode 100644 libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
 create mode 100644 libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
 create mode 100644 libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/keybind/KeyBindingExtension.java
 create mode 100644 libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
 create mode 100644 libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/access/KeyBindingAccess.java
 create mode 100644 libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/keybind/KeyBindingExtensionImpl.java
 create mode 100644 libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingMixin.java
 create mode 100644 libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.keybinds.classtweaker
 create mode 100644 libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
 create mode 100644 libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
 create mode 100644 libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/keybind/KeyBindingExtension.java
 create mode 100644 libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
 create mode 100644 libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/access/KeyBindingAccess.java
 create mode 100644 libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/keybind/KeyBindingExtensionImpl.java
 create mode 100644 libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingMixin.java
 create mode 100644 libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/osl.keybinds.classtweaker

diff --git a/libraries/keybinds/README.md b/libraries/keybinds/README.md
index 0c4d976a..cc79a63b 100644
--- a/libraries/keybinds/README.md
+++ b/libraries/keybinds/README.md
@@ -1,26 +1,42 @@
 # Keybinds API
 
-The keybinds API provides events for registering keybinds. You may register a callback to this event in your mod's initializer:
+The Keybinds API provides events and utilities for registering and working with keybinds.
+
+## Registering Custom Keybinds
+
+Keybind registration should be done in a listener to the `REGISTER_KEYBINDS` event. The `KeybindRegistry` class provides utility methods for registering keybinds.
+
+An example is shown below.
 
 ```java
 package com.example;
 
-import net.minecraft.client.options.KeyBinding;
-
 import net.ornithemc.osl.entrypoints.api.client.ClientModInitializer;
-import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
-
-import org.lwjgl.input.Keyboard;
+import net.ornithemc.osl.keybinds.api.KeybindEvents;
 
 public class ExampleInitializer implements ClientModInitializer {
 
-	public static KeyBinding cookieKeybind;
-
 	@Override
 	public void initClient() {
-		KeyBindingEvents.REGISTER_KEYBINDS.register(registry -> {
-			cookieKeybind = registry.register("Cookie", Keyboard.KEY_NONE, "Example Mod");
-		});
+		KeybindEvents.REGISTER_KEYBINDS.register(ExampleKeybinds::init);
+	}
+}
+```
+
+```java
+package com.example;
+
+import org.lwjgl.glfw.GLFW;
+
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.api.KeybindRegistry;
+
+public final class ExampleKeybinds {
+
+	public static final KeyBinding COOKIE = KeybindRegistry.register("cookie", GLFW.GLFW_KEY_Z, "example");
+
+	public static void init() {
 	}
 }
 ```
diff --git a/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
index e83fd431..b22b902b 100644
--- a/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
+++ b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
@@ -6,7 +6,10 @@
 
 /**
  * Events related to Minecraft's keybinds.
+ * 
+ * @deprecated use {@linkplain KeybindEvents} instead
  */
+@Deprecated
 public class KeyBindingEvents {
 
 	/**
diff --git a/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
new file mode 100644
index 00000000..43ca7209
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
@@ -0,0 +1,34 @@
+package net.ornithemc.osl.keybinds.api;
+
+import net.ornithemc.osl.core.api.events.Event;
+
+/**
+ * Events related to Minecraft's keybinds.
+ */
+public final class KeybindEvents {
+
+	/**
+	 * This event is invoked upon game start-up, before game options are loaded.
+	 * 
+	 * <p>
+	 * Custom keybind registration should be done in a listener of this event.
+	 * Helper methods for registering keybinds can be found in the {@linkplain
+	 * KeybindRegistry} class.
+	 * 
+	 * <p>
+	 * Listeners to this event should be registered in your mod's entrypoint,
+	 * and can be done as follows:
+	 * 
+	 * <pre>
+	 * {@code
+	 * KeybindEvents.REGISTER_KEYBINDS.register(() -> {
+	 * 	KeybindRegistry.register("cookie", Keyboard.KEY_Z, "example");
+	 * });
+	 * }
+	 * </pre>
+	 * 
+	 * @see KeybindRegistry
+	 */
+	public static final Event<Runnable> REGISTER_KEYBINDS = Event.runnable();
+
+}
diff --git a/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
new file mode 100644
index 00000000..137ea6c4
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
@@ -0,0 +1,38 @@
+package net.ornithemc.osl.keybinds.api;
+
+import java.util.Set;
+
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.impl.KeybindRegistryImpl;
+
+/**
+ * Public access to the Keybinds registry.
+ */
+public final class KeybindRegistry {
+
+	/**
+	 * @return the set of all keybind categories.
+	 */
+	public static Set<String> getCategories() {
+		return KeybindRegistryImpl.getCategories();
+	}
+
+	/**
+	 * @param name           the name or translation key of the keybind.
+	 * @param defaultKeyCode the default key code of the keybind.
+	 * @param category       the name or translation key of the category to which the keybind belongs.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(String name, int defaultKeyCode, String category) {
+		return KeybindRegistryImpl.register(name, defaultKeyCode, category);
+	}
+
+	/**
+	 * @param keybind the keybind to register.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(KeyBinding keybind) {
+		return KeybindRegistryImpl.register(keybind);
+	}
+}
diff --git a/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
new file mode 100644
index 00000000..651b877f
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
@@ -0,0 +1,76 @@
+package net.ornithemc.osl.keybinds.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
+import net.ornithemc.osl.keybinds.api.KeyBindingRegistry;
+import net.ornithemc.osl.keybinds.api.KeybindEvents;
+import net.ornithemc.osl.keybinds.impl.mixin.client.KeyBindingAccessor;
+
+public final class KeybindRegistryImpl {
+
+	private static GameOptions options;
+	private static Set<String> categories;
+
+	private static List<KeyBinding> pendingKeybinds;
+
+	public static Set<String> getCategories() {
+		return categories;
+	}
+
+	public static KeyBinding register(String name, int defaultKeyCode, String category) {
+		return register(new KeyBinding(name, defaultKeyCode, category));
+	}
+
+	public static KeyBinding register(KeyBinding keybind) {
+		addCategory(keybind.getCategory());
+		addKeybind(keybind);
+
+		return keybind;
+	}
+
+	private static void addCategory(String category) {
+		categories.add(category);
+	}
+
+	private static void addKeybind(KeyBinding keybind) {
+		if (pendingKeybinds != null) {
+			pendingKeybinds.add(keybind);
+		} else {
+			// this code path is only reached if register methods are called after
+			// the event has been run - manually append the keybind anyway
+			options.keyBindings = ArrayUtils.addAll(options.keyBindings, keybind);
+		}
+	}
+
+	public static void init(GameOptions gameOptions) {
+		options = gameOptions;
+		categories = KeyBindingAccessor.accessCategories();
+
+		pendingKeybinds = new ArrayList<>();
+
+		KeyBindingEvents.REGISTER_KEYBINDS.invoker().accept(new KeyBindingRegistry() {
+
+			@Override
+			public KeyBinding register(String name, int defaultKeyCode, String category) {
+				return KeybindRegistryImpl.register(name, defaultKeyCode, category);
+			}
+
+			@Override
+			public KeyBinding register(KeyBinding keybind) {
+				return KeybindRegistryImpl.register(keybind);
+			}
+		});
+		KeybindEvents.REGISTER_KEYBINDS.invoker().run();
+
+		options.keyBindings = ArrayUtils.addAll(options.keyBindings, pendingKeybinds.toArray(new KeyBinding[0]));
+		pendingKeybinds = null;
+	}
+}
diff --git a/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
index 63a0d5d3..df09ee77 100644
--- a/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
+++ b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
@@ -1,25 +1,16 @@
 package net.ornithemc.osl.keybinds.impl.mixin.client;
 
-import java.util.LinkedHashSet;
-import java.util.Set;
-
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.options.GameOptions;
-import net.minecraft.client.options.KeyBinding;
 
-import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
-import net.ornithemc.osl.keybinds.api.KeyBindingRegistry;
+import net.ornithemc.osl.keybinds.impl.KeybindRegistryImpl;
 
 @Mixin(GameOptions.class)
-public class GameOptionsMixin implements KeyBindingRegistry {
-
-	@Shadow private KeyBinding[] keyBindings;
-	private Set<KeyBinding> modKeyBindings;
+public class GameOptionsMixin {
 
 	@Inject(
 		method = "<init>(Lnet/minecraft/client/Minecraft;Ljava/io/File;)V",
@@ -29,30 +20,6 @@ public class GameOptionsMixin implements KeyBindingRegistry {
 		)
 	)
 	private void osl$keybinds$registerKeybinds(CallbackInfo ci) {
-		modKeyBindings = new LinkedHashSet<>();
-
-		KeyBindingEvents.REGISTER_KEYBINDS.invoker().accept(this);
-
-		KeyBinding[] mcKeybinds = keyBindings;
-		keyBindings = new KeyBinding[mcKeybinds.length + modKeyBindings.size()];
-
-		int i = 0;
-		for (KeyBinding keybind : mcKeybinds) {
-			keyBindings[i++] = keybind;
-		}
-		for (KeyBinding keybind : modKeyBindings) {
-			keyBindings[i++] = keybind;
-		}
-	}
-
-	@Override
-	public KeyBinding register(String name, int defaultKeyCode, String category) {
-		return register(new KeyBinding(name, defaultKeyCode, category));
-	}
-
-	@Override
-	public KeyBinding register(KeyBinding keybind) {
-		modKeyBindings.add(keybind);
-		return keybind;
+		KeybindRegistryImpl.init((GameOptions) (Object) this);
 	}
 }
diff --git a/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java
new file mode 100644
index 00000000..bdb47e42
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java
@@ -0,0 +1,17 @@
+package net.ornithemc.osl.keybinds.impl.mixin.client;
+
+import java.util.Set;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.client.options.KeyBinding;
+
+@Mixin(KeyBinding.class)
+public interface KeyBindingAccessor {
+
+	@Accessor("CATEGORIES")
+	static Set<String> accessCategories() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/resources/osl.keybinds.mixins.json b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/resources/osl.keybinds.mixins.json
index 47885649..6328a239 100644
--- a/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/resources/osl.keybinds.mixins.json
+++ b/libraries/keybinds/keybinds-mc13w36a-mc17w15a/src/main/resources/osl.keybinds.mixins.json
@@ -6,7 +6,8 @@
 	"mixins": [
 	],
 	"client": [
-		"client.GameOptionsMixin"
+		"client.GameOptionsMixin",
+		"client.KeyBindingAccessor"
 	],
 	"server": [
 	],
diff --git a/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
index e83fd431..b22b902b 100644
--- a/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
+++ b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
@@ -6,7 +6,10 @@
 
 /**
  * Events related to Minecraft's keybinds.
+ * 
+ * @deprecated use {@linkplain KeybindEvents} instead
  */
+@Deprecated
 public class KeyBindingEvents {
 
 	/**
diff --git a/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
new file mode 100644
index 00000000..43ca7209
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
@@ -0,0 +1,34 @@
+package net.ornithemc.osl.keybinds.api;
+
+import net.ornithemc.osl.core.api.events.Event;
+
+/**
+ * Events related to Minecraft's keybinds.
+ */
+public final class KeybindEvents {
+
+	/**
+	 * This event is invoked upon game start-up, before game options are loaded.
+	 * 
+	 * <p>
+	 * Custom keybind registration should be done in a listener of this event.
+	 * Helper methods for registering keybinds can be found in the {@linkplain
+	 * KeybindRegistry} class.
+	 * 
+	 * <p>
+	 * Listeners to this event should be registered in your mod's entrypoint,
+	 * and can be done as follows:
+	 * 
+	 * <pre>
+	 * {@code
+	 * KeybindEvents.REGISTER_KEYBINDS.register(() -> {
+	 * 	KeybindRegistry.register("cookie", Keyboard.KEY_Z, "example");
+	 * });
+	 * }
+	 * </pre>
+	 * 
+	 * @see KeybindRegistry
+	 */
+	public static final Event<Runnable> REGISTER_KEYBINDS = Event.runnable();
+
+}
diff --git a/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
new file mode 100644
index 00000000..137ea6c4
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
@@ -0,0 +1,38 @@
+package net.ornithemc.osl.keybinds.api;
+
+import java.util.Set;
+
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.impl.KeybindRegistryImpl;
+
+/**
+ * Public access to the Keybinds registry.
+ */
+public final class KeybindRegistry {
+
+	/**
+	 * @return the set of all keybind categories.
+	 */
+	public static Set<String> getCategories() {
+		return KeybindRegistryImpl.getCategories();
+	}
+
+	/**
+	 * @param name           the name or translation key of the keybind.
+	 * @param defaultKeyCode the default key code of the keybind.
+	 * @param category       the name or translation key of the category to which the keybind belongs.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(String name, int defaultKeyCode, String category) {
+		return KeybindRegistryImpl.register(name, defaultKeyCode, category);
+	}
+
+	/**
+	 * @param keybind the keybind to register.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(KeyBinding keybind) {
+		return KeybindRegistryImpl.register(keybind);
+	}
+}
diff --git a/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
new file mode 100644
index 00000000..2d1eaeb2
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
@@ -0,0 +1,83 @@
+package net.ornithemc.osl.keybinds.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
+import net.ornithemc.osl.keybinds.api.KeyBindingRegistry;
+import net.ornithemc.osl.keybinds.api.KeybindEvents;
+import net.ornithemc.osl.keybinds.impl.mixin.client.KeyBindingAccessor;
+
+public final class KeybindRegistryImpl {
+
+	private static GameOptions options;
+	private static Set<String> categories;
+	private static Map<String, Integer> sortOrder;
+
+	private static List<KeyBinding> pendingKeybinds;
+
+	public static Set<String> getCategories() {
+		return categories;
+	}
+
+	public static KeyBinding register(String name, int defaultKeyCode, String category) {
+		return register(new KeyBinding(name, defaultKeyCode, category));
+	}
+
+	public static KeyBinding register(KeyBinding keybind) {
+		addCategory(keybind.getCategory());
+		addKeybind(keybind);
+
+		return keybind;
+	}
+
+	private static void addCategory(String category) {
+		categories.add(category);
+
+		if (!sortOrder.containsKey(category)) {
+			sortOrder.put(category, sortOrder.size() + 1);
+		}
+	}
+
+	private static void addKeybind(KeyBinding keybind) {
+		if (pendingKeybinds != null) {
+			pendingKeybinds.add(keybind);
+		} else {
+			// this code path is only reached if register methods are called after
+			// the event has been run - manually append the keybind anyway
+			options.keyBindings = ArrayUtils.addAll(options.keyBindings, keybind);
+		}
+	}
+
+	public static void init(GameOptions gameOptions) {
+		options = gameOptions;
+		categories = KeyBindingAccessor.accessCategories();
+		sortOrder = KeyBindingAccessor.accessCategorySortOrder();
+
+		pendingKeybinds = new ArrayList<>();
+
+		KeyBindingEvents.REGISTER_KEYBINDS.invoker().accept(new KeyBindingRegistry() {
+
+			@Override
+			public KeyBinding register(String name, int defaultKeyCode, String category) {
+				return KeybindRegistryImpl.register(name, defaultKeyCode, category);
+			}
+
+			@Override
+			public KeyBinding register(KeyBinding keybind) {
+				return KeybindRegistryImpl.register(keybind);
+			}
+		});
+		KeybindEvents.REGISTER_KEYBINDS.invoker().run();
+
+		options.keyBindings = ArrayUtils.addAll(options.keyBindings, pendingKeybinds.toArray(new KeyBinding[0]));
+		pendingKeybinds = null;
+	}
+}
diff --git a/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
index 4eb9024b..df09ee77 100644
--- a/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
+++ b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
@@ -1,26 +1,16 @@
 package net.ornithemc.osl.keybinds.impl.mixin.client;
 
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.options.GameOptions;
-import net.minecraft.client.options.KeyBinding;
 
-import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
-import net.ornithemc.osl.keybinds.api.KeyBindingRegistry;
+import net.ornithemc.osl.keybinds.impl.KeybindRegistryImpl;
 
 @Mixin(GameOptions.class)
-public class GameOptionsMixin implements KeyBindingRegistry {
-
-	@Shadow private KeyBinding[] keyBindings;
-	private Set<KeyBinding> modKeyBindings;
+public class GameOptionsMixin {
 
 	@Inject(
 		method = "<init>(Lnet/minecraft/client/Minecraft;Ljava/io/File;)V",
@@ -30,39 +20,6 @@ public class GameOptionsMixin implements KeyBindingRegistry {
 		)
 	)
 	private void osl$keybinds$registerKeybinds(CallbackInfo ci) {
-		modKeyBindings = new LinkedHashSet<>();
-
-		KeyBindingEvents.REGISTER_KEYBINDS.invoker().accept(this);
-
-		KeyBinding[] mcKeybinds = keyBindings;
-		keyBindings = new KeyBinding[mcKeybinds.length + modKeyBindings.size()];
-
-		int i = 0;
-		for (KeyBinding keybind : mcKeybinds) {
-			keyBindings[i++] = keybind;
-		}
-		for (KeyBinding keybind : modKeyBindings) {
-			keyBindings[i++] = keybind;
-		}
-	}
-
-	@Override
-	public KeyBinding register(String name, int defaultKeyCode, String category) {
-		return register(new KeyBinding(name, defaultKeyCode, category));
-	}
-
-	@Override
-	public KeyBinding register(KeyBinding keybind) {
-		modKeyBindings.add(keybind);
-		addCategory(keybind.getCategory());
-		return keybind;
-	}
-
-	private void addCategory(String category) {
-		Map<String, Integer> sortOrder = KeyBindingAccessor.osl$keybinds$getCategorySortOrder();
-
-		if (!sortOrder.containsKey(category)) {
-			sortOrder.put(category, sortOrder.size() + 1);
-		}
+		KeybindRegistryImpl.init((GameOptions) (Object) this);
 	}
 }
diff --git a/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java
index 4595d540..332cbd94 100644
--- a/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java
+++ b/libraries/keybinds/keybinds-mc17w16a-mc1.12.2/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java
@@ -1,6 +1,7 @@
 package net.ornithemc.osl.keybinds.impl.mixin.client;
 
 import java.util.Map;
+import java.util.Set;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -10,8 +11,13 @@
 @Mixin(KeyBinding.class)
 public interface KeyBindingAccessor {
 
+	@Accessor("CATEGORIES")
+	static Set<String> accessCategories() {
+		throw new UnsupportedOperationException();
+	}
+
 	@Accessor("CATEGORY_SORT_ORDER")
-	static Map<String, Integer> osl$keybinds$getCategorySortOrder() {
+	static Map<String, Integer> accessCategorySortOrder() {
 		throw new UnsupportedOperationException();
 	}
 }
diff --git a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
index 52590ecb..022c7870 100644
--- a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
+++ b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
@@ -6,7 +6,10 @@
 
 /**
  * Events related to Minecraft's keybinds.
+ * 
+ * @deprecated use {@linkplain KeybindEvents} instead
  */
+@Deprecated
 public class KeyBindingEvents {
 
 	/**
diff --git a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
new file mode 100644
index 00000000..51da2d98
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
@@ -0,0 +1,34 @@
+package net.ornithemc.osl.keybinds.api;
+
+import net.ornithemc.osl.core.api.events.Event;
+
+/**
+ * Events related to Minecraft's keybinds.
+ */
+public final class KeybindEvents {
+
+	/**
+	 * This event is invoked upon game start-up, before game options are loaded.
+	 * 
+	 * <p>
+	 * Custom keybind registration should be done in a listener of this event.
+	 * Helper methods for registering keybinds can be found in the {@linkplain
+	 * KeybindRegistry} class.
+	 * 
+	 * <p>
+	 * Listeners to this event should be registered in your mod's entrypoint,
+	 * and can be done as follows:
+	 * 
+	 * <pre>
+	 * {@code
+	 * KeybindEvents.REGISTER_KEYBINDS.register(() -> {
+	 * 	KeybindRegistry.register("cookie", GLFW.GLFW_KEY_Z, "example");
+	 * });
+	 * }
+	 * </pre>
+	 * 
+	 * @see KeybindRegistry
+	 */
+	public static final Event<Runnable> REGISTER_KEYBINDS = Event.runnable();
+
+}
diff --git a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
new file mode 100644
index 00000000..ba3857fe
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
@@ -0,0 +1,51 @@
+package net.ornithemc.osl.keybinds.api;
+
+import java.util.Set;
+
+import com.mojang.blaze3d.platform.InputConstants;
+
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.impl.KeybindRegistryImpl;
+
+/**
+ * Public access to the Keybinds registry.
+ */
+public final class KeybindRegistry {
+
+	/**
+	 * @return the set of all keybind categories.
+	 */
+	public static Set<String> getCategories() {
+		return KeybindRegistryImpl.getCategories();
+	}
+
+	/**
+	 * @param name           the name or translation key of the keybind.
+	 * @param defaultKeyCode the default key code of the keybind.
+	 * @param category       the name or translation key of the category to which the keybind belongs.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(String name, int defaultKeyCode, String category) {
+		return KeybindRegistryImpl.register(name, defaultKeyCode, category);
+	}
+
+	/**
+	 * @param name           the name or translation key of the keybind.
+	 * @param type           the type of input allowed for the default key code.
+	 * @param defaultKeyCode the default key code of the keybind.
+	 * @param category       the name or translation key of the category to which the keybind belongs.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(String name, InputConstants.Type type, int defaultKeyCode, String category) {
+		return KeybindRegistryImpl.register(name, type, defaultKeyCode, category);
+	}
+
+	/**
+	 * @param keybind the keybind to register.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(KeyBinding keybind) {
+		return KeybindRegistryImpl.register(keybind);
+	}
+}
diff --git a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
new file mode 100644
index 00000000..29ef0103
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
@@ -0,0 +1,95 @@
+package net.ornithemc.osl.keybinds.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import com.mojang.blaze3d.platform.InputConstants.Type;
+
+import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
+import net.ornithemc.osl.keybinds.api.KeyBindingRegistry;
+import net.ornithemc.osl.keybinds.api.KeybindEvents;
+import net.ornithemc.osl.keybinds.impl.mixin.client.KeyBindingAccessor;
+
+public final class KeybindRegistryImpl {
+
+	private static GameOptions options;
+	private static Set<String> categories;
+	private static Map<String, Integer> sortOrder;
+
+	private static List<KeyBinding> pendingKeybinds;
+
+	public static Set<String> getCategories() {
+		return categories;
+	}
+
+	public static KeyBinding register(String name, int defaultKeyCode, String category) {
+		return register(new KeyBinding(name, defaultKeyCode, category));
+	}
+
+	public static KeyBinding register(String name, InputConstants.Type type, int defaultKeyCode, String category) {
+		return register(new KeyBinding(name, type, defaultKeyCode, category));
+	}
+
+	public static KeyBinding register(KeyBinding keybind) {
+		addCategory(keybind.getCategory());
+		addKeybind(keybind);
+
+		return keybind;
+	}
+
+	private static void addCategory(String category) {
+		categories.add(category);
+
+		if (!sortOrder.containsKey(category)) {
+			sortOrder.put(category, sortOrder.size() + 1);
+		}
+	}
+
+	private static void addKeybind(KeyBinding keybind) {
+		if (pendingKeybinds != null) {
+			pendingKeybinds.add(keybind);
+		} else {
+			// this code path is only reached if register methods are called after
+			// the event has been run - manually append the keybind anyway
+			options.keyBindings = ArrayUtils.addAll(options.keyBindings, keybind);
+		}
+	}
+
+	public static void init(GameOptions gameOptions) {
+		options = gameOptions;
+		categories = KeyBindingAccessor.accessCategories();
+		sortOrder = KeyBindingAccessor.accessCategorySortOrder();
+
+		pendingKeybinds = new ArrayList<>();
+
+		KeyBindingEvents.REGISTER_KEYBINDS.invoker().accept(new KeyBindingRegistry() {
+
+			@Override
+			public KeyBinding register(String name, int defaultKeyCode, String category) {
+				return KeybindRegistryImpl.register(name, defaultKeyCode, category);
+			}
+
+			@Override
+			public KeyBinding register(String name, Type type, int defaultKeyCode, String category) {
+				return KeybindRegistryImpl.register(name, type, defaultKeyCode, category);
+			}
+
+			@Override
+			public KeyBinding register(KeyBinding keybind) {
+				return KeybindRegistryImpl.register(keybind);
+			}
+		});
+		KeybindEvents.REGISTER_KEYBINDS.invoker().run();
+
+		options.keyBindings = ArrayUtils.addAll(options.keyBindings, pendingKeybinds.toArray(new KeyBinding[0]));
+		pendingKeybinds = null;
+	}
+}
diff --git a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
index 11cf2d02..df09ee77 100644
--- a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
+++ b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
@@ -1,28 +1,16 @@
 package net.ornithemc.osl.keybinds.impl.mixin.client;
 
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.mojang.blaze3d.platform.InputConstants.Type;
-
 import net.minecraft.client.options.GameOptions;
-import net.minecraft.client.options.KeyBinding;
 
-import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
-import net.ornithemc.osl.keybinds.api.KeyBindingRegistry;
+import net.ornithemc.osl.keybinds.impl.KeybindRegistryImpl;
 
 @Mixin(GameOptions.class)
-public class GameOptionsMixin implements KeyBindingRegistry {
-
-	@Shadow private KeyBinding[] keyBindings;
-	private Set<KeyBinding> modKeyBindings;
+public class GameOptionsMixin {
 
 	@Inject(
 		method = "<init>(Lnet/minecraft/client/Minecraft;Ljava/io/File;)V",
@@ -32,44 +20,6 @@ public class GameOptionsMixin implements KeyBindingRegistry {
 		)
 	)
 	private void osl$keybinds$registerKeybinds(CallbackInfo ci) {
-		modKeyBindings = new LinkedHashSet<>();
-
-		KeyBindingEvents.REGISTER_KEYBINDS.invoker().accept(this);
-
-		KeyBinding[] mcKeybinds = keyBindings;
-		keyBindings = new KeyBinding[mcKeybinds.length + modKeyBindings.size()];
-
-		int i = 0;
-		for (KeyBinding keybind : mcKeybinds) {
-			keyBindings[i++] = keybind;
-		}
-		for (KeyBinding keybind : modKeyBindings) {
-			keyBindings[i++] = keybind;
-		}
-	}
-
-	@Override
-	public KeyBinding register(String name, int defaultKeyCode, String category) {
-		return register(new KeyBinding(name, defaultKeyCode, category));
-	}
-
-	@Override
-	public KeyBinding register(String name, Type type, int defaultKeyCode, String category) {
-		return register(new KeyBinding(name, type, defaultKeyCode, category));
-	}
-
-	@Override
-	public KeyBinding register(KeyBinding keybind) {
-		modKeyBindings.add(keybind);
-		addCategory(keybind.getCategory());
-		return keybind;
-	}
-
-	private void addCategory(String category) {
-		Map<String, Integer> sortOrder = KeyBindingAccessor.osl$keybinds$getCategorySortOrder();
-
-		if (!sortOrder.containsKey(category)) {
-			sortOrder.put(category, sortOrder.size() + 1);
-		}
+		KeybindRegistryImpl.init((GameOptions) (Object) this);
 	}
 }
diff --git a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java
index 4595d540..332cbd94 100644
--- a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java
+++ b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingAccessor.java
@@ -1,6 +1,7 @@
 package net.ornithemc.osl.keybinds.impl.mixin.client;
 
 import java.util.Map;
+import java.util.Set;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -10,8 +11,13 @@
 @Mixin(KeyBinding.class)
 public interface KeyBindingAccessor {
 
+	@Accessor("CATEGORIES")
+	static Set<String> accessCategories() {
+		throw new UnsupportedOperationException();
+	}
+
 	@Accessor("CATEGORY_SORT_ORDER")
-	static Map<String, Integer> osl$keybinds$getCategorySortOrder() {
+	static Map<String, Integer> accessCategorySortOrder() {
 		throw new UnsupportedOperationException();
 	}
 }
diff --git a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/resources/fabric.mod.json b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/resources/fabric.mod.json
index 5b7d390a..790eeba1 100644
--- a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/resources/fabric.mod.json
+++ b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/resources/fabric.mod.json
@@ -6,6 +6,7 @@
   "mixins": [
     "osl.keybinds.mixins.json"
   ],
+  "accessWidener": "osl.keybinds.classtweaker",
   "depends": {
     "fabricloader": "\u003e\u003d0.18.0",
     "minecraft": "\u003e\u003d1.13-alpha.17.43.a \u003c\u003d1.14.4",
diff --git a/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/resources/osl.keybinds.classtweaker b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/resources/osl.keybinds.classtweaker
new file mode 100644
index 00000000..507348de
--- /dev/null
+++ b/libraries/keybinds/keybinds-mc17w43a-mc1.14.4/src/main/resources/osl.keybinds.classtweaker
@@ -0,0 +1,3 @@
+classTweaker	v1	named
+
+mutable	field	net/minecraft/client/options/GameOptions	keyBindings	[Lnet/minecraft/client/options/KeyBinding;
\ No newline at end of file
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
index 5a1ad61f..7b7c4448 100644
--- a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
@@ -6,7 +6,10 @@
 
 /**
  * Events related to Minecraft's keybinds.
+ * 
+ * @deprecated use {@linkplain KeybindEvents} instead
  */
+@Deprecated
 public class KeyBindingEvents {
 
 	/**
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
new file mode 100644
index 00000000..43ca7209
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
@@ -0,0 +1,34 @@
+package net.ornithemc.osl.keybinds.api;
+
+import net.ornithemc.osl.core.api.events.Event;
+
+/**
+ * Events related to Minecraft's keybinds.
+ */
+public final class KeybindEvents {
+
+	/**
+	 * This event is invoked upon game start-up, before game options are loaded.
+	 * 
+	 * <p>
+	 * Custom keybind registration should be done in a listener of this event.
+	 * Helper methods for registering keybinds can be found in the {@linkplain
+	 * KeybindRegistry} class.
+	 * 
+	 * <p>
+	 * Listeners to this event should be registered in your mod's entrypoint,
+	 * and can be done as follows:
+	 * 
+	 * <pre>
+	 * {@code
+	 * KeybindEvents.REGISTER_KEYBINDS.register(() -> {
+	 * 	KeybindRegistry.register("cookie", Keyboard.KEY_Z, "example");
+	 * });
+	 * }
+	 * </pre>
+	 * 
+	 * @see KeybindRegistry
+	 */
+	public static final Event<Runnable> REGISTER_KEYBINDS = Event.runnable();
+
+}
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
new file mode 100644
index 00000000..9c610a43
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
@@ -0,0 +1,39 @@
+package net.ornithemc.osl.keybinds.api;
+
+import java.util.Set;
+
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.impl.KeybindRegistryImpl;
+
+/**
+ * Public access to the Keybinds registry.
+ */
+public final class KeybindRegistry {
+
+	/**
+	 * @return the set of all keybind categories.
+	 */
+	public static Set<String> getCategories() {
+		return KeybindRegistryImpl.getCategories();
+	}
+
+	/**
+	 * @param name           the name or translation key of the keybind.
+	 * @param defaultKeyCode the default key code of the keybind.
+	 * @param category       the name or translation key of the category to which the keybind belongs.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(String name, int defaultKeyCode, String category) {
+		return KeybindRegistryImpl.register(name, defaultKeyCode, category);
+	}
+
+	/**
+	 * @param keybind the keybind to register.
+	 * @param category       the name or translation key of the category to which the keybind belongs.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(KeyBinding keybind, String category) {
+		return KeybindRegistryImpl.register(keybind, category);
+	}
+}
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/keybind/KeyBindingExtension.java b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/keybind/KeyBindingExtension.java
new file mode 100644
index 00000000..4ade6b4f
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/api/keybind/KeyBindingExtension.java
@@ -0,0 +1,7 @@
+package net.ornithemc.osl.keybinds.api.keybind;
+
+public interface KeyBindingExtension {
+
+	String getCategory();
+
+}
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
new file mode 100644
index 00000000..414f7bf4
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
@@ -0,0 +1,87 @@
+package net.ornithemc.osl.keybinds.impl;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
+import net.ornithemc.osl.keybinds.api.KeyBindingRegistry;
+import net.ornithemc.osl.keybinds.api.KeybindEvents;
+import net.ornithemc.osl.keybinds.impl.access.KeyBindingAccess;
+
+public final class KeybindRegistryImpl {
+
+	private static GameOptions options;
+	private static Set<String> categories;
+
+	private static List<KeyBinding> pendingKeybinds;
+
+	public static Set<String> getCategories() {
+		return categories;
+	}
+
+	public static KeyBinding register(String name, int defaultKeyCode, String category) {
+		return register(new KeyBinding(name, defaultKeyCode), category);
+	}
+
+	public static KeyBinding register(KeyBinding keybind, String category) {
+		addCategory(category);
+		addKeybind(keybind);
+
+		if (category != null) {
+			((KeyBindingAccess) keybind).osl$keybinds$setCategory(category);
+		}
+
+		return keybind;
+	}
+
+	private static void addCategory(String category) {
+		categories.add(category);
+	}
+
+	private static void addKeybind(KeyBinding keybind) {
+		if (pendingKeybinds != null) {
+			pendingKeybinds.add(keybind);
+		} else {
+			// this code path is only reached if register methods are called after
+			// the event has been run - manually append the keybind anyway
+			options.keyBindings = ArrayUtils.addAll(options.keyBindings, keybind);
+		}
+	}
+
+	public static void init(GameOptions gameOptions) {
+		options = gameOptions;
+		categories = new HashSet<>();
+
+		pendingKeybinds = new ArrayList<>();
+
+		// TODO: properly categorize Vanilla keybinds
+		// TODO: use translation key
+		for (KeyBinding keybind : options.keyBindings) {
+			((KeyBindingAccess) keybind).osl$keybinds$setCategory("Vanilla");
+		}
+
+		KeyBindingEvents.REGISTER_KEYBINDS.invoker().accept(new KeyBindingRegistry() {
+
+			@Override
+			public KeyBinding register(String name, int defaultKeyCode) {
+				return KeybindRegistryImpl.register(name, defaultKeyCode, null);
+			}
+
+			@Override
+			public KeyBinding register(KeyBinding keybind) {
+				return KeybindRegistryImpl.register(keybind, null);
+			}
+		});
+		KeybindEvents.REGISTER_KEYBINDS.invoker().run();
+
+		options.keyBindings = ArrayUtils.addAll(options.keyBindings, pendingKeybinds.toArray(new KeyBinding[0]));
+		pendingKeybinds = null;
+	}
+}
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/access/KeyBindingAccess.java b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/access/KeyBindingAccess.java
new file mode 100644
index 00000000..31be1941
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/access/KeyBindingAccess.java
@@ -0,0 +1,7 @@
+package net.ornithemc.osl.keybinds.impl.access;
+
+public interface KeyBindingAccess {
+
+	void osl$keybinds$setCategory(String category);
+
+}
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/keybind/KeyBindingExtensionImpl.java b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/keybind/KeyBindingExtensionImpl.java
new file mode 100644
index 00000000..3d6fbb3c
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/keybind/KeyBindingExtensionImpl.java
@@ -0,0 +1,11 @@
+package net.ornithemc.osl.keybinds.impl.keybind;
+
+import net.ornithemc.osl.keybinds.api.keybind.KeyBindingExtension;
+
+public interface KeyBindingExtensionImpl extends KeyBindingExtension {
+
+	@Override
+	default String getCategory() {
+		throw new AbstractMethodError();
+	}
+}
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
index a0f49cc4..df09ee77 100644
--- a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
@@ -1,25 +1,16 @@
 package net.ornithemc.osl.keybinds.impl.mixin.client;
 
-import java.util.LinkedHashSet;
-import java.util.Set;
-
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.options.GameOptions;
-import net.minecraft.client.options.KeyBinding;
 
-import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
-import net.ornithemc.osl.keybinds.api.KeyBindingRegistry;
+import net.ornithemc.osl.keybinds.impl.KeybindRegistryImpl;
 
 @Mixin(GameOptions.class)
-public class GameOptionsMixin implements KeyBindingRegistry {
-
-	@Shadow private KeyBinding[] keyBindings;
-	private Set<KeyBinding> modKeyBindings;
+public class GameOptionsMixin {
 
 	@Inject(
 		method = "<init>(Lnet/minecraft/client/Minecraft;Ljava/io/File;)V",
@@ -29,30 +20,6 @@ public class GameOptionsMixin implements KeyBindingRegistry {
 		)
 	)
 	private void osl$keybinds$registerKeybinds(CallbackInfo ci) {
-		modKeyBindings = new LinkedHashSet<>();
-
-		KeyBindingEvents.REGISTER_KEYBINDS.invoker().accept(this);
-
-		KeyBinding[] mcKeybinds = keyBindings;
-		keyBindings = new KeyBinding[mcKeybinds.length + modKeyBindings.size()];
-
-		int i = 0;
-		for (KeyBinding keybind : mcKeybinds) {
-			keyBindings[i++] = keybind;
-		}
-		for (KeyBinding keybind : modKeyBindings) {
-			keyBindings[i++] = keybind;
-		}
-	}
-
-	@Override
-	public KeyBinding register(String name, int defaultKeyCode) {
-		return register(new KeyBinding(name, defaultKeyCode));
-	}
-
-	@Override
-	public KeyBinding register(KeyBinding keybind) {
-		modKeyBindings.add(keybind);
-		return keybind;
+		KeybindRegistryImpl.init((GameOptions) (Object) this);
 	}
 }
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingMixin.java b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingMixin.java
new file mode 100644
index 00000000..020cba37
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingMixin.java
@@ -0,0 +1,26 @@
+package net.ornithemc.osl.keybinds.impl.mixin.client;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.api.keybind.KeyBindingExtension;
+import net.ornithemc.osl.keybinds.impl.access.KeyBindingAccess;
+
+@Mixin(KeyBinding.class)
+public class KeyBindingMixin implements KeyBindingExtension, KeyBindingAccess {
+
+	@Unique
+	private String category = "None";
+
+	@Override
+	public String getCategory() {
+		return this.category;
+	}
+
+	@Override
+	public void osl$keybinds$setCategory(String category) {
+		this.category = category;
+	}
+}
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/fabric.mod.json b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/fabric.mod.json
index 5642cfb9..4df951b3 100644
--- a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/fabric.mod.json
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/fabric.mod.json
@@ -6,6 +6,7 @@
   "mixins": [
     "osl.keybinds.mixins.json"
   ],
+  "accessWidener": "osl.keybinds.classtweaker",
   "depends": {
     "fabricloader": "\u003e\u003d0.18.0",
     "minecraft": "\u003e\u003d1.0.0-beta.8 \u003c\u003d1.6.4",
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.keybinds.classtweaker b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.keybinds.classtweaker
new file mode 100644
index 00000000..843e3c41
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.keybinds.classtweaker
@@ -0,0 +1,3 @@
+classTweaker	v1	named
+
+transitive-inject-interface	net/minecraft/client/options/KeyBinding	net/ornithemc/osl/keybinds/impl/keybind/KeyBindingExtensionImpl
\ No newline at end of file
diff --git a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.keybinds.mixins.json b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.keybinds.mixins.json
index 47885649..cf574be3 100644
--- a/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.keybinds.mixins.json
+++ b/libraries/keybinds/keybinds-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.keybinds.mixins.json
@@ -6,7 +6,8 @@
 	"mixins": [
 	],
 	"client": [
-		"client.GameOptionsMixin"
+		"client.GameOptionsMixin",
+		"client.KeyBindingMixin"
 	],
 	"server": [
 	],
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
index 5a1ad61f..7b7c4448 100644
--- a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeyBindingEvents.java
@@ -6,7 +6,10 @@
 
 /**
  * Events related to Minecraft's keybinds.
+ * 
+ * @deprecated use {@linkplain KeybindEvents} instead
  */
+@Deprecated
 public class KeyBindingEvents {
 
 	/**
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
new file mode 100644
index 00000000..43ca7209
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeybindEvents.java
@@ -0,0 +1,34 @@
+package net.ornithemc.osl.keybinds.api;
+
+import net.ornithemc.osl.core.api.events.Event;
+
+/**
+ * Events related to Minecraft's keybinds.
+ */
+public final class KeybindEvents {
+
+	/**
+	 * This event is invoked upon game start-up, before game options are loaded.
+	 * 
+	 * <p>
+	 * Custom keybind registration should be done in a listener of this event.
+	 * Helper methods for registering keybinds can be found in the {@linkplain
+	 * KeybindRegistry} class.
+	 * 
+	 * <p>
+	 * Listeners to this event should be registered in your mod's entrypoint,
+	 * and can be done as follows:
+	 * 
+	 * <pre>
+	 * {@code
+	 * KeybindEvents.REGISTER_KEYBINDS.register(() -> {
+	 * 	KeybindRegistry.register("cookie", Keyboard.KEY_Z, "example");
+	 * });
+	 * }
+	 * </pre>
+	 * 
+	 * @see KeybindRegistry
+	 */
+	public static final Event<Runnable> REGISTER_KEYBINDS = Event.runnable();
+
+}
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
new file mode 100644
index 00000000..9c610a43
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/KeybindRegistry.java
@@ -0,0 +1,39 @@
+package net.ornithemc.osl.keybinds.api;
+
+import java.util.Set;
+
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.impl.KeybindRegistryImpl;
+
+/**
+ * Public access to the Keybinds registry.
+ */
+public final class KeybindRegistry {
+
+	/**
+	 * @return the set of all keybind categories.
+	 */
+	public static Set<String> getCategories() {
+		return KeybindRegistryImpl.getCategories();
+	}
+
+	/**
+	 * @param name           the name or translation key of the keybind.
+	 * @param defaultKeyCode the default key code of the keybind.
+	 * @param category       the name or translation key of the category to which the keybind belongs.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(String name, int defaultKeyCode, String category) {
+		return KeybindRegistryImpl.register(name, defaultKeyCode, category);
+	}
+
+	/**
+	 * @param keybind the keybind to register.
+	 * @param category       the name or translation key of the category to which the keybind belongs.
+	 * @return the registered keybind.
+	 */
+	public static KeyBinding register(KeyBinding keybind, String category) {
+		return KeybindRegistryImpl.register(keybind, category);
+	}
+}
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/keybind/KeyBindingExtension.java b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/keybind/KeyBindingExtension.java
new file mode 100644
index 00000000..4ade6b4f
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/api/keybind/KeyBindingExtension.java
@@ -0,0 +1,7 @@
+package net.ornithemc.osl.keybinds.api.keybind;
+
+public interface KeyBindingExtension {
+
+	String getCategory();
+
+}
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
new file mode 100644
index 00000000..414f7bf4
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/KeybindRegistryImpl.java
@@ -0,0 +1,87 @@
+package net.ornithemc.osl.keybinds.impl;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
+import net.ornithemc.osl.keybinds.api.KeyBindingRegistry;
+import net.ornithemc.osl.keybinds.api.KeybindEvents;
+import net.ornithemc.osl.keybinds.impl.access.KeyBindingAccess;
+
+public final class KeybindRegistryImpl {
+
+	private static GameOptions options;
+	private static Set<String> categories;
+
+	private static List<KeyBinding> pendingKeybinds;
+
+	public static Set<String> getCategories() {
+		return categories;
+	}
+
+	public static KeyBinding register(String name, int defaultKeyCode, String category) {
+		return register(new KeyBinding(name, defaultKeyCode), category);
+	}
+
+	public static KeyBinding register(KeyBinding keybind, String category) {
+		addCategory(category);
+		addKeybind(keybind);
+
+		if (category != null) {
+			((KeyBindingAccess) keybind).osl$keybinds$setCategory(category);
+		}
+
+		return keybind;
+	}
+
+	private static void addCategory(String category) {
+		categories.add(category);
+	}
+
+	private static void addKeybind(KeyBinding keybind) {
+		if (pendingKeybinds != null) {
+			pendingKeybinds.add(keybind);
+		} else {
+			// this code path is only reached if register methods are called after
+			// the event has been run - manually append the keybind anyway
+			options.keyBindings = ArrayUtils.addAll(options.keyBindings, keybind);
+		}
+	}
+
+	public static void init(GameOptions gameOptions) {
+		options = gameOptions;
+		categories = new HashSet<>();
+
+		pendingKeybinds = new ArrayList<>();
+
+		// TODO: properly categorize Vanilla keybinds
+		// TODO: use translation key
+		for (KeyBinding keybind : options.keyBindings) {
+			((KeyBindingAccess) keybind).osl$keybinds$setCategory("Vanilla");
+		}
+
+		KeyBindingEvents.REGISTER_KEYBINDS.invoker().accept(new KeyBindingRegistry() {
+
+			@Override
+			public KeyBinding register(String name, int defaultKeyCode) {
+				return KeybindRegistryImpl.register(name, defaultKeyCode, null);
+			}
+
+			@Override
+			public KeyBinding register(KeyBinding keybind) {
+				return KeybindRegistryImpl.register(keybind, null);
+			}
+		});
+		KeybindEvents.REGISTER_KEYBINDS.invoker().run();
+
+		options.keyBindings = ArrayUtils.addAll(options.keyBindings, pendingKeybinds.toArray(new KeyBinding[0]));
+		pendingKeybinds = null;
+	}
+}
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/access/KeyBindingAccess.java b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/access/KeyBindingAccess.java
new file mode 100644
index 00000000..31be1941
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/access/KeyBindingAccess.java
@@ -0,0 +1,7 @@
+package net.ornithemc.osl.keybinds.impl.access;
+
+public interface KeyBindingAccess {
+
+	void osl$keybinds$setCategory(String category);
+
+}
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/keybind/KeyBindingExtensionImpl.java b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/keybind/KeyBindingExtensionImpl.java
new file mode 100644
index 00000000..3d6fbb3c
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/keybind/KeyBindingExtensionImpl.java
@@ -0,0 +1,11 @@
+package net.ornithemc.osl.keybinds.impl.keybind;
+
+import net.ornithemc.osl.keybinds.api.keybind.KeyBindingExtension;
+
+public interface KeyBindingExtensionImpl extends KeyBindingExtension {
+
+	@Override
+	default String getCategory() {
+		throw new AbstractMethodError();
+	}
+}
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
index a0f49cc4..df09ee77 100644
--- a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/GameOptionsMixin.java
@@ -1,25 +1,16 @@
 package net.ornithemc.osl.keybinds.impl.mixin.client;
 
-import java.util.LinkedHashSet;
-import java.util.Set;
-
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.options.GameOptions;
-import net.minecraft.client.options.KeyBinding;
 
-import net.ornithemc.osl.keybinds.api.KeyBindingEvents;
-import net.ornithemc.osl.keybinds.api.KeyBindingRegistry;
+import net.ornithemc.osl.keybinds.impl.KeybindRegistryImpl;
 
 @Mixin(GameOptions.class)
-public class GameOptionsMixin implements KeyBindingRegistry {
-
-	@Shadow private KeyBinding[] keyBindings;
-	private Set<KeyBinding> modKeyBindings;
+public class GameOptionsMixin {
 
 	@Inject(
 		method = "<init>(Lnet/minecraft/client/Minecraft;Ljava/io/File;)V",
@@ -29,30 +20,6 @@ public class GameOptionsMixin implements KeyBindingRegistry {
 		)
 	)
 	private void osl$keybinds$registerKeybinds(CallbackInfo ci) {
-		modKeyBindings = new LinkedHashSet<>();
-
-		KeyBindingEvents.REGISTER_KEYBINDS.invoker().accept(this);
-
-		KeyBinding[] mcKeybinds = keyBindings;
-		keyBindings = new KeyBinding[mcKeybinds.length + modKeyBindings.size()];
-
-		int i = 0;
-		for (KeyBinding keybind : mcKeybinds) {
-			keyBindings[i++] = keybind;
-		}
-		for (KeyBinding keybind : modKeyBindings) {
-			keyBindings[i++] = keybind;
-		}
-	}
-
-	@Override
-	public KeyBinding register(String name, int defaultKeyCode) {
-		return register(new KeyBinding(name, defaultKeyCode));
-	}
-
-	@Override
-	public KeyBinding register(KeyBinding keybind) {
-		modKeyBindings.add(keybind);
-		return keybind;
+		KeybindRegistryImpl.init((GameOptions) (Object) this);
 	}
 }
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingMixin.java b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingMixin.java
new file mode 100644
index 00000000..020cba37
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/java/net/ornithemc/osl/keybinds/impl/mixin/client/KeyBindingMixin.java
@@ -0,0 +1,26 @@
+package net.ornithemc.osl.keybinds.impl.mixin.client;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+import net.minecraft.client.options.KeyBinding;
+
+import net.ornithemc.osl.keybinds.api.keybind.KeyBindingExtension;
+import net.ornithemc.osl.keybinds.impl.access.KeyBindingAccess;
+
+@Mixin(KeyBinding.class)
+public class KeyBindingMixin implements KeyBindingExtension, KeyBindingAccess {
+
+	@Unique
+	private String category = "None";
+
+	@Override
+	public String getCategory() {
+		return this.category;
+	}
+
+	@Override
+	public void osl$keybinds$setCategory(String category) {
+		this.category = category;
+	}
+}
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/fabric.mod.json b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/fabric.mod.json
index e70310cc..24826497 100644
--- a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/fabric.mod.json
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/fabric.mod.json
@@ -6,6 +6,7 @@
   "mixins": [
     "osl.keybinds.mixins.json"
   ],
+  "accessWidener": "osl.keybinds.classtweaker",
   "depends": {
     "fabricloader": "\u003e\u003d0.18.0",
     "minecraft": "\u003e\u003d1.0.0-alpha.0.1.1 \u003c\u003d1.0.0-beta.7.3",
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/osl.keybinds.classtweaker b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/osl.keybinds.classtweaker
new file mode 100644
index 00000000..843e3c41
--- /dev/null
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/osl.keybinds.classtweaker
@@ -0,0 +1,3 @@
+classTweaker	v1	named
+
+transitive-inject-interface	net/minecraft/client/options/KeyBinding	net/ornithemc/osl/keybinds/impl/keybind/KeyBindingExtensionImpl
\ No newline at end of file
diff --git a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/osl.keybinds.mixins.json b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/osl.keybinds.mixins.json
index 47885649..cf574be3 100644
--- a/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/osl.keybinds.mixins.json
+++ b/libraries/keybinds/keybinds-mcc0.0.23a_01-mcb1.7.3/src/main/resources/osl.keybinds.mixins.json
@@ -6,7 +6,8 @@
 	"mixins": [
 	],
 	"client": [
-		"client.GameOptionsMixin"
+		"client.GameOptionsMixin",
+		"client.KeyBindingMixin"
 	],
 	"server": [
 	],