From bf79be5210935c90949ad5d6cf8974cd69852b70 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 27 Sep 2019 12:02:09 -0500 Subject: [PATCH] 'Fix' shader loading --- .../java/vazkii/botania/client/core/helper/ShaderHelper.java | 1 + .../java/vazkii/botania/client/core/proxy/ClientProxy.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index 7b346627a..197e3ff5b 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -64,6 +64,7 @@ public final class ShaderHelper { } } + @SuppressWarnings("deprecation") public static void initShaders() { if (Minecraft.getInstance().getResourceManager() instanceof IReloadableResourceManager) { ((IReloadableResourceManager) Minecraft.getInstance().getResourceManager()).addReloadListener( diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 58c3e5048..789187515 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -108,6 +108,9 @@ public class ClientProxy implements IProxy { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetup); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete); FMLJavaModLoadingContext.get().getModEventBus().register(MiscellaneousIcons.INSTANCE); + // This is the only place it works, but mods are constructed in parallel (brilliant idea) so this + // *could* end up blowing up if it races with someone else. Let's pray that doesn't happen. + ShaderHelper.initShaders(); } private void clientSetup(FMLClientSetupEvent event) { @@ -140,7 +143,6 @@ public class ClientProxy implements IProxy { private void loadComplete(FMLLoadCompleteEvent event) { DeferredWorkQueue.runLater(() -> { - ShaderHelper.initShaders(); initAuxiliaryRender(); ColorHandler.init(); });