From 0c48d6a1dd53b1bc4a2d1b258433840cecc5649c Mon Sep 17 00:00:00 2001 From: johni0702 Date: Fri, 11 Nov 2016 17:58:41 +0100 Subject: [PATCH] Make ShaderReflection init fail fast, not printing out unneeded exceptions --- .../compat/shaders/ShaderReflection.java | 53 +------------------ 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/replaymod/compat/shaders/ShaderReflection.java b/src/main/java/com/replaymod/compat/shaders/ShaderReflection.java index 55d785b2..63b07ebf 100644 --- a/src/main/java/com/replaymod/compat/shaders/ShaderReflection.java +++ b/src/main/java/com/replaymod/compat/shaders/ShaderReflection.java @@ -23,80 +23,31 @@ public class ShaderReflection { public static Method config_isShaders; static { - initFrameTimeCounter(); - - initIsShadowPass(); - - initBeginRender(); - - initChunksToUpdateForced(); - - initConfigIsShaders(); - } - - private static void initFrameTimeCounter() { try { shaders_frameTimeCounter = Class.forName("shadersmod.client.Shaders") .getDeclaredField("frameTimeCounter"); shaders_frameTimeCounter.setAccessible(true); - } catch (ClassNotFoundException ignore) { - // no shaders mod installed - } catch (NoSuchFieldException e) { - // the field wasn't found. Has it been renamed? - e.printStackTrace(); - } - } - private static void initIsShadowPass() { - try { shaders_isShadowPass = Class.forName("shadersmod.client.Shaders") .getDeclaredField("isShadowPass"); shaders_isShadowPass.setAccessible(true); - } catch (ClassNotFoundException ignore) { - // no shaders mod installed - } catch (NoSuchFieldException e) { - // the field wasn't found. Has it been renamed? - e.printStackTrace(); - } - } - private static void initBeginRender() { - try { shaders_beginRender = Class.forName("shadersmod.client.Shaders") .getDeclaredMethod("beginRender", Minecraft.class, float.class, long.class); - shaders_frameTimeCounter.setAccessible(true); - } catch (ClassNotFoundException ignore) { - // no shaders mod installed - } catch (NoSuchMethodException e) { - // the method wasn't found. Has it been renamed? - e.printStackTrace(); - } - } + shaders_beginRender.setAccessible(true); - private static void initChunksToUpdateForced() { - try { renderGlobal_chunksToUpdateForced = Class.forName("net.minecraft.client.renderer.RenderGlobal") .getDeclaredField("chunksToUpdateForced"); renderGlobal_chunksToUpdateForced.setAccessible(true); - } catch (ClassNotFoundException ignore) { - // no shaders mod installed - } catch (NoSuchFieldException e) { - // the field wasn't found. Has it been renamed? - e.printStackTrace(); - } - } - private static void initConfigIsShaders() { - try { config_isShaders = Class.forName("Config") .getDeclaredMethod("isShaders"); config_isShaders.setAccessible(true); } catch (ClassNotFoundException ignore) { // no shaders mod installed - } catch (NoSuchMethodException e) { + } catch (NoSuchMethodException | NoSuchFieldException e) { // the method wasn't found. Has it been renamed? e.printStackTrace(); } } - }