Merge remote-tracking branch 'upstream/rv2' into rv2

Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java

src/main/java/appeng/core/AppEng.java

@@ -53,7 +53,7 @@ public class AppEng
 	public final static String modid = "appliedenergistics2";
 	public final static String name = "Applied Energistics 2";
 
-	HashMap<String, IIMCHandler> IMCHandlers = new HashMap();
+	HashMap<String, IIMCHandler> IMCHandlers = new HashMap<String, IIMCHandler>();
 
 	public static AppEng instance;
 

src/main/java/appeng/core/WorldSettings.java

@@ -224,7 +224,7 @@ public class WorldSettings extends Configuration
 		instance = null;
 	}
 
-	List<Integer> storageCellDims = new ArrayList();
+	List<Integer> storageCellDims = new ArrayList<Integer>();
 	HashMap<Integer, UUID> idToUUID;
 
 	public void addStorageCellDim(int newDim)
@@ -317,7 +317,7 @@ public class WorldSettings extends Configuration
 		save();
 	}
 
-	private WeakHashMap<GridStorageSearch, WeakReference<GridStorageSearch>> loadedStorage = new WeakHashMap();
+	private WeakHashMap<GridStorageSearch, WeakReference<GridStorageSearch>> loadedStorage = new WeakHashMap<GridStorageSearch, WeakReference<GridStorageSearch>>();
 
 	public WorldCoord getStoredSize(int dim)
 	{

src/main/java/appeng/core/api/ApiPart.java

@@ -44,12 +44,12 @@ public class ApiPart implements IPartHelper
 
 	int classNum = 1;
 
-	HashMap<String, Class> TileImplementations = new HashMap();
-	HashMap<String, ClassNode> readerCache = new HashMap();
-	HashMap<Class, String> interfaces2Layer = new HashMap();
-	HashMap<String, Class> roots = new HashMap();
+	HashMap<String, Class> TileImplementations = new HashMap<String, Class>();
+	HashMap<String, ClassNode> readerCache = new HashMap<String, ClassNode>();
+	HashMap<Class, String> interfaces2Layer = new HashMap<Class, String>();
+	HashMap<String, Class> roots = new HashMap<String, Class>();
 
-	List<String> desc = new LinkedList();
+	List<String> desc = new LinkedList<String>();
 
 	public void initFMPSupport()
 	{

src/main/java/appeng/core/api/ApiStorage.java

@@ -40,13 +40,13 @@ public class ApiStorage implements IStorageHelper
 	@Override
 	public IItemList<IAEItemStack> createItemList()
 	{
-		return new ItemList( IAEItemStack.class );
+		return new ItemList<IAEItemStack>( IAEItemStack.class );
 	}
 
 	@Override
 	public IItemList<IAEFluidStack> createFluidList()
 	{
-		return new ItemList( IAEFluidStack.class );
+		return new ItemList<IAEFluidStack>( IAEFluidStack.class );
 	}
 
 	@Override

src/main/java/appeng/core/features/registries/CellRegistry.java

@@ -16,7 +16,7 @@ public class CellRegistry implements ICellRegistry
 	List<ICellHandler> handlers;
 
 	public CellRegistry() {
-		handlers = new ArrayList();
+		handlers = new ArrayList<ICellHandler>();
 	}
 
 	@Override

src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java

@@ -18,7 +18,7 @@ public class ExternalStorageRegistry implements IExternalStorageRegistry
 	final ExternalIInv lastHandler = new ExternalIInv();
 
 	public ExternalStorageRegistry() {
-		Handlers = new ArrayList();
+		Handlers = new ArrayList<IExternalStorageHandler>();
 	}
 
 	@Override

src/main/java/appeng/core/features/registries/GridCacheRegistry.java

@@ -11,7 +11,7 @@ import appeng.core.AELog;
 public class GridCacheRegistry implements IGridCacheRegistry
 {
 
-	final private HashMap<Class<? extends IGridCache>, Class<? extends IGridCache>> caches = new HashMap();
+	final private HashMap<Class<? extends IGridCache>, Class<? extends IGridCache>> caches = new HashMap<Class<? extends IGridCache>, Class<? extends IGridCache>>();
 
 	@Override
 	public void registerGridCache(Class<? extends IGridCache> iface, Class<? extends IGridCache> implementation)
@@ -25,7 +25,7 @@ public class GridCacheRegistry implements IGridCacheRegistry
 	@Override
 	public HashMap<Class<? extends IGridCache>, IGridCache> createCacheInstance(IGrid g)
 	{
-		HashMap<Class<? extends IGridCache>, IGridCache> map = new HashMap();
+		HashMap<Class<? extends IGridCache>, IGridCache> map = new HashMap<Class<? extends IGridCache>, IGridCache>();
 
 		for (Class<? extends IGridCache> iface : caches.keySet())
 		{

src/main/java/appeng/core/features/registries/GrinderRecipeManager.java

@@ -31,7 +31,7 @@ public class GrinderRecipeManager implements IGrinderRegistry, IOreListener
 	}
 
 	public GrinderRecipeManager() {
-		RecipeList = new ArrayList();
+		RecipeList = new ArrayList<IGrinderEntry>();
 
 		addOre( "Coal", new ItemStack( Items.coal ) );
 		addOre( "Charcoal", new ItemStack( Items.coal, 1, 1 ) );

src/main/java/appeng/core/features/registries/LocatableRegistry.java

@@ -32,7 +32,7 @@ public class LocatableRegistry implements ILocatableRegistry
 	}
 
 	public LocatableRegistry() {
-		set = new HashMap();
+		set = new HashMap<Long, ILocatable>();
 		MinecraftForge.EVENT_BUS.register( this );
 	}
 

src/main/java/appeng/core/features/registries/MovableTileRegistry.java

@@ -15,7 +15,7 @@ import appeng.spatial.DefaultSpatialHandler;
 public class MovableTileRegistry implements IMovableRegistry
 {
 
-	private HashSet<Block> blacklisted = new HashSet();
+	private HashSet<Block> blacklisted = new HashSet<Block>();
 
 	private HashMap<Class<? extends TileEntity>, IMovableHandler> Valid = new HashMap<Class<? extends TileEntity>, IMovableHandler>();
 	private LinkedList<Class<? extends TileEntity>> test = new LinkedList<Class<? extends TileEntity>>();

src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java

@@ -18,7 +18,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 public class P2PTunnelRegistry implements IP2PTunnelRegistry
 {
 
-	HashMap<ItemStack, TunnelType> Tunnels = new HashMap();
+	HashMap<ItemStack, TunnelType> Tunnels = new HashMap<ItemStack, TunnelType>();
 
 	public ItemStack getModItem(String modID, String Name, int meta)
 	{

src/main/java/appeng/core/features/registries/WirelessRegistry.java

@@ -19,7 +19,7 @@ public class WirelessRegistry implements IWirelessTermRegistry
 	List<IWirelessTermHandler> handlers;
 
 	public WirelessRegistry() {
-		handlers = new ArrayList();
+		handlers = new ArrayList<IWirelessTermHandler>();
 	}
 
 	@Override

src/main/java/appeng/core/features/registries/WorldGenRegistry.java

@@ -12,8 +12,8 @@ public class WorldGenRegistry implements IWorldGen
 	private class TypeSet
 	{
 
-		HashSet<Class<? extends WorldProvider>> badProviders = new HashSet();
-		HashSet<Integer> badDimensions = new HashSet();
+		HashSet<Class<? extends WorldProvider>> badProviders = new HashSet<Class<? extends WorldProvider>>();
+		HashSet<Integer> badDimensions = new HashSet<Integer>();
 
 	}
 

src/main/java/appeng/core/stats/PlayerStatsRegistration.java

@@ -124,7 +124,7 @@ public class PlayerStatsRegistration
 			/**
 			 * register
 			 */
-			ArrayList<Achievement> list = new ArrayList();
+			ArrayList<Achievement> list = new ArrayList<Achievement>();
 
 			for (Achievements a : Achievements.values())
 			{

src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java

@@ -47,7 +47,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
 	public PacketMEInventoryUpdate(final ByteBuf stream) throws IOException {
 		data = null;
 		compressFrame = null;
-		list = new LinkedList();
+		list = new LinkedList<IAEItemStack>();
 		ref = stream.readByte();
 
 		// int originalBytes = stream.readableBytes();