From 394f4f57a4652e3e0416d0a001a6f3fafe389e32 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 20 Mar 2021 14:03:59 +0800 Subject: Fix #488 Signed-off-by: shedaniel --- .../main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'runtime/src/main/java') diff --git a/runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java index 67dd29cb3..a31a704e7 100644 --- a/runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java +++ b/runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java @@ -35,7 +35,9 @@ import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.RoughlyEnoughItemsCore; -import me.shedaniel.rei.api.*; +import me.shedaniel.rei.api.ClientHelper; +import me.shedaniel.rei.api.REIHelper; +import me.shedaniel.rei.api.REIOverlay; import me.shedaniel.rei.api.config.ConfigManager; import me.shedaniel.rei.api.config.ConfigObject; import me.shedaniel.rei.api.favorites.FavoriteEntry; @@ -74,6 +76,7 @@ import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.multiplayer.PlayerInfo; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.resources.language.I18n; import net.minecraft.client.resources.sounds.SimpleSoundInstance; @@ -470,7 +473,8 @@ public class ContainerScreenOverlay extends REIOverlay { } private GameType getCurrentGameMode() { - return Minecraft.getInstance().getConnection().getPlayerInfo(Minecraft.getInstance().player.getGameProfile().getId()).getGameMode(); + PlayerInfo info = Minecraft.getInstance().getConnection().getPlayerInfo(Minecraft.getInstance().player.getGameProfile().getId()); + return info == null ? GameType.SURVIVAL : info.getGameMode(); } private Rectangle getSearchFieldArea() { -- cgit