dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE

Browse Source
This commit is contained in:
raoulvdberge
2019-10-22 17:53:51 +02:00
parent f6656b6b06
commit 31fd6d5dd9
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/raoulvdberge/refinedstorage/screen/KeyInputListener.java
View File

@@ -22,17 +22,19 @@ import java.util.function.Consumer;
public class KeyInputListener { public class KeyInputListener {
@SubscribeEvent @SubscribeEvent
public void onKeyInput(InputEvent.KeyInputEvent e) { public void onKeyInput(InputEvent.KeyInputEvent e) {
PlayerInventory inv = Minecraft.getInstance().player.inventory; if (Minecraft.getInstance().player != null) {
PlayerInventory inv = Minecraft.getInstance().player.inventory;
if (RSKeyBindings.OPEN_WIRELESS_GRID.isKeyDown()) { if (RSKeyBindings.OPEN_WIRELESS_GRID.isKeyDown()) {
findAndOpen(inv, (error) -> Minecraft.getInstance().player.sendMessage(error), RSItems.WIRELESS_GRID, RSItems.CREATIVE_WIRELESS_GRID); findAndOpen(inv, (error) -> Minecraft.getInstance().player.sendMessage(error), RSItems.WIRELESS_GRID, RSItems.CREATIVE_WIRELESS_GRID);
} else if (RSKeyBindings.OPEN_WIRELESS_FLUID_GRID.isKeyDown()) { } else if (RSKeyBindings.OPEN_WIRELESS_FLUID_GRID.isKeyDown()) {
findAndOpen(inv, (error) -> Minecraft.getInstance().player.sendMessage(error), RSItems.WIRELESS_FLUID_GRID, RSItems.CREATIVE_WIRELESS_FLUID_GRID); findAndOpen(inv, (error) -> Minecraft.getInstance().player.sendMessage(error), RSItems.WIRELESS_FLUID_GRID, RSItems.CREATIVE_WIRELESS_FLUID_GRID);
}/* TODO else if (RSKeyBindings.OPEN_PORTABLE_GRID.isKeyDown()) { }/* TODO else if (RSKeyBindings.OPEN_PORTABLE_GRID.isKeyDown()) {
findAndOpen(inv, Item.getItemFromBlock(RSBlocks.PORTABLE_GRID)); findAndOpen(inv, Item.getItemFromBlock(RSBlocks.PORTABLE_GRID));
} else if (RSKeyBindings.OPEN_WIRELESS_CRAFTING_MONITOR.isKeyDown()) { } else if (RSKeyBindings.OPEN_WIRELESS_CRAFTING_MONITOR.isKeyDown()) {
findAndOpen(inv, RSItems.WIRELESS_CRAFTING_MONITOR); findAndOpen(inv, RSItems.WIRELESS_CRAFTING_MONITOR);
}*/ }*/
}
} }
private void findAndOpen(IInventory inv, Consumer<ITextComponent> onError, Item... items) { private void findAndOpen(IInventory inv, Consumer<ITextComponent> onError, Item... items) {