From 51a35585ac880dcab957ce3154b2c0da42870f02 Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Sun, 7 Sep 2014 23:32:42 +1000 Subject: [PATCH] Fixed NPE when looking at blocks with no associated item --- .../nei/DefaultHighlightHandler.java | 33 ++++++++----------- src/codechicken/nei/HUDRenderer.java | 5 ++- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/codechicken/nei/DefaultHighlightHandler.java b/src/codechicken/nei/DefaultHighlightHandler.java index 785e4c65..e2c3fd6d 100644 --- a/src/codechicken/nei/DefaultHighlightHandler.java +++ b/src/codechicken/nei/DefaultHighlightHandler.java @@ -14,37 +14,30 @@ import java.util.List; public class DefaultHighlightHandler implements IHighlightHandler { @Override - public List handleTextData(ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop, List currenttip, ItemInfo.Layout layout) - { + public List handleTextData(ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop, List currenttip, ItemInfo.Layout layout) { String name = null; - try - { + try { String s = GuiContainerManager.itemDisplayNameShort(stack); - if(s != null && !s.endsWith("Unnamed")) + if (s != null && !s.endsWith("Unnamed")) name = s; - if(name != null) + if (name != null) currenttip.add(name); - } - catch(Exception e) - { + } catch (Exception ignored) {} + + if (name != null && stack.getItem() == Items.redstone) { + int md = world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ); + String s = "" + md; + if (s.length() < 2) + s = " " + s; + currenttip.set(currenttip.size() - 1, name + " " + s); } - if(stack.getItem() == Items.redstone) - { - int md = world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ); - String s = ""+md; - if(s.length() < 2) - s=" "+s; - currenttip.set(currenttip.size()-1, name+" "+s); - } - return currenttip; } @Override - public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop) - { + public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop) { return null; } } diff --git a/src/codechicken/nei/HUDRenderer.java b/src/codechicken/nei/HUDRenderer.java index dd2042de..1680899b 100644 --- a/src/codechicken/nei/HUDRenderer.java +++ b/src/codechicken/nei/HUDRenderer.java @@ -57,6 +57,9 @@ public class HUDRenderer implements IKeyStateTracker } public static void renderOverlay(ItemStack stack, List textData, Point pos) { + if((stack == null || stack.getItem() == null) && textData.isEmpty()) + return; + int w = 0; for (String s : textData) w = Math.max(w, getStringWidth(s) + 29); @@ -80,7 +83,7 @@ public class HUDRenderer implements IKeyStateTracker RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - if (stack.getItem() != null) + if (stack != null && stack.getItem() != null) GuiContainerManager.drawItem(x + 5, y + h / 2 - 8, stack); }