From 6eb8e59f3ce86a2d7a47c4864ec13e918f477627 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 3 Apr 2017 20:12:02 -0400 Subject: [PATCH] Fix more ItemStack issues --- .../api/energy/EnergizedItemManager.java | 4 +- .../java/mekanism/client/ClientProxy.java | 10 ++--- .../mekanism/client/ClientTickHandler.java | 10 ++--- .../mekanism/client/gui/GuiDictionary.java | 10 ++--- .../java/mekanism/client/gui/GuiFactory.java | 2 +- .../client/gui/GuiFormulaicAssemblicator.java | 6 +-- .../client/gui/GuiMItemStackFilter.java | 24 +++++------- .../client/gui/GuiMMaterialFilter.java | 27 ++++++------- .../mekanism/client/gui/GuiMModIDFilter.java | 14 +++---- .../client/gui/GuiMOreDictFilter.java | 14 +++---- .../java/mekanism/client/gui/GuiMekanism.java | 2 +- .../client/gui/GuiOredictionificator.java | 8 ++-- .../mekanism/client/gui/GuiRobitRepair.java | 6 +-- .../client/gui/GuiTItemStackFilter.java | 16 +++----- .../client/gui/GuiTMaterialFilter.java | 16 +++----- .../mekanism/client/gui/GuiTeleporter.java | 12 +++--- .../client/gui/element/GuiFluidGauge.java | 2 +- .../client/gui/element/GuiGasGauge.java | 2 +- .../mekanism/client/gui/element/GuiGauge.java | 2 +- .../tileentity/RenderConfigurableMachine.java | 2 +- .../RenderLogisticalTransporter.java | 2 +- .../common/CommonPlayerTickHandler.java | 6 +-- .../java/mekanism/common/CommonProxy.java | 2 +- src/main/java/mekanism/common/IMCHandler.java | 2 +- .../java/mekanism/common/base/IFactory.java | 2 +- .../mekanism/common/base/ITankManager.java | 4 +- .../common/block/BlockEnergyCube.java | 2 +- .../mekanism/common/block/BlockGasTank.java | 2 +- .../common/block/BlockObsidianTNT.java | 2 +- .../common/block/BlockTransmitter.java | 2 +- .../transporter/TransporterManager.java | 17 ++++++++- .../mekanism/common/entity/EntityFlame.java | 4 +- .../inventory/container/ContainerFactory.java | 2 +- .../container/ContainerPersonalChest.java | 2 +- .../common/item/ItemCraftingFormula.java | 2 +- .../mekanism/common/item/ItemElectricBow.java | 12 +++--- .../mekanism/common/item/ItemFreeRunners.java | 2 +- .../network/PacketConfiguratorState.java | 2 +- .../network/PacketElectricBowState.java | 2 +- .../network/PacketFlamethrowerData.java | 2 +- .../common/network/PacketJetpackData.java | 2 +- .../network/PacketPortableTankState.java | 2 +- .../network/PacketPortableTeleporter.java | 2 +- .../common/network/PacketScubaTankData.java | 2 +- .../network/PacketWalkieTalkieState.java | 2 +- .../mekanism/common/recipe/BinRecipe.java | 38 +++++++++---------- .../mekanism/common/recipe/RecipeHandler.java | 4 +- .../recipe/inputs/AdvancedMachineInput.java | 2 +- .../recipe/inputs/PressurizedInput.java | 2 +- .../common/tile/TileEntityChargepad.java | 2 +- .../tile/TileEntityChemicalCrystallizer.java | 4 +- .../TileEntityChemicalDissolutionChamber.java | 2 +- .../tile/TileEntityChemicalInfuser.java | 4 +- .../tile/TileEntityChemicalOxidizer.java | 2 +- .../common/tile/TileEntityChemicalWasher.java | 2 +- .../common/tile/TileEntityContainerBlock.java | 2 +- .../common/tile/TileEntityDigitalMiner.java | 36 +++++++++--------- .../tile/component/TileComponentEjector.java | 6 +-- .../TileEntityLogisticalTransporter.java | 2 +- .../common/transmitters/TransporterImpl.java | 2 +- .../common/util/ItemRegistryUtils.java | 2 +- .../mekanism/common/util/MekanismUtils.java | 4 +- .../mekanism/common/util/RecipeUtils.java | 12 +++--- .../mekanism/common/util/SecurityUtils.java | 2 +- .../common/voice/VoiceConnection.java | 4 +- .../common/block/BlockGenerator.java | 8 ++-- .../generators/common/block/BlockReactor.java | 2 +- .../tile/reactor/TileEntityReactorPort.java | 2 +- 68 files changed, 207 insertions(+), 211 deletions(-) diff --git a/src/main/java/mekanism/api/energy/EnergizedItemManager.java b/src/main/java/mekanism/api/energy/EnergizedItemManager.java index 165bdf608..d49b61d4d 100644 --- a/src/main/java/mekanism/api/energy/EnergizedItemManager.java +++ b/src/main/java/mekanism/api/energy/EnergizedItemManager.java @@ -12,7 +12,7 @@ public class EnergizedItemManager */ public static double discharge(ItemStack itemStack, double amount) { - if(itemStack != null) + if(!itemStack.isEmpty()) { if(itemStack.getItem() instanceof IEnergizedItem) { @@ -39,7 +39,7 @@ public class EnergizedItemManager */ public static double charge(ItemStack itemStack, double amount) { - if(itemStack != null) + if(!itemStack.isEmpty()) { if(itemStack.getItem() instanceof IEnergizedItem) { diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 305d48916..db847aa74 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -794,7 +794,7 @@ public class ClientProxy extends CommonProxy case 14: ItemStack itemStack = player.getHeldItem(EnumHand.values()[pos.getX()]); - if(itemStack != null && itemStack.getItem() instanceof ItemPortableTeleporter) + if(!itemStack.isEmpty() && itemStack.getItem() instanceof ItemPortableTeleporter) { return new GuiTeleporter(player, EnumHand.values()[pos.getX()], itemStack); } @@ -863,7 +863,7 @@ public class ClientProxy extends CommonProxy case 38: ItemStack itemStack1 = player.getHeldItem(EnumHand.values()[pos.getX()]); - if(itemStack1 != null && itemStack1.getItem() instanceof ItemSeismicReader) + if(!itemStack1.isEmpty() && itemStack1.getItem() instanceof ItemSeismicReader) { return new GuiSeismicReader(world, new Coord4D(player), itemStack1.copy()); } @@ -917,7 +917,7 @@ public class ClientProxy extends CommonProxy { GuiScreen screen = Minecraft.getMinecraft().currentScreen; - if(screen instanceof GuiTeleporter && ((GuiTeleporter)screen).itemStack != null) + if(screen instanceof GuiTeleporter && !((GuiTeleporter)screen).itemStack.isEmpty()) { GuiTeleporter teleporter = (GuiTeleporter)screen; @@ -1102,7 +1102,7 @@ public class ClientProxy extends CommonProxy @Override public ModelResourceLocation getModelLocation(ItemStack stack) { - if(stack != null && stack.getItem() instanceof ItemWalkieTalkie) + if(!stack.isEmpty() && stack.getItem() instanceof ItemWalkieTalkie) { ItemWalkieTalkie item = (ItemWalkieTalkie)stack.getItem(); @@ -1121,7 +1121,7 @@ public class ClientProxy extends CommonProxy @Override public ModelResourceLocation getModelLocation(ItemStack stack) { - if(stack != null && stack.getItem() instanceof ItemCraftingFormula) + if(!stack.isEmpty() && stack.getItem() instanceof ItemCraftingFormula) { ItemCraftingFormula item = (ItemCraftingFormula)stack.getItem(); diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index d3cb07f4c..50a6091ec 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -205,7 +205,7 @@ public class ClientTickHandler ItemStack bootStack = mc.player.getItemStackFromSlot(EntityEquipmentSlot.FEET); - if(bootStack != null && bootStack.getItem() instanceof ItemFreeRunners) + if(!bootStack.isEmpty() && bootStack.getItem() instanceof ItemFreeRunners) { mc.player.stepHeight = 1.002F; } @@ -303,7 +303,7 @@ public class ClientTickHandler ItemStack chestStack = mc.player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); - if(chestStack != null && chestStack.getItem() instanceof ItemJetpack) + if(!chestStack.isEmpty() && chestStack.getItem() instanceof ItemJetpack) { MekanismClient.updateKey(mc.gameSettings.keyBindJump, KeySync.ASCEND); MekanismClient.updateKey(mc.gameSettings.keyBindSneak, KeySync.DESCEND); @@ -430,7 +430,7 @@ public class ClientTickHandler ItemStack stack = player.inventory.armorInventory.get(2); - if(stack != null && !player.capabilities.isCreativeMode) + if(!stack.isEmpty() && !player.capabilities.isCreativeMode) { if(stack.getItem() instanceof ItemJetpack) { @@ -472,7 +472,7 @@ public class ClientTickHandler ItemStack tank = player.inventory.armorInventory.get(2); ItemStack mask = player.inventory.armorInventory.get(3); - if(tank != null && mask != null) + if(!tank.isEmpty() && !mask.isEmpty()) { if(tank.getItem() instanceof ItemScubaTank && mask.getItem() instanceof ItemGasMask) { @@ -511,7 +511,7 @@ public class ClientTickHandler public static boolean hasFlamethrower(EntityPlayer player) { - if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof ItemFlamethrower) + if(!player.inventory.getCurrentItem().isEmpty() && player.inventory.getCurrentItem().getItem() instanceof ItemFlamethrower) { ItemFlamethrower flamethrower = (ItemFlamethrower)player.inventory.getCurrentItem().getItem(); diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index 0052915c2..b81dbb100 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -43,7 +43,7 @@ public class GuiDictionary extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("item.Dictionary.name"), 64, 5, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); - if(itemType != null) + if(!itemType.isEmpty()) { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); @@ -118,7 +118,7 @@ public class GuiDictionary extends GuiMekanism { ItemStack stack = hovering.getStack(); - if(stack != null) + if(!stack.isEmpty()) { itemType = stack.copy(); itemType.setCount(1); @@ -135,16 +135,16 @@ public class GuiDictionary extends GuiMekanism { ItemStack stack = mc.player.inventory.getItemStack(); - if(stack != null && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!stack.isEmpty() && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { itemType = stack.copy(); itemType.setCount(1); scrollList.setText(MekanismUtils.getOreDictName(itemType)); } - else if(stack == null && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + else if(stack.isEmpty() && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - itemType = null; + itemType = ItemStack.EMPTY; scrollList.setText(null); } diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 7acc136ea..8b194969d 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -170,7 +170,7 @@ public class GuiFactory extends GuiMekanism { ItemStack stack = mc.player.inventory.getItemStack(); - if(stack != null && stack.getItem() instanceof ItemGaugeDropper) + if(!stack.isEmpty() && stack.getItem() instanceof ItemGaugeDropper) { ArrayList data = new ArrayList(); data.add(1); diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index f11d03326..e8035c6d2 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -199,12 +199,12 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { ItemStack stack = tileEntity.formula.input.get(i); - if(stack != null) + if(!stack.isEmpty()) { Slot slot = (Slot)inventorySlots.inventorySlots.get(i+20); GlStateManager.pushMatrix(); - if(slot.getStack() == null || !slot.getStack().isItemEqual(stack)) + if(slot.getStack().isEmpty() || !slot.getStack().isItemEqual(stack)) { drawGradientRect(guiWidth + slot.xPos, guiHeight + slot.yPos, guiWidth + slot.xPos + 16, guiHeight + slot.yPos + 16, -2137456640, -2137456640); } @@ -223,7 +223,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism private boolean canEncode() { return tileEntity.formula == null && !tileEntity.inventory.get(2).isEmpty() && tileEntity.inventory.get(2).getItem() instanceof ItemCraftingFormula && - ((ItemCraftingFormula)tileEntity.inventory.get(2).getItem()).getInventory(tileEntity.inventory.get(2)) == null; + ((ItemCraftingFormula)tileEntity.inventory.get(2).getItem()).getInventory(tileEntity.inventory.get(2)).isEmpty(); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 1e2dcc17e..e37e25d8e 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -88,7 +88,7 @@ public class GuiMItemStackFilter extends GuiMekanism if(guibutton.id == 0) { - if(filter.itemType != null) + if(!filter.itemType.isEmpty()) { if(isNew) { @@ -122,13 +122,9 @@ public class GuiMItemStackFilter extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00); - if(filter.itemType != null) + if(!filter.itemType.isEmpty()) { renderScaledText(filter.itemType.getDisplayName(), 35, 41, 0x00CD00, 107); - } - - if(filter.itemType != null) - { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.itemType, 12, 19); @@ -136,7 +132,7 @@ public class GuiMItemStackFilter extends GuiMekanism GlStateManager.popMatrix(); } - if(filter.replaceStack != null) + if(!filter.replaceStack.isEmpty()) { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); @@ -277,7 +273,7 @@ public class GuiMItemStackFilter extends GuiMekanism { ItemStack stack = mc.player.inventory.getItemStack(); - if(stack != null && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!stack.isEmpty() && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { if(stack.getItem() instanceof ItemBlock) { @@ -288,9 +284,9 @@ public class GuiMItemStackFilter extends GuiMekanism } } } - else if(stack == null && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + else if(stack.isEmpty() && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - filter.itemType = null; + filter.itemType = ItemStack.EMPTY; } SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); @@ -300,9 +296,9 @@ public class GuiMItemStackFilter extends GuiMekanism { boolean doNull = false; ItemStack stack = mc.player.inventory.getItemStack(); - ItemStack toUse = null; + ItemStack toUse = ItemStack.EMPTY; - if(stack != null && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!stack.isEmpty() && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { if(stack.getItem() instanceof ItemBlock) { @@ -313,12 +309,12 @@ public class GuiMItemStackFilter extends GuiMekanism } } } - else if(stack == null && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + else if(stack.isEmpty() && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { doNull = true; } - if(toUse != null || doNull) + if(!toUse.isEmpty() || doNull) { filter.replaceStack = toUse; } diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 7119c29d7..b6996f1da 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -88,7 +88,7 @@ public class GuiMMaterialFilter extends GuiMekanism if(guibutton.id == 0) { - if(filter.materialItem != null) + if(!filter.materialItem.isEmpty()) { if(isNew) { @@ -100,8 +100,7 @@ public class GuiMMaterialFilter extends GuiMekanism Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } - else if(filter.materialItem == null) - { + else { status = EnumColor.DARK_RED + LangUtils.localize("gui.itemFilter.noItem"); ticker = 20; } @@ -123,13 +122,9 @@ public class GuiMMaterialFilter extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00); - if(filter.materialItem != null) + if(!filter.materialItem.isEmpty()) { renderScaledText(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00, 107); - } - - if(filter.materialItem != null) - { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.materialItem, 12, 19); @@ -137,7 +132,7 @@ public class GuiMMaterialFilter extends GuiMekanism GlStateManager.popMatrix(); } - if(filter.replaceStack != null) + if(!filter.replaceStack.isEmpty()) { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); @@ -259,7 +254,7 @@ public class GuiMMaterialFilter extends GuiMekanism { ItemStack stack = mc.player.inventory.getItemStack(); - if(stack != null && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!stack.isEmpty() && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { if(stack.getItem() instanceof ItemBlock) { @@ -270,9 +265,9 @@ public class GuiMMaterialFilter extends GuiMekanism } } } - else if(stack == null && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + else if(stack.isEmpty() && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - filter.materialItem = null; + filter.materialItem = ItemStack.EMPTY; } SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); @@ -282,9 +277,9 @@ public class GuiMMaterialFilter extends GuiMekanism { boolean doNull = false; ItemStack stack = mc.player.inventory.getItemStack(); - ItemStack toUse = null; + ItemStack toUse = ItemStack.EMPTY; - if(stack != null && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!stack.isEmpty() && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { if(stack.getItem() instanceof ItemBlock) { @@ -295,12 +290,12 @@ public class GuiMMaterialFilter extends GuiMekanism } } } - else if(stack == null && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + else if(stack.isEmpty() && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { doNull = true; } - if(toUse != null || doNull) + if(!toUse.isEmpty() || doNull) { filter.replaceStack = toUse; } diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 755e9b5cd..1570c11f0 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -167,7 +167,7 @@ public class GuiMModIDFilter extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); renderScaledText(LangUtils.localize("gui.id") + ": " + filter.modID, 35, 32, 0x00CD00, 107); - if(renderStack != null) + if(!renderStack.isEmpty()) { try { GlStateManager.pushMatrix(); @@ -178,7 +178,7 @@ public class GuiMModIDFilter extends GuiMekanism } catch(Exception e) {} } - if(filter.replaceStack != null) + if(!filter.replaceStack.isEmpty()) { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); @@ -290,7 +290,7 @@ public class GuiMModIDFilter extends GuiMekanism } else if(iterStacks != null && iterStacks.size() == 0) { - renderStack = null; + renderStack = ItemStack.EMPTY; } } @@ -328,9 +328,9 @@ public class GuiMModIDFilter extends GuiMekanism { boolean doNull = false; ItemStack stack = mc.player.inventory.getItemStack(); - ItemStack toUse = null; + ItemStack toUse = ItemStack.EMPTY; - if(stack != null && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!stack.isEmpty() && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { if(stack.getItem() instanceof ItemBlock) { @@ -341,12 +341,12 @@ public class GuiMModIDFilter extends GuiMekanism } } } - else if(stack == null && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + else if(stack.isEmpty() && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { doNull = true; } - if(toUse != null || doNull) + if(!toUse.isEmpty() || doNull) { filter.replaceStack = toUse; } diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index 7674dda7f..d17fe402c 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -167,7 +167,7 @@ public class GuiMOreDictFilter extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); renderScaledText(LangUtils.localize("gui.key") + ": " + filter.oreDictName, 35, 32, 0x00CD00, 107); - if(renderStack != null) + if(!renderStack.isEmpty()) { try { GlStateManager.pushMatrix(); @@ -178,7 +178,7 @@ public class GuiMOreDictFilter extends GuiMekanism } catch(Exception e) {} } - if(filter.replaceStack != null) + if(!filter.replaceStack.isEmpty()) { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); @@ -290,7 +290,7 @@ public class GuiMOreDictFilter extends GuiMekanism } else if(iterStacks != null && iterStacks.size() == 0) { - renderStack = null; + renderStack = ItemStack.EMPTY; } } @@ -328,9 +328,9 @@ public class GuiMOreDictFilter extends GuiMekanism { boolean doNull = false; ItemStack stack = mc.player.inventory.getItemStack(); - ItemStack toUse = null; + ItemStack toUse = ItemStack.EMPTY; - if(stack != null && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!stack.isEmpty() && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { if(stack.getItem() instanceof ItemBlock) { @@ -341,12 +341,12 @@ public class GuiMOreDictFilter extends GuiMekanism } } } - else if(stack == null && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + else if(stack.isEmpty() && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { doNull = true; } - if(toUse != null || doNull) + if(!toUse.isEmpty() || doNull) { filter.replaceStack = toUse; } diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index c8474db08..33ae357af 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -118,7 +118,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper ItemStack stack = mc.player.inventory.getItemStack(); - if(stack != null && stack.getItem() instanceof ItemConfigurator && hovering != null) + if(!stack.isEmpty() && stack.getItem() instanceof ItemConfigurator && hovering != null) { SideData data = getFromSlot(hovering); diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index 2c9a23c89..82c5ed314 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -132,7 +132,7 @@ public class GuiOredictionificator extends GuiMekanism ItemStack stack = renderStacks.get(filter); - if(stack != null) + if(!stack.isEmpty()) { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); @@ -258,7 +258,7 @@ public class GuiOredictionificator extends GuiMekanism { if(filter.filter == null || filter.filter.isEmpty()) { - renderStacks.put(filter, null); + renderStacks.put(filter, ItemStack.EMPTY); continue; } @@ -266,7 +266,7 @@ public class GuiOredictionificator extends GuiMekanism if(stacks.isEmpty()) { - renderStacks.put(filter, null); + renderStacks.put(filter, ItemStack.EMPTY); continue; } @@ -275,7 +275,7 @@ public class GuiOredictionificator extends GuiMekanism renderStacks.put(filter, stacks.get(filter.index).copy()); } else { - renderStacks.put(filter, null); + renderStacks.put(filter, ItemStack.EMPTY); } } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index c5b3a9a91..e351e33b1 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -264,10 +264,10 @@ public class GuiRobitRepair extends GuiMekanism implements IContainerListener { if(slotID == 0) { - itemNameField.setText(itemstack == null ? "" : itemstack.getDisplayName()); - itemNameField.setEnabled(itemstack != null); + itemNameField.setText(itemstack.isEmpty() ? "" : itemstack.getDisplayName()); + itemNameField.setEnabled(!itemstack.isEmpty()); - if(itemstack != null) + if(!itemstack.isEmpty()) { repairContainer.updateItemName(itemNameField.getText()); mc.player.connection.sendPacket(new CPacketCustomPayload("MC|ItemName", (new PacketBuffer(Unpooled.buffer())).writeString(itemNameField.getText()))); diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index cb25e9ca4..c844423e8 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -101,7 +101,7 @@ public class GuiTItemStackFilter extends GuiMekanism if(guibutton.id == 0) { - if(filter.itemType != null && !minField.getText().isEmpty() && !maxField.getText().isEmpty()) + if(!filter.itemType.isEmpty() && !minField.getText().isEmpty() && !maxField.getText().isEmpty()) { int min = Integer.parseInt(minField.getText()); int max = Integer.parseInt(maxField.getText()); @@ -132,7 +132,7 @@ public class GuiTItemStackFilter extends GuiMekanism ticker = 20; } } - else if(filter.itemType == null) + else if(filter.itemType.isEmpty()) { status = EnumColor.DARK_RED + "No item"; ticker = 20; @@ -179,13 +179,9 @@ public class GuiTItemStackFilter extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.max") + ":", 128, 32, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui." + (filter.sizeMode ? "on" : "off")), 141, 46, 0x404040); - if(filter.itemType != null) + if(!filter.itemType.isEmpty()) { renderScaledText(filter.itemType.getDisplayName(), 35, 41, 0x00CD00, 89); - } - - if(filter.itemType != null) - { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.itemType, 12, 19); @@ -312,14 +308,14 @@ public class GuiTItemStackFilter extends GuiMekanism { ItemStack stack = mc.player.inventory.getItemStack(); - if(stack != null && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!stack.isEmpty() && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { filter.itemType = stack.copy(); filter.itemType.setCount(1); } - else if(stack == null && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + else if(stack.isEmpty() && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - filter.itemType = null; + filter.itemType = ItemStack.EMPTY; } SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 6f0987f72..4dc9e301f 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -92,7 +92,7 @@ public class GuiTMaterialFilter extends GuiMekanism if(guibutton.id == 0) { - if(filter.materialItem != null) + if(!filter.materialItem.isEmpty()) { if(isNew) { @@ -104,7 +104,7 @@ public class GuiTMaterialFilter extends GuiMekanism Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } - else if(filter.materialItem == null) + else if(filter.materialItem.isEmpty()) { status = EnumColor.DARK_RED + LangUtils.localize("gui.itemFilter.noItem"); ticker = 20; @@ -127,13 +127,9 @@ public class GuiTMaterialFilter extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00); - if(filter.materialItem != null) + if(!filter.materialItem.isEmpty()) { renderScaledText(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00, 107); - } - - if(filter.materialItem != null) - { GlStateManager.pushMatrix(); RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI(filter.materialItem, 12, 19); @@ -243,7 +239,7 @@ public class GuiTMaterialFilter extends GuiMekanism { ItemStack stack = mc.player.inventory.getItemStack(); - if(stack != null && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!stack.isEmpty() && !Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { if(stack.getItem() instanceof ItemBlock) { @@ -254,9 +250,9 @@ public class GuiTMaterialFilter extends GuiMekanism } } } - else if(stack == null && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + else if(stack.isEmpty() && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - filter.materialItem = null; + filter.materialItem = ItemStack.EMPTY; } SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 0c0fb4963..8b9b399b1 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -162,7 +162,7 @@ public class GuiTeleporter extends GuiMekanism setButton = new GuiButton(2, guiWidth + 27, guiHeight + 116, 60, 20, LangUtils.localize("gui.set")); deleteButton = new GuiButton(3, guiWidth + 89, guiHeight + 116, 60, 20, LangUtils.localize("gui.delete")); - if(itemStack != null) + if(!itemStack.isEmpty()) { teleportButton = new GuiButton(4, guiWidth + 42, guiHeight + 140, 92, 20, LangUtils.localize("gui.teleport")); } @@ -179,7 +179,7 @@ public class GuiTeleporter extends GuiMekanism buttonList.add(setButton); buttonList.add(deleteButton); - if(itemStack != null) + if(!itemStack.isEmpty()) { buttonList.add(teleportButton); @@ -281,7 +281,7 @@ public class GuiTeleporter extends GuiMekanism deleteButton.enabled = false; } - if(itemStack != null) + if(!itemStack.isEmpty()) { if(clientFreq != null && clientStatus == 1) { @@ -418,7 +418,7 @@ public class GuiTeleporter extends GuiMekanism int yAxis = (mouseY-(height-ySize)/2); fontRendererObj.drawString(getName(), (xSize/2)-(fontRendererObj.getStringWidth(getName())/2), 4, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (getOwner() != null ? getOwner() : LangUtils.localize("gui.none")), 8, itemStack != null ? ySize-12 : (ySize-96)+4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (getOwner() != null ? getOwner() : LangUtils.localize("gui.none")), 8, !itemStack.isEmpty() ? ySize-12 : (ySize-96)+4, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040); @@ -528,7 +528,7 @@ public class GuiTeleporter extends GuiMekanism private double getEnergy() { - if(itemStack != null) + if(!itemStack.isEmpty()) { return ((ItemPortableTeleporter)itemStack.getItem()).getEnergy(itemStack); } @@ -538,7 +538,7 @@ public class GuiTeleporter extends GuiMekanism private double getMaxEnergy() { - if(itemStack != null) + if(!itemStack.isEmpty()) { return ((ItemPortableTeleporter)itemStack.getItem()).getMaxEnergy(itemStack); } diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index 531c09f1e..6a56bceb5 100644 --- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -65,7 +65,7 @@ public class GuiFluidGauge extends GuiGauge { ItemStack stack = mc.player.inventory.getItemStack(); - if(guiObj instanceof GuiMekanism && stack != null && stack.getItem() instanceof ItemGaugeDropper) + if(guiObj instanceof GuiMekanism && !stack.isEmpty() && stack.getItem() instanceof ItemGaugeDropper) { TileEntity tile = ((GuiMekanism)guiObj).getTileEntity(); diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index 3a0ff9768..e0b67fb96 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -52,7 +52,7 @@ public class GuiGasGauge extends GuiGauge { ItemStack stack = mc.player.inventory.getItemStack(); - if(guiObj instanceof GuiMekanism && stack != null && stack.getItem() instanceof ItemGaugeDropper) + if(guiObj instanceof GuiMekanism && !stack.isEmpty() && stack.getItem() instanceof ItemGaugeDropper) { TileEntity tile = ((GuiMekanism)guiObj).getTileEntity(); diff --git a/src/main/java/mekanism/client/gui/element/GuiGauge.java b/src/main/java/mekanism/client/gui/element/GuiGauge.java index 042fcd5c0..b87a17c10 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGauge.java @@ -133,7 +133,7 @@ public abstract class GuiGauge extends GuiElement { ItemStack stack = mc.player.inventory.getItemStack(); - if(stack != null && stack.getItem() instanceof ItemConfigurator && color != null) + if(!stack.isEmpty() && stack.getItem() instanceof ItemConfigurator && color != null) { if(guiObj instanceof GuiMekanism && ((GuiMekanism)guiObj).getTileEntity() != null) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 83d9ce2ad..0026ead4c 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -48,7 +48,7 @@ public class RenderConfigurableMachine ret = NonNullList.withSize(handler.getSlots(), ItemStack.EMPTY); + + for(int i = 0; i < handler.getSlots(); i++) + { + ret.set(i, handler.getStackInSlot(i)); + } + + return new InventoryCopy(ret); + } public static InventoryCopy copyInvFromSide(IInventory inv, EnumFacing side) { inv = InventoryUtils.checkChestInv(inv); - - NonNullListret = NonNullList.withSize(inv.getSizeInventory(), ItemStack.EMPTY); + + NonNullList ret = NonNullList.withSize(inv.getSizeInventory(), ItemStack.EMPTY); if(!(inv instanceof ISidedInventory)) { diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 7304fbf66..343087f49 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -233,14 +233,14 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData { ItemStack stack = block.getStack(world); - if(stack == null) + if(stack.isEmpty()) { return false; } ItemStack result = FurnaceRecipes.instance().getSmeltingResult(block.getStack(world)); - if(result != null && result.getItem() != null) + if(!result.isEmpty() && result.getItem() != null) { if(!world.isRemote) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java index c950ac188..4e5a75ada 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java @@ -254,7 +254,7 @@ public class ContainerFactory extends Container public boolean isProperMachine(ItemStack itemStack) { - if(itemStack != null && itemStack.getItem() instanceof ItemBlockMachine) + if(!itemStack.isEmpty() && itemStack.getItem() instanceof ItemBlockMachine) { for(RecipeType type : RecipeType.values()) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java index 8738bf3d8..ca3105bda 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java @@ -144,7 +144,7 @@ public class ContainerPersonalChest extends Container { ItemStack itemStack = player.inventory.getStackInSlot(destSlot); - if(itemStack != null && MachineType.get(itemStack) == MachineType.PERSONAL_CHEST) + if(!itemStack.isEmpty() && MachineType.get(itemStack) == MachineType.PERSONAL_CHEST) { return ItemStack.EMPTY; } diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index 4adfd5918..712b5bb12 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -50,7 +50,7 @@ public class ItemCraftingFormula extends ItemMekanism for(ItemStack stack : inv) { - if(stack != null) + if(!stack.isEmpty()) { boolean found = false; diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index e7f9b1f3a..1d6a0c154 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -51,12 +51,12 @@ public class ItemElectricBow extends ItemEnergized ItemStack ammo = findAmmo(player); int maxItemUse = getMaxItemUseDuration(itemstack) - itemUseCount; - maxItemUse = ForgeEventFactory.onArrowLoose(itemstack, world, player, maxItemUse, itemstack != null || flag); + maxItemUse = ForgeEventFactory.onArrowLoose(itemstack, world, player, maxItemUse, !itemstack.isEmpty() || flag); if(maxItemUse < 0) return; - if(flag || ammo != null) + if(flag || !ammo.isEmpty()) { - if(ammo == null) + if(ammo.isEmpty()) { ammo = new ItemStack(Items.ARROW); } @@ -152,20 +152,20 @@ public class ItemElectricBow extends ItemEnergized } } - return null; + return ItemStack.EMPTY; } } protected boolean isArrow(@Nullable ItemStack stack) { - return stack != null && stack.getItem() instanceof ItemArrow; + return !stack.isEmpty() && stack.getItem() instanceof ItemArrow; } @Override public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand hand) { ItemStack itemStackIn = playerIn.getHeldItem(hand); - boolean flag = findAmmo(playerIn) != null; + boolean flag = !findAmmo(playerIn).isEmpty(); ActionResult ret = ForgeEventFactory.onArrowNock(itemStackIn, worldIn, playerIn, hand, flag); if(ret != null) return ret; diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index f56608e8a..ad3014992 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -217,7 +217,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci EntityLivingBase base = event.getEntityLiving(); ItemStack stack = base.getItemStackFromSlot(EntityEquipmentSlot.FEET); - if(stack != null && stack.getItem() instanceof ItemFreeRunners) + if(!stack.isEmpty() && stack.getItem() instanceof ItemFreeRunners) { ItemFreeRunners boots = (ItemFreeRunners)stack.getItem(); diff --git a/src/main/java/mekanism/common/network/PacketConfiguratorState.java b/src/main/java/mekanism/common/network/PacketConfiguratorState.java index 42a76f3d8..58739ce68 100644 --- a/src/main/java/mekanism/common/network/PacketConfiguratorState.java +++ b/src/main/java/mekanism/common/network/PacketConfiguratorState.java @@ -18,7 +18,7 @@ public class PacketConfiguratorState implements IMessageHandler 1) + if(bin.isEmpty() || bin.getCount() > 1) { - return null; + return ItemStack.EMPTY; } - ItemStack addStack = null; + ItemStack addStack = ItemStack.EMPTY; for(int i = 0; i < 9; i++) { ItemStack stack = inv.getStackInSlot(i); - if(stack != null && !isBin(stack)) + if(!stack.isEmpty() && !isBin(stack)) { - if(addStack != null) + if(!addStack.isEmpty()) { - return null; + return ItemStack.EMPTY; } addStack = stack.copy(); @@ -95,13 +95,13 @@ public class BinRecipe implements IRecipe InventoryBin binInv = new InventoryBin(bin); - if(addStack != null) + if(!addStack.isEmpty()) { if(!(addStack.getItem() instanceof ItemProxy)) { - if(binInv.getItemType() != null && !binInv.getItemType().isItemEqual(addStack)) + if(!binInv.getItemType().isEmpty() && !binInv.getItemType().isItemEqual(addStack)) { - return null; + return ItemStack.EMPTY; } binInv.add(addStack); @@ -135,7 +135,7 @@ public class BinRecipe implements IRecipe @SubscribeEvent public void onCrafting(ItemCraftedEvent event) { - if(getResult(event.craftMatrix) != null) + if(!getResult(event.craftMatrix).isEmpty()) { if(!isBin(event.crafting)) { @@ -149,7 +149,7 @@ public class BinRecipe implements IRecipe int size = inv.getItemCount(); ItemStack testRemove = inv.removeStack(); - int newCount = size-(testRemove != null ? testRemove.getCount() : 0); + int newCount = size-(!testRemove.isEmpty() ? testRemove.getCount() : 0); if(inv.getTier() == BinTier.CREATIVE) { @@ -170,7 +170,7 @@ public class BinRecipe implements IRecipe { bin = i; } - else if(!isBin(event.craftMatrix.getStackInSlot(i)) && event.craftMatrix.getStackInSlot(i) != null) + else if(!isBin(event.craftMatrix.getStackInSlot(i)) && !event.craftMatrix.getStackInSlot(i).isEmpty()) { other = i; } @@ -181,14 +181,14 @@ public class BinRecipe implements IRecipe ItemStack testRemain = new InventoryBin(binStack.copy()).add(otherStack.copy()); - if(testRemain != null && testRemain.getCount() > 0) + if(!testRemain.isEmpty() && testRemain.getCount() > 0) { ItemStack proxy = new ItemStack(MekanismItems.ItemProxy); ((ItemProxy)proxy.getItem()).setSavedItem(proxy, testRemain.copy()); event.craftMatrix.setInventorySlotContents(other, proxy); } else { - event.craftMatrix.setInventorySlotContents(other, null); + event.craftMatrix.setInventorySlotContents(other, ItemStack.EMPTY); } } } diff --git a/src/main/java/mekanism/common/recipe/RecipeHandler.java b/src/main/java/mekanism/common/recipe/RecipeHandler.java index 64fd38e54..cb4457724 100644 --- a/src/main/java/mekanism/common/recipe/RecipeHandler.java +++ b/src/main/java/mekanism/common/recipe/RecipeHandler.java @@ -489,7 +489,7 @@ public final class RecipeHandler */ public static > boolean isInRecipe(ItemStack itemstack, Map recipes) { - if(itemstack != null) + if(!itemstack.isEmpty()) { for(RECIPE recipe : recipes.values()) { @@ -509,7 +509,7 @@ public final class RecipeHandler public static boolean isInPressurizedRecipe(ItemStack stack) { - if(stack != null) + if(!stack.isEmpty()) { for(PressurizedInput key : (Set)Recipe.PRESSURIZED_REACTION_CHAMBER.get().keySet()) { diff --git a/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java b/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java index 56e4861d2..48d0891a0 100644 --- a/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java @@ -38,7 +38,7 @@ public class AdvancedMachineInput extends MachineInput @Override public boolean isValid() { - return itemStack != null && gasType != null; + return !itemStack.isEmpty() && gasType != null; } public boolean useItem(NonNullList inventory, int index, boolean deplete) diff --git a/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java b/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java index 63ae6c3e3..b2aac2cda 100644 --- a/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java @@ -69,7 +69,7 @@ public class PressurizedInput extends MachineInput */ public boolean containsType(ItemStack stack) { - if(stack == null || stack.getCount() == 0) + if(stack.isEmpty() || stack.getCount() == 0) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 13e9b45ea..4f51405c3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -130,7 +130,7 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock public void chargeItemStack(ItemStack itemstack) { - if(itemstack != null) + if(!itemstack.isEmpty()) { if(itemstack.getItem() instanceof IEnergizedItem) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 63af4b32e..f571cb1d0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -411,7 +411,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock { if(slotID == 0) { - return itemstack != null && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && + return !itemstack.isEmpty() && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && RecipeHandler.Recipe.CHEMICAL_CRYSTALLIZER.containsRecipe(((IGasItem)itemstack.getItem()).getGas(itemstack).getGas()); } else if(slotID == 2) @@ -427,7 +427,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock { if(slotID == 0) { - return itemstack != null && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).getGas(itemstack) == null; + return !itemstack.isEmpty() && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).getGas(itemstack) == null; } else if(slotID == 1) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 3acf855fe..379b338e8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -195,7 +195,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri { if(slotID == 2) { - return itemstack != null && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).canProvideGas(itemstack, null); + return !itemstack.isEmpty() && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).canProvideGas(itemstack, null); } return false; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 2416a5d65..09b8db34f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -471,11 +471,11 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl { if(slotID == 0 || slotID == 2) { - return itemstack != null && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).canReceiveGas(itemstack, null); + return !itemstack.isEmpty() && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).canReceiveGas(itemstack, null); } else if(slotID == 1) { - return itemstack != null && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).canProvideGas(itemstack, null); + return !itemstack.isEmpty() && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).canProvideGas(itemstack, null); } else if(slotID == 3) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index 6b48ba1e3..ba08c7df8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -173,7 +173,7 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp { if(slotID == 2) { - return itemstack != null && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).canProvideGas(itemstack, null); + return !itemstack.isEmpty() && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).canProvideGas(itemstack, null); } return false; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 734fa4431..891ab2d33 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -465,7 +465,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple { if(slotID == 1) { - return itemstack != null && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).canProvideGas(itemstack, null); + return !itemstack.isEmpty() && itemstack.getItem() instanceof IGasItem && ((IGasItem)itemstack.getItem()).canProvideGas(itemstack, null); } else if(slotID == 2) { diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index fddd0067f..56d33317a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -140,7 +140,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl { inventory.set(slotID, itemstack); - if(itemstack != null && itemstack.getCount() > getInventoryStackLimit()) + if(!itemstack.isEmpty() && itemstack.getCount() > getInventoryStackLimit()) { itemstack.setCount(getInventoryStackLimit()); } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 57c5d3849..13b8da7aa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -98,7 +98,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public boolean doEject = false; public boolean doPull = false; - public ItemStack missingStack = null; + public ItemStack missingStack = ItemStack.EMPTY; public int BASE_DELAY = 80; @@ -278,7 +278,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I world.playEvent(null, 2001, coord.getPos(), Block.getStateId(state)); - missingStack = null; + missingStack = ItemStack.EMPTY; } break; @@ -305,7 +305,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } } - if(doEject && delayTicks == 0 && getTopEject(false, null) != null && getEjectInv() != null && getEjectTile() != null) + if(doEject && delayTicks == 0 && !getTopEject(false, null).isEmpty() && getEjectInv() != null && getEjectTile() != null) { if(getEjectInv() instanceof IInventory) { @@ -381,7 +381,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { ItemStack stack = getReplace(index); - if(stack != null) + if(!stack.isEmpty()) { world.setBlockState(obj.getPos(), Block.getBlockFromItem(stack.getItem()).getStateFromMeta(stack.getItemDamage()), 3); @@ -417,9 +417,9 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { MinerFilter filter = replaceMap.get(index); - if(filter == null || filter.replaceStack == null) + if(filter == null || filter.replaceStack.isEmpty()) { - return null; + return ItemStack.EMPTY; } for(int i = 0; i < 27; i++) @@ -480,7 +480,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } } - return null; + return ItemStack.EMPTY; } public boolean canInsert(List stacks) @@ -497,7 +497,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I stacks: for(ItemStack stack : stacks) { - if(stack == null || stack.getItem() == null) + if(stack.isEmpty() || stack.getItem() == null) { continue; } @@ -609,7 +609,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I running = false; oresToMine.clear(); replaceMap.clear(); - missingStack = null; + missingStack = ItemStack.EMPTY; MekanismUtils.saveChunk(this); } @@ -618,7 +618,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { for(MinerFilter filter : filters) { - if(filter.replaceStack != null && filter.replaceStack.isItemEqual(stack)) + if(!filter.replaceStack.isEmpty() && filter.replaceStack.isItemEqual(stack)) { return true; } @@ -823,7 +823,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I missingStack = new ItemStack(Item.getItemById(dataStream.readInt()), 1, dataStream.readInt()); } else { - missingStack = null; + missingStack = ItemStack.EMPTY; } filters.clear(); @@ -856,7 +856,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I missingStack = new ItemStack(Item.getItemById(dataStream.readInt()), 1, dataStream.readInt()); } else { - missingStack = null; + missingStack = ItemStack.EMPTY; } } else if(type == 2) @@ -881,7 +881,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I missingStack = new ItemStack(Item.getItemById(dataStream.readInt()), 1, dataStream.readInt()); } else { - missingStack = null; + missingStack = ItemStack.EMPTY; } } @@ -922,7 +922,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I data.add(controlType.ordinal()); data.add(inverse); - if(missingStack != null) + if(!missingStack.isEmpty()) { data.add(true); data.add(MekanismUtils.getID(missingStack)); @@ -959,7 +959,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I data.add(getSize()); } - if(missingStack != null) + if(!missingStack.isEmpty()) { data.add(true); data.add(MekanismUtils.getID(missingStack)); @@ -1000,7 +1000,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I data.add(controlType.ordinal()); data.add(inverse); - if(missingStack != null) + if(!missingStack.isEmpty()) { data.add(true); data.add(MekanismUtils.getID(missingStack)); @@ -1220,7 +1220,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } else if(location.equals(pull)) { - if(itemstack != null && isReplaceStack(itemstack)) + if(!itemstack.isEmpty() && isReplaceStack(itemstack)) { return true; } @@ -1239,7 +1239,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(location.equals(eject)) { - if(itemstack != null && isReplaceStack(itemstack)) + if(!itemstack.isEmpty() && isReplaceStack(itemstack)) { return false; } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index e7f4c6bf0..b2781fabf 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -180,7 +180,7 @@ public class TileComponentEjector implements ITileComponent { int slotID = sideData.get(TransmissionType.ITEM).availableSlots[index]; - if(tileEntity.getStackInSlot(slotID) == null) + if(tileEntity.getStackInSlot(slotID).isEmpty()) { continue; } @@ -207,12 +207,12 @@ public class TileComponentEjector implements ITileComponent } } - if(stack == null || prev.getCount() != stack.getCount()) + if(stack.isEmpty() || prev.getCount() != stack.getCount()) { trackers.get(TransmissionType.ITEM)[index] = side.ordinal(); } - if(stack == null) + if(stack.isEmpty()) { break; } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java index bc93f3460..f7d5976ac 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java @@ -144,7 +144,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter stackMap = Upgrade.buildMap(ItemDataUtils.getDataMap(itemstack)); @@ -294,7 +294,7 @@ public class RecipeUtils } } - return null; + return ItemStack.EMPTY; } public static boolean removeRecipes(ItemStack stack) diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java index 35e67499f..d001ba77f 100644 --- a/src/main/java/mekanism/common/util/SecurityUtils.java +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -27,7 +27,7 @@ public final class SecurityUtils return owner == null || owner.equals(player.getName()); } - if(stack == null || !(stack.getItem() instanceof ISecurityItem)) + if(stack.isEmpty() || !(stack.getItem() instanceof ISecurityItem)) { return true; } diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index 8e7d76121..008bfdd2e 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -177,7 +177,7 @@ public class VoiceConnection extends Thread public boolean canListen(int channel, ItemStack itemStack) { - if(itemStack != null) + if(!itemStack.isEmpty()) { if(itemStack.getItem() instanceof ItemWalkieTalkie) { @@ -198,7 +198,7 @@ public class VoiceConnection extends Thread { ItemStack itemStack = getPlayer().inventory.getCurrentItem(); - if(itemStack != null) + if(!itemStack.isEmpty()) { ItemWalkieTalkie walkieTalkie = (ItemWalkieTalkie)itemStack.getItem(); diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 774c6f193..ee38f2da0 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -413,7 +413,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock int metadata = state.getBlock().getMetaFromState(state); ItemStack stack = entityplayer.getHeldItem(hand); - if(stack != null) + if(!stack.isEmpty()) { Item tool = stack.getItem(); @@ -457,7 +457,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock if(!entityplayer.isSneaking()) { - if(stack != null && stack.getItem() == GeneratorsItems.TurbineBlade) + if(!stack.isEmpty() && stack.getItem() == GeneratorsItems.TurbineBlade) { if(!world.isRemote && rod.editBlade(true)) { @@ -467,7 +467,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock if(stack.getCount() == 0) { - entityplayer.setHeldItem(hand, null); + entityplayer.setHeldItem(hand, ItemStack.EMPTY); } } } @@ -478,7 +478,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock else { if(!world.isRemote) { - if(stack == null) + if(stack.isEmpty()) { if(rod.editBlade(false)) { diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 94b75abef..ce2a3ad1e 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -178,7 +178,7 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock int metadata = state.getBlock().getMetaFromState(state); ItemStack stack = entityplayer.getHeldItem(hand); - if(stack != null) + if(!stack.isEmpty()) { if(MekanismUtils.isBCWrench(stack.getItem()) && !stack.getUnlocalizedName().contains("omniwrench")) { diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 0b2223749..71b791ad8 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -397,7 +397,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl { getReactor().getInventory().set(slotID, itemstack); - if(itemstack != null && itemstack.getCount() > getInventoryStackLimit()) + if(!itemstack.isEmpty() && itemstack.getCount() > getInventoryStackLimit()) { itemstack.setCount(getInventoryStackLimit()); }