From 785cb2c6839f45bf329322c3ca96cf6d393089a9 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Tue, 13 Jun 2017 14:59:55 +0800 Subject: [PATCH] add @Nullable to internal ItemStack fields and also make sure they're not IS.isEmpty() --- .../client/gui/GuiChemicalCrystallizer.java | 5 +++-- .../client/gui/GuiDigitalMinerConfig.java | 17 ++++++++++------- .../client/gui/GuiLogisticalSorter.java | 17 ++++++++++------- .../client/gui/GuiOredictionificatorFilter.java | 7 ++++--- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 435ccb02c..7afa6df62 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nullable; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; @@ -48,7 +49,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism public Gas prevGas; - public ItemStack renderStack; + public @Nullable ItemStack renderStack; public int stackSwitch = 0; @@ -125,7 +126,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism } } - if(renderStack != null) + if(renderStack != null && !renderStack.isEmpty()) { try { GlStateManager.pushMatrix(); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 5ae12399d..5ddf9ef7a 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -7,6 +7,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -464,7 +465,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { MItemStackFilter itemFilter = (MItemStackFilter)filter; - if(itemFilter.itemType != null) + if(itemFilter.itemType != null && !itemFilter.itemType.isEmpty()) { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); @@ -484,12 +485,13 @@ public class GuiDigitalMinerConfig extends GuiMekanism updateStackList(oreFilter); } - if(oreDictStacks.get(filter).renderStack != null) + ItemStack renderStack = oreDictStacks.get(filter).renderStack; + if(renderStack != null && !renderStack.isEmpty()) { try { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); - itemRender.renderItemAndEffectIntoGUI(oreDictStacks.get(filter).renderStack, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(Exception e) {} @@ -501,7 +503,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { MMaterialFilter itemFilter = (MMaterialFilter)filter; - if(itemFilter.materialItem != null) + if(itemFilter.materialItem != null && !itemFilter.materialItem.isEmpty()) { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); @@ -521,12 +523,13 @@ public class GuiDigitalMinerConfig extends GuiMekanism updateStackList(modFilter); } - if(modIDStacks.get(filter).renderStack != null) + ItemStack renderStack = modIDStacks.get(filter).renderStack; + if(renderStack != null && !renderStack.isEmpty()) { try { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); - itemRender.renderItemAndEffectIntoGUI(modIDStacks.get(filter).renderStack, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(Exception e) {} @@ -762,7 +765,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism { public List iterStacks; public int stackIndex; - public ItemStack renderStack; + public @Nullable ItemStack renderStack; } /** diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index d5700ecd4..f682936e5 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -7,6 +7,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -471,7 +472,7 @@ public class GuiLogisticalSorter extends GuiMekanism { final TItemStackFilter itemFilter = (TItemStackFilter) filter; - if(itemFilter.itemType != null) + if(itemFilter.itemType != null && !itemFilter.itemType.isEmpty()) { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); @@ -492,12 +493,13 @@ public class GuiLogisticalSorter extends GuiMekanism updateStackList(oreFilter); } - if(oreDictStacks.get(filter).renderStack != null) + ItemStack renderStack = oreDictStacks.get(filter).renderStack; + if(renderStack != null && !renderStack.isEmpty()) { try { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); - itemRender.renderItemAndEffectIntoGUI(oreDictStacks.get(filter).renderStack, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(final Exception e) {} @@ -510,7 +512,7 @@ public class GuiLogisticalSorter extends GuiMekanism { final TMaterialFilter itemFilter = (TMaterialFilter) filter; - if(itemFilter.materialItem != null) + if(itemFilter.materialItem != null && !itemFilter.materialItem.isEmpty()) { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); @@ -531,12 +533,13 @@ public class GuiLogisticalSorter extends GuiMekanism updateStackList(modFilter); } - if(modIDStacks.get(filter).renderStack != null) + ItemStack renderStack = modIDStacks.get(filter).renderStack; + if(renderStack != null && !renderStack.isEmpty()) { try { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); - itemRender.renderItemAndEffectIntoGUI(modIDStacks.get(filter).renderStack, 59, yStart + 3); + itemRender.renderItemAndEffectIntoGUI(renderStack, 59, yStart + 3); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); } catch(final Exception e) {} @@ -724,7 +727,7 @@ public class GuiLogisticalSorter extends GuiMekanism public int stackIndex; - public ItemStack renderStack; + public @Nullable ItemStack renderStack; } /** diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index c75e85c80..a48cd73d7 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import java.io.IOException; import java.util.List; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; @@ -43,7 +44,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism public boolean isNew; - public ItemStack renderStack; + public @Nullable ItemStack renderStack; public GuiOredictionificatorFilter(EntityPlayer player, TileEntityOredictionificator tentity, int index) { @@ -149,7 +150,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism renderScaledText(filter.filter, 32, 38, 0x404040, 111); } - if(renderStack != null) + if(renderStack != null && !renderStack.isEmpty()) { try { GlStateManager.pushMatrix(); @@ -177,7 +178,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism if(xAxis >= 45 && xAxis <= 61 && yAxis >= 19 && yAxis <= 35) { - if(renderStack != null) + if(renderStack != null && !renderStack.isEmpty()) { String name = ItemRegistryUtils.getMod(renderStack); String extra = name.equals("null") ? "" : " (" + name + ")";