diff --git a/fabric-1.21.1/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java b/fabric-1.21.1/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java index d61e7f4..759375b 100644 --- a/fabric-1.21.1/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java +++ b/fabric-1.21.1/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java @@ -71,7 +71,7 @@ private static void initializeMonitors() { } else { monitorHandles.add(0L); // Fallback to primary } - } catch (Exception e) { + } catch (Exception | LinkageError e) { monitorHandles.add(0L); // Fallback to primary } } @@ -90,7 +90,7 @@ private static void initializeMonitors() { selectedMonitorIndex = 0; } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Fallback to GLFW if OSHI fails initializeMonitorsWithGLFW(); } @@ -119,7 +119,7 @@ private static void initializeMonitorsWithGLFW() { } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Final fallback availableMonitors.add("Primary"); monitorHandles.add(0L); @@ -179,7 +179,7 @@ private static void initializeMonitorsWithGLFW() { // Also inject video tooltips into the final blocks injectVideoTooltips(finalBlocks); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Log error but continue with original blocks if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to inject monitor selection into video options: {}", e.getMessage()); @@ -209,7 +209,7 @@ private static boolean containsResolutionOption(net.vulkanmod.config.gui.OptionB } return false; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to check block for resolution options: {}", e.getMessage()); } @@ -244,7 +244,7 @@ private static net.vulkanmod.config.gui.OptionBlock addMonitorSelectionToBlock(n newOptions.toArray(new Option[0]) ); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to add monitor selection to existing block: {}", e.getMessage()); } @@ -283,14 +283,14 @@ private static Option createMonitorSelectionOption() { try { Text tooltip = Text.translatable("vulkanmod-extra.option.video.monitorSelection.tooltip"); monitorOption.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue if tooltip fails } } return monitorOption; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create monitor selection option: {}", e.getMessage()); } @@ -331,7 +331,7 @@ private static net.vulkanmod.config.gui.OptionBlock createMonitorSelectionBlock( try { Text tooltip = Text.translatable("vulkanmod.options.video.monitor_selection.tooltip"); monitorOption.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue if tooltip fails } } @@ -343,7 +343,7 @@ private static net.vulkanmod.config.gui.OptionBlock createMonitorSelectionBlock( options.toArray(new Option[0]) ); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create monitor selection block: {}", e.getMessage()); } @@ -390,7 +390,7 @@ private static Option createCyclingOption(Text name, String[] values, return option; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create cycling option: {}", e.getMessage()); } @@ -431,21 +431,21 @@ private static void updateVideoModesForSelectedMonitor() { java.lang.reflect.Field selectedVideoModeField = VideoModeManager.class.getDeclaredField("selectedVideoMode"); selectedVideoModeField.setAccessible(true); selectedVideoModeField.set(null, currentMode); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update selected video mode: {}", e.getMessage()); } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update video mode sets: {}", e.getMessage()); } } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update video modes for selected monitor: {}", e.getMessage()); } @@ -532,7 +532,7 @@ private static void injectVideoTooltips(net.vulkanmod.config.gui.OptionBlock[] b } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to inject video tooltips", e); } @@ -563,13 +563,13 @@ private static void injectTooltipsIntoBlock(net.vulkanmod.config.gui.OptionBlock try { Text tooltip = Text.translatable(tooltipKey); option.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue on failure } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.warn("Failed to inject tooltips into option block", e); } diff --git a/fabric-1.21.2/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java b/fabric-1.21.2/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java index 4bd653e..e919a0a 100644 --- a/fabric-1.21.2/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java +++ b/fabric-1.21.2/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java @@ -71,7 +71,7 @@ private static void initializeMonitors() { } else { monitorHandles.add(0L); // Fallback to primary } - } catch (Exception e) { + } catch (Exception | LinkageError e) { monitorHandles.add(0L); // Fallback to primary } } @@ -90,7 +90,7 @@ private static void initializeMonitors() { selectedMonitorIndex = 0; } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Fallback to GLFW if OSHI fails initializeMonitorsWithGLFW(); } @@ -119,7 +119,7 @@ private static void initializeMonitorsWithGLFW() { } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Final fallback availableMonitors.add("Primary"); monitorHandles.add(0L); @@ -179,7 +179,7 @@ private static void initializeMonitorsWithGLFW() { // Also inject video tooltips into the final blocks injectVideoTooltips(finalBlocks); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Log error but continue with original blocks if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to inject monitor selection into video options: {}", e.getMessage()); @@ -209,7 +209,7 @@ private static boolean containsResolutionOption(net.vulkanmod.config.gui.OptionB } return false; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to check block for resolution options: {}", e.getMessage()); } @@ -244,7 +244,7 @@ private static net.vulkanmod.config.gui.OptionBlock addMonitorSelectionToBlock(n newOptions.toArray(new Option[0]) ); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to add monitor selection to existing block: {}", e.getMessage()); } @@ -283,14 +283,14 @@ private static Option createMonitorSelectionOption() { try { Text tooltip = Text.translatable("vulkanmod-extra.option.video.monitorSelection.tooltip"); monitorOption.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue if tooltip fails } } return monitorOption; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create monitor selection option: {}", e.getMessage()); } @@ -331,7 +331,7 @@ private static net.vulkanmod.config.gui.OptionBlock createMonitorSelectionBlock( try { Text tooltip = Text.translatable("vulkanmod.options.video.monitor_selection.tooltip"); monitorOption.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue if tooltip fails } } @@ -343,7 +343,7 @@ private static net.vulkanmod.config.gui.OptionBlock createMonitorSelectionBlock( options.toArray(new Option[0]) ); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create monitor selection block: {}", e.getMessage()); } @@ -390,7 +390,7 @@ private static Option createCyclingOption(Text name, String[] values, return option; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create cycling option: {}", e.getMessage()); } @@ -431,21 +431,21 @@ private static void updateVideoModesForSelectedMonitor() { java.lang.reflect.Field selectedVideoModeField = VideoModeManager.class.getDeclaredField("selectedVideoMode"); selectedVideoModeField.setAccessible(true); selectedVideoModeField.set(null, currentMode); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update selected video mode: {}", e.getMessage()); } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update video mode sets: {}", e.getMessage()); } } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update video modes for selected monitor: {}", e.getMessage()); } @@ -532,7 +532,7 @@ private static void injectVideoTooltips(net.vulkanmod.config.gui.OptionBlock[] b } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue on failure } } @@ -562,14 +562,14 @@ private static void injectTooltipsIntoBlock(net.vulkanmod.config.gui.OptionBlock try { Text tooltip = Text.translatable(tooltipKey); option.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue on failure } } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.warn("Failed to inject tooltips into option block", e); } diff --git a/fabric-1.21.3/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java b/fabric-1.21.3/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java index 4bd653e..e919a0a 100644 --- a/fabric-1.21.3/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java +++ b/fabric-1.21.3/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java @@ -71,7 +71,7 @@ private static void initializeMonitors() { } else { monitorHandles.add(0L); // Fallback to primary } - } catch (Exception e) { + } catch (Exception | LinkageError e) { monitorHandles.add(0L); // Fallback to primary } } @@ -90,7 +90,7 @@ private static void initializeMonitors() { selectedMonitorIndex = 0; } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Fallback to GLFW if OSHI fails initializeMonitorsWithGLFW(); } @@ -119,7 +119,7 @@ private static void initializeMonitorsWithGLFW() { } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Final fallback availableMonitors.add("Primary"); monitorHandles.add(0L); @@ -179,7 +179,7 @@ private static void initializeMonitorsWithGLFW() { // Also inject video tooltips into the final blocks injectVideoTooltips(finalBlocks); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Log error but continue with original blocks if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to inject monitor selection into video options: {}", e.getMessage()); @@ -209,7 +209,7 @@ private static boolean containsResolutionOption(net.vulkanmod.config.gui.OptionB } return false; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to check block for resolution options: {}", e.getMessage()); } @@ -244,7 +244,7 @@ private static net.vulkanmod.config.gui.OptionBlock addMonitorSelectionToBlock(n newOptions.toArray(new Option[0]) ); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to add monitor selection to existing block: {}", e.getMessage()); } @@ -283,14 +283,14 @@ private static Option createMonitorSelectionOption() { try { Text tooltip = Text.translatable("vulkanmod-extra.option.video.monitorSelection.tooltip"); monitorOption.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue if tooltip fails } } return monitorOption; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create monitor selection option: {}", e.getMessage()); } @@ -331,7 +331,7 @@ private static net.vulkanmod.config.gui.OptionBlock createMonitorSelectionBlock( try { Text tooltip = Text.translatable("vulkanmod.options.video.monitor_selection.tooltip"); monitorOption.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue if tooltip fails } } @@ -343,7 +343,7 @@ private static net.vulkanmod.config.gui.OptionBlock createMonitorSelectionBlock( options.toArray(new Option[0]) ); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create monitor selection block: {}", e.getMessage()); } @@ -390,7 +390,7 @@ private static Option createCyclingOption(Text name, String[] values, return option; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create cycling option: {}", e.getMessage()); } @@ -431,21 +431,21 @@ private static void updateVideoModesForSelectedMonitor() { java.lang.reflect.Field selectedVideoModeField = VideoModeManager.class.getDeclaredField("selectedVideoMode"); selectedVideoModeField.setAccessible(true); selectedVideoModeField.set(null, currentMode); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update selected video mode: {}", e.getMessage()); } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update video mode sets: {}", e.getMessage()); } } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update video modes for selected monitor: {}", e.getMessage()); } @@ -532,7 +532,7 @@ private static void injectVideoTooltips(net.vulkanmod.config.gui.OptionBlock[] b } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue on failure } } @@ -562,14 +562,14 @@ private static void injectTooltipsIntoBlock(net.vulkanmod.config.gui.OptionBlock try { Text tooltip = Text.translatable(tooltipKey); option.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue on failure } } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.warn("Failed to inject tooltips into option block", e); } diff --git a/fabric-1.21.4/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java b/fabric-1.21.4/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java index 4bd653e..e919a0a 100644 --- a/fabric-1.21.4/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java +++ b/fabric-1.21.4/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java @@ -71,7 +71,7 @@ private static void initializeMonitors() { } else { monitorHandles.add(0L); // Fallback to primary } - } catch (Exception e) { + } catch (Exception | LinkageError e) { monitorHandles.add(0L); // Fallback to primary } } @@ -90,7 +90,7 @@ private static void initializeMonitors() { selectedMonitorIndex = 0; } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Fallback to GLFW if OSHI fails initializeMonitorsWithGLFW(); } @@ -119,7 +119,7 @@ private static void initializeMonitorsWithGLFW() { } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Final fallback availableMonitors.add("Primary"); monitorHandles.add(0L); @@ -179,7 +179,7 @@ private static void initializeMonitorsWithGLFW() { // Also inject video tooltips into the final blocks injectVideoTooltips(finalBlocks); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Log error but continue with original blocks if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to inject monitor selection into video options: {}", e.getMessage()); @@ -209,7 +209,7 @@ private static boolean containsResolutionOption(net.vulkanmod.config.gui.OptionB } return false; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to check block for resolution options: {}", e.getMessage()); } @@ -244,7 +244,7 @@ private static net.vulkanmod.config.gui.OptionBlock addMonitorSelectionToBlock(n newOptions.toArray(new Option[0]) ); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to add monitor selection to existing block: {}", e.getMessage()); } @@ -283,14 +283,14 @@ private static Option createMonitorSelectionOption() { try { Text tooltip = Text.translatable("vulkanmod-extra.option.video.monitorSelection.tooltip"); monitorOption.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue if tooltip fails } } return monitorOption; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create monitor selection option: {}", e.getMessage()); } @@ -331,7 +331,7 @@ private static net.vulkanmod.config.gui.OptionBlock createMonitorSelectionBlock( try { Text tooltip = Text.translatable("vulkanmod.options.video.monitor_selection.tooltip"); monitorOption.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue if tooltip fails } } @@ -343,7 +343,7 @@ private static net.vulkanmod.config.gui.OptionBlock createMonitorSelectionBlock( options.toArray(new Option[0]) ); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create monitor selection block: {}", e.getMessage()); } @@ -390,7 +390,7 @@ private static Option createCyclingOption(Text name, String[] values, return option; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create cycling option: {}", e.getMessage()); } @@ -431,21 +431,21 @@ private static void updateVideoModesForSelectedMonitor() { java.lang.reflect.Field selectedVideoModeField = VideoModeManager.class.getDeclaredField("selectedVideoMode"); selectedVideoModeField.setAccessible(true); selectedVideoModeField.set(null, currentMode); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update selected video mode: {}", e.getMessage()); } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update video mode sets: {}", e.getMessage()); } } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update video modes for selected monitor: {}", e.getMessage()); } @@ -532,7 +532,7 @@ private static void injectVideoTooltips(net.vulkanmod.config.gui.OptionBlock[] b } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue on failure } } @@ -562,14 +562,14 @@ private static void injectTooltipsIntoBlock(net.vulkanmod.config.gui.OptionBlock try { Text tooltip = Text.translatable(tooltipKey); option.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue on failure } } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.warn("Failed to inject tooltips into option block", e); } diff --git a/fabric-1.21.5/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java b/fabric-1.21.5/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java index 4bd653e..e919a0a 100644 --- a/fabric-1.21.5/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java +++ b/fabric-1.21.5/src/main/java/com/criticalrange/mixins/vulkanmod/MixinVulkanModMonitorSelection.java @@ -71,7 +71,7 @@ private static void initializeMonitors() { } else { monitorHandles.add(0L); // Fallback to primary } - } catch (Exception e) { + } catch (Exception | LinkageError e) { monitorHandles.add(0L); // Fallback to primary } } @@ -90,7 +90,7 @@ private static void initializeMonitors() { selectedMonitorIndex = 0; } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Fallback to GLFW if OSHI fails initializeMonitorsWithGLFW(); } @@ -119,7 +119,7 @@ private static void initializeMonitorsWithGLFW() { } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Final fallback availableMonitors.add("Primary"); monitorHandles.add(0L); @@ -179,7 +179,7 @@ private static void initializeMonitorsWithGLFW() { // Also inject video tooltips into the final blocks injectVideoTooltips(finalBlocks); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Log error but continue with original blocks if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to inject monitor selection into video options: {}", e.getMessage()); @@ -209,7 +209,7 @@ private static boolean containsResolutionOption(net.vulkanmod.config.gui.OptionB } return false; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to check block for resolution options: {}", e.getMessage()); } @@ -244,7 +244,7 @@ private static net.vulkanmod.config.gui.OptionBlock addMonitorSelectionToBlock(n newOptions.toArray(new Option[0]) ); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to add monitor selection to existing block: {}", e.getMessage()); } @@ -283,14 +283,14 @@ private static Option createMonitorSelectionOption() { try { Text tooltip = Text.translatable("vulkanmod-extra.option.video.monitorSelection.tooltip"); monitorOption.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue if tooltip fails } } return monitorOption; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create monitor selection option: {}", e.getMessage()); } @@ -331,7 +331,7 @@ private static net.vulkanmod.config.gui.OptionBlock createMonitorSelectionBlock( try { Text tooltip = Text.translatable("vulkanmod.options.video.monitor_selection.tooltip"); monitorOption.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue if tooltip fails } } @@ -343,7 +343,7 @@ private static net.vulkanmod.config.gui.OptionBlock createMonitorSelectionBlock( options.toArray(new Option[0]) ); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create monitor selection block: {}", e.getMessage()); } @@ -390,7 +390,7 @@ private static Option createCyclingOption(Text name, String[] values, return option; - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to create cycling option: {}", e.getMessage()); } @@ -431,21 +431,21 @@ private static void updateVideoModesForSelectedMonitor() { java.lang.reflect.Field selectedVideoModeField = VideoModeManager.class.getDeclaredField("selectedVideoMode"); selectedVideoModeField.setAccessible(true); selectedVideoModeField.set(null, currentMode); - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update selected video mode: {}", e.getMessage()); } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update video mode sets: {}", e.getMessage()); } } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.error("Failed to update video modes for selected monitor: {}", e.getMessage()); } @@ -532,7 +532,7 @@ private static void injectVideoTooltips(net.vulkanmod.config.gui.OptionBlock[] b } - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue on failure } } @@ -562,14 +562,14 @@ private static void injectTooltipsIntoBlock(net.vulkanmod.config.gui.OptionBlock try { Text tooltip = Text.translatable(tooltipKey); option.setTooltip(tooltip); - } catch (Exception e) { + } catch (Exception | LinkageError e) { // Silently continue on failure } } } } - } catch (Exception e) { + } catch (Exception | LinkageError e) { if (com.criticalrange.VulkanModExtra.LOGGER != null) { com.criticalrange.VulkanModExtra.LOGGER.warn("Failed to inject tooltips into option block", e); }