Skip to content

Commit aae4db7

Browse files
committed
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2 parents 61eca64 + 80617c2 commit aae4db7

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.embeddedt.modernfix.common.mixin.perf.blast_search_trees;
22

3+
import net.minecraft.client.KeyMapping;
34
import net.minecraft.client.Minecraft;
45
import net.minecraft.client.searchtree.SearchRegistry;
56
import org.embeddedt.modernfix.ModernFix;
@@ -27,6 +28,11 @@ private void replaceSearchTrees(CallbackInfo ci) {
2728
this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, list -> provider.getSearchTree(false));
2829
this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, list -> provider.getSearchTree(true));
2930
this.searchRegistry.register(SearchRegistry.RECIPE_COLLECTIONS, list -> new DummySearchTree<>());
31+
// grab components for all key mappings in order to prevent them from being loaded off-thread later
32+
// this populates the LazyLoadedValues
33+
for(KeyMapping mapping : KeyMapping.ALL.values()) {
34+
mapping.getTranslatedKeyMessage();
35+
}
3036
ci.cancel();
3137
}
3238
}

common/src/main/resources/modernfix.accesswidener

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ accessible method net/minecraft/client/gui/screens/worldselection/WorldGenSettin
2828
accessible class net/minecraft/world/level/chunk/PalettedContainer$Data
2929
accessible field net/minecraft/server/MinecraftServer resources Lnet/minecraft/server/MinecraftServer$ReloadableResources;
3030
accessible class net/minecraft/server/MinecraftServer$ReloadableResources
31-
accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
31+
accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
32+
accessible field net/minecraft/client/KeyMapping ALL Ljava/util/Map;

0 commit comments

Comments
 (0)