Mixin moment ngl

CHANGELOG.md

@@ -1 +1 @@
-- Fixed a crash on dedicated servers. (#113)
+- Fixed an incompatibility with Keybind Fix.

gradle.properties

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx4096M
 minecraft_version=1.20
 
 archives_base_name=do-a-barrel-roll
-mod_version=3.3.5
+mod_version=3.3.6
 maven_group=nl.enjarai
 
 yarn_version=1.20+build.1
 
-loader_version=0.14.22
+loader_version=0.14.24
 fabric_version=0.83.0+1.20
 
 cicada_version=0.4.4

src/main/java/nl/enjarai/doabarrelroll/fabric/DoABarrelRollFabric.java

@@ -25,7 +25,12 @@ public void onInitialize() {
     public boolean shouldCancel(List<String> targetClassNames, String mixinClassName) {
         if (mixinClassName.equals("com.anthonyhilyard.equipmentcompare.mixin.KeyMappingMixin") && MixinAnnotationReader.getPriority(mixinClassName) == 1000) {
             DoABarrelRoll.LOGGER.warn("Equipment Compare detected, disabling their overly invasive keybinding mixin. Report any relevant issues to them.");
-            DoABarrelRoll.LOGGER.warn("If the author of Equipment Compare is reading this: see #31 on your github. Once the issue is fixed, you can set the priority of this mixin to anything other than 1000 to stop it being disabled.");
+            DoABarrelRoll.LOGGER.warn("If the author of Equipment Compare is reading this: see #31 on your github. Once the issue is resolved, you can set the priority of this mixin to anything other than 1000 to stop it being disabled.");
+            return true;
+        }
+        if (mixinClassName.equals("me.fzzyhmstrs.keybind_fix.mixins.KeybindingMixin") && MixinAnnotationReader.getPriority(mixinClassName) == 1000) {
+            DoABarrelRoll.LOGGER.warn("Keybind Fix detected, disabling their overly invasive keybinding mixin (Ironic, I know). Report any relevant issues to them.");
+            DoABarrelRoll.LOGGER.warn("If the author of Keybind Fix is reading this: please don't use unconditionally cancelled injects... try looking into MixinExtras! Once the issue is resolved, you can set the priority of this mixin to anything other than 1000 to stop it being disabled.");
             return true;
         }
         return false;