fix issue when client player is null

Author: brachy84

src/main/java/com/cleanroommc/modularui/screen/ClientScreenHandler.java

@@ -118,6 +118,7 @@ public void onGuiOpen(GuiOpenEvent event) {
                     lastChar = null;
                 }
                 currentScreen = muiScreen.getScreen();
+                currentScreen.getContext().setParentScreen(Minecraft.getMinecraft().currentScreen);
                 fpsCounter.reset();
             }
         } else if (hasScreen() && getMCScreen() != null && newGui != getMCScreen()) {
@@ -194,7 +195,7 @@ public void onGuiDraw(GuiScreenEvent.DrawScreenEvent.Pre event) {
     }
 
     @SubscribeEvent(priority = EventPriority.HIGH)
-    public static void onGuiDraw(GuiScreenEvent.DrawScreenEvent.Post event) {
+    public void onGuiDraw(GuiScreenEvent.DrawScreenEvent.Post event) {
         OverlayStack.draw(event.getMouseX(), event.getMouseY(), event.getRenderPartialTicks());
         Platform.setupDrawTex(); // jei and other mods may expect this state
     }

src/main/java/com/cleanroommc/modularui/screen/ModularPanel.java

@@ -4,6 +4,7 @@
 import com.cleanroommc.modularui.animation.Animator;
 import com.cleanroommc.modularui.api.IPanelHandler;
 import com.cleanroommc.modularui.api.ITheme;
+import com.cleanroommc.modularui.api.MCHelper;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.api.layout.IViewport;
 import com.cleanroommc.modularui.api.layout.IViewportStack;
@@ -29,10 +30,10 @@
 import com.cleanroommc.modularui.widget.WidgetTree;
 import com.cleanroommc.modularui.widget.sizer.Area;
 import com.cleanroommc.modularui.widgets.SlotGroupWidget;
-
 import com.cleanroommc.neverenoughanimations.NEAConfig;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
 
 import mezz.jei.gui.ghost.GhostIngredientDrag;
 import org.jetbrains.annotations.ApiStatus;
@@ -129,7 +130,13 @@ public void closeIfOpen() {
         closeSubPanels();
         if (isMainPanel()) {
             // close screen and let NEA animation
-            Minecraft.getMinecraft().player.closeScreen();
+            EntityPlayer player = MCHelper.getPlayer();
+            if (player != null) {
+                player.closeScreen();
+            } else {
+                // we are currently not in a world and want to display the previous screen
+                Minecraft.getMinecraft().displayGuiScreen(getContext().getParentScreen());
+            }
             return;
         }
         if (!shouldAnimate()) {

src/main/java/com/cleanroommc/modularui/screen/viewport/ModularGuiContext.java

@@ -3,11 +3,22 @@
 import com.cleanroommc.modularui.ClientProxy;
 import com.cleanroommc.modularui.api.ITheme;
 import com.cleanroommc.modularui.api.MCHelper;
-import com.cleanroommc.modularui.api.widget.*;
-import com.cleanroommc.modularui.screen.*;
+import com.cleanroommc.modularui.api.widget.IDraggable;
+import com.cleanroommc.modularui.api.widget.IFocusedWidget;
+import com.cleanroommc.modularui.api.widget.IGuiElement;
+import com.cleanroommc.modularui.api.widget.IVanillaSlot;
+import com.cleanroommc.modularui.api.widget.IWidget;
+import com.cleanroommc.modularui.api.widget.ResizeDragArea;
+import com.cleanroommc.modularui.screen.DraggablePanelWrapper;
+import com.cleanroommc.modularui.screen.JeiSettingsImpl;
+import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.screen.ModularScreen;
+import com.cleanroommc.modularui.screen.PanelManager;
+import com.cleanroommc.modularui.screen.UISettings;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiScreen;
 
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -26,12 +37,10 @@
  */
 public class ModularGuiContext extends GuiContext {
 
-    /* GUI elements */
-    @Deprecated
-    public final ModularScreen screen;
+    private final ModularScreen screen;
+    private @Nullable GuiScreen parent;
     private LocatedWidget focusedWidget = LocatedWidget.EMPTY;
-    @Nullable
-    private LocatedWidget hovered;
+    private @Nullable LocatedWidget hovered;
     private int timeHovered = 0;
     private final HoveredIterable hoveredWidgets;
 
@@ -53,6 +62,18 @@ public ModularScreen getScreen() {
         return screen;
     }
 
+    /**
+     * @return the screen that was open before when this screen was opened or null of none was open
+     */
+    public @Nullable GuiScreen getParentScreen() {
+        return parent;
+    }
+
+    @ApiStatus.Internal
+    public void setParentScreen(@Nullable GuiScreen parent) {
+        this.parent = parent;
+    }
+
     /**
      * @return true if any widget is being hovered
      */
@@ -428,4 +449,4 @@ public IGuiElement next() {
             };
         }
     }
-}
+}