From 8112c852ef305c5a4983737d616752525014f0bc Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Fri, 14 Jun 2019 19:37:27 +0200 Subject: [PATCH] [1.14] Fix NPE in FullBrightness Turns out fabric's init runs earlier than forge so mc.options is still null. Instead we just store mc and access the options when needed (thanks to the preprocessor that's even shorter than before). --- .../java/com/replaymod/extras/FullBrightness.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/replaymod/extras/FullBrightness.java b/src/main/java/com/replaymod/extras/FullBrightness.java index 351c5fbc..088e4bfb 100644 --- a/src/main/java/com/replaymod/extras/FullBrightness.java +++ b/src/main/java/com/replaymod/extras/FullBrightness.java @@ -10,7 +10,7 @@ import de.johni0702.minecraft.gui.element.GuiImage; import de.johni0702.minecraft.gui.element.IGuiImage; import de.johni0702.minecraft.gui.layout.HorizontalLayout; import de.johni0702.minecraft.gui.utils.EventRegistrations; -import net.minecraft.client.options.GameOptions; +import net.minecraft.client.MinecraftClient; //#if MC>=11400 import com.replaymod.core.events.PreRenderCallback; @@ -25,7 +25,7 @@ public class FullBrightness extends EventRegistrations implements Extra { private final IGuiImage indicator = new GuiImage().setTexture(ReplayMod.TEXTURE, 90, 20, 19, 13).setSize(19, 13); - private GameOptions gameSettings; + private MinecraftClient mc; private boolean active; //#if MC>=11300 private double originalGamma; @@ -36,7 +36,7 @@ public class FullBrightness extends EventRegistrations implements Extra { @Override public void register(final ReplayMod mod) throws Exception { this.module = ReplayModReplay.instance; - this.gameSettings = mod.getMinecraft().options; + this.mc = mod.getMinecraft(); mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.lighting", Keyboard.KEY_Z, new Runnable() { @Override @@ -67,8 +67,8 @@ public class FullBrightness extends EventRegistrations implements Extra { //$$ if (event.phase != TickEvent.Phase.START) return; //#endif if (active && module.getReplayHandler() != null) { - originalGamma = gameSettings.gamma; - gameSettings.gamma = 1000; + originalGamma = mc.options.gamma; + mc.options.gamma = 1000; } } @@ -81,7 +81,7 @@ public class FullBrightness extends EventRegistrations implements Extra { //$$ if (event.phase != TickEvent.Phase.END) return; //#endif if (active && module.getReplayHandler() != null) { - gameSettings.gamma = originalGamma; + mc.options.gamma = originalGamma; } }