From fceed3a07406af062a8100c95802dd5d53c1360d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 13 Apr 2017 17:06:52 -0400 Subject: [PATCH] Fixed some GUI crashes --- src/main/java/mekanism/client/gui/GuiDigitalMiner.java | 4 ++-- src/main/java/mekanism/client/gui/GuiMModIDFilter.java | 2 +- src/main/java/mekanism/client/gui/GuiMOreDictFilter.java | 2 +- src/main/java/mekanism/client/gui/GuiTModIDFilter.java | 2 +- src/main/java/mekanism/client/gui/GuiTOreDictFilter.java | 2 +- .../java/mekanism/common/content/miner/MItemStackFilter.java | 2 +- .../java/mekanism/common/content/miner/MMaterialFilter.java | 2 +- .../mekanism/common/content/transporter/TItemStackFilter.java | 2 +- .../mekanism/common/content/transporter/TMaterialFilter.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index ed6e55153..0b8f092b5 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -183,7 +183,7 @@ public class GuiDigitalMiner extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.digitalMiner.toMine") + ":", 9, 59, 0x00CD00); fontRendererObj.drawString("" + tileEntity.clientToMine, 9, 68, 0x00CD00); - if(tileEntity.missingStack != null) + if(!tileEntity.missingStack.isEmpty()) { GlStateManager.pushMatrix(); GL11.glColor4f(1, 1, 1, 1); @@ -220,7 +220,7 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 144 && xAxis <= 160 && yAxis >= 27 && yAxis <= 43) { - if(tileEntity.missingStack != null) + if(!tileEntity.missingStack.isEmpty()) { drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.missingBlock"), xAxis, yAxis); } diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 1570c11f0..c0f75588a 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -48,7 +48,7 @@ public class GuiMModIDFilter extends GuiMekanism private GuiTextField modIDText; - public ItemStack renderStack; + public ItemStack renderStack = ItemStack.EMPTY; public int ticker = 0; diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index d17fe402c..a9ea1e9c9 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -48,7 +48,7 @@ public class GuiMOreDictFilter extends GuiMekanism private GuiTextField oreDictText; - public ItemStack renderStack; + public ItemStack renderStack = ItemStack.EMPTY; public int ticker = 0; diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 18225cbc4..44375e4b2 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -49,7 +49,7 @@ public class GuiTModIDFilter extends GuiMekanism private GuiTextField modIDText; - public ItemStack renderStack; + public ItemStack renderStack = ItemStack.EMPTY; public int ticker = 0; diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index d8affc2f3..848f29096 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -49,7 +49,7 @@ public class GuiTOreDictFilter extends GuiMekanism private GuiTextField oreDictText; - public ItemStack renderStack; + public ItemStack renderStack = ItemStack.EMPTY; public int ticker = 0; diff --git a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java index 0da124b44..b9c9913a6 100644 --- a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java +++ b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java @@ -12,7 +12,7 @@ import net.minecraft.nbt.NBTTagCompound; public class MItemStackFilter extends MinerFilter { - public ItemStack itemType; + public ItemStack itemType = ItemStack.EMPTY; public boolean fuzzy; public MItemStackFilter(ItemStack item) diff --git a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java index 3b32c271a..92cf312a3 100644 --- a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java +++ b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java @@ -16,7 +16,7 @@ import net.minecraft.nbt.NBTTagCompound; public class MMaterialFilter extends MinerFilter { - public ItemStack materialItem; + public ItemStack materialItem = ItemStack.EMPTY; public Material getMaterial() { diff --git a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java index 488e00289..f4097593f 100644 --- a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java @@ -18,7 +18,7 @@ public class TItemStackFilter extends TransporterFilter public int min; public int max; - public ItemStack itemType; + public ItemStack itemType = ItemStack.EMPTY; @Override public boolean canFilter(ItemStack itemStack) diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index c54b7626f..288a7cef9 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -16,7 +16,7 @@ import net.minecraft.nbt.NBTTagCompound; public class TMaterialFilter extends TransporterFilter { - public ItemStack materialItem; + public ItemStack materialItem = ItemStack.EMPTY; public Material getMaterial() {