From 0754cf55ebced12c23961267a4e27ade7b6f4453 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 7 Aug 2023 14:18:55 +0700 Subject: [PATCH] Don't throw actual exception when custom tex color shader fails to load --- .../ru/dbotthepony/mc/otm/client/render/RenderHelper.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderHelper.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderHelper.kt index 7421ec99f..b64a244e0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderHelper.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderHelper.kt @@ -12,6 +12,7 @@ import net.minecraft.client.renderer.ShaderInstance import net.minecraft.client.renderer.texture.TextureAtlasSprite import net.minecraft.resources.ResourceLocation import net.minecraft.server.packs.resources.ResourceProvider +import org.apache.logging.log4j.LogManager import org.joml.Matrix4f import org.lwjgl.opengl.GL11.GL_ALWAYS import org.lwjgl.opengl.GL11.GL_LESS @@ -39,11 +40,16 @@ var lockBlendFunc = false private val defaultUV = UVCoords(0f, 0f, 1f, 1f) +private val LOGGER = LogManager.getLogger() var customTexColorShader: ShaderInstance by Delegates.notNull() private set fun reloadShaders(provider: ResourceProvider) { - customTexColorShader = ShaderInstance(provider, ResourceLocation(OverdriveThatMatters.MOD_ID, "position_tex_color"), DefaultVertexFormat.POSITION_TEX_COLOR) + try { + customTexColorShader = ShaderInstance(provider, ResourceLocation(OverdriveThatMatters.MOD_ID, "position_tex_color"), DefaultVertexFormat.POSITION_TEX_COLOR) + } catch (err: Throwable) { + LOGGER.error("Failed to load custom tex color shader, this gonna result in uninitialized property exception later", err) + } } fun renderRect(