Tweak narrator mixin

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/NarratorMixin.java

@@ -1,5 +1,7 @@
 package org.embeddedt.modernfix.common.mixin.feature.suppress_narrator_stacktrace;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.mojang.text2speech.Narrator;
 import com.mojang.text2speech.NarratorLinux;
 import com.mojang.text2speech.OperatingSystem;
@@ -8,17 +10,16 @@
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @ClientOnlyMixin
 @Mixin(GameNarrator.class)
 public class GameNarratorMixin {
-    @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/text2speech/Narrator;getNarrator()Lcom/mojang/text2speech/Narrator;"))
-    private Narrator suppressStacktracePrinting() {
+    @WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/text2speech/Narrator;getNarrator()Lcom/mojang/text2speech/Narrator;"))
+    private Narrator suppressStacktracePrinting(Operation<Narrator> original) {
         try {
             return switch (OperatingSystem.get()) {
                 case LINUX -> new NarratorLinux();
-                default -> Narrator.getNarrator();
+                default -> original.call();
             };
         } catch (Narrator.InitializeException e) {
             ModernFix.LOGGER.warn("Failed to initialize Linux Narrator. Make sure you have libflite installed!");

common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/suppress_narrator_stacktrace/GameNarratorMixin.java

@@ -187,7 +187,6 @@ public DefaultSettingMapBuilder put(String key, Boolean value) {
             .put("mixin.feature.log_stdout_in_log_files", true)
             .put("mixin.devenv", isDevEnv)
             .put("mixin.perf.remove_spawn_chunks", isDevEnv)
-            .put("mixin.feature.suppress_narrator_stacktrace", !isDevEnv) // Not compatible with mixin.devenv
             .putConditionally(() -> !isFabric, "mixin.bugfix.fix_config_crashes", true)
             .putConditionally(() -> !isFabric, "mixin.bugfix.forge_at_inject_error", true)
             .putConditionally(() -> !isFabric, "mixin.feature.registry_event_progress", false)