Skip to content

Commit f7120c0

Browse files
committed
(neo)forge: run setup on main thread
(cherry picked from commit 6837e25)
1 parent fb80237 commit f7120c0

File tree

4 files changed

+42
-22
lines changed

4 files changed

+42
-22
lines changed

platform/forge/src/main/java/mcp/mobius/waila/forge/ForgeWaila.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,24 @@ public class ForgeWaila extends Waila {
2525

2626
@SubscribeEvent
2727
static void setup(FMLCommonSetupEvent event) {
28-
Packets.initServer();
28+
event.enqueueWork(() -> {
29+
Packets.initServer();
2930

30-
var mods = new String[]{"minecraft", "forge", "wthit", "jei"};
31-
for (var mod : mods) {
32-
ModList.get().getModContainerById(mod)
33-
.map(ModContainer::getModInfo)
34-
.ifPresent(m -> DumpGenerator.VERSIONS.put(m.getDisplayName(), m.getVersion().toString()));
35-
}
31+
var mods = new String[]{"minecraft", "forge", "wthit", "jei"};
32+
for (var mod : mods) {
33+
ModList.get().getModContainerById(mod)
34+
.map(ModContainer::getModInfo)
35+
.ifPresent(m -> DumpGenerator.VERSIONS.put(m.getDisplayName(), m.getVersion().toString()));
36+
}
37+
});
3638
}
3739

3840
@SubscribeEvent
41+
@SuppressWarnings("Convert2MethodRef")
3942
static void loadComplete(FMLLoadCompleteEvent event) {
40-
PluginLoader.INSTANCE.loadPlugins();
43+
event.enqueueWork(() -> {
44+
PluginLoader.INSTANCE.loadPlugins();
45+
});
4146
}
4247

4348
@EventBusSubscriber(modid = WailaConstants.WAILA)

platform/forge/src/main/java/mcp/mobius/waila/forge/ForgeWailaClient.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ public class ForgeWailaClient extends WailaClient {
2424

2525
@SubscribeEvent
2626
static void clientSetup(FMLClientSetupEvent event) {
27-
Packets.initClient();
28-
registerConfigScreen();
27+
event.enqueueWork(() -> {
28+
Packets.initClient();
29+
registerConfigScreen();
30+
});
2931
}
3032

3133
@SubscribeEvent
@@ -74,8 +76,11 @@ static void loggingOut(ClientPlayerNetworkEvent.LoggingOut event) {
7476
public static class HahaBorgeGoBrrrr {
7577

7678
@SubscribeEvent
79+
@SuppressWarnings("Convert2MethodRef")
7780
static void clientSetup(FMLClientSetupEvent event) {
78-
registerConfigScreen();
81+
event.enqueueWork(() -> {
82+
registerConfigScreen();
83+
});
7984
}
8085

8186
}

platform/neo/src/main/java/mcp/mobius/waila/neo/NeoWaila.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,24 @@ public class NeoWaila extends Waila {
2424

2525
@SubscribeEvent
2626
static void setup(FMLCommonSetupEvent event) {
27-
Packets.initServer();
27+
event.enqueueWork(() -> {
28+
Packets.initServer();
2829

29-
var mods = new String[]{"minecraft", "forge", "wthit", "jei"};
30-
for (var mod : mods) {
31-
ModList.get().getModContainerById(mod)
32-
.map(ModContainer::getModInfo)
33-
.ifPresent(m -> DumpGenerator.VERSIONS.put(m.getDisplayName(), m.getVersion().toString()));
34-
}
30+
var mods = new String[]{"minecraft", "forge", "wthit", "jei"};
31+
for (var mod : mods) {
32+
ModList.get().getModContainerById(mod)
33+
.map(ModContainer::getModInfo)
34+
.ifPresent(m -> DumpGenerator.VERSIONS.put(m.getDisplayName(), m.getVersion().toString()));
35+
}
36+
});
3537
}
3638

3739
@SubscribeEvent
40+
@SuppressWarnings("Convert2MethodRef")
3841
static void loadComplete(FMLLoadCompleteEvent event) {
39-
PluginLoader.INSTANCE.loadPlugins();
42+
event.enqueueWork(() -> {
43+
PluginLoader.INSTANCE.loadPlugins();
44+
});
4045
}
4146

4247
@EventBusSubscriber(modid = WailaConstants.WAILA)

platform/neo/src/main/java/mcp/mobius/waila/neo/NeoWailaClient.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ public class NeoWailaClient extends WailaClient {
2525

2626
@SubscribeEvent
2727
static void clientSetup(FMLClientSetupEvent event) {
28-
Packets.initClient();
29-
registerConfigScreen();
28+
event.enqueueWork(() -> {
29+
Packets.initClient();
30+
registerConfigScreen();
31+
});
3032
}
3133

3234
@SubscribeEvent
@@ -74,8 +76,11 @@ static void loggingOut(ClientPlayerNetworkEvent.LoggingOut event) {
7476
public static class HahaBorgeGoBrrrr {
7577

7678
@SubscribeEvent
79+
@SuppressWarnings("Convert2MethodRef")
7780
static void clientSetup(FMLClientSetupEvent event) {
78-
registerConfigScreen();
81+
event.enqueueWork(() -> {
82+
registerConfigScreen();
83+
});
7984
}
8085

8186
}

0 commit comments

Comments
 (0)