fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1425 from thatsIch/e-weaker-collection-type

Browse Source 
Use weaker collection types
This commit is contained in:
thatsIch
2015-05-09 15:57:57 +02:00
parent 168038c595 16c0fbe3c1
commit 1d737c3167
18 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/crafting/CraftingJob.java
+2 -1
View File
@@ -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 com.google.common.base.Stopwatch;
@@ -47,7 +48,7 @@ public class CraftingJob implements Runnable, ICraftingJob
{
final IItemList<IAEItemStack> storage;
final HashSet<IAEItemStack> prophecies;
final Set<IAEItemStack> prophecies;
final MECraftingInventory original;
final World world;
final IItemList<IAEItemStack> crafting = AEApi.instance().storage().createItemList();
src/main/java/appeng/helpers/PlayerSecurityWrapper.java
+2 -1
View File
@@ -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<Integer, EnumSet<SecurityPermissions>> target;
final Map<Integer, EnumSet<SecurityPermissions>> target;
public PlayerSecurityWrapper( HashMap<Integer, EnumSet<SecurityPermissions>> playerPerms )
{
src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java
+1 -1
View File
@@ -198,7 +198,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
public class CachedShapedRecipe extends TemplateRecipeHandler.CachedRecipe
{
public final ArrayList<PositionedStack> ingredients;
public final List<PositionedStack> ingredients;
public final PositionedStack result;
public CachedShapedRecipe( ShapedRecipe recipe )
src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java
+1 -1
View File
@@ -198,7 +198,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
public class CachedShapelessRecipe extends TemplateRecipeHandler.CachedRecipe
{
public final ArrayList<PositionedStack> ingredients;
public final List<PositionedStack> ingredients;
public final PositionedStack result;
public CachedShapelessRecipe( ShapelessRecipe recipe )
src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java
+1 -1
View File
@@ -196,7 +196,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
private final class CachedShapedRecipe extends TemplateRecipeHandler.CachedRecipe
{
public final ArrayList<PositionedStack> ingredients;
public final List<PositionedStack> ingredients;
public final PositionedStack result;
public CachedShapedRecipe( IFacadeItem facade, ItemStack anchor, ItemStack output )
src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java
+1 -1
View File
@@ -163,7 +163,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler
public class CachedInscriberRecipe extends TemplateRecipeHandler.CachedRecipe
{
public final ArrayList<PositionedStack> ingredients;
public final List<PositionedStack> ingredients;
public final PositionedStack result;
public CachedInscriberRecipe( IInscriberRecipe recipe )
src/main/java/appeng/me/GridNode.java
+2 -2
View File
@@ -175,7 +175,7 @@ public class GridNode implements IGridNode, IPathItem
gcv.visitConnection( nextConn.poll() );
}
LinkedList<GridNode> thisRun = nextRun;
Iterable<GridNode> thisRun = nextRun;
nextRun = new LinkedList<GridNode>();
for( GridNode n : thisRun )
@@ -188,7 +188,7 @@ public class GridNode implements IGridNode, IPathItem
{
while( !nextRun.isEmpty() )
{
LinkedList<GridNode> thisRun = nextRun;
Iterable<GridNode> thisRun = nextRun;
nextRun = new LinkedList<GridNode>();
for( GridNode n : thisRun )
src/main/java/appeng/tile/AEBaseTile.java
+2 -2
View File
@@ -480,7 +480,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<ItemStack> drops )
public void getDrops( World w, int x, int y, int z, List<ItemStack> drops )
{
if( this instanceof IInventory )
{
@@ -497,7 +497,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
}
}
public void getNoDrops( World w, int x, int y, int z, ArrayList<ItemStack> drops )
public void getNoDrops( World w, int x, int y, int z, List<ItemStack> drops )
{
}
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java
+2 -2
View File
@@ -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<ItemStack> drops )
public void getDrops( World w, int x, int y, int z, List<ItemStack> drops )
{
super.getDrops( w, x, y, z, drops );
src/main/java/appeng/tile/misc/TileCellWorkbench.java
+2 -2
View File
@@ -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<ItemStack> drops )
public void getDrops( World w, int x, int y, int z, List<ItemStack> drops )
{
super.getDrops( w, x, y, z, drops );
src/main/java/appeng/tile/misc/TileInscriber.java
+1 -2
View File
@@ -20,7 +20,6 @@ package appeng.tile.misc;
import java.io.IOException;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
@@ -195,7 +194,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
@Override
public void getDrops( World w, int x, int y, int z, ArrayList<ItemStack> drops )
public void getDrops( World w, int x, int y, int z, List<ItemStack> drops )
{
super.getDrops( w, x, y, z, drops );
src/main/java/appeng/tile/misc/TileInterface.java
+2 -1
View File
@@ -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<ItemStack> drops )
public void getDrops( World w, int x, int y, int z, List<ItemStack> drops )
{
this.duality.addDrops( drops );
}
src/main/java/appeng/tile/misc/TilePaint.java
+2 -1
View File
@@ -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 com.google.common.collect.ImmutableList;
@@ -50,7 +51,7 @@ public class TilePaint extends AEBaseTile
static final int LIGHT_PER_DOT = 12;
int isLit = 0;
ArrayList<Splotch> dots = null;
List<Splotch> dots = null;
@TileEvent( TileEventType.WORLD_NBT_WRITE )
public void writeToNBT_TilePaint( NBTTagCompound data )
src/main/java/appeng/tile/misc/TileSecurity.java
+2 -1
View File
@@ -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<ItemStack> drops )
public void getDrops( World w, int x, int y, int z, List<ItemStack> drops )
{
if( !this.configSlot.isEmpty() )
{
src/main/java/appeng/tile/networking/TileCableBus.java
+2 -2
View File
@@ -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<ItemStack> drops )
public void getNoDrops( World w, int x, int y, int z, List<ItemStack> drops )
{
this.cb.getNoDrops( drops );
}
src/main/java/appeng/tile/storage/TileIOPort.java
+2 -2
View File
@@ -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<ItemStack> drops )
public void getDrops( World w, int x, int y, int z, List<ItemStack> drops )
{
super.getDrops( w, x, y, z, drops );
src/main/java/appeng/util/inv/WrapperChainedInventory.java
+2 -1
View File
@@ -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 com.google.common.collect.ImmutableList;
@@ -35,7 +36,7 @@ public class WrapperChainedInventory implements IInventory
int fullSize = 0;
private List<IInventory> l;
private HashMap<Integer, InvOffset> offsets;
private Map<Integer, InvOffset> offsets;
public WrapperChainedInventory( IInventory... inventories )
{