From 0c48d6a1dd53b1bc4a2d1b258433840cecc5649c Mon Sep 17 00:00:00 2001 From: johni0702 Date: Fri, 11 Nov 2016 17:58:41 +0100 Subject: [PATCH 1/2] 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(); } } - } From 682fb4bfdcd1ca97ea775ab9da75f78b32b07fd9 Mon Sep 17 00:00:00 2001 From: johni0702 Date: Fri, 11 Nov 2016 18:03:09 +0100 Subject: [PATCH 2/2] Download OpenEye via http because of outdated java versions The Java version shipped with the default Minecraft launcher for Windows and OSX, is quite old and does not contain the necessary root certificates for properly accepting LetsEncrypt's certificates. This can be reversed once the Minecraft launcher ships at least 1.8.0_101. --- src/main/java/com/replaymod/extras/OpenEyeExtra.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/replaymod/extras/OpenEyeExtra.java b/src/main/java/com/replaymod/extras/OpenEyeExtra.java index 600db9ad..e198a826 100644 --- a/src/main/java/com/replaymod/extras/OpenEyeExtra.java +++ b/src/main/java/com/replaymod/extras/OpenEyeExtra.java @@ -25,7 +25,7 @@ import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; public class OpenEyeExtra implements Extra { - private static final String DOWNLOAD_URL = "https://www.replaymod.com/dl/openeye/" + Loader.MC_VERSION; + private static final String DOWNLOAD_URL = "http://www.replaymod.com/dl/openeye/" + Loader.MC_VERSION; private static final Setting ASK_FOR_OPEN_EYE = new Setting<>("advanced", "askForOpenEye", null, true); private ReplayMod mod;