diff --git a/src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java b/src/main/java/com/replaymod/core/mixin/Mixin_PostRenderWorldCalback.java
similarity index 67%
rename from src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java
rename to src/main/java/com/replaymod/core/mixin/Mixin_PostRenderWorldCalback.java
index a7c817a9..ec85fe86 100644
--- a/src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java
+++ b/src/main/java/com/replaymod/core/mixin/Mixin_PostRenderWorldCalback.java
@@ -2,8 +2,6 @@
 package com.replaymod.core.mixin;
 
 import com.replaymod.core.events.PostRenderWorldCallback;
-import com.replaymod.core.events.PreRenderHandCallback;
-import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
@@ -12,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(GameRenderer.class)
-public class MixinGameRenderer {
+public class Mixin_PostRenderWorldCalback {
     @Inject(
             method = "renderWorld",
             at = @At(
@@ -32,18 +30,5 @@ public class MixinGameRenderer {
         //#endif
         PostRenderWorldCallback.EVENT.invoker().postRenderWorld(matrixStack);
     }
-
-    @Inject(method = "renderHand", at = @At("HEAD"), cancellable = true)
-    private void preRenderHand(
-            //#if MC>=11500
-            MatrixStack matrixStack,
-            //#endif
-            Camera camera,
-            float partialTicks,
-            CallbackInfo ci) {
-        if (PreRenderHandCallback.EVENT.invoker().preRenderHand()) {
-            ci.cancel();
-        }
-    }
 }
 //#endif
diff --git a/src/main/java/com/replaymod/core/mixin/Mixin_PreRenderHandCallback.java b/src/main/java/com/replaymod/core/mixin/Mixin_PreRenderHandCallback.java
new file mode 100644
index 00000000..e52b713f
--- /dev/null
+++ b/src/main/java/com/replaymod/core/mixin/Mixin_PreRenderHandCallback.java
@@ -0,0 +1,28 @@
+//#if MC>=11400
+package com.replaymod.core.mixin;
+
+import com.replaymod.core.events.PreRenderHandCallback;
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(GameRenderer.class)
+public class Mixin_PreRenderHandCallback {
+    @Inject(method = "renderHand", at = @At("HEAD"), cancellable = true)
+    private void preRenderHand(
+            //#if MC>=11500
+            MatrixStack matrixStack,
+            //#endif
+            Camera camera,
+            float partialTicks,
+            CallbackInfo ci) {
+        if (PreRenderHandCallback.EVENT.invoker().preRenderHand()) {
+            ci.cancel();
+        }
+    }
+}
+//#endif
diff --git a/src/main/java/com/replaymod/recording/mixin/DecoderHandlerAccessor.java b/src/main/java/com/replaymod/recording/mixin/DecoderHandlerAccessor.java
new file mode 100644
index 00000000..b40cfd98
--- /dev/null
+++ b/src/main/java/com/replaymod/recording/mixin/DecoderHandlerAccessor.java
@@ -0,0 +1 @@
+// 1.20.6 and above
diff --git a/src/main/resources/mixins.core.replaymod.json b/src/main/resources/mixins.core.replaymod.json
index 7e10b9c9..eb682f0d 100644
--- a/src/main/resources/mixins.core.replaymod.json
+++ b/src/main/resources/mixins.core.replaymod.json
@@ -7,7 +7,8 @@
     "Mixin_ContextualKeyBindings",
     //#if MC>=11400
     "AbstractButtonWidgetAccessor",
-    "MixinGameRenderer",
+    "Mixin_PostRenderWorldCalback",
+    "Mixin_PreRenderHandCallback",
     "Mixin_InjectDynamicResourcePacks",
     //#endif
     //#if MC>=11400