From a0813e5f22028464f667af012570694fc57f9327 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 19 Oct 2017 08:49:18 -0500 Subject: [PATCH] Fix shaders loading twice on startup --- .../vazkii/botania/client/core/helper/ShaderHelper.java | 6 +++--- .../java/vazkii/botania/client/core/proxy/ClientProxy.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) 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 cadc9a801..a057b8585 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -58,7 +58,7 @@ public final class ShaderHelper { } } - public static void registerReloadListener() { + public static void initShaders() { if (Minecraft.getMinecraft().getResourceManager() instanceof SimpleReloadableResourceManager) { ((SimpleReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(manager -> { deleteShader(pylonGlow); pylonGlow = 0; @@ -73,12 +73,12 @@ public final class ShaderHelper { deleteShader(categoryButton); categoryButton = 0; deleteShader(alpha); alpha = 0; - initShaders(); + loadShaders(); }); } } - public static void initShaders() { + private static void loadShaders() { if(!useShaders()) return; 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 2be30a12e..87224b990 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -242,8 +242,7 @@ public class ClientProxy implements IProxy { RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.manaResource, Minecraft.getMinecraft().getRenderItem(), entity -> new ItemStack(ModItems.manaResource, 1, 15))); ShaderHelper.initShaders(); - ShaderHelper.registerReloadListener(); - + IMultiblockRenderHook.renderHooks.put(ModBlocks.pylon, renderTilePylon); }