Improve keyboard handling

V: Toggle world rendering
F: Switch between vanilla renderer and my renderer
Only accept keyboard presses if no gui is active

2 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/makamys/lodmod/mixin/MixinRenderGlobal.java b/src/main/java/makamys/lodmod/mixin/MixinRenderGlobal.java
index e03bc95..18f2177 100644
--- a/src/main/java/makamys/lodmod/mixin/MixinRenderGlobal.java
+++ b/src/main/java/makamys/lodmod/mixin/MixinRenderGlobal.java
@@ -26,7 +26,7 @@ abstract class MixinRenderGlobal {
     
     @Redirect(method = "renderSortedRenderers", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderGlobal;renderAllRenderLists(ID)V"))
     private void redirectRenderAllRenderLists(RenderGlobal thiz, int p1, double p2) {
-        if(!LODMod.isActive() || (LODMod.isActive() && LODMod.renderer.renderWorld)) {
+        if(LODMod.shouldRenderVanillaWorld()) {
             thiz.renderAllRenderLists(p1, p2);
         }
     }
diff --git a/src/main/java/makamys/lodmod/mixin/MixinRenderGlobal_OptiFine.java b/src/main/java/makamys/lodmod/mixin/MixinRenderGlobal_OptiFine.java
index 3ce0c4c..521bf1a 100644
--- a/src/main/java/makamys/lodmod/mixin/MixinRenderGlobal_OptiFine.java
+++ b/src/main/java/makamys/lodmod/mixin/MixinRenderGlobal_OptiFine.java
@@ -17,7 +17,7 @@ abstract class MixinRenderGlobal_OptiFine {
     // for OptiFine's Fast Render option
     @Redirect(method = "renderSortedRenderersFast", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glCallLists(Ljava/nio/IntBuffer;)V"), remap=false)
     private void redirectRenderAllRenderLists(IntBuffer buffer) {
-        if(!LODMod.isActive() || (LODMod.isActive() && LODMod.renderer.renderWorld)) {
+        if(LODMod.shouldRenderVanillaWorld()) {
             GL11.glCallLists(buffer);
         }
     }