From 16c0fbe3c1673e630cf58da7c29616055b0d4693 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 9 May 2015 00:04:44 +0200 Subject: [PATCH] Use weaker collection types --- src/api/java/appeng/api/util/ICommonTile.java | 4 ++-- src/main/java/appeng/crafting/CraftingJob.java | 3 ++- src/main/java/appeng/helpers/PlayerSecurityWrapper.java | 3 ++- .../modules/NEIHelpers/NEIAEShapedRecipeHandler.java | 2 +- .../modules/NEIHelpers/NEIAEShapelessRecipeHandler.java | 2 +- .../modules/NEIHelpers/NEIFacadeRecipeHandler.java | 2 +- .../modules/NEIHelpers/NEIInscriberRecipeHandler.java | 2 +- src/main/java/appeng/me/GridNode.java | 4 ++-- src/main/java/appeng/tile/AEBaseTile.java | 4 ++-- .../java/appeng/tile/crafting/TileMolecularAssembler.java | 4 ++-- src/main/java/appeng/tile/misc/TileCellWorkbench.java | 4 ++-- src/main/java/appeng/tile/misc/TileInscriber.java | 3 +-- src/main/java/appeng/tile/misc/TileInterface.java | 3 ++- src/main/java/appeng/tile/misc/TilePaint.java | 3 ++- src/main/java/appeng/tile/misc/TileSecurity.java | 3 ++- src/main/java/appeng/tile/networking/TileCableBus.java | 4 ++-- src/main/java/appeng/tile/storage/TileIOPort.java | 4 ++-- src/main/java/appeng/util/inv/WrapperChainedInventory.java | 3 ++- 18 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/api/java/appeng/api/util/ICommonTile.java b/src/api/java/appeng/api/util/ICommonTile.java index ca87b4d1d..08972a74d 100644 --- a/src/api/java/appeng/api/util/ICommonTile.java +++ b/src/api/java/appeng/api/util/ICommonTile.java @@ -24,7 +24,7 @@ package appeng.api.util; -import java.util.ArrayList; +import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -43,5 +43,5 @@ public interface ICommonTile * @param z z pos of tile entity * @param drops drops of tile entity */ - void getDrops( World world, int x, int y, int z, ArrayList drops ); + void getDrops( World world, int x, int y, int z, List drops ); } \ No newline at end of file diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 751f978d8..99d2f33e4 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -21,6 +21,7 @@ package appeng.crafting; import java.util.HashMap; import java.util.HashSet; +import java.util.Set; import java.util.concurrent.TimeUnit; import net.minecraft.nbt.NBTTagCompound; @@ -47,7 +48,7 @@ public class CraftingJob implements Runnable, ICraftingJob { final IItemList storage; - final HashSet prophecies; + final Set prophecies; final MECraftingInventory original; final World world; final IItemList crafting = AEApi.instance().storage().createItemList(); diff --git a/src/main/java/appeng/helpers/PlayerSecurityWrapper.java b/src/main/java/appeng/helpers/PlayerSecurityWrapper.java index 0f110a185..556855bb8 100644 --- a/src/main/java/appeng/helpers/PlayerSecurityWrapper.java +++ b/src/main/java/appeng/helpers/PlayerSecurityWrapper.java @@ -21,6 +21,7 @@ package appeng.helpers; import java.util.EnumSet; import java.util.HashMap; +import java.util.Map; import appeng.api.config.SecurityPermissions; import appeng.api.networking.security.ISecurityRegistry; @@ -29,7 +30,7 @@ import appeng.api.networking.security.ISecurityRegistry; public class PlayerSecurityWrapper implements ISecurityRegistry { - final HashMap> target; + final Map> target; public PlayerSecurityWrapper( HashMap> playerPerms ) { diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java index 255c674e7..7742cb43c 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java @@ -198,7 +198,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler public class CachedShapedRecipe extends TemplateRecipeHandler.CachedRecipe { - public final ArrayList ingredients; + public final List ingredients; public final PositionedStack result; public CachedShapedRecipe( ShapedRecipe recipe ) diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java index d33e9d3a1..6430f9334 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java @@ -198,7 +198,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler public class CachedShapelessRecipe extends TemplateRecipeHandler.CachedRecipe { - public final ArrayList ingredients; + public final List ingredients; public final PositionedStack result; public CachedShapelessRecipe( ShapelessRecipe recipe ) diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java index 68358815d..b44f18505 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java @@ -196,7 +196,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler private final class CachedShapedRecipe extends TemplateRecipeHandler.CachedRecipe { - public final ArrayList ingredients; + public final List ingredients; public final PositionedStack result; public CachedShapedRecipe( IFacadeItem facade, ItemStack anchor, ItemStack output ) diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java index b6072c0d2..a9bedb1b7 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java @@ -163,7 +163,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler public class CachedInscriberRecipe extends TemplateRecipeHandler.CachedRecipe { - public final ArrayList ingredients; + public final List ingredients; public final PositionedStack result; public CachedInscriberRecipe( IInscriberRecipe recipe ) diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 8458cba08..a0bac033c 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -175,7 +175,7 @@ public class GridNode implements IGridNode, IPathItem gcv.visitConnection( nextConn.poll() ); } - LinkedList thisRun = nextRun; + Iterable thisRun = nextRun; nextRun = new LinkedList(); for( GridNode n : thisRun ) @@ -188,7 +188,7 @@ public class GridNode implements IGridNode, IPathItem { while( !nextRun.isEmpty() ) { - LinkedList thisRun = nextRun; + Iterable thisRun = nextRun; nextRun = new LinkedList(); for( GridNode n : thisRun ) diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 71f817fd4..8f885bae5 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -479,7 +479,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, * @param drops drops of tile entity */ @Override - public void getDrops( World w, int x, int y, int z, ArrayList drops ) + public void getDrops( World w, int x, int y, int z, List drops ) { if( this instanceof IInventory ) { @@ -496,7 +496,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } } - public void getNoDrops( World w, int x, int y, int z, ArrayList drops ) + public void getNoDrops( World w, int x, int y, int z, List drops ) { } diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index 3a07ed8c3..6a09bf443 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -20,7 +20,7 @@ package appeng.tile.crafting; import java.io.IOException; -import java.util.ArrayList; +import java.util.List; import io.netty.buffer.ByteBuf; @@ -398,7 +398,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade } @Override - public void getDrops( World w, int x, int y, int z, ArrayList drops ) + public void getDrops( World w, int x, int y, int z, List drops ) { super.getDrops( w, x, y, z, drops ); diff --git a/src/main/java/appeng/tile/misc/TileCellWorkbench.java b/src/main/java/appeng/tile/misc/TileCellWorkbench.java index 96e4c5023..b6001d89a 100644 --- a/src/main/java/appeng/tile/misc/TileCellWorkbench.java +++ b/src/main/java/appeng/tile/misc/TileCellWorkbench.java @@ -19,7 +19,7 @@ package appeng.tile.misc; -import java.util.ArrayList; +import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -235,7 +235,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I } @Override - public void getDrops( World w, int x, int y, int z, ArrayList drops ) + public void getDrops( World w, int x, int y, int z, List drops ) { super.getDrops( w, x, y, z, drops ); diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index e6e629a47..cc73494aa 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -20,7 +20,6 @@ package appeng.tile.misc; import java.io.IOException; -import java.util.ArrayList; import java.util.EnumSet; import java.util.List; import javax.annotation.Nullable; @@ -194,7 +193,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, } @Override - public void getDrops( World w, int x, int y, int z, ArrayList drops ) + public void getDrops( World w, int x, int y, int z, List drops ) { super.getDrops( w, x, y, z, drops ); diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index 1f9681399..a06165fec 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -21,6 +21,7 @@ package appeng.tile.misc; import java.util.ArrayList; import java.util.EnumSet; +import java.util.List; import com.google.common.collect.ImmutableSet; @@ -127,7 +128,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT } @Override - public void getDrops( World w, int x, int y, int z, ArrayList drops ) + public void getDrops( World w, int x, int y, int z, List drops ) { this.duality.addDrops( drops ); } diff --git a/src/main/java/appeng/tile/misc/TilePaint.java b/src/main/java/appeng/tile/misc/TilePaint.java index 935aee52e..9169af406 100644 --- a/src/main/java/appeng/tile/misc/TilePaint.java +++ b/src/main/java/appeng/tile/misc/TilePaint.java @@ -22,6 +22,7 @@ package appeng.tile.misc; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; +import java.util.List; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -50,7 +51,7 @@ public class TilePaint extends AEBaseTile static final int LIGHT_PER_DOT = 12; int isLit = 0; - ArrayList dots = null; + List dots = null; @TileEvent( TileEventType.WORLD_NBT_WRITE ) public void writeToNBT_TilePaint( NBTTagCompound data ) diff --git a/src/main/java/appeng/tile/misc/TileSecurity.java b/src/main/java/appeng/tile/misc/TileSecurity.java index bd014baef..298bed56b 100644 --- a/src/main/java/appeng/tile/misc/TileSecurity.java +++ b/src/main/java/appeng/tile/misc/TileSecurity.java @@ -22,6 +22,7 @@ package appeng.tile.misc; import java.util.ArrayList; import java.util.EnumSet; import java.util.HashMap; +import java.util.List; import io.netty.buffer.ByteBuf; @@ -114,7 +115,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp } @Override - public void getDrops( World w, int x, int y, int z, ArrayList drops ) + public void getDrops( World w, int x, int y, int z, List drops ) { if( !this.configSlot.isEmpty() ) { diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index b46f73b42..3860915d1 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -194,13 +194,13 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl } @Override - public void getDrops( World w, int x, int y, int z, ArrayList drops ) + public void getDrops( World w, int x, int y, int z, List drops ) { this.cb.getDrops( drops ); } @Override - public void getNoDrops( World w, int x, int y, int z, ArrayList drops ) + public void getNoDrops( World w, int x, int y, int z, List drops ) { this.cb.getNoDrops( drops ); } diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index 42c28137b..554161c36 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -19,7 +19,7 @@ package appeng.tile.storage; -import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; @@ -562,7 +562,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC * @param drops drops of tile entity */ @Override - public void getDrops( World w, int x, int y, int z, ArrayList drops ) + public void getDrops( World w, int x, int y, int z, List drops ) { super.getDrops( w, x, y, z, drops ); diff --git a/src/main/java/appeng/util/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index c1a833c4c..144025d54 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperChainedInventory.java @@ -22,6 +22,7 @@ package appeng.util.inv; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -35,7 +36,7 @@ public class WrapperChainedInventory implements IInventory int fullSize = 0; private List l; - private HashMap offsets; + private Map offsets; public WrapperChainedInventory( IInventory... inventories ) {