From 3ba38b602ae4cc93f817ef36a9a1f02e77e70cfc Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 7 May 2023 13:57:52 -0400 Subject: [PATCH 1/2] Remove nonexistent mixin configs --- .../embeddedt/modernfix/core/config/ModernFixEarlyConfig.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java index 28733531..70e3833a 100644 --- a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java +++ b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java @@ -139,15 +139,12 @@ public class ModernFixEarlyConfig { private static final ImmutableMap DEFAULT_SETTING_OVERRIDES = ImmutableMap.builder() .put("mixin.perf.dynamic_resources", false) - .put("mixin.feature.reduce_loading_screen_freezes", false) .put("mixin.feature.direct_stack_trace", false) .put("mixin.perf.rewrite_registry", false) .put("mixin.perf.clear_mixin_classinfo", false) .put("mixin.perf.compress_blockstate", false) .put("mixin.bugfix.packet_leak", false) .put("mixin.perf.deduplicate_location", false) - .put("mixin.perf.preload_block_classes", false) - .put("mixin.perf.faster_singleplayer_load", false) .put("mixin.perf.blast_search_trees", shouldReplaceSearchTrees) .put("mixin.devenv", isDevEnv) .put("mixin.perf.remove_spawn_chunks", isDevEnv) From 65e12016b60524ee00aeca10fafebe1cfead4842 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 7 May 2023 14:07:17 -0400 Subject: [PATCH 2/2] Add config for integrated server watchdog --- .../src/main/java/org/embeddedt/modernfix/ModernFixClient.java | 2 ++ .../embeddedt/modernfix/core/config/ModernFixEarlyConfig.java | 1 + 2 files changed, 3 insertions(+) diff --git a/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java b/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java index 3c1cf8be..bf15ca24 100644 --- a/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java +++ b/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java @@ -173,6 +173,8 @@ public class ModernFixClient { } public void onServerStarted(MinecraftServer server) { + if(!ModernFixMixinPlugin.instance.isOptionEnabled("feature.integrated_server_watchdog.IntegratedWatchdog")) + return; IntegratedWatchdog watchdog = new IntegratedWatchdog(server); watchdog.start(); } diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java index 70e3833a..d37bbdb5 100644 --- a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java +++ b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java @@ -145,6 +145,7 @@ public class ModernFixEarlyConfig { .put("mixin.perf.compress_blockstate", false) .put("mixin.bugfix.packet_leak", false) .put("mixin.perf.deduplicate_location", false) + .put("mixin.feature.integrated_server_watchdog", true) .put("mixin.perf.blast_search_trees", shouldReplaceSearchTrees) .put("mixin.devenv", isDevEnv) .put("mixin.perf.remove_spawn_chunks", isDevEnv)