diff --git a/gradle.properties b/gradle.properties
index 17652f3..772748f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
 	minecraft_version=1.19.2
-	yarn_mappings=1.19.2+build.13
+	yarn_mappings=1.19.2+build.18
 	loader_version=0.14.9
 # Mod Properties
 	mod_version = 1.1.4
diff --git a/src/main/java/net/saltymc/eaa/commands/EaaModCommand.java b/src/main/java/net/saltymc/eaa/commands/EaaModCommand.java
index f5ab281..87dd75b 100644
--- a/src/main/java/net/saltymc/eaa/commands/EaaModCommand.java
+++ b/src/main/java/net/saltymc/eaa/commands/EaaModCommand.java
@@ -4,12 +4,14 @@ import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 
 public abstract class EaaModCommand implements Command<FabricClientCommandSource> {
 
     public EaaModCommand() {
-        this(ClientCommandManager.getActiveDispatcher());
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> this.register(dispatcher));
     }
 
     public EaaModCommand(CommandDispatcher<FabricClientCommandSource> dispatcher) {
diff --git a/src/main/resources/eaamod.mixins.json b/src/main/resources/eaamod.mixins.json
index 8bae705..2f18b97 100644
--- a/src/main/resources/eaamod.mixins.json
+++ b/src/main/resources/eaamod.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.saltymc.eaa.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_17",
   "mixins": [
   ],
   "client": [
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index fbedc0c..56cd81f 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -30,7 +30,8 @@
   "depends": {
     "fabricloader": ">=0.7.4",
     "fabric": "*",
-    "minecraft": "1.19.x"
+    "minecraft": "1.19.x",
+    "java": ">=17"
   },
   "suggests": {
     "another-mod": "*"