Fixed startup crash

GirafiStudios · Jun 10, 2019 · 808df8a · 808df8a
1 parent b955423
commit 808df8a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@ group = "dmillerw.menu"
 archivesBaseName = "MineMenu"
 
 minecraft {
-    mappings channel: 'snapshot', version: '20190610-1.14.2'
+    mappings channel: 'snapshot', version: '20190609-1.14.2'
     runs {
         client {
             workingDirectory project.file('run')

diff --git a/src/main/java/dmillerw/menu/gui/RadialMenuScreen.java b/src/main/java/dmillerw/menu/gui/RadialMenuScreen.java
@@ -19,15 +19,15 @@ public RadialMenuScreen() {
     }
 
     public static void activate() {
-        if (Minecraft.getInstance().currentScreen == null) {
+        if (Minecraft.getInstance().field_71462_r == null) {
             active = true;
             Minecraft.getInstance().displayGuiScreen(INSTANCE);
         }
     }
 
     public static void deactivate() {
         active = false;
-        if (Minecraft.getInstance().currentScreen == INSTANCE) {
+        if (Minecraft.getInstance().field_71462_r == INSTANCE) {
             Minecraft.getInstance().displayGuiScreen(null);
         }
     }

diff --git a/src/main/java/dmillerw/menu/gui/menu/list/GuiControlList.java b/src/main/java/dmillerw/menu/gui/menu/list/GuiControlList.java
@@ -74,7 +74,7 @@ public class CategoryEntry extends KeyBindingList.Entry {
 
         @Override
         public void render(int p_render_1_, int p_render_2_, int p_render_3_, int p_render_4_, int p_render_5_, int p_render_6_, int p_render_7_, boolean p_render_8_, float p_render_9_) {
-            GuiControlList.this.mc.fontRenderer.drawString(this.category, (float) (Objects.requireNonNull(GuiControlList.this.mc.currentScreen).width / 2 - this.width / 2), (float) p_render_2_ - GuiControlList.this.mc.fontRenderer.FONT_HEIGHT - 1, 16777215);
+            GuiControlList.this.mc.fontRenderer.drawString(this.category, (float) (Objects.requireNonNull(GuiControlList.this.mc.field_71462_r).width / 2 - this.width / 2), (float) p_render_2_ - GuiControlList.this.mc.fontRenderer.FONT_HEIGHT - 1, 16777215);
         }
 
         @Override

diff --git a/src/main/java/dmillerw/menu/handler/KeyboardHandler.java b/src/main/java/dmillerw/menu/handler/KeyboardHandler.java
@@ -90,7 +90,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
                         }
                         RadialMenuScreen.deactivate();
                     } else {
-                        if (mc.currentScreen == null || mc.currentScreen instanceof RadialMenuScreen) {
+                        if (mc.field_71462_r == null || mc.field_71462_r instanceof RadialMenuScreen) {
                             RadialMenu.resetCategory();
                             RadialMenu.resetTimer();
                             RadialMenuScreen.activate();
@@ -100,7 +100,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
             } else {
                 if (wheelKeyPressed != RadialMenuScreen.active) {
                     if (wheelKeyPressed) {
-                        if (mc.currentScreen == null || mc.currentScreen instanceof RadialMenuScreen) {
+                        if (mc.field_71462_r == null || mc.field_71462_r instanceof RadialMenuScreen) {
                             RadialMenu.resetCategory();
                             RadialMenu.resetTimer();
                             RadialMenuScreen.activate();
@@ -131,7 +131,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
         iterator = TOGGLED_KEYS.iterator();
         while (iterator.hasNext()) {
             KeyBinding keyBinding = iterator.next();
-            if ((keyBinding.getKey().getKeyCode() >= 0 ? keyBinding.isPressed() : InputMappings.isKeyDown(handle, keyBinding.getKey().getKeyCode() + 100)) || mc.currentScreen != null) {
+            if ((keyBinding.getKey().getKeyCode() >= 0 ? keyBinding.isPressed() : InputMappings.isKeyDown(handle, keyBinding.getKey().getKeyCode() + 100)) || mc.field_71462_r != null) {
                 iterator.remove();
             }
         }

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -11,11 +11,4 @@ logoFile="logo.png"
     authors="dmillerw, Girafi"
     description='''
     MineMenu supports key bindings, commands, and creative functions to make your life easier.
-    '''
-
-[[dependencies.minemenu]]
-    modId="forge"
-    mandatory=true
-    versionRange="[26.0.14,]"
-    ordering="NONE"
-    side="BOTH"
+    '''