From d2883825deb45699a338e228649e9a7a5e7d87bc Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 3 Feb 2016 22:44:44 +0100 Subject: [PATCH] fix NPE --- src/main/java/storagecraft/item/ItemPattern.java | 6 +++--- src/main/java/storagecraft/proxy/ClientProxy.java | 10 +++++++++- src/main/java/storagecraft/tile/TileGrid.java | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/storagecraft/item/ItemPattern.java b/src/main/java/storagecraft/item/ItemPattern.java index ce56d7d98..692c05165 100644 --- a/src/main/java/storagecraft/item/ItemPattern.java +++ b/src/main/java/storagecraft/item/ItemPattern.java @@ -19,11 +19,11 @@ public class ItemPattern extends ItemBase } @Override - public void addInformation(ItemStack cell, EntityPlayer player, List list, boolean b) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { - if (isValid(player.worldObj, cell)) + if (isValid(player.worldObj, stack)) { - list.add(getPatternResult(player.worldObj, cell).getDisplayName()); + list.add(getPatternResult(player.worldObj, stack).getDisplayName()); } } diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java index c9f2776f2..82c4f2248 100644 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -96,7 +96,14 @@ public class ClientProxy extends CommonProxy @Override public ModelResourceLocation getModelLocation(ItemStack stack) { - return new ModelResourceLocation("storagecraft:" + (!ItemPattern.hasPattern(stack) ? "blank_" : "") + "pattern", "inventory"); + if (ItemPattern.hasPattern(stack)) + { + return new ModelResourceLocation("storagecraft:pattern", "inventory"); + } + else + { + return new ModelResourceLocation("storagecraft:blank_pattern", "inventory"); + } } }); @@ -106,6 +113,7 @@ public class ClientProxy extends CommonProxy ModelLoader.setCustomModelResourceLocation(StorageCraftItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("storagecraft:destruction_core", "inventory")); ModelLoader.setCustomModelResourceLocation(StorageCraftItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("storagecraft:wireless_grid_plate", "inventory")); + ModelLoader.setCustomMeshDefinition(StorageCraftItems.WIRELESS_GRID, new ItemMeshDefinition() { @Override diff --git a/src/main/java/storagecraft/tile/TileGrid.java b/src/main/java/storagecraft/tile/TileGrid.java index 179c27350..ea032e293 100644 --- a/src/main/java/storagecraft/tile/TileGrid.java +++ b/src/main/java/storagecraft/tile/TileGrid.java @@ -158,7 +158,7 @@ public class TileGrid extends TileMachine { ItemStack result = patternCraftingResultInventory.getStackInSlot(0); - if (result != null && patternInventory.getStackInSlot(0).stackSize > 0 && patternInventory.getStackInSlot(1) == null) + if (result != null && patternInventory.getStackInSlot(0) != null && patternInventory.getStackInSlot(0).stackSize > 0 && patternInventory.getStackInSlot(1) == null) { ItemStack pattern = new ItemStack(StorageCraftItems.PATTERN);