Updated Forge and Mappings

GirafiStudios · Jun 12, 2019 · 88e41e1 · 88e41e1
1 parent ee13962
commit 88e41e1
Show file tree

Hide file tree

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

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 minecraft_version=1.14.2
-forge_version=26.0.14
+forge_version=26.0.21
 mod_version=1.8.0
 
 org.gradle.jvmargs=-Xmx4G

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().field_71462_r == null) {
+        if (Minecraft.getInstance().currentScreen == null) {
             active = true;
             Minecraft.getInstance().displayGuiScreen(INSTANCE);
         }
     }
 
     public static void deactivate() {
         active = false;
-        if (Minecraft.getInstance().field_71462_r == INSTANCE) {
+        if (Minecraft.getInstance().currentScreen == 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.minecraft.field_71462_r).width / 2 - this.width / 2), (float)(p_render_2_ + p_render_5_ - GuiControlList.this.mc.fontRenderer.FONT_HEIGHT - 1), 16777215);
+            GuiControlList.this.mc.fontRenderer.drawString(this.category, (float)(Objects.requireNonNull(GuiControlList.this.minecraft.currentScreen).width / 2 - this.width / 2), (float)(p_render_2_ + p_render_5_ - 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
@@ -78,7 +78,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
                         }
                         RadialMenuScreen.deactivate();
                     } else {
-                        if (mc.field_71462_r == null || mc.field_71462_r instanceof RadialMenuScreen) {
+                        if (mc.currentScreen == null || mc.currentScreen instanceof RadialMenuScreen) {
                             RadialMenu.resetCategory();
                             RadialMenu.resetTimer();
                             RadialMenuScreen.activate();
@@ -88,7 +88,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
             } else {
                 if (wheelKeyPressed != RadialMenuScreen.active) {
                     if (wheelKeyPressed) {
-                        if (mc.field_71462_r == null || mc.field_71462_r instanceof RadialMenuScreen) {
+                        if (mc.currentScreen == null || mc.currentScreen instanceof RadialMenuScreen) {
                             RadialMenu.resetCategory();
                             RadialMenu.resetTimer();
                             RadialMenuScreen.activate();
@@ -119,7 +119,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.field_71462_r != null) {
+            if ((keyBinding.getKey().getKeyCode() >= 0 ? keyBinding.isPressed() : InputMappings.isKeyDown(handle, keyBinding.getKey().getKeyCode() + 100)) || mc.currentScreen != null) {
                 iterator.remove();
             }
         }