From 1cde7bc9337750aea86c409c82ebd99038c76099 Mon Sep 17 00:00:00 2001 From: yueh Date: Wed, 21 Dec 2016 20:27:23 +0100 Subject: [PATCH] Changed to Null ItemStack instead of null. --- gradle.properties | 4 ++-- .../appeng/block/networking/BlockCableBus.java | 2 +- src/main/java/appeng/client/gui/Size1Slot.java | 2 +- .../appeng/client/me/SlotDisconnected.java | 2 +- .../java/appeng/container/AEBaseContainer.java | 16 ++++++++-------- .../implementations/ContainerQuartzKnife.java | 10 +++++----- .../java/appeng/container/slot/AppEngSlot.java | 4 ++-- .../java/appeng/container/slot/NullSlot.java | 4 ++-- .../container/slot/SlotCraftingTerm.java | 4 ++-- .../java/appeng/container/slot/SlotFake.java | 2 +- .../core/features/ColoredItemDefinition.java | 2 +- .../features/registries/P2PTunnelRegistry.java | 2 +- .../grinder/GrinderRecipeManager.java | 2 +- src/main/java/appeng/debug/TileItemGen.java | 2 +- .../java/appeng/helpers/PatternHelper.java | 4 ++-- .../appeng/items/materials/MaterialType.java | 4 ++-- .../appeng/items/misc/ItemCrystalSeed.java | 4 ++-- .../appeng/items/misc/ItemEncodedPattern.java | 4 ++-- .../java/appeng/items/parts/ItemFacade.java | 18 +++++++++--------- .../tools/powered/ToolColorApplicator.java | 2 +- .../powered/powersink/AERootPoweredItem.java | 3 ++- .../powersink/PoweredItemCapabilities.java | 4 +--- .../java/appeng/parts/p2p/PartP2PItems.java | 2 +- .../appeng/recipes/game/DisassembleRecipe.java | 2 +- .../java/appeng/recipes/game/FacadeRecipe.java | 2 +- src/main/java/appeng/tile/AEBaseInvTile.java | 2 +- src/main/java/appeng/tile/AEBaseTile.java | 2 +- .../inventory/AppEngInternalAEInventory.java | 4 ++-- .../inventory/AppEngInternalInventory.java | 4 ++-- .../tile/inventory/AppEngNullInventory.java | 6 +++--- .../java/appeng/tile/misc/TileCondenser.java | 8 ++++---- .../java/appeng/tile/misc/TileInscriber.java | 4 ++-- .../tile/powersink/TeslaEnergyAdapter.java | 18 ++++++++++++++++++ .../java/appeng/tile/storage/TileChest.java | 2 +- src/main/java/appeng/util/Platform.java | 10 +++++----- .../appeng/util/inv/AdaptorIInventory.java | 6 +++--- 36 files changed, 95 insertions(+), 78 deletions(-) diff --git a/gradle.properties b/gradle.properties index 85ddd038..574a3de7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -aeversion=rv4 +aeversion=rv5 aechannel=alpha aebuild=0 aegroup=appeng @@ -9,7 +9,7 @@ aebasename=appliedenergistics2 ######################################################### minecraft_version=1.11 mcp_mappings=snapshot_20161206 -forge_version=13.19.1.2188 +forge_version=13.19.1.2189 ######################################################### # Installable # diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index e00f349d..4d755e05 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -237,7 +237,7 @@ public class BlockCableBus extends AEBaseTileBlock return sp.facade.getItemStack(); } - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/client/gui/Size1Slot.java b/src/main/java/appeng/client/gui/Size1Slot.java index 72deb2e3..1aadf38b 100644 --- a/src/main/java/appeng/client/gui/Size1Slot.java +++ b/src/main/java/appeng/client/gui/Size1Slot.java @@ -40,7 +40,7 @@ class Size1Slot extends Slot return modifiedStack; } - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/client/me/SlotDisconnected.java b/src/main/java/appeng/client/me/SlotDisconnected.java index 3be3b044..68186a2f 100644 --- a/src/main/java/appeng/client/me/SlotDisconnected.java +++ b/src/main/java/appeng/client/me/SlotDisconnected.java @@ -91,7 +91,7 @@ public class SlotDisconnected extends AppEngSlot @Override public ItemStack decrStackSize( final int par1 ) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index bebe3d82..895c732b 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -455,7 +455,7 @@ public abstract class AEBaseContainer extends Container { if( Platform.isClient() ) { - return null; + return ItemStack.EMPTY; } boolean hasMETiles = false; @@ -470,14 +470,14 @@ public abstract class AEBaseContainer extends Container if( hasMETiles && Platform.isClient() ) { - return null; + return ItemStack.EMPTY; } final AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get( idx ); // require AE SLots! if( clickSlot instanceof SlotDisabled || clickSlot instanceof SlotInaccessible ) { - return null; + return ItemStack.EMPTY; } if( clickSlot != null && clickSlot.getHasStack() ) { @@ -485,7 +485,7 @@ public abstract class AEBaseContainer extends Container if( tis == null ) { - return null; + return ItemStack.EMPTY; } final List selectedSlots = new ArrayList(); @@ -602,7 +602,7 @@ public abstract class AEBaseContainer extends Container this.updateSlot( clickSlot ); this.updateSlot( d ); - return null; + return ItemStack.EMPTY; } else { @@ -656,7 +656,7 @@ public abstract class AEBaseContainer extends Container this.updateSlot( clickSlot ); this.updateSlot( d ); - return null; + return ItemStack.EMPTY; } else { @@ -692,7 +692,7 @@ public abstract class AEBaseContainer extends Container this.updateSlot( clickSlot ); this.updateSlot( d ); - return null; + return ItemStack.EMPTY; } else { @@ -707,7 +707,7 @@ public abstract class AEBaseContainer extends Container } this.updateSlot( clickSlot ); - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java index 75665a8b..b417cae6 100644 --- a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java +++ b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java @@ -128,9 +128,9 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn public ItemStack getStackInSlot( final int var1 ) { final ItemStack input = this.inSlot.getStackInSlot( 0 ); - if( input == null ) + if( input == ItemStack.EMPTY ) { - return null; + return ItemStack.EMPTY; } if( SlotRestrictedInput.isMetalIngot( input ) ) @@ -147,7 +147,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn } } - return null; + return ItemStack.EMPTY; } @Override @@ -161,7 +161,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn return is; } } - return null; + return ItemStack.EMPTY; } private boolean makePlate() @@ -185,7 +185,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn @Override public ItemStack removeStackFromSlot( final int var1 ) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/container/slot/AppEngSlot.java b/src/main/java/appeng/container/slot/AppEngSlot.java index ddd98126..3848633c 100644 --- a/src/main/java/appeng/container/slot/AppEngSlot.java +++ b/src/main/java/appeng/container/slot/AppEngSlot.java @@ -85,12 +85,12 @@ public class AppEngSlot extends Slot { if( !this.isEnabled() ) { - return null; + return ItemStack.EMPTY; } if( this.inventory.getSizeInventory() <= this.getSlotIndex() ) { - return null; + return ItemStack.EMPTY; } if( this.isDisplay() ) diff --git a/src/main/java/appeng/container/slot/NullSlot.java b/src/main/java/appeng/container/slot/NullSlot.java index 10fa1fae..f2c3b7d1 100644 --- a/src/main/java/appeng/container/slot/NullSlot.java +++ b/src/main/java/appeng/container/slot/NullSlot.java @@ -54,7 +54,7 @@ public class NullSlot extends Slot @Override public ItemStack getStack() { - return null; + return ItemStack.EMPTY; } @Override @@ -78,7 +78,7 @@ public class NullSlot extends Slot @Override public ItemStack decrStackSize( final int par1 ) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java index 09779caf..bbf0d6bf 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java @@ -200,7 +200,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot return request; } } - return null; + return ItemStack.EMPTY; } is = r.getCraftingResult( ic ); @@ -231,7 +231,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot return is; } - return null; + return ItemStack.EMPTY; } private boolean preCraft( final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, final ItemStack result ) diff --git a/src/main/java/appeng/container/slot/SlotFake.java b/src/main/java/appeng/container/slot/SlotFake.java index 5db083d8..6d4a2c29 100644 --- a/src/main/java/appeng/container/slot/SlotFake.java +++ b/src/main/java/appeng/container/slot/SlotFake.java @@ -41,7 +41,7 @@ public class SlotFake extends AppEngSlot @Override public ItemStack decrStackSize( final int par1 ) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/core/features/ColoredItemDefinition.java b/src/main/java/appeng/core/features/ColoredItemDefinition.java index ab6486ab..f102178f 100644 --- a/src/main/java/appeng/core/features/ColoredItemDefinition.java +++ b/src/main/java/appeng/core/features/ColoredItemDefinition.java @@ -70,7 +70,7 @@ public final class ColoredItemDefinition implements AEColoredItemDefinition if( is == null ) { - return null; + return ItemStack.EMPTY; } return is.stack( stackSize ); diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index f917576b..8aae8914 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -162,7 +162,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry if( item == null ) { - return null; + return ItemStack.EMPTY; } final ItemStack myItemStack = new ItemStack( item, 1, meta ); diff --git a/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java b/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java index 69325ef0..c288dd20 100644 --- a/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java +++ b/src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java @@ -233,7 +233,7 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene { return is.copy(); } - return null; + return ItemStack.EMPTY; } private int getDustToOreRatio( final String name ) diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index f1466c10..ec3d7249 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -93,7 +93,7 @@ public class TileItemGen extends AEBaseTile implements IInventory @Override public ItemStack removeStackFromSlot( final int i ) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index 6d152a5e..ab0ab810 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -316,7 +316,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable FINAL_STAGE ) { - return null; + return ItemStack.EMPTY; } this.setProgress( is, newDamage ); diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index 81614cb0..783febc6 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -175,14 +175,14 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt final World w = AppEng.proxy.getWorld(); if( w == null ) { - return null; + return ItemStack.EMPTY; } final ICraftingPatternDetails details = this.getPatternForItem( item, w ); if( details == null ) { - return null; + return ItemStack.EMPTY; } SIMPLE_CACHE.put( item, out = details.getCondensedOutputs()[0].getItemStack() ); diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index dc326ae7..9670c6e7 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -155,13 +155,13 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte { if( l == null ) { - return null; + return ItemStack.EMPTY; } final Block b = Block.getBlockFromItem( l.getItem() ); if( b == null || l.hasTagCompound() ) { - return null; + return ItemStack.EMPTY; } final int metadata = l.getItem().getMetadata( l.getItemDamage() ); @@ -180,7 +180,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte catch( Exception e ) { AELog.debug( e, "Cannot create a facade for " + b.getRegistryName() ); - return null; + return ItemStack.EMPTY; } final boolean defaultValue = ( b.isFullyOpaque( blockState ) && hasSimpleModel( blockState ) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass; @@ -198,7 +198,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte is.setTagCompound( data ); return is; } - return null; + return ItemStack.EMPTY; } @Override @@ -220,7 +220,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte if( nbt == null ) { - return null; + return ItemStack.EMPTY; } ResourceLocation itemId; @@ -232,12 +232,12 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte int[] data = nbt.getIntArray( "x" ); if( data.length != 2 ) { - return null; + return ItemStack.EMPTY; } Item item = Item.REGISTRY.getObjectById( data[0] ); if ( item == null ) { - return null; + return ItemStack.EMPTY; } itemId = item.getRegistryName(); @@ -252,7 +252,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte if( baseItem == null ) { - return null; + return ItemStack.EMPTY; } return new ItemStack( baseItem, 1, itemDamage ); @@ -315,7 +315,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte // Convert back to a registry name... Item item = Item.REGISTRY.getObjectById( ids[0] ); if ( item == null ) { - return null; + return ItemStack.EMPTY; } final NBTTagCompound facadeTag = new NBTTagCompound(); diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 5b8fd9f2..dfe94ea5 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -288,7 +288,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe if( list.size() <= 0 ) { - return null; + return ItemStack.EMPTY; } IAEItemStack where = list.getFirst(); diff --git a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java index 48af3a49..dc3d1016 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java @@ -66,7 +66,8 @@ public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPow final double percent = internalCurrentPower / internalMaxPower; - lines.add( GuiText.StoredEnergy.getLocal() + ':' + MessageFormat.format( " {0,number,#} ", internalCurrentPower ) + Platform.gui_localize( PowerUnits.AE.unlocalizedName ) + " - " + MessageFormat.format( " {0,number,#.##%} ", percent ) ); + lines.add( GuiText.StoredEnergy.getLocal() + ':' + MessageFormat.format( " {0,number,#} ", internalCurrentPower ) + Platform + .gui_localize( PowerUnits.AE.unlocalizedName ) + " - " + MessageFormat.format( " {0,number,#.##%} ", percent ) ); } @Override diff --git a/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java b/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java index 450b7444..77454aee 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java +++ b/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java @@ -64,9 +64,7 @@ class PoweredItemCapabilities implements ICapabilityProvider, IEnergyStorage @Override public boolean hasCapability( Capability capability, @Nullable EnumFacing facing ) { - return capability == CapabilityEnergy.ENERGY - || capability == Capabilities.TESLA_CONSUMER - || capability == Capabilities.TESLA_HOLDER; + return capability == CapabilityEnergy.ENERGY || capability == Capabilities.TESLA_CONSUMER || capability == Capabilities.TESLA_HOLDER; } @SuppressWarnings( "unchecked" ) diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index fb5f9cb2..5e83ba3a 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -281,7 +281,7 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip @Override public ItemStack removeStackFromSlot( final int i ) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index ba888679..ce20136e 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -171,7 +171,7 @@ public final class DisassembleRecipe implements IRecipe @Override public ItemStack getRecipeOutput() // no default output.. { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index 73ae60e3..0674fd3c 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -88,7 +88,7 @@ public final class FacadeRecipe implements IRecipe @Override public ItemStack getRecipeOutput() // no default output.. { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/tile/AEBaseInvTile.java b/src/main/java/appeng/tile/AEBaseInvTile.java index f8ef5622..823be409 100644 --- a/src/main/java/appeng/tile/AEBaseInvTile.java +++ b/src/main/java/appeng/tile/AEBaseInvTile.java @@ -111,7 +111,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor @Override public ItemStack removeStackFromSlot( final int i ) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index ce14fc0b..e6d2e56c 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -110,7 +110,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, final IStackSrc src = ITEM_STACKS.get( obj.getClass() ); if( src == null ) { - return null; + return ItemStack.EMPTY; } return src.stack( 1 ); } diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index b42c0e61..7d9ae36b 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -174,13 +174,13 @@ public class AppEngInternalAEInventory implements IInventory, Iterable return ns; } - return null; + return ItemStack.EMPTY; } protected boolean eventsEnabled() @@ -110,7 +110,7 @@ public class AppEngInternalInventory implements IInventory, Iterable @Override public ItemStack removeStackFromSlot( final int var1 ) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/tile/inventory/AppEngNullInventory.java b/src/main/java/appeng/tile/inventory/AppEngNullInventory.java index b9696e10..cc5f49e8 100644 --- a/src/main/java/appeng/tile/inventory/AppEngNullInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngNullInventory.java @@ -46,19 +46,19 @@ public class AppEngNullInventory implements IInventory @Override public ItemStack getStackInSlot( final int var1 ) { - return null; + return ItemStack.EMPTY; } @Override public ItemStack decrStackSize( final int slot, final int qty ) { - return null; + return ItemStack.EMPTY; } @Override public ItemStack removeStackFromSlot( final int var1 ) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/tile/misc/TileCondenser.java b/src/main/java/appeng/tile/misc/TileCondenser.java index 9c508e57..f80a215b 100644 --- a/src/main/java/appeng/tile/misc/TileCondenser.java +++ b/src/main/java/appeng/tile/misc/TileCondenser.java @@ -172,7 +172,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, case TRASH: default: - return null; + return ItemStack.EMPTY; } } @@ -314,7 +314,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, public ItemStack getStackInSlot( int slot ) { // The void slot never has any content - return null; + return ItemStack.EMPTY; } @Override @@ -328,13 +328,13 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, { addPower( stack.getCount() ); } - return null; + return ItemStack.EMPTY; } @Override public ItemStack extractItem( int slot, int amount, boolean simulate ) { - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index 99daf0a2..c5c6af0a 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -672,7 +672,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, { return inv.getStackInSlot( extractSlot ); } - return null; + return ItemStack.EMPTY; } @Override @@ -708,7 +708,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, if( slot != validExtractSlot || amount == 0 ) { - return null; + return ItemStack.EMPTY; } AdaptorIInventory adapter = new AdaptorIInventory( new WrapperInventoryRange( TileInscriber.this, extractSlot, 1, true ) ); diff --git a/src/main/java/appeng/tile/powersink/TeslaEnergyAdapter.java b/src/main/java/appeng/tile/powersink/TeslaEnergyAdapter.java index 95765ec3..1fba255d 100644 --- a/src/main/java/appeng/tile/powersink/TeslaEnergyAdapter.java +++ b/src/main/java/appeng/tile/powersink/TeslaEnergyAdapter.java @@ -1,3 +1,21 @@ +/* + * This file is part of Applied Energistics 2. + * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * + * Applied Energistics 2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Applied Energistics 2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Applied Energistics 2. If not, see . + */ + package appeng.tile.powersink; diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 465a26a8..f06c8ecc 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -700,7 +700,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal { return this.storageType; } - return null; + return ItemStack.EMPTY; } @Override diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index f22c3587..64855fec 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -1626,7 +1626,7 @@ public class Platform { if( providedTemplate == null ) { - return null; + return ItemStack.EMPTY; } final AEItemStack ae_req = AEItemStack.create( providedTemplate ); @@ -1679,7 +1679,7 @@ public class Platform } } } - return null; + return ItemStack.EMPTY; } public static ItemStack cloneItemStack( final ItemStack a ) @@ -1691,7 +1691,7 @@ public class Platform { if( stackInSlot == null ) { - return null; + return ItemStack.EMPTY; } final Item i = stackInSlot.getItem(); @@ -1702,13 +1702,13 @@ public class Platform stackInSlot.setCount( stackInSlot.getCount() - 1 ); return stackInSlot; } - return null; + return ItemStack.EMPTY; } ItemStack ci = i.getContainerItem( stackInSlot.copy() ); if( ci != null && ci.isItemStackDamageable() && ci.getItemDamage() == ci.getMaxDamage() ) { - ci = null; + ci = ItemStack.EMPTY; } return ci; diff --git a/src/main/java/appeng/util/inv/AdaptorIInventory.java b/src/main/java/appeng/util/inv/AdaptorIInventory.java index fa2c4145..1cbda48a 100644 --- a/src/main/java/appeng/util/inv/AdaptorIInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorIInventory.java @@ -264,7 +264,7 @@ public class AdaptorIInventory extends InventoryAdaptor { if( itemsToAdd == null || itemsToAdd.getCount() == 0 ) { - return null; + return ItemStack.EMPTY; } final ItemStack left = itemsToAdd.copy(); @@ -292,7 +292,7 @@ public class AdaptorIInventory extends InventoryAdaptor if( left.getCount() <= 0 ) { - return null; + return ItemStack.EMPTY; } } else if( Platform.itemComparisons().isSameItem( is, left ) && is.getCount() < perOperationLimit ) @@ -310,7 +310,7 @@ public class AdaptorIInventory extends InventoryAdaptor left.grow( -used ); if( left.getCount() <= 0 ) { - return null; + return ItemStack.EMPTY; } } }