From 80617c24f1cd6c7280cb50966f26a703410fa190 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Mon, 22 May 2023 13:25:14 -0400
Subject: [PATCH] Work around KeyMapping names being retrieved off-thread

---
 .../mixin/perf/blast_search_trees/MinecraftMixin.java       | 6 ++++++
 common/src/main/resources/modernfix.accesswidener           | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java
index d28c2fc0..73f6a358 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java
@@ -1,5 +1,6 @@
 package org.embeddedt.modernfix.common.mixin.perf.blast_search_trees;
 
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.searchtree.SearchRegistry;
 import org.embeddedt.modernfix.ModernFix;
@@ -27,6 +28,11 @@ public class MinecraftMixin {
         this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, provider.getSearchTree(false));
         this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, provider.getSearchTree(true));
         this.searchRegistry.register(SearchRegistry.RECIPE_COLLECTIONS, new DummySearchTree<>());
+        // grab components for all key mappings in order to prevent them from being loaded off-thread later
+        // this populates the LazyLoadedValues
+        for(KeyMapping mapping : KeyMapping.ALL.values()) {
+            mapping.getTranslatedKeyMessage();
+        }
         ci.cancel();
     }
 }
diff --git a/common/src/main/resources/modernfix.accesswidener b/common/src/main/resources/modernfix.accesswidener
index 459f6b00..6f44fc25 100644
--- a/common/src/main/resources/modernfix.accesswidener
+++ b/common/src/main/resources/modernfix.accesswidener
@@ -28,4 +28,5 @@ accessible class net/minecraft/server/level/ChunkMap$DistanceManager
 accessible class net/minecraft/world/level/chunk/PalettedContainer$Data
 accessible field net/minecraft/server/MinecraftServer resources Lnet/minecraft/server/MinecraftServer$ReloadableResources;
 accessible class net/minecraft/server/MinecraftServer$ReloadableResources
-accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
\ No newline at end of file
+accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
+accessible field net/minecraft/client/KeyMapping ALL Ljava/util/Map;
\ No newline at end of file