From afd3525a4b7dfe16814ad41b3867693f13fa4352 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 29 Mar 2017 01:33:04 -0400 Subject: [PATCH] Even more inventory changes --- .../mekanism/common/entity/EntityRobit.java | 149 +++++++----------- .../common/inventory/InventoryBin.java | 22 +-- .../inventory/InventoryPersonalChest.java | 6 +- .../ContainerAdvancedElectricMachine.java | 26 +-- .../container/ContainerChanceMachine.java | 22 +-- .../ContainerChemicalCrystallizer.java | 22 +-- .../ContainerChemicalDissolutionChamber.java | 24 +-- .../container/ContainerChemicalInfuser.java | 20 +-- .../container/ContainerChemicalOxidizer.java | 24 +-- .../container/ContainerChemicalWasher.java | 26 +-- .../container/ContainerDictionary.java | 12 +- .../container/ContainerDigitalMiner.java | 14 +- .../container/ContainerDynamicTank.java | 16 +- .../container/ContainerElectricMachine.java | 22 +-- .../container/ContainerElectricPump.java | 4 +- .../ContainerElectrolyticSeparator.java | 24 +-- .../container/ContainerEnergyCube.java | 26 +-- .../inventory/container/ContainerFactory.java | 34 ++-- .../inventory/container/ContainerFilter.java | 12 +- .../container/ContainerFluidTank.java | 16 +- .../container/ContainerFluidicPlenisher.java | 22 +-- .../ContainerFormulaicAssemblicator.java | 24 +-- .../container/ContainerFuelwoodHeater.java | 16 +- .../inventory/container/ContainerGasTank.java | 16 +- .../container/ContainerInductionMatrix.java | 26 +-- .../container/ContainerLaserAmplifier.java | 12 +- .../container/ContainerLaserTractorBeam.java | 10 +- .../ContainerMetallurgicInfuser.java | 20 +-- .../ContainerOredictionificator.java | 18 +-- .../inventory/container/ContainerPRC.java | 22 +-- .../container/ContainerPersonalChest.java | 12 +- .../ContainerQuantumEntangloporter.java | 12 +- .../container/ContainerResistiveHeater.java | 16 +- .../container/ContainerRobitInventory.java | 10 +- .../container/ContainerRobitMain.java | 2 +- .../container/ContainerRobitSmelting.java | 16 +- .../ContainerRotaryCondensentrator.java | 26 +-- .../container/ContainerSecurityDesk.java | 16 +- .../container/ContainerSeismicVibrator.java | 16 +- .../ContainerSolarNeutronActivator.java | 18 +-- .../container/ContainerTeleporter.java | 16 +- ...ContainerThermalEvaporationController.java | 22 +-- .../container/ContainerUpgradeManagement.java | 16 +- .../inventory/slot/SlotPersonalChest.java | 2 +- .../mekanism/common/util/ChargeUtils.java | 4 +- .../container/ContainerBioGenerator.java | 20 +-- .../container/ContainerGasGenerator.java | 20 +-- .../container/ContainerHeatGenerator.java | 20 +-- .../container/ContainerNeutronCapture.java | 16 +- .../container/ContainerReactorController.java | 16 +- .../container/ContainerSolarGenerator.java | 16 +- .../container/ContainerWindGenerator.java | 16 +- 52 files changed, 498 insertions(+), 537 deletions(-) diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 76e90b88e..3231a071e 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -32,6 +32,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; @@ -44,6 +45,7 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -60,7 +62,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public Coord4D homeLocation; - public ItemStack[] inventory = new ItemStack[31]; + public NonNullList inventory = NonNullList.withSize(31, ItemStack.EMPTY); public int furnaceBurnTime = 0; public int currentItemBurnTime = 0; @@ -178,41 +180,36 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine goHome(); } - if(inventory[27] != null && getEnergy() < MAX_ELECTRICITY) + if(!inventory.get(27).isEmpty() && getEnergy() < MAX_ELECTRICITY) { - if(inventory[27].getItem() instanceof IEnergizedItem) + if(inventory.get(27).getItem() instanceof IEnergizedItem) { - setEnergy(getEnergy() + EnergizedItemManager.discharge(inventory[27], MAX_ELECTRICITY - getEnergy())); + setEnergy(getEnergy() + EnergizedItemManager.discharge(inventory.get(27), MAX_ELECTRICITY - getEnergy())); } - else if(MekanismUtils.useIC2() && inventory[27].getItem() instanceof IElectricItem) + else if(MekanismUtils.useIC2() && inventory.get(27).getItem() instanceof IElectricItem) { - IElectricItem item = (IElectricItem)inventory[27].getItem(); + IElectricItem item = (IElectricItem)inventory.get(27).getItem(); - if(item.canProvideEnergy(inventory[27])) + if(item.canProvideEnergy(inventory.get(27))) { - double gain = ElectricItem.manager.discharge(inventory[27], (MAX_ELECTRICITY - getEnergy())* general.TO_IC2, 4, true, true, false)*general.FROM_IC2; + double gain = ElectricItem.manager.discharge(inventory.get(27), (MAX_ELECTRICITY - getEnergy())* general.TO_IC2, 4, true, true, false)*general.FROM_IC2; setEnergy(getEnergy() + gain); } } - else if(MekanismUtils.useRF() && inventory[27].getItem() instanceof IEnergyContainerItem) + else if(MekanismUtils.useRF() && inventory.get(27).getItem() instanceof IEnergyContainerItem) { - ItemStack itemStack = inventory[27]; - IEnergyContainerItem item = (IEnergyContainerItem)inventory[27].getItem(); + ItemStack itemStack = inventory.get(27); + IEnergyContainerItem item = (IEnergyContainerItem)inventory.get(27).getItem(); int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack))); int toTransfer = (int)Math.round(Math.min(itemEnergy, ((MAX_ELECTRICITY - getEnergy())*general.TO_RF))); setEnergy(getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_RF)); } - else if(inventory[27].getItem() == Items.REDSTONE && getEnergy()+ general.ENERGY_PER_REDSTONE <= MAX_ELECTRICITY) + else if(inventory.get(27).getItem() == Items.REDSTONE && getEnergy()+ general.ENERGY_PER_REDSTONE <= MAX_ELECTRICITY) { setEnergy(getEnergy() + general.ENERGY_PER_REDSTONE); - inventory[27].shrink(1); - - if(inventory[27].getCount() <= 0) - { - inventory[27] = null; - } + inventory.get(27).shrink(1); } } @@ -225,17 +222,17 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { if(furnaceBurnTime == 0 && canSmelt()) { - currentItemBurnTime = furnaceBurnTime = TileEntityFurnace.getItemBurnTime(inventory[29]); + currentItemBurnTime = furnaceBurnTime = TileEntityFurnace.getItemBurnTime(inventory.get(29)); if(furnaceBurnTime > 0) { - if(inventory[29] != null) + if(!inventory.get(29).isEmpty()) { - inventory[29].shrink(1); + inventory.get(29).shrink(1); - if(inventory[29].getCount() == 0) + if(inventory.get(29).getCount() == 0) { - inventory[29] = inventory[29].getItem().getContainerItem(inventory[29]); + inventory.set(29, inventory.get(29).getItem().getContainerItem(inventory.get(29))); } } } @@ -273,11 +270,11 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine for(int i = 0; i < 27; i++) { - ItemStack itemStack = inventory[i]; + ItemStack itemStack = inventory.get(i); - if(itemStack == null) + if(itemStack.isEmpty()) { - inventory[i] = item.getEntityItem(); + inventory.set(i, item.getEntityItem()); onItemPickup(item, item.getEntityItem().getCount()); item.setDead(); @@ -327,16 +324,16 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine private boolean canSmelt() { - if(inventory[28] == null) + if(inventory.get(28).isEmpty()) { return false; } else { - ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(inventory[28]); - if(itemstack == null) return false; - if(inventory[30] == null) return true; - if(!inventory[30].isItemEqual(itemstack)) return false; - int result = inventory[30].getCount() + itemstack.getCount(); + ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(inventory.get(28)); + if(itemstack.isEmpty()) return false; + if(inventory.get(30).isEmpty()) return true; + if(!inventory.get(30).isItemEqual(itemstack)) return false; + int result = inventory.get(30).getCount() + itemstack.getCount(); return (result <= getInventoryStackLimit() && result <= itemstack.getMaxStackSize()); } } @@ -345,23 +342,18 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { if(canSmelt()) { - ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(inventory[28]); + ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(inventory.get(28)); - if(inventory[30] == null) + if(inventory.get(30).isEmpty()) { - inventory[30] = itemstack.copy(); + inventory.set(30, itemstack.copy()); } - else if(inventory[30].isItemEqual(itemstack)) + else if(inventory.get(30).isItemEqual(itemstack)) { - inventory[30].grow(itemstack.getCount()); + inventory.get(30).grow(itemstack.getCount()); } - inventory[28].shrink(1); - - if(inventory[28].getCount() <= 0) - { - inventory[28] = null; - } + inventory.get(28).shrink(1); } } @@ -384,7 +376,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine if(entityplayer.isSneaking()) { - if(stack != null && stack.getItem() instanceof ItemConfigurator) + if(!stack.isEmpty() && stack.getItem() instanceof ItemConfigurator) { if(!world.isRemote) { @@ -447,13 +439,13 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine NBTTagList tagList = new NBTTagList(); - for(int slotCount = 0; slotCount < inventory.length; slotCount++) + for(int slotCount = 0; slotCount < inventory.size(); slotCount++) { - if(inventory[slotCount] != null) + if(!inventory.get(slotCount).isEmpty()) { NBTTagCompound tagCompound = new NBTTagCompound(); tagCompound.setByte("Slot", (byte)slotCount); - inventory[slotCount].writeToNBT(tagCompound); + inventory.get(slotCount).writeToNBT(tagCompound); tagList.appendTag(tagCompound); } } @@ -482,16 +474,16 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine homeLocation = Coord4D.read(nbtTags); NBTTagList tagList = nbtTags.getTagList("Items", Constants.NBT.TAG_COMPOUND); - inventory = new ItemStack[getSizeInventory()]; + inventory = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) { NBTTagCompound tagCompound = tagList.getCompoundTagAt(tagCount); byte slotID = tagCompound.getByte("Slot"); - if(slotID >= 0 && slotID < inventory.length) + if(slotID >= 0 && slotID < inventory.size()) { - inventory[slotID] = InventoryUtils.loadFromNBT(tagCompound); + inventory.set(slotID, InventoryUtils.loadFromNBT(tagCompound)); } } } @@ -576,64 +568,33 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine @Override public int getSizeInventory() { - return inventory.length; + return inventory.size(); } @Override public ItemStack getStackInSlot(int slotID) { - return inventory[slotID]; + return inventory.get(slotID); } @Override public ItemStack decrStackSize(int slotID, int amount) { - if(getStackInSlot(slotID) != null) - { - ItemStack tempStack; - - if(getStackInSlot(slotID).getCount() <= amount) - { - tempStack = getStackInSlot(slotID); - setInventorySlotContents(slotID, null); - return tempStack; - } - else { - tempStack = getStackInSlot(slotID).splitStack(amount); - - if(getStackInSlot(slotID).getCount() == 0) - { - setInventorySlotContents(slotID, null); - } - - return tempStack; - } - } - else { - return null; - } + return ItemStackHelper.getAndSplit(inventory, slotID, amount); } @Override public ItemStack removeStackFromSlot(int slotID) { - if(getStackInSlot(slotID) != null) - { - ItemStack tempStack = getStackInSlot(slotID); - setInventorySlotContents(slotID, null); - return tempStack; - } - else { - return null; - } + return ItemStackHelper.getAndRemove(inventory, slotID); } @Override public void setInventorySlotContents(int slotID, ItemStack itemstack) { - inventory[slotID] = itemstack; + inventory.set(slotID, itemstack); - if(itemstack != null && itemstack.getCount() > getInventoryStackLimit()) + if(!itemstack.isEmpty() && itemstack.getCount() > getInventoryStackLimit()) { itemstack.setCount(getInventoryStackLimit()); } @@ -692,16 +653,16 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine return; } - inventory = new ItemStack[getSizeInventory()]; + inventory = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); for(int slots = 0; slots < nbtTags.tagCount(); slots++) { NBTTagCompound tagCompound = (NBTTagCompound)nbtTags.getCompoundTagAt(slots); byte slotID = tagCompound.getByte("Slot"); - if(slotID >= 0 && slotID < inventory.length) + if(slotID >= 0 && slotID < inventory.size()) { - inventory[slotID] = InventoryUtils.loadFromNBT(tagCompound); + inventory.set(slotID, InventoryUtils.loadFromNBT(tagCompound)); } } } @@ -711,13 +672,13 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { NBTTagList tagList = new NBTTagList(); - for(int slots = 0; slots < inventory.length; slots++) + for(int slots = 0; slots < inventory.size(); slots++) { - if(inventory[slots] != null) + if(!inventory.get(slots).isEmpty()) { NBTTagCompound tagCompound = new NBTTagCompound(); tagCompound.setByte("Slot", (byte)slots); - inventory[slots].writeToNBT(tagCompound); + inventory.get(slots).writeToNBT(tagCompound); tagList.appendTag(tagCompound); } } @@ -730,7 +691,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { for(ItemStack stack : inventory) { - if(stack != null) + if(!stack.isEmpty()) { return false; } diff --git a/src/main/java/mekanism/common/inventory/InventoryBin.java b/src/main/java/mekanism/common/inventory/InventoryBin.java index e9e5313d3..81a2527c8 100644 --- a/src/main/java/mekanism/common/inventory/InventoryBin.java +++ b/src/main/java/mekanism/common/inventory/InventoryBin.java @@ -20,7 +20,7 @@ public class InventoryBin public ItemStack getStack() { - if(getItemCount() > 0 && getItemType() != null) + if(getItemCount() > 0 && !getItemType().isEmpty()) { ItemStack ret = getItemType().copy(); ret.setCount(Math.min(getItemType().getMaxStackSize(), getItemCount())); @@ -28,16 +28,16 @@ public class InventoryBin return ret; } - return null; + return ItemStack.EMPTY; } public ItemStack removeStack() { ItemStack stack = getStack(); - if(stack == null) + if(stack.isEmpty()) { - return null; + return ItemStack.EMPTY; } if(getTier() != BinTier.CREATIVE) @@ -52,7 +52,7 @@ public class InventoryBin { if(isValid(stack) && (getTier() == BinTier.CREATIVE || getItemCount() != getMaxStorage())) { - if(getItemType() == null) + if(getItemType().isEmpty()) { setItemType(stack); } @@ -62,7 +62,7 @@ public class InventoryBin if(getItemCount() + stack.getCount() <= getMaxStorage()) { setItemCount(getItemCount() + stack.getCount()); - return null; + return ItemStack.EMPTY; } else { ItemStack rejects = getItemType().copy(); @@ -83,7 +83,7 @@ public class InventoryBin public boolean isValid(ItemStack stack) { - if(stack == null || stack.getCount() <= 0) + if(stack.isEmpty() || stack.getCount() <= 0) { return false; } @@ -93,7 +93,7 @@ public class InventoryBin return false; } - if(getItemType() == null) + if(getItemType().isEmpty()) { return true; } @@ -127,7 +127,7 @@ public class InventoryBin if(getItemCount() == 0) { - setItemType(null); + setItemType(ItemStack.EMPTY); } } @@ -135,7 +135,7 @@ public class InventoryBin { if(getItemCount() == 0) { - return null; + return ItemStack.EMPTY; } return InventoryUtils.loadFromNBT(ItemDataUtils.getCompound(bin, "storedItem")); @@ -143,7 +143,7 @@ public class InventoryBin public void setItemType(ItemStack stack) { - if(stack == null) + if(stack.isEmpty()) { ItemDataUtils.removeData(bin, "storedItem"); return; diff --git a/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java b/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java index a8950379f..a0ff60c6f 100644 --- a/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java @@ -64,7 +64,7 @@ public class InventoryPersonalChest extends InventoryBasic for(int slotCount = 0; slotCount < getSizeInventory(); slotCount++) { - if(getStackInSlot(slotCount) != null) + if(!getStackInSlot(slotCount).isEmpty()) { NBTTagCompound tagCompound = new NBTTagCompound(); tagCompound.setByte("Slot", (byte)slotCount); @@ -73,7 +73,7 @@ public class InventoryPersonalChest extends InventoryBasic } } - if(getStack() != null) + if(!getStack().isEmpty()) { ((ISustainedInventory)getStack().getItem()).setInventory(tagList, getStack()); } @@ -109,6 +109,6 @@ public class InventoryPersonalChest extends InventoryBasic public ItemStack getStack() { - return itemStack != null ? itemStack : entityPlayer.getHeldItem(currentHand); + return !itemStack.isEmpty() ? itemStack : entityPlayer.getHeldItem(currentHand); } } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index ae4d162d5..e5fbc6b0a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -62,7 +62,7 @@ public class ContainerAdvancedElectricMachine extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -74,7 +74,7 @@ public class ContainerAdvancedElectricMachine extends Container { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(ChargeUtils.canBeDischarged(slotStack)) @@ -83,13 +83,13 @@ public class ContainerAdvancedElectricMachine extends Container { if(!mergeItemStack(slotStack, 3, 4, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -99,13 +99,13 @@ public class ContainerAdvancedElectricMachine extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -115,13 +115,13 @@ public class ContainerAdvancedElectricMachine extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -130,27 +130,27 @@ public class ContainerAdvancedElectricMachine extends Container { if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 30) { if(!mergeItemStack(slotStack, 4, 30, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -158,7 +158,7 @@ public class ContainerAdvancedElectricMachine extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java index 9c5332d7e..413a1c8dc 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java @@ -61,7 +61,7 @@ public class ContainerChanceMachine extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -73,7 +73,7 @@ public class ContainerChanceMachine extends Container { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(ChargeUtils.canBeDischarged(slotStack)) @@ -82,14 +82,14 @@ public class ContainerChanceMachine extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 1) { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -99,13 +99,13 @@ public class ContainerChanceMachine extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -114,27 +114,27 @@ public class ContainerChanceMachine extends Container { if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 30) { if(!mergeItemStack(slotStack, 4, 30, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -142,7 +142,7 @@ public class ContainerChanceMachine extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java index 4a126433f..59285818a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java @@ -60,7 +60,7 @@ public class ContainerChemicalCrystallizer extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -74,13 +74,13 @@ public class ContainerChemicalCrystallizer extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -88,7 +88,7 @@ public class ContainerChemicalCrystallizer extends Container { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(ChargeUtils.canBeDischarged(slotStack)) @@ -97,14 +97,14 @@ public class ContainerChemicalCrystallizer extends Container { if(!mergeItemStack(slotStack, 2, 3, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 2) { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -113,27 +113,27 @@ public class ContainerChemicalCrystallizer extends Container { if(!mergeItemStack(slotStack, 30, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 29) { if(!mergeItemStack(slotStack, 3, 29, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -141,7 +141,7 @@ public class ContainerChemicalCrystallizer extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java index d35ddf5f5..b7e350500 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java @@ -62,7 +62,7 @@ public class ContainerChemicalDissolutionChamber extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -76,13 +76,13 @@ public class ContainerChemicalDissolutionChamber extends Container { if(!mergeItemStack(slotStack, 1, 2, true)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -92,14 +92,14 @@ public class ContainerChemicalDissolutionChamber extends Container { if(!mergeItemStack(slotStack, 3, 4, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 3) { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -111,14 +111,14 @@ public class ContainerChemicalDissolutionChamber extends Container { if(!mergeItemStack(slotStack, 2, 3, false)) { - return null; + return ItemStack.EMPTY; } } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -127,27 +127,27 @@ public class ContainerChemicalDissolutionChamber extends Container { if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 30) { if(!mergeItemStack(slotStack, 4, 30, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -155,7 +155,7 @@ public class ContainerChemicalDissolutionChamber extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java index 87c986e70..ab08acb1f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -60,7 +60,7 @@ public class ContainerChemicalInfuser extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -74,14 +74,14 @@ public class ContainerChemicalInfuser extends Container { if(!mergeItemStack(slotStack, 3, 4, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 3) { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -91,13 +91,13 @@ public class ContainerChemicalInfuser extends Container { if(!mergeItemStack(slotStack, 0, 3, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -106,27 +106,27 @@ public class ContainerChemicalInfuser extends Container { if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 30) { if(!mergeItemStack(slotStack, 4, 30, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -134,7 +134,7 @@ public class ContainerChemicalInfuser extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java index 81e1fa5df..1d48f6c4f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java @@ -61,7 +61,7 @@ public class ContainerChemicalOxidizer extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -75,14 +75,14 @@ public class ContainerChemicalOxidizer extends Container { if(!mergeItemStack(slotStack, 0, 1, true)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -92,14 +92,14 @@ public class ContainerChemicalOxidizer extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 1) { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -109,13 +109,13 @@ public class ContainerChemicalOxidizer extends Container { if(!mergeItemStack(slotStack, 2, 3, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -124,27 +124,27 @@ public class ContainerChemicalOxidizer extends Container { if(!mergeItemStack(slotStack, 30, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 29) { if(!mergeItemStack(slotStack, 3, 29, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -152,7 +152,7 @@ public class ContainerChemicalOxidizer extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java index ce6c03d68..e2eccc915 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java @@ -63,7 +63,7 @@ public class ContainerChemicalWasher extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -75,7 +75,7 @@ public class ContainerChemicalWasher extends Container { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(FluidUtil.getFluidContained(slotStack) != null && FluidUtil.getFluidContained(slotStack).getFluid() == FluidRegistry.WATER) @@ -84,13 +84,13 @@ public class ContainerChemicalWasher extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -100,13 +100,13 @@ public class ContainerChemicalWasher extends Container { if(!mergeItemStack(slotStack, 2, 3, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -116,14 +116,14 @@ public class ContainerChemicalWasher extends Container { if(!mergeItemStack(slotStack, 3, 4, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 3) { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -132,27 +132,27 @@ public class ContainerChemicalWasher extends Container { if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 31) { if(!mergeItemStack(slotStack, 4, 30, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -160,7 +160,7 @@ public class ContainerChemicalWasher extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java b/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java index 3c131040d..122c843e7 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDictionary.java @@ -35,7 +35,7 @@ public class ContainerDictionary extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -47,26 +47,26 @@ public class ContainerDictionary extends Container { if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 26) { if(!mergeItemStack(slotStack, 0, 26, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -74,7 +74,7 @@ public class ContainerDictionary extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java index 682205732..177c1027f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java @@ -64,7 +64,7 @@ public class ContainerDigitalMiner extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -78,14 +78,14 @@ public class ContainerDigitalMiner extends Container { if(!mergeItemStack(slotStack, 27, 28, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID <= 27) { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -94,18 +94,18 @@ public class ContainerDigitalMiner extends Container { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(!mergeItemStack(slotStack, 0, 27, false)) { - return null; + return ItemStack.EMPTY; } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -113,7 +113,7 @@ public class ContainerDigitalMiner extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java index 6de70e680..6f52255dd 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java @@ -56,7 +56,7 @@ public class ContainerDynamicTank extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -70,13 +70,13 @@ public class ContainerDynamicTank extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -85,27 +85,27 @@ public class ContainerDynamicTank extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -113,7 +113,7 @@ public class ContainerDynamicTank extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java index 64972e635..901987ed9 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -60,7 +60,7 @@ public class ContainerElectricMachine extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -72,7 +72,7 @@ public class ContainerElectricMachine extends Container { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(RecipeHandler.getRecipe(new ItemStackInput(slotStack), tileEntity.getRecipes()) != null) @@ -81,13 +81,13 @@ public class ContainerElectricMachine extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -97,14 +97,14 @@ public class ContainerElectricMachine extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 1) { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -113,27 +113,27 @@ public class ContainerElectricMachine extends Container { if(!mergeItemStack(slotStack, 30, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 29) { if(!mergeItemStack(slotStack, 3, 29, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -141,7 +141,7 @@ public class ContainerElectricMachine extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java index 4ef0d2251..2ea04f34a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java @@ -60,7 +60,7 @@ public class ContainerElectricPump extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -133,7 +133,7 @@ public class ContainerElectricPump extends Container if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java index 78034ffe4..b586b007f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java @@ -62,7 +62,7 @@ public class ContainerElectrolyticSeparator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -76,7 +76,7 @@ public class ContainerElectrolyticSeparator extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotStack.getItem() instanceof IGasItem) @@ -87,14 +87,14 @@ public class ContainerElectrolyticSeparator extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else if(((IGasItem)slotStack.getItem()).getGas(slotStack).getGas() == GasRegistry.getGas("oxygen")) { if(!mergeItemStack(slotStack, 2, 3, false)) { - return null; + return ItemStack.EMPTY; } } } @@ -104,7 +104,7 @@ public class ContainerElectrolyticSeparator extends Container { if(!mergeItemStack(slotStack, 2, 3, false)) { - return null; + return ItemStack.EMPTY; } } } @@ -113,7 +113,7 @@ public class ContainerElectrolyticSeparator extends Container { if(!mergeItemStack(slotStack, 3, 4, false)) { - return null; + return ItemStack.EMPTY; } } else { @@ -121,20 +121,20 @@ public class ContainerElectrolyticSeparator extends Container { if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 30) { if(!mergeItemStack(slotStack, 4, 30, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -142,13 +142,13 @@ public class ContainerElectrolyticSeparator extends Container else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -156,7 +156,7 @@ public class ContainerElectrolyticSeparator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java index 65839058b..78ac955c3 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java @@ -61,7 +61,7 @@ public class ContainerEnergyCube extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -77,13 +77,13 @@ public class ContainerEnergyCube extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -98,7 +98,7 @@ public class ContainerEnergyCube extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } } @@ -107,7 +107,7 @@ public class ContainerEnergyCube extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } } @@ -119,14 +119,14 @@ public class ContainerEnergyCube extends Container { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -134,7 +134,7 @@ public class ContainerEnergyCube extends Container { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -144,27 +144,27 @@ public class ContainerEnergyCube extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -172,7 +172,7 @@ public class ContainerEnergyCube extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java index 05be9647f..c950ac188 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java @@ -114,7 +114,7 @@ public class ContainerFactory extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -126,21 +126,21 @@ public class ContainerFactory extends Container { if(!mergeItemStack(slotStack, tileEntity.inventory.size()-1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(slotID != 1 && slotID != 2 && isProperMachine(slotStack) && !slotStack.isItemEqual(tileEntity.getMachineStack())) { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 2) { if(!mergeItemStack(slotStack, tileEntity.inventory.size()-1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(tileEntity.recipeType.getAnyRecipe(slotStack, tileEntity.gasTank.getGasType(), tileEntity.infuseStored) != null) @@ -149,13 +149,13 @@ public class ContainerFactory extends Container { if(!mergeItemStack(slotStack, 4, 4+tileEntity.tier.processes, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, tileEntity.inventory.size()-1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -165,14 +165,14 @@ public class ContainerFactory extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, tileEntity.inventory.size()-1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -182,13 +182,13 @@ public class ContainerFactory extends Container { if(!mergeItemStack(slotStack, 3, 4, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, tileEntity.inventory.size()-1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -198,13 +198,13 @@ public class ContainerFactory extends Container { if(!mergeItemStack(slotStack, 3, 4, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, tileEntity.inventory.size()-1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -215,27 +215,27 @@ public class ContainerFactory extends Container { if(!mergeItemStack(slotStack, (slotEnd+27), inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > (slotEnd+26)) { if(!mergeItemStack(slotStack, slotEnd, (slotEnd+26), false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, slotEnd, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -243,7 +243,7 @@ public class ContainerFactory extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java index 367d129dc..d33b110f4 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java @@ -52,7 +52,7 @@ public class ContainerFilter extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -64,26 +64,26 @@ public class ContainerFilter extends Container { if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 26) { if(!mergeItemStack(slotStack, 0, 26, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -91,7 +91,7 @@ public class ContainerFilter extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java index d268ec10d..3bca77056 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java @@ -56,7 +56,7 @@ public class ContainerFluidTank extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -70,13 +70,13 @@ public class ContainerFluidTank extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -85,27 +85,27 @@ public class ContainerFluidTank extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -113,7 +113,7 @@ public class ContainerFluidTank extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java index 9fead128e..233623b9f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java @@ -59,7 +59,7 @@ public class ContainerFluidicPlenisher extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -73,13 +73,13 @@ public class ContainerFluidicPlenisher extends Container { if(!mergeItemStack(slotStack, 2, 3, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -89,14 +89,14 @@ public class ContainerFluidicPlenisher extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -104,7 +104,7 @@ public class ContainerFluidicPlenisher extends Container { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else { @@ -112,27 +112,27 @@ public class ContainerFluidicPlenisher extends Container { if(!mergeItemStack(slotStack, 30, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 29) { if(!mergeItemStack(slotStack, 3, 29, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -140,7 +140,7 @@ public class ContainerFluidicPlenisher extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java index 9d4425baf..04d0ff33a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java @@ -103,7 +103,7 @@ public class ContainerFormulaicAssemblicator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -117,13 +117,13 @@ public class ContainerFormulaicAssemblicator extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -133,13 +133,13 @@ public class ContainerFormulaicAssemblicator extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -147,14 +147,14 @@ public class ContainerFormulaicAssemblicator extends Container { if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(tileEntity.formula == null || tileEntity.formula.isIngredient(tileEntity.getWorld(), slotStack)) { if(!mergeItemStack(slotStack, 2, 20, false)) { - return null; + return ItemStack.EMPTY; } } else { @@ -162,27 +162,27 @@ public class ContainerFormulaicAssemblicator extends Container { if(!mergeItemStack(slotStack, 61, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 60) { if(!mergeItemStack(slotStack, 34, 60, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -190,7 +190,7 @@ public class ContainerFormulaicAssemblicator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java b/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java index e30802dd3..aa9f238df 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java @@ -54,7 +54,7 @@ public class ContainerFuelwoodHeater extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -68,14 +68,14 @@ public class ContainerFuelwoodHeater extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -84,27 +84,27 @@ public class ContainerFuelwoodHeater extends Container { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 27) { if(!mergeItemStack(slotStack, 1, 27, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -112,7 +112,7 @@ public class ContainerFuelwoodHeater extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java index 1a9e736d2..44d8e1926 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java @@ -56,7 +56,7 @@ public class ContainerGasTank extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -72,7 +72,7 @@ public class ContainerGasTank extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } } @@ -80,7 +80,7 @@ public class ContainerGasTank extends Container { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -89,27 +89,27 @@ public class ContainerGasTank extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -117,7 +117,7 @@ public class ContainerGasTank extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java b/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java index 7a79d6295..ebe6de2b5 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerInductionMatrix.java @@ -60,7 +60,7 @@ public class ContainerInductionMatrix extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -76,13 +76,13 @@ public class ContainerInductionMatrix extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -97,7 +97,7 @@ public class ContainerInductionMatrix extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } } @@ -106,7 +106,7 @@ public class ContainerInductionMatrix extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } } @@ -118,14 +118,14 @@ public class ContainerInductionMatrix extends Container { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -133,7 +133,7 @@ public class ContainerInductionMatrix extends Container { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -143,27 +143,27 @@ public class ContainerInductionMatrix extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -171,7 +171,7 @@ public class ContainerInductionMatrix extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java b/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java index 42698157a..e034d29fb 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerLaserAmplifier.java @@ -52,7 +52,7 @@ public class ContainerLaserAmplifier extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -64,26 +64,26 @@ public class ContainerLaserAmplifier extends Container { if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 26) { if(!mergeItemStack(slotStack, 0, 26, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -91,7 +91,7 @@ public class ContainerLaserAmplifier extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java b/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java index 8aa0d9547..bf1899940 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerLaserTractorBeam.java @@ -59,7 +59,7 @@ public class ContainerLaserTractorBeam extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -71,17 +71,17 @@ public class ContainerLaserTractorBeam extends Container { if(!mergeItemStack(slotStack, 27, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(!mergeItemStack(slotStack, 0, 27, false)) { - return null; + return ItemStack.EMPTY; } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -89,7 +89,7 @@ public class ContainerLaserTractorBeam extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index 4b874e610..09c68f61f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -63,7 +63,7 @@ public class ContainerMetallurgicInfuser extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -77,21 +77,21 @@ public class ContainerMetallurgicInfuser extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(ChargeUtils.canBeDischarged(slotStack)) { if(!mergeItemStack(slotStack, 3, 4, false)) { - return null; + return ItemStack.EMPTY; } } else if(isInputItem(slotStack)) { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else { @@ -99,20 +99,20 @@ public class ContainerMetallurgicInfuser extends Container { if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 30) { if(!mergeItemStack(slotStack, 4, 30, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -120,13 +120,13 @@ public class ContainerMetallurgicInfuser extends Container else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -134,7 +134,7 @@ public class ContainerMetallurgicInfuser extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java b/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java index 7ebdeb245..9aac4568f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java @@ -55,7 +55,7 @@ public class ContainerOredictionificator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -67,7 +67,7 @@ public class ContainerOredictionificator extends Container { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(tileEntity.getResult(slotStack) != null) @@ -76,13 +76,13 @@ public class ContainerOredictionificator extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -91,27 +91,27 @@ public class ContainerOredictionificator extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -119,7 +119,7 @@ public class ContainerOredictionificator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java index c45bfa209..86c451488 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java @@ -59,7 +59,7 @@ public class ContainerPRC extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -71,7 +71,7 @@ public class ContainerPRC extends Container { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(ChargeUtils.canBeDischarged(slotStack)) @@ -80,14 +80,14 @@ public class ContainerPRC extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 1) { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -97,13 +97,13 @@ public class ContainerPRC extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -112,27 +112,27 @@ public class ContainerPRC extends Container { if(!mergeItemStack(slotStack, 30, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 29) { if(!mergeItemStack(slotStack, 3, 29, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -140,7 +140,7 @@ public class ContainerPRC extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java index f60a03527..8738bf3d8 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java @@ -98,7 +98,7 @@ public class ContainerPersonalChest extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -110,17 +110,17 @@ public class ContainerPersonalChest extends Container { if(!mergeItemStack(slotStack, 54, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(!mergeItemStack(slotStack, 0, 54, false)) { - return null; + return ItemStack.EMPTY; } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -128,7 +128,7 @@ public class ContainerPersonalChest extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); @@ -146,7 +146,7 @@ public class ContainerPersonalChest extends Container if(itemStack != null && MachineType.get(itemStack) == MachineType.PERSONAL_CHEST) { - return null; + return ItemStack.EMPTY; } } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java index ed8b49a47..24df7774f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java @@ -52,7 +52,7 @@ public class ContainerQuantumEntangloporter extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -64,26 +64,26 @@ public class ContainerQuantumEntangloporter extends Container { if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 26) { if(!mergeItemStack(slotStack, 0, 26, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -91,7 +91,7 @@ public class ContainerQuantumEntangloporter extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java index 00272ebae..ecb943e89 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java @@ -55,7 +55,7 @@ public class ContainerResistiveHeater extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -69,14 +69,14 @@ public class ContainerResistiveHeater extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -85,27 +85,27 @@ public class ContainerResistiveHeater extends Container { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 27) { if(!mergeItemStack(slotStack, 1, 27, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -113,7 +113,7 @@ public class ContainerResistiveHeater extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java index 4918e109b..d7ad1dc0b 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java @@ -49,7 +49,7 @@ public class ContainerRobitInventory extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -61,17 +61,17 @@ public class ContainerRobitInventory extends Container { if(!mergeItemStack(slotStack, 27, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(!mergeItemStack(slotStack, 0, 27, false)) { - return null; + return ItemStack.EMPTY; } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -79,7 +79,7 @@ public class ContainerRobitInventory extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java index c1737e246..6a110ab79 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java @@ -51,6 +51,6 @@ public class ContainerRobitMain extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - return null; + return ItemStack.EMPTY; } } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index 6ae1fc800..b09fb8340 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -111,7 +111,7 @@ public class ContainerRobitSmelting extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -123,7 +123,7 @@ public class ContainerRobitSmelting extends Container { if(!mergeItemStack(slotStack, 3, 39, true)) { - return null; + return ItemStack.EMPTY; } } else if(slotID != 1 && slotID != 0) @@ -132,31 +132,31 @@ public class ContainerRobitSmelting extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(TileEntityFurnace.isItemFuel(slotStack)) { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID >= 3 && slotID < 30) { if(!mergeItemStack(slotStack, 30, 39, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID >= 30 && slotID < 39 && !mergeItemStack(slotStack, 3, 30, false)) { - return null; + return ItemStack.EMPTY; } } else if(!mergeItemStack(slotStack, 3, 39, false)) { - return null; + return ItemStack.EMPTY; } if(slotStack.getCount() == 0) @@ -169,7 +169,7 @@ public class ContainerRobitSmelting extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java index dfe7c6b58..cfbcc2a9c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java @@ -63,7 +63,7 @@ public class ContainerRotaryCondensentrator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -77,13 +77,13 @@ public class ContainerRotaryCondensentrator extends Container { if(!mergeItemStack(slotStack, 4, 5, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -93,13 +93,13 @@ public class ContainerRotaryCondensentrator extends Container { if(!mergeItemStack(slotStack, 2, 3, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -111,21 +111,21 @@ public class ContainerRotaryCondensentrator extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(((IGasItem)slotStack.getItem()).canReceiveGas(slotStack, tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas() : null)) { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } } else { if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -134,27 +134,27 @@ public class ContainerRotaryCondensentrator extends Container { if(!mergeItemStack(slotStack, 32, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 31) { if(!mergeItemStack(slotStack, 5, 31, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -162,7 +162,7 @@ public class ContainerRotaryCondensentrator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java b/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java index 4997014f7..19afded4a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java @@ -56,7 +56,7 @@ public class ContainerSecurityDesk extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -70,13 +70,13 @@ public class ContainerSecurityDesk extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } } @@ -85,27 +85,27 @@ public class ContainerSecurityDesk extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -113,7 +113,7 @@ public class ContainerSecurityDesk extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java index d599a5bc9..949bfd730 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java @@ -55,7 +55,7 @@ public class ContainerSeismicVibrator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -69,14 +69,14 @@ public class ContainerSeismicVibrator extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -85,27 +85,27 @@ public class ContainerSeismicVibrator extends Container { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 27) { if(!mergeItemStack(slotStack, 1, 27, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -113,7 +113,7 @@ public class ContainerSeismicVibrator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java b/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java index aa245f29d..a05d80e83 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java @@ -56,7 +56,7 @@ public class ContainerSolarNeutronActivator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -72,21 +72,21 @@ public class ContainerSolarNeutronActivator extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(((IGasItem)slotStack.getItem()).canReceiveGas(slotStack, tileEntity.outputTank.getGas() != null ? tileEntity.outputTank.getGas().getGas() : null)) { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -95,27 +95,27 @@ public class ContainerSolarNeutronActivator extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -123,7 +123,7 @@ public class ContainerSolarNeutronActivator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java index 0d316eaef..a030f001c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java @@ -55,7 +55,7 @@ public class ContainerTeleporter extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -69,14 +69,14 @@ public class ContainerTeleporter extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -85,27 +85,27 @@ public class ContainerTeleporter extends Container { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 27) { if(!mergeItemStack(slotStack, 1, 27, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -113,7 +113,7 @@ public class ContainerTeleporter extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java b/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java index c1cd61d72..617c1e743 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java @@ -60,7 +60,7 @@ public class ContainerThermalEvaporationController extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -72,7 +72,7 @@ public class ContainerThermalEvaporationController extends Container { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } else if(FluidContainerUtils.isFluidContainer(slotStack) && FluidUtil.getFluidContained(slotStack) == null) @@ -81,14 +81,14 @@ public class ContainerThermalEvaporationController extends Container { if(!mergeItemStack(slotStack, 2, 3, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 2) { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -98,14 +98,14 @@ public class ContainerThermalEvaporationController extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -114,27 +114,27 @@ public class ContainerThermalEvaporationController extends Container { if(!mergeItemStack(slotStack, 31, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 30) { if(!mergeItemStack(slotStack, 4, 30, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -142,7 +142,7 @@ public class ContainerThermalEvaporationController extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java index a00733463..5cce2a08c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java @@ -56,7 +56,7 @@ public class ContainerUpgradeManagement extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -70,13 +70,13 @@ public class ContainerUpgradeManagement extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -85,27 +85,27 @@ public class ContainerUpgradeManagement extends Container { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 27) { if(!mergeItemStack(slotStack, 1, 27, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -113,7 +113,7 @@ public class ContainerUpgradeManagement extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java b/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java index 6cd48c1bf..ab7506f83 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java @@ -15,7 +15,7 @@ public class SlotPersonalChest extends Slot @Override public boolean canTakeStack(EntityPlayer player) { - if(inventory.getStackInSlot(getSlotIndex()) == null) + if(inventory.getStackInSlot(getSlotIndex()).isEmpty()) { return false; } diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java index 9ce8ac1a8..84bf064c3 100644 --- a/src/main/java/mekanism/common/util/ChargeUtils.java +++ b/src/main/java/mekanism/common/util/ChargeUtils.java @@ -25,7 +25,7 @@ public final class ChargeUtils { IInventory inv = (TileEntityContainerBlock)storer; - if(inv.getStackInSlot(slotID) != null && storer.getEnergy() < storer.getMaxEnergy()) + if(!inv.getStackInSlot(slotID).isEmpty() && storer.getEnergy() < storer.getMaxEnergy()) { if(inv.getStackInSlot(slotID).getItem() instanceof IEnergizedItem) { @@ -73,7 +73,7 @@ public final class ChargeUtils { IInventory inv = (TileEntityContainerBlock)storer; - if(inv.getStackInSlot(slotID) != null && storer.getEnergy() > 0) + if(!inv.getStackInSlot(slotID).isEmpty() && storer.getEnergy() > 0) { if(inv.getStackInSlot(slotID).getItem() instanceof IEnergizedItem) { diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java index 53e77a29a..19e3b77b0 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java @@ -57,7 +57,7 @@ public class ContainerBioGenerator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -71,14 +71,14 @@ public class ContainerBioGenerator extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 1) { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } } @@ -88,13 +88,13 @@ public class ContainerBioGenerator extends Container { if (!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -103,27 +103,27 @@ public class ContainerBioGenerator extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -131,7 +131,7 @@ public class ContainerBioGenerator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java index 08f94579d..0b42744cc 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java @@ -56,7 +56,7 @@ public class ContainerGasGenerator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -70,14 +70,14 @@ public class ContainerGasGenerator extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 1) { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } } @@ -89,14 +89,14 @@ public class ContainerGasGenerator extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -105,27 +105,27 @@ public class ContainerGasGenerator extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -133,7 +133,7 @@ public class ContainerGasGenerator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java index d6da062b4..60c8d3c9b 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java @@ -55,7 +55,7 @@ public class ContainerHeatGenerator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -69,14 +69,14 @@ public class ContainerHeatGenerator extends Container { if(!mergeItemStack(slotStack, 1, 2, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 1) { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } } @@ -86,13 +86,13 @@ public class ContainerHeatGenerator extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } @@ -101,27 +101,27 @@ public class ContainerHeatGenerator extends Container { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 28) { if(!mergeItemStack(slotStack, 2, 28, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -129,7 +129,7 @@ public class ContainerHeatGenerator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java index c6503f078..77b5beff5 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java @@ -54,7 +54,7 @@ public class ContainerNeutronCapture extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -68,14 +68,14 @@ public class ContainerNeutronCapture extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } } @@ -84,27 +84,27 @@ public class ContainerNeutronCapture extends Container { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 27) { if(!mergeItemStack(slotStack, 1, 27, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -112,7 +112,7 @@ public class ContainerNeutronCapture extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java index 01457e718..f1b9405fa 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java @@ -57,7 +57,7 @@ public class ContainerReactorController extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -71,14 +71,14 @@ public class ContainerReactorController extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } } @@ -87,27 +87,27 @@ public class ContainerReactorController extends Container { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 27) { if(!mergeItemStack(slotStack, 1, 27, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -115,7 +115,7 @@ public class ContainerReactorController extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java index 0603491ae..47730082a 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java @@ -54,7 +54,7 @@ public class ContainerSolarGenerator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -68,14 +68,14 @@ public class ContainerSolarGenerator extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } } @@ -84,27 +84,27 @@ public class ContainerSolarGenerator extends Container { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 27) { if(!mergeItemStack(slotStack, 1, 27, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -112,7 +112,7 @@ public class ContainerSolarGenerator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack); diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java index a745fa654..6ac89c1d5 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java @@ -54,7 +54,7 @@ public class ContainerWindGenerator extends Container @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotID) { - ItemStack stack = null; + ItemStack stack = ItemStack.EMPTY; Slot currentSlot = (Slot)inventorySlots.get(slotID); if(currentSlot != null && currentSlot.getHasStack()) @@ -68,14 +68,14 @@ public class ContainerWindGenerator extends Container { if(!mergeItemStack(slotStack, 0, 1, false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID == 0) { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } } @@ -84,27 +84,27 @@ public class ContainerWindGenerator extends Container { if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) { - return null; + return ItemStack.EMPTY; } } else if(slotID > 27) { if(!mergeItemStack(slotStack, 1, 27, false)) { - return null; + return ItemStack.EMPTY; } } else { if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) { - return null; + return ItemStack.EMPTY; } } } if(slotStack.getCount() == 0) { - currentSlot.putStack((ItemStack)null); + currentSlot.putStack(ItemStack.EMPTY); } else { currentSlot.onSlotChanged(); @@ -112,7 +112,7 @@ public class ContainerWindGenerator extends Container if(slotStack.getCount() == stack.getCount()) { - return null; + return ItemStack.EMPTY; } currentSlot.onTake(player, slotStack);