fix MC-122477 crash on linux

Author: isXander

build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 }
 
 group = "dev.isxander"
-version = "1.19.4+2.0"
+version = "1.19.4+2.1"
 
 loom {
     splitEnvironmentSourceSets()

changelogs/1.19.4/1.19.4+2.1.md

@@ -0,0 +1 @@
+- Fix crash relating to MC-122477 on Linux

src/client/java/dev/isxander/debugify/client/mixins/basic/mc122477/RenderSystemMixin.java

@@ -13,7 +13,7 @@
 @BugFix(id = "MC-122477", category = FixCategory.BASIC, env = BugFix.Env.CLIENT, os = OS.LINUX)
 @Mixin(value = RenderSystem.class, priority = 1100, remap = false) // higher priority to improve compatibility with VulkanMod
 public class RenderSystemMixin {
-    @Inject(method = "flipFrame", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwPollEvents()V"))
+    @Inject(method = "flipFrame", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;pollEvents()V"))
     private static void onPollEvents(long window, CallbackInfo ci) {
         KeyboardPollCounter.poll();
     }

src/client/resources/debugify.client.mixins.json

@@ -6,7 +6,7 @@
     "defaultRequire": 1,
     "maxShiftBy": 2
   },
-  "plugin": "dev.isxander.debugify.utils.MixinPlugin",
+  "plugin": "dev.isxander.debugify.mixinplugin.MixinPlugin",
   "client": [
     "basic.mc108948.BoatMixin",
     "basic.mc111516.PlayerRendererMixin",

src/main/java/dev/isxander/debugify/fixes/BugFixData.java

@@ -1,6 +1,7 @@
 package dev.isxander.debugify.fixes;
 
 import dev.isxander.debugify.api.DebugifyApi;
+import dev.isxander.debugify.mixinplugin.DebugifyDebugFlags;
 import net.fabricmc.loader.api.FabricLoader;
 import org.jetbrains.annotations.NotNull;
 
@@ -23,7 +24,10 @@ public Set<String> getActiveConflicts() {
     }
 
     public boolean satisfiesOSRequirement() {
-        return requiredOs() == OS.UNKNOWN || requiredOs() == OS.getOperatingSystem();
+        return requiredOs() == OS.UNKNOWN || requiredOs() == OS.getOperatingSystem()
+                || (requiredOs() == OS.LINUX && DebugifyDebugFlags.FORCE_LINUX_FIXES)
+                || (requiredOs() == OS.WINDOWS && DebugifyDebugFlags.FORCE_WINDOWS_FIXES)
+                || (requiredOs() == OS.MAC && DebugifyDebugFlags.FORCE_MACOS_FIXES);
     }
 
     @Override

src/main/java/dev/isxander/debugify/mixinplugin/DebugifyDebugFlags.java

@@ -0,0 +1,11 @@
+package dev.isxander.debugify.mixinplugin;
+
+public class DebugifyDebugFlags {
+    public static final boolean FORCE_LINUX_FIXES = boolProp("debugify.forceLinuxFixes");
+    public static final boolean FORCE_WINDOWS_FIXES = boolProp("debugify.forceWindowsFixes");
+    public static final boolean FORCE_MACOS_FIXES = boolProp("debugify.forceMacOSFixes");
+
+    private static boolean boolProp(String property) {
+        return Boolean.parseBoolean(System.getProperty(property));
+    }
+}

…isxander/debugify/utils/MixinPlugin.java …er/debugify/mixinplugin/MixinPlugin.javasrc/main/java/dev/isxander/debugify/utils/MixinPlugin.java renamed to src/main/java/dev/isxander/debugify/mixinplugin/MixinPlugin.java src/main/java/dev/isxander/debugify/utils/MixinPlugin.java renamed to src/main/java/dev/isxander/debugify/mixinplugin/MixinPlugin.java

@@ -1,4 +1,4 @@
-package dev.isxander.debugify.utils;
+package dev.isxander.debugify.mixinplugin;
 
 import dev.isxander.debugify.Debugify;
 import dev.isxander.debugify.api.DebugifyApi;

src/main/resources/debugify.mixins.json

@@ -6,7 +6,7 @@
     "defaultRequire": 1,
     "maxShiftBy": 2
   },
-  "plugin": "dev.isxander.debugify.utils.MixinPlugin",
+  "plugin": "dev.isxander.debugify.mixinplugin.MixinPlugin",
   "mixins": [
     "basic.mc100991.FishingHookMixin",
     "basic.mc100991.ProjectileMixin",