diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..4551fbf55 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,160 @@ +# How to contribute + +We want to keep it as easy as possible to contribute changes support +the growth and stability of AE2. There are a few guidelines that we +need contributors to follow so that we can have a chance of keeping on +top of things. + +## Getting Started + +### Reporting an Issue + +When reporting issues, it is critically important that you provide as much +detail as possible. Without this detail, it is impossible for us to track +down what the real issue is. + +When creating a new issue, please include the following items, at a minimum. +Issues that do not contain the following will be closed. Sorry, but we don't +have the time to chase down "My inscriber doesn't work" or "ae crashes" +type of issues. + +```` +What version of Minecraft +What version of Forge +What version of AE2 - If this is not the latest version of AE, does the problem +happen on the latest version? + +If this is a crash, provide the crash log. You can use [PasteBin](http://pastebin.com) +to upload the log. + +If a specific setup is causing the crash or failure, post a screen shot. You can +use [Puush.me](http://puush.me/) to host the screen shot. + +Describe in full detail exactly how to reproduce the failure. +```` + +### Submitting Changes + +* Submit an issue to the github project, assuming one does not already exist. + * Clearly describe the issue including steps to reproduce when it is a bug. + * Make sure you fill in the earliest version that you know has the issue. +* Fork the repository on GitHub +* Create a topic branch from where you want to base your work. + * This is revison branch that is under active development. + * Only target release branches if you are certain your fix must be on that + branch. + * To quickly create a topic branch based on the development branch; `git + checkout -b fix/master/my_contribution branch`. Please avoid working + directly on the `active development` branch. +* Make commits of logical units. +* Check for unnecessary whitespace with `git diff --check` before committing. +* Make sure your commit messages are in the proper format. + +```` + (#12345) Make the example in CONTRIBUTING imperative and concrete + + Without this patch applied the example commit message in the CONTRIBUTING + document is not a concrete example. This is a problem because the + contributor is left to imagine what the commit message should look like + based on a description rather than an example. This patch fixes the + problem by making the example concrete and imperative. + + The first line is a real life imperative statement with a ticket number + from our issue tracker. The body describes the behavior without the patch, + why this is a problem, and how the patch fixes the problem when applied. +```` +* Always fully test your changes. If they are large engouh in scope, then fully + test AE2. +* Describing the process you used to test your changes in detail will help speed + up this process. + +## Making Trivial Changes + +### Documentation + +For changes of a trivial nature to comments and documentation, it is not +always necessary to create a new issue. In this case, it is +appropriate to start the first line of a commit with '(doc)' instead of +a ticket number. + +```` + (doc) Add documentation commit example to CONTRIBUTING + + There is no example for contributing a documentation commit + to the Puppet repository. This is a problem because the contributor + is left to assume how a commit of this nature may appear. + + The first line is a real life imperative statement with '(doc)' in + place of what would have been the ticket number in a + non-documentation related commit. The body describes the nature of + the new documentation or comments added. +```` + +### Semantic Changes + +In order to keep the code in a state where PRs can be safely merged, it is important to +avoid changes to syntax or changes that don't add any real value to the code base. PRs +that make changes only to syntax or "clean up" the code will be rejected. Any code clean-up +should be coordinated with the core team first. + + +## Style Guidelines + +Applied Energistics does not follow standard Java syntax. The guidelines below illustrate +the styling guidelines used by AE. + +PRs that do not conform to these standards will be rejected. + +### Whitespace + +#### Tabs or spaces +Configure your IDE to use tabs as padding whitespace. Ensure that there is no extra whitespace +at the end of lines, or on blank lines. + +#### Pad parenthes with whitespace +```` +if( item.equals( newItem ) + +public void DeleteItem( item ) + +catch( Throwable ) +```` + +### Braces + +Place opening and closing braces on a new line. Always include open and close braces, even if +the body is a single line. + +```` +if( item.equals( newItem ) +{ + +} +else +{ + +} + +public void DeleteItem( item ) +{ + +} +```` + +## Submitting Changes + +* Push your changes to a topic branch in your fork of the repository. +* Submit a pull request to the repository in the puppetlabs organization. +* Update your issue to mark that you have submitted code and are ready for it to be reviewed. + * Include a link to the pull request in the ticket. +* The core team looks at Pull Requests on a regular basis. + * There are many reasons why it will take a long time to pull your PR. Be patient, we'll + get to it. +* After feedback has been given we expect responses within two weeks. After two + weeks will may close the pull request if it isn't showing any activity. + +# Additional Resources + +* [General GitHub documentation](http://help.github.com/) +* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) +* #AppliedEnergistics IRC channel on esper.net \ No newline at end of file diff --git a/README.md b/README.md index 0db83c58f..874a82a1a 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,18 @@ You install this mod by putting it into the `minecraft/mods/` folder. It has no Before you want to add major changes, you might want to discuss them with us first, before wasting your time. If you are still willing to contribute to this project, you can contribute via [Pull-Request](https://help.github.com/articles/creating-a-pull-request). +Here are a few things to keep in mind that will help get your PR approved. + +* A PR should be focused on content. Any PRs where the changes are only syntax will be rejected. +* Use the file you are editing as a style guide. +* Consider your feature. [Suggestion Guidelines](http://ae-mod.info/Suggestion-Guidelines/) + - Is your suggestion already possible using Vanilla + AE2? + - Make sure your feature isn't already in the works, or hasn't been rejected previously. + - Does your feature simplify another feature of AE2? These changes will not be accepted. + - If your feature can be done by any popular mod, discuss with us first. + +Getting Started + 1. Fork this repository 2. Clone the fork via * SSH `git clone git@github.com:/Applied-Energistics-2.git` or diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 452fb199d..1b16c8691 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -280,7 +280,7 @@ public class ClientHelper extends ServerHelper { if ( Platform.isClient() ) { - List o = new ArrayList(); + List o = new ArrayList(); o.add( Minecraft.getMinecraft().thePlayer ); return o; } diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index a425b4837..7a6f6de12 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -177,7 +177,7 @@ public abstract class AEBaseGui extends GuiContainer Slot bl_clicked; // drag y - Set drag_click = new HashSet(); + Set drag_click = new HashSet(); @Override protected void handleMouseClick(Slot slot, int slotIdx, int ctrlDown, int key) diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index 23341ad86..902616589 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -46,7 +46,7 @@ public class GuiCraftConfirm extends AEBaseGui IItemList pending = AEApi.instance().storage().createItemList(); IItemList missing = AEApi.instance().storage().createItemList(); - List visual = new ArrayList(); + List visual = new ArrayList(); GuiBridge OriginalGui; @@ -382,7 +382,7 @@ public class GuiCraftConfirm extends AEBaseGui int viewEnd = viewStart + 3 * rows; String dspToolTip = ""; - List lineList = new LinkedList(); + List lineList = new LinkedList(); int toolPosX = 0; int toolPosY = 0; diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index 5ba7a8560..b3de50051 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -39,14 +39,14 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource IItemList active = AEApi.instance().storage().createItemList(); IItemList pending = AEApi.instance().storage().createItemList(); - List visual = new ArrayList(); + List visual = new ArrayList(); public void clearItems() { storage = AEApi.instance().storage().createItemList(); active = AEApi.instance().storage().createItemList(); pending = AEApi.instance().storage().createItemList(); - visual = new ArrayList(); + visual = new ArrayList(); } protected GuiCraftingCPU(ContainerCraftingCPU container) { @@ -269,7 +269,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource int viewEnd = viewStart + 3 * 6; String dspToolTip = ""; - List lineList = new LinkedList(); + List lineList = new LinkedList(); int toolPosX = 0; int toolPosY = 0; diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java index 0438d429d..69bfc36a8 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java @@ -25,11 +25,11 @@ import com.google.common.collect.HashMultimap; public class GuiInterfaceTerminal extends AEBaseGui { - HashMap byId = new HashMap(); + HashMap byId = new HashMap(); HashMultimap byName = HashMultimap.create(); - ArrayList names = new ArrayList(); + ArrayList names = new ArrayList(); - ArrayList lines = new ArrayList(); + ArrayList lines = new ArrayList(); private int getTotalRows() { @@ -43,7 +43,7 @@ public class GuiInterfaceTerminal extends AEBaseGui ySize = 222; } - LinkedList dcSlots = new LinkedList(); + LinkedList dcSlots = new LinkedList(); @Override public void initGui() @@ -178,12 +178,12 @@ public class GuiInterfaceTerminal extends AEBaseGui Collections.sort( names ); - lines = new ArrayList( getTotalRows() ); + lines = new ArrayList( getTotalRows() ); for (String n : names) { lines.add( n ); - ArrayList clientInventories = new ArrayList(); + ArrayList clientInventories = new ArrayList(); clientInventories.addAll( byName.get( n ) ); Collections.sort( clientInventories ); diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index b17a91f6e..76640a3fe 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java @@ -101,7 +101,7 @@ public class GuiImgButton extends GuiButton implements ITooltip if ( Appearances == null ) { - Appearances = new HashMap(); + Appearances = new HashMap(); registerApp( 16 * 7 + 0, Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash ); registerApp( 16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOutput.MATTER_BALLS, ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls ); registerApp( 16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOutput.SINGULARITY, ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity ); diff --git a/src/main/java/appeng/client/render/BusRenderer.java b/src/main/java/appeng/client/render/BusRenderer.java index 879f3dcce..1ad145e48 100644 --- a/src/main/java/appeng/client/render/BusRenderer.java +++ b/src/main/java/appeng/client/render/BusRenderer.java @@ -29,7 +29,7 @@ public class BusRenderer implements IItemRenderer public static final BusRenderer instance = new BusRenderer(); public RenderBlocksWorkaround renderer = new RenderBlocksWorkaround(); - public static final HashMap renderPart = new HashMap(); + public static final HashMap renderPart = new HashMap(); public IPart getRenderer(ItemStack is, IPartItem c) { diff --git a/src/main/java/appeng/client/render/CableRenderHelper.java b/src/main/java/appeng/client/render/CableRenderHelper.java index 4fbc2b907..36c6dc6cf 100644 --- a/src/main/java/appeng/client/render/CableRenderHelper.java +++ b/src/main/java/appeng/client/render/CableRenderHelper.java @@ -106,7 +106,7 @@ public class CableRenderHelper /** * snag list of boxes... */ - List boxes = new ArrayList(); + List boxes = new ArrayList(); for (ForgeDirection s : ForgeDirection.values()) { IPart part = cableBusContainer.getPart( s ); diff --git a/src/main/java/appeng/client/render/WorldRender.java b/src/main/java/appeng/client/render/WorldRender.java index 453fea84f..a22b820eb 100644 --- a/src/main/java/appeng/client/render/WorldRender.java +++ b/src/main/java/appeng/client/render/WorldRender.java @@ -23,7 +23,7 @@ public class WorldRender implements ISimpleBlockRenderingHandler public static final WorldRender instance = new WorldRender(); boolean hasError = false; - public HashMap blockRenders = new HashMap(); + public HashMap blockRenders = new HashMap(); void setRender(AEBaseBlock in, BaseBlockRender r) { diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index ce1862aad..7a939dd7f 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -72,7 +72,7 @@ public abstract class AEBaseContainer extends Container int ticksSinceCheck = 900; IAEItemStack clientRequestedTargetItem = null; - List dataChunks = new LinkedList(); + List dataChunks = new LinkedList(); public void postPartial(PacketPartialItem packetPartialItem) { @@ -129,7 +129,7 @@ public abstract class AEBaseContainer extends Container CompressedStreamTools.writeCompressed( item, stream ); int maxChunkSize = 30000; - List miniPackets = new LinkedList(); + List miniPackets = new LinkedList(); byte[] data = stream.toByteArray(); @@ -216,7 +216,7 @@ public abstract class AEBaseContainer extends Container public ContainerOpenContext openContext; protected IMEInventoryHandler cellInv; - protected HashSet locked = new HashSet(); + protected HashSet locked = new HashSet(); protected IEnergySource powerSrc; public void lockPlayerInventorySlot(int idx) @@ -774,7 +774,7 @@ public abstract class AEBaseContainer extends Container if ( action == InventoryAction.MOVE_REGION ) { - List from = new LinkedList(); + List from = new LinkedList(); for (Object j : inventorySlots) { diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index d989695ca..3300696b7 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -76,7 +76,7 @@ public class ContainerCraftConfirm extends AEBaseContainer protected long cpuIdx = Long.MIN_VALUE; - public ArrayList cpus = new ArrayList(); + public ArrayList cpus = new ArrayList(); public ContainerCraftConfirm(InventoryPlayer ip, ITerminalHost te) { super( ip, te ); diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java b/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java index 6ae030b5f..eac154a82 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java @@ -23,7 +23,7 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU @GuiSync(7) public String myName = ""; - public ArrayList cpus = new ArrayList(); + public ArrayList cpus = new ArrayList(); private void sendCPUs() { diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index 9efd97bdc..dce1cee54 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -61,8 +61,8 @@ public class ContainerInterfaceTerminal extends AEBaseContainer } - Map diList = new HashMap(); - Map byId = new HashMap(); + Map diList = new HashMap(); + Map byId = new HashMap(); IGrid g; public ContainerInterfaceTerminal(InventoryPlayer ip, PartMonitor anchor) { diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index 8e95e82c3..140f81ec9 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -259,7 +259,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA } else { - List list = new ArrayList( 3 ); + List list = new ArrayList( 3 ); boolean hasValue = false; for (int x = 0; x < outputSlots.length; x++) diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java index f2ee08f67..9285fa797 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java @@ -149,7 +149,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot public void postCraft(EntityPlayer p, IMEMonitor inv, ItemStack set[], ItemStack result) { - List drops = new ArrayList(); + List drops = new ArrayList(); // add one of each item to the items on the board... if ( Platform.isServer() ) @@ -219,7 +219,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot ItemStack extra = ia.addItems( craftItem( who, rs, inv, all ) ); if ( extra != null ) { - List drops = new ArrayList(); + List drops = new ArrayList(); drops.add( extra ); Platform.spawnDrops( who.worldObj, (int) who.posX, (int) who.posY, (int) who.posZ, drops ); return; diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 0610c2ee1..17866c03f 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/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 IMCHandlers = new HashMap(); + HashMap IMCHandlers = new HashMap(); public static AppEng instance; diff --git a/src/main/java/appeng/core/WorldSettings.java b/src/main/java/appeng/core/WorldSettings.java index 90cbb7e62..b31390427 100644 --- a/src/main/java/appeng/core/WorldSettings.java +++ b/src/main/java/appeng/core/WorldSettings.java @@ -224,7 +224,7 @@ public class WorldSettings extends Configuration instance = null; } - List storageCellDims = new ArrayList(); + List storageCellDims = new ArrayList(); HashMap idToUUID; public void addStorageCellDim(int newDim) @@ -317,7 +317,7 @@ public class WorldSettings extends Configuration save(); } - private WeakHashMap> loadedStorage = new WeakHashMap(); + private WeakHashMap> loadedStorage = new WeakHashMap>(); public WorldCoord getStoredSize(int dim) { diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index 419681c13..54f26cb1f 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -44,12 +44,12 @@ public class ApiPart implements IPartHelper int classNum = 1; - HashMap TileImplementations = new HashMap(); - HashMap readerCache = new HashMap(); - HashMap interfaces2Layer = new HashMap(); - HashMap roots = new HashMap(); + HashMap TileImplementations = new HashMap(); + HashMap readerCache = new HashMap(); + HashMap interfaces2Layer = new HashMap(); + HashMap roots = new HashMap(); - List desc = new LinkedList(); + List desc = new LinkedList(); public void initFMPSupport() { diff --git a/src/main/java/appeng/core/api/ApiStorage.java b/src/main/java/appeng/core/api/ApiStorage.java index f1854ebbb..ca6e86340 100644 --- a/src/main/java/appeng/core/api/ApiStorage.java +++ b/src/main/java/appeng/core/api/ApiStorage.java @@ -40,13 +40,13 @@ public class ApiStorage implements IStorageHelper @Override public IItemList createItemList() { - return new ItemList( IAEItemStack.class ); + return new ItemList( IAEItemStack.class ); } @Override public IItemList createFluidList() { - return new ItemList( IAEFluidStack.class ); + return new ItemList( IAEFluidStack.class ); } @Override diff --git a/src/main/java/appeng/core/features/registries/CellRegistry.java b/src/main/java/appeng/core/features/registries/CellRegistry.java index 74d6af862..d790208e8 100644 --- a/src/main/java/appeng/core/features/registries/CellRegistry.java +++ b/src/main/java/appeng/core/features/registries/CellRegistry.java @@ -16,7 +16,7 @@ public class CellRegistry implements ICellRegistry List handlers; public CellRegistry() { - handlers = new ArrayList(); + handlers = new ArrayList(); } @Override diff --git a/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java b/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java index c776291fc..8cba75c9b 100644 --- a/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java +++ b/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(); } @Override diff --git a/src/main/java/appeng/core/features/registries/GridCacheRegistry.java b/src/main/java/appeng/core/features/registries/GridCacheRegistry.java index d74233ea6..4c70fe617 100644 --- a/src/main/java/appeng/core/features/registries/GridCacheRegistry.java +++ b/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> caches = new HashMap(); + final private HashMap, Class> caches = new HashMap, Class>(); @Override public void registerGridCache(Class iface, Class implementation) @@ -25,7 +25,7 @@ public class GridCacheRegistry implements IGridCacheRegistry @Override public HashMap, IGridCache> createCacheInstance(IGrid g) { - HashMap, IGridCache> map = new HashMap(); + HashMap, IGridCache> map = new HashMap, IGridCache>(); for (Class iface : caches.keySet()) { diff --git a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java index aca8ea9a8..cbeb345a2 100644 --- a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java +++ b/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(); addOre( "Coal", new ItemStack( Items.coal ) ); addOre( "Charcoal", new ItemStack( Items.coal, 1, 1 ) ); diff --git a/src/main/java/appeng/core/features/registries/LocatableRegistry.java b/src/main/java/appeng/core/features/registries/LocatableRegistry.java index ee99632f9..39b39a68a 100644 --- a/src/main/java/appeng/core/features/registries/LocatableRegistry.java +++ b/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(); MinecraftForge.EVENT_BUS.register( this ); } diff --git a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java index 304be446e..b36197db7 100644 --- a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java +++ b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java @@ -15,7 +15,7 @@ import appeng.spatial.DefaultSpatialHandler; public class MovableTileRegistry implements IMovableRegistry { - private HashSet blacklisted = new HashSet(); + private HashSet blacklisted = new HashSet(); private HashMap, IMovableHandler> Valid = new HashMap, IMovableHandler>(); private LinkedList> test = new LinkedList>(); diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index 84a4bfb17..0a9ed1303 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/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 Tunnels = new HashMap(); + HashMap Tunnels = new HashMap(); public ItemStack getModItem(String modID, String Name, int meta) { diff --git a/src/main/java/appeng/core/features/registries/WirelessRegistry.java b/src/main/java/appeng/core/features/registries/WirelessRegistry.java index ff8af8790..1248f36f3 100644 --- a/src/main/java/appeng/core/features/registries/WirelessRegistry.java +++ b/src/main/java/appeng/core/features/registries/WirelessRegistry.java @@ -19,7 +19,7 @@ public class WirelessRegistry implements IWirelessTermRegistry List handlers; public WirelessRegistry() { - handlers = new ArrayList(); + handlers = new ArrayList(); } @Override diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 03b9eb4f2..e5d8ef67d 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -12,8 +12,8 @@ public class WorldGenRegistry implements IWorldGen private class TypeSet { - HashSet> badProviders = new HashSet(); - HashSet badDimensions = new HashSet(); + HashSet> badProviders = new HashSet>(); + HashSet badDimensions = new HashSet(); } diff --git a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java index 31f50c1bf..c19fee840 100644 --- a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java +++ b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java @@ -124,7 +124,7 @@ public class PlayerStatsRegistration /** * register */ - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); for (Achievements a : Achievements.values()) { diff --git a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java index 440ed7eaf..0f638d297 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java +++ b/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(); ref = stream.readByte(); // int originalBytes = stream.readableBytes(); diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 3bfeb05f2..04d1b0b43 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -52,7 +52,7 @@ public class CraftingJob implements Runnable, ICraftingJob { world = wrapWorld( w ); storage = AEApi.instance().storage().createItemList(); - prophecies = new HashSet(); + prophecies = new HashSet(); original = null; availableCheck = null; } @@ -72,7 +72,7 @@ public class CraftingJob implements Runnable, ICraftingJob world = wrapWorld( w ); output = what.copy(); storage = AEApi.instance().storage().createItemList(); - prophecies = new HashSet(); + prophecies = new HashSet(); this.actionSrc = actionSrc; this.callback = callback; @@ -131,7 +131,7 @@ public class CraftingJob implements Runnable, ICraftingJob public long times = 0; } - HashMap opsAndMultiplier = new HashMap(); + HashMap opsAndMultiplier = new HashMap(); @Override public void run() diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/main/java/appeng/crafting/CraftingTreeNode.java index 8c113a276..31b46e5c2 100644 --- a/src/main/java/appeng/crafting/CraftingTreeNode.java +++ b/src/main/java/appeng/crafting/CraftingTreeNode.java @@ -30,7 +30,7 @@ public class CraftingTreeNode private IAEItemStack what; // what are the crafting patterns for this? - private ArrayList nodes = new ArrayList(); + private ArrayList nodes = new ArrayList(); boolean canEmit = false; boolean cannotUse = false; @@ -95,7 +95,7 @@ public class CraftingTreeNode { job.handlePausing(); - List thingsUsed = new LinkedList(); + List thingsUsed = new LinkedList(); what.setStackSize( l ); if ( slot >= 0 && parent != null && parent.details.isCraftable() ) diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index dc18961bf..2499ad926 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -36,7 +36,7 @@ public class CraftingTreeProcess private long bytes = 0; final private int depth; - Map nodes = new HashMap(); + Map nodes = new HashMap(); public boolean possible = true; public CraftingTreeProcess(ICraftingGrid cc, CraftingJob job, ICraftingPatternDetails details, CraftingTreeNode craftingTreeNode, int depth, World world) { diff --git a/src/main/java/appeng/crafting/CraftingWatcher.java b/src/main/java/appeng/crafting/CraftingWatcher.java index 8eb6535ba..546a3981b 100644 --- a/src/main/java/appeng/crafting/CraftingWatcher.java +++ b/src/main/java/appeng/crafting/CraftingWatcher.java @@ -49,17 +49,17 @@ public class CraftingWatcher implements ICraftingWatcher } CraftingGridCache gsc; - ICraftingWatcherHost myObject; - HashSet myInterests = new HashSet(); + ICraftingWatcherHost host; + HashSet myInterests = new HashSet(); public CraftingWatcher(CraftingGridCache cache, ICraftingWatcherHost host) { gsc = cache; - myObject = host; + this.host = host; } public ICraftingWatcherHost getHost() { - return myObject; + return host; } @Override diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index 8e0c0664b..f5dc6ff39 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -14,7 +14,7 @@ import appeng.tile.AEBaseTile; public class TileItemGen extends AEBaseTile implements IInventory { - public static Queue possibleItems = new LinkedList(); + public static Queue possibleItems = new LinkedList(); public TileItemGen() { if ( possibleItems.isEmpty() ) diff --git a/src/main/java/appeng/debug/ToolDebugCard.java b/src/main/java/appeng/debug/ToolDebugCard.java index 19e52a146..559fd9bcb 100644 --- a/src/main/java/appeng/debug/ToolDebugCard.java +++ b/src/main/java/appeng/debug/ToolDebugCard.java @@ -84,7 +84,7 @@ public class ToolDebugCard extends AEBaseItem { int length = 0; - HashSet next = new HashSet(); + HashSet next = new HashSet(); next.add( node ); int maxLength = 10000; @@ -92,7 +92,7 @@ public class ToolDebugCard extends AEBaseItem outer: while ( ! next.isEmpty() ) { HashSet current = next; - next = new HashSet(); + next = new HashSet(); for ( IGridNode n : current ) { diff --git a/src/main/java/appeng/debug/ToolEraser.java b/src/main/java/appeng/debug/ToolEraser.java index 9dcdda791..8820e50de 100644 --- a/src/main/java/appeng/debug/ToolEraser.java +++ b/src/main/java/appeng/debug/ToolEraser.java @@ -34,14 +34,14 @@ public class ToolEraser extends AEBaseItem int meta = world.getBlockMetadata( x, y, z ); int blocks = 0; - List next = new LinkedList(); + List next = new LinkedList(); next.add( new WorldCoord( x, y, z ) ); while (blocks < 90000 && !next.isEmpty()) { List c = next; - next = new LinkedList(); + next = new LinkedList(); for (WorldCoord wc : c) { diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/EntityChargedQuartz.java index 6d53d5fe7..32277ecec 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/EntityChargedQuartz.java @@ -106,7 +106,7 @@ final public class EntityChargedQuartz extends EntityItem if ( netherQuartz.getEntityItem().stackSize <= 0 ) netherQuartz.setDead(); - List i = new ArrayList(); + List i = new ArrayList(); i.add( AEApi.instance().materials().materialFluixCrystal.stack( 1 ) ); ItemStack Output = AEApi.instance().materials().materialFluixCrystal.stack( 2 ); diff --git a/src/main/java/appeng/fmp/CableBusPart.java b/src/main/java/appeng/fmp/CableBusPart.java index a9debdae1..40ab069eb 100644 --- a/src/main/java/appeng/fmp/CableBusPart.java +++ b/src/main/java/appeng/fmp/CableBusPart.java @@ -314,7 +314,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds { if ( !(side == null || side == ForgeDirection.UNKNOWN || tile() == null) ) { - List boxes = new ArrayList(); + List boxes = new ArrayList(); IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true ); fp.getBoxes( bch, null ); for (AxisAlignedBB bb : boxes) @@ -341,7 +341,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds IPart bp = bi.createPartFromItemStack( is ); if ( !(side == null || side == ForgeDirection.UNKNOWN || tile() == null) ) { - List boxes = new ArrayList(); + List boxes = new ArrayList(); IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true ); bp.getBoxes( bch ); for (AxisAlignedBB bb : boxes) @@ -411,7 +411,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds @Override public Iterable getCollisionBoxes() { - LinkedList l = new LinkedList(); + LinkedList l = new LinkedList(); for (AxisAlignedBB b : cb.getSelectedBoundingBoxesFromPool( false, true, null, false )) { l.add( new Cuboid6( b.minX, b.minY, b.minZ, b.maxX, b.maxY, b.maxZ ) ); @@ -423,7 +423,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds @Override public Iterable getSubParts() { - LinkedList l = new LinkedList(); + LinkedList l = new LinkedList(); for (Cuboid6 c : getCollisionBoxes()) { l.add( new IndexedCuboid6( 0, c ) ); @@ -434,7 +434,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds @Override public Iterable getOcclusionBoxes() { - LinkedList l = new LinkedList(); + LinkedList l = new LinkedList(); for (AxisAlignedBB b : cb.getSelectedBoundingBoxesFromPool( true, disableFacadeOcclusion.get() == null, null, true )) { l.add( new Cuboid6( b.minX, b.minY, b.minZ, b.maxX, b.maxY, b.maxZ ) ); @@ -543,7 +543,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds ForgeDirection dir = ForgeDirection.getOrientation( side ); if ( cable != null && cable.isConnected( dir ) ) { - List boxes = new ArrayList(); + List boxes = new ArrayList(); BusCollisionHelper bch = new BusCollisionHelper( boxes, ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH, null, true ); diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index bb9242e49..fe553dc87 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -169,7 +169,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt if ( details != null ) { if ( craftingList == null ) - craftingList = new LinkedList(); + craftingList = new LinkedList(); craftingList.add( details ); } @@ -182,7 +182,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt return; if ( waitingToSend == null ) - waitingToSend = new LinkedList(); + waitingToSend = new LinkedList(); waitingToSend.add( is ); @@ -513,8 +513,8 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt return patterns; } - MEMonitorPassThrough items = new MEMonitorPassThrough( new NullInventory(), StorageChannel.ITEMS ); - MEMonitorPassThrough fluids = new MEMonitorPassThrough( new NullInventory(), StorageChannel.FLUIDS ); + MEMonitorPassThrough items = new MEMonitorPassThrough( new NullInventory(), StorageChannel.ITEMS ); + MEMonitorPassThrough fluids = new MEMonitorPassThrough( new NullInventory(), StorageChannel.FLUIDS ); public void gridChanged() { @@ -525,8 +525,8 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt } catch (GridAccessException gae) { - items.setInternal( new NullInventory() ); - fluids.setInternal( new NullInventory() ); + items.setInternal( new NullInventory() ); + fluids.setInternal( new NullInventory() ); } notifyNeighbors(); @@ -997,7 +997,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt craftingTracker.jobStateChange( link ); } - static final Set badBlocks = new HashSet(); + static final Set badBlocks = new HashSet(); public String getTermName() { diff --git a/src/main/java/appeng/helpers/MeteoritePlacer.java b/src/main/java/appeng/helpers/MeteoritePlacer.java index e760837e2..d6f101bfc 100644 --- a/src/main/java/appeng/helpers/MeteoritePlacer.java +++ b/src/main/java/appeng/helpers/MeteoritePlacer.java @@ -378,8 +378,8 @@ public class MeteoritePlacer } int minBLocks = 200; - HashSet validSpawn = new HashSet(); - HashSet invalidSpawn = new HashSet(); + HashSet validSpawn = new HashSet(); + HashSet invalidSpawn = new HashSet(); Fallout type = new Fallout(); @@ -700,7 +700,7 @@ public class MeteoritePlacer ap.addItems( AEApi.instance().blocks().blockSkyStone.stack( (int) (Math.random() * 12) + 1 ) ); break; case 1: - List possibles = new LinkedList(); + List possibles = new LinkedList(); possibles.addAll( OreDictionary.getOres( "nuggetIron" ) ); possibles.addAll( OreDictionary.getOres( "nuggetCopper" ) ); possibles.addAll( OreDictionary.getOres( "nuggetTin" ) ); diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index 73c10784c..a477d3edf 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -79,8 +79,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable failCache = new HashSet(); - HashSet passCache = new HashSet(); + HashSet failCache = new HashSet(); + HashSet passCache = new HashSet(); private void markItemAs(int slotIndex, ItemStack i, TestStatus b) { @@ -122,8 +122,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable in = new ArrayList(); - List out = new ArrayList(); + List in = new ArrayList(); + List out = new ArrayList(); for (int x = 0; x < inTag.tagCount(); x++) { diff --git a/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java index 983d5ca12..97e69cd0d 100644 --- a/src/main/java/appeng/hooks/CompassManager.java +++ b/src/main/java/appeng/hooks/CompassManager.java @@ -44,7 +44,7 @@ public class CompassManager } - HashMap requests = new HashMap(); + HashMap requests = new HashMap(); public void postResult(long attunement, int x, int y, int z, CompassResult result) { diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index 63ff9a12b..83f5e25ea 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -43,13 +43,13 @@ public class TickHandler class HandlerRep { - public Queue tiles = new LinkedList(); + public Queue tiles = new LinkedList(); public Collection networks = new NetworkList(); public void clear() { - tiles = new LinkedList(); + tiles = new LinkedList(); networks = new NetworkList(); } @@ -83,8 +83,8 @@ public class TickHandler } - final private HashMap cliPlayerColors = new HashMap(); - final private HashMap srvPlayerColors = new HashMap(); + final private HashMap cliPlayerColors = new HashMap(); + final private HashMap srvPlayerColors = new HashMap(); public HashMap getPlayerColors() { @@ -159,7 +159,7 @@ public class TickHandler { if ( Platform.isServer() ) // for no there is no reason to care about this on the client... { - LinkedList toDestroy = new LinkedList(); + LinkedList toDestroy = new LinkedList(); for (Grid g : getRepo().networks) { diff --git a/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java b/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java index e5cd279ba..8323bfa59 100644 --- a/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java +++ b/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java @@ -17,7 +17,7 @@ public class AEGenericSchematicTile extends SchematicTile public void writeRequirementsToBlueprint(IBuilderContext context, int x, int y, int z) { TileEntity tile = context.world().getTileEntity( x, y, z ); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); if ( tile instanceof AEBaseTile ) { AEBaseTile tcb = (AEBaseTile) tile; diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java index 325de0be7..20840e791 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java @@ -70,7 +70,7 @@ public class NEICraftingHandler implements IOverlayHandler if ( ctSlot.getSlotIndex() == col + row * 3 ) { NBTTagList tags = new NBTTagList(); - List list = new LinkedList(); + List list = new LinkedList(); // prefer pure crystals. for (int x = 0; x < positionedStack.items.length; x++) diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java index 847cce4a9..0e758006c 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java @@ -30,8 +30,8 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler { HashMap details = new HashMap(); - List offsets = new LinkedList(); - List outputs = new LinkedList(); + List offsets = new LinkedList(); + List outputs = new LinkedList(); ItemStack target; diff --git a/src/main/java/appeng/items/materials/ItemMultiMaterial.java b/src/main/java/appeng/items/materials/ItemMultiMaterial.java index e2c52c9b7..5e3d42ddb 100644 --- a/src/main/java/appeng/items/materials/ItemMultiMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMultiMaterial.java @@ -49,7 +49,7 @@ import com.google.common.collect.ImmutableSet; public class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule { - HashMap dmgToMaterial = new HashMap(); + HashMap dmgToMaterial = new HashMap(); public static ItemMultiMaterial instance; @@ -109,7 +109,7 @@ public class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, Upgrades u = getType( is ); if ( u != null ) { - List textList = new LinkedList(); + List textList = new LinkedList(); for (Entry j : u.getSupported().entrySet()) { String name = null; diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index 20726c7a7..d3f44ecc0 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -110,7 +110,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte { if ( subTypes == null ) { - subTypes = new ArrayList(); + subTypes = new ArrayList(); for (Object blk : Block.blockRegistry) { Block b = (Block) blk; @@ -118,7 +118,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte { Item item = Item.getItemFromBlock( b ); - List tmpList = new ArrayList(); + List tmpList = new ArrayList(); b.getSubBlocks( item, b.getCreativeTabToDisplayOn(), tmpList ); for (ItemStack l : tmpList) { diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index 3e8f36b51..0b26c3385 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -43,7 +43,7 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup IIcon ico; } - HashMap dmgToPart = new HashMap(); + HashMap dmgToPart = new HashMap(); public static ItemMultiPart instance; @@ -209,7 +209,7 @@ public class ItemMultiPart extends AEBaseItem implements IPartItem, IItemGroup @Override public void getSubItems(Item number, CreativeTabs tab, List cList) { - List> types = new ArrayList( dmgToPart.entrySet() ); + List> types = new ArrayList>( dmgToPart.entrySet() ); Collections.sort( types, new Comparator>() { @Override diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index b293131c6..299553bfb 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -58,7 +58,7 @@ import appeng.util.item.AEItemStack; public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem { - final static HashMap oreToColor = new HashMap(); + final static HashMap oreToColor = new HashMap(); static { diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 8edd0f474..da7250568 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -146,7 +146,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT coolDown.put( new Combo( Blocks.flowing_lava, OreDictionary.WILDCARD_VALUE ), new InWorldToolOperationResult( new ItemStack( Blocks.obsidian ) ) ); coolDown.put( new Combo( Blocks.grass, OreDictionary.WILDCARD_VALUE ), new InWorldToolOperationResult( new ItemStack( Blocks.dirt ) ) ); - List snowBalls = new ArrayList(); + List snowBalls = new ArrayList(); snowBalls.add( new ItemStack( Items.snowball ) ); coolDown.put( new Combo( Blocks.flowing_water, OreDictionary.WILDCARD_VALUE ), new InWorldToolOperationResult( null, snowBalls ) ); coolDown.put( new Combo( Blocks.water, OreDictionary.WILDCARD_VALUE ), new InWorldToolOperationResult( new ItemStack( Blocks.ice ) ) ); diff --git a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java index d1496650c..0b5a0e600 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java @@ -196,12 +196,13 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell continue; float f1 = 0.3F; - AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand( f1, f1, f1 ); - MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept( vec3, vec31 ); - if ( movingobjectposition1 != null ) + AxisAlignedBB boundingBox = entity1.boundingBox.expand( f1, f1, f1 ); + MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 ); + + if ( movingObjectPosition != null ) { - double nd = vec3.squareDistanceTo( movingobjectposition1.hitVec ); + double nd = vec3.squareDistanceTo( movingObjectPosition.hitVec ); if ( nd < closest ) { @@ -215,8 +216,8 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, false ); - Vec3 Srec = Vec3.createVectorHelper( d0, d1, d2 ); - if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > closest ) + Vec3 vec = Vec3.createVectorHelper( d0, d1, d2 ); + if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( vec ) > closest ) { pos = new MovingObjectPosition( entity ); } @@ -228,7 +229,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell try { CommonHelper.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.xCoord, - (float) direction.yCoord, (float) direction.zCoord, (byte) (pos == null ? 32 : pos.hitVec.squareDistanceTo( Srec ) + 1) ) ); + (float) direction.yCoord, (float) direction.zCoord, (byte) (pos == null ? 32 : pos.hitVec.squareDistanceTo( vec ) + 1) ) ); } catch (Exception err) @@ -321,12 +322,13 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell continue; float f1 = 0.3F; - AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand( f1, f1, f1 ); - MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept( vec3, vec31 ); - if ( movingobjectposition1 != null ) + AxisAlignedBB boundingBox = entity1.boundingBox.expand( f1, f1, f1 ); + MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 ); + + if ( movingObjectPosition != null ) { - double nd = vec3.squareDistanceTo( movingobjectposition1.hitVec ); + double nd = vec3.squareDistanceTo( movingObjectPosition.hitVec ); if ( nd < closest ) { @@ -338,9 +340,9 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } } - Vec3 Srec = Vec3.createVectorHelper( d0, d1, d2 ); + Vec3 vec = Vec3.createVectorHelper( d0, d1, d2 ); MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, true ); - if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > closest ) + if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( vec ) > closest ) { pos = new MovingObjectPosition( entity ); } @@ -352,7 +354,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell try { CommonHelper.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.xCoord, - (float) direction.yCoord, (float) direction.zCoord, (byte) (pos == null ? 32 : pos.hitVec.squareDistanceTo( Srec ) + 1) ) ); + (float) direction.yCoord, (float) direction.zCoord, (byte) (pos == null ? 32 : pos.hitVec.squareDistanceTo( vec ) + 1) ) ); } catch (Exception err) @@ -480,7 +482,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } @Override - public int BytePerType(ItemStack iscellItem) + public int BytePerType(ItemStack cell) { return 8; } diff --git a/src/main/java/appeng/me/GridConnection.java b/src/main/java/appeng/me/GridConnection.java index 5a8eec59d..63f151dd7 100644 --- a/src/main/java/appeng/me/GridConnection.java +++ b/src/main/java/appeng/me/GridConnection.java @@ -156,7 +156,7 @@ public class GridConnection implements IGridConnection, IPathItem @Override public IReadOnlyCollection getPossibleOptions() { - return new ReadOnlyCollection( Arrays.asList( new IPathItem[] { (IPathItem) a(), (IPathItem) b() } ) ); + return new ReadOnlyCollection( Arrays.asList( (IPathItem) a(), (IPathItem) b() ) ); } @Override diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 398ec0f46..a129e945d 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -39,7 +39,7 @@ public class GridNode implements IGridNode, IPathItem final static private MENetworkChannelsChanged event = new MENetworkChannelsChanged(); final static private int channelCount[] = new int[] { 0, 8, 32 }; - final List Connections = new LinkedList(); + final List Connections = new LinkedList(); GridStorage myStorage = null; IGridBlock gridProxy; @@ -167,14 +167,14 @@ public class GridNode implements IGridNode, IPathItem { Object tracker = new Object(); - LinkedList nextRun = new LinkedList(); + LinkedList nextRun = new LinkedList(); nextRun.add( this ); visitorIterationNumber = tracker; if ( g instanceof IGridConnectionVisitor ) { - LinkedList nextConn = new LinkedList(); + LinkedList nextConn = new LinkedList(); IGridConnectionVisitor gcv = (IGridConnectionVisitor) g; while (!nextRun.isEmpty()) @@ -183,7 +183,7 @@ public class GridNode implements IGridNode, IPathItem gcv.visitConnection( nextConn.poll() ); LinkedList thisRun = nextRun; - nextRun = new LinkedList(); + nextRun = new LinkedList(); for (GridNode n : thisRun) n.visitorConnection( tracker, g, nextRun, nextConn ); @@ -194,7 +194,7 @@ public class GridNode implements IGridNode, IPathItem while (!nextRun.isEmpty()) { LinkedList thisRun = nextRun; - nextRun = new LinkedList(); + nextRun = new LinkedList(); for (GridNode n : thisRun) n.visitorNode( tracker, g, nextRun ); diff --git a/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java index cc9e68dcc..789034a73 100644 --- a/src/main/java/appeng/me/GridStorage.java +++ b/src/main/java/appeng/me/GridStorage.java @@ -22,7 +22,7 @@ public class GridStorage implements IGridStorage final NBTTagCompound data; public boolean isDirty = false; - private WeakHashMap divided = new WeakHashMap(); + private WeakHashMap divided = new WeakHashMap(); final GridStorageSearch mySearchEntry; // keep myself in the list until I'm // lost... diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index b9bed5084..b73d2404e 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/src/main/java/appeng/me/NetworkEventBus.java @@ -57,7 +57,7 @@ public class NetworkEventBus class MENetworkEventInfo { - private ArrayList methods = new ArrayList(); + private ArrayList methods = new ArrayList(); public void Add(Class Event, Class ObjClass, Method ObjMethod) { @@ -71,8 +71,8 @@ public class NetworkEventBus } } - private static Set readClasses = new HashSet(); - private static Hashtable, Hashtable> events = new Hashtable(); + private static Set readClasses = new HashSet(); + private static Hashtable, Hashtable> events = new Hashtable, Hashtable>(); public void readClass(Class listAs, Class c) { @@ -95,7 +95,7 @@ public class NetworkEventBus Hashtable classEvents = events.get( types[0] ); if ( classEvents == null ) - events.put( types[0], classEvents = new Hashtable() ); + events.put( types[0], classEvents = new Hashtable() ); MENetworkEventInfo thisEvent = classEvents.get( listAs ); if ( thisEvent == null ) diff --git a/src/main/java/appeng/me/NetworkList.java b/src/main/java/appeng/me/NetworkList.java index a2336afb4..849ec0e3a 100644 --- a/src/main/java/appeng/me/NetworkList.java +++ b/src/main/java/appeng/me/NetworkList.java @@ -8,7 +8,7 @@ import java.util.List; public class NetworkList implements Collection { - private List networks = new LinkedList(); + private List networks = new LinkedList(); @Override public boolean add(Grid e) diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index 9941b1daf..b7e624036 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -68,8 +68,8 @@ import com.google.common.collect.SetMultimap; public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler { - HashSet cpuClusters = new HashSet(); - HashSet providers = new HashSet(); + HashSet cpuClusters = new HashSet(); + HashSet providers = new HashSet(); private HashMap watchers = new HashMap(); @@ -77,14 +77,14 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper IStorageGrid sg; IEnergyGrid eg; - HashMap> craftingMethods = new HashMap(); - HashMap> craftableItems = new HashMap(); - HashSet emitableItems = new HashSet(); - HashMap links = new HashMap(); + HashMap> craftingMethods = new HashMap>(); + HashMap> craftableItems = new HashMap>(); + HashSet emitableItems = new HashSet(); + HashMap links = new HashMap(); boolean updateList = false; - final private SetMultimap interests = HashMultimap.create(); - final public GenericInterestManager interestManager = new GenericInterestManager( interests ); + final private SetMultimap interests = HashMultimap.create(); + final public GenericInterestManager interestManager = new GenericInterestManager( interests ); class ActiveCpuIterator implements Iterator { @@ -301,7 +301,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper // erase list. craftingMethods.clear(); - craftableItems = new HashMap(); + craftableItems = new HashMap>(); emitableItems.clear(); // update the stuff that was in the list... @@ -311,7 +311,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper for (ICraftingProvider cp : providers) cp.provideCrafting( this ); - HashMap> tmpCraft = new HashMap(); + HashMap> tmpCraft = new HashMap>(); // new craftables! for (ICraftingPatternDetails details : craftingMethods.keySet()) diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java index b1e0ca5c0..5e3616437 100644 --- a/src/main/java/appeng/me/cache/EnergyGridCache.java +++ b/src/main/java/appeng/me/cache/EnergyGridCache.java @@ -71,15 +71,15 @@ public class EnergyGridCache implements IEnergyGrid double extra = 0; IAEPowerStorage lastProvider; - final Set providers = new LinkedHashSet(); + final Set providers = new LinkedHashSet(); IAEPowerStorage lastRequester; - final Set requesters = new LinkedHashSet(); + final Set requesters = new LinkedHashSet(); final public TreeSet interests = new TreeSet(); final private HashMap watchers = new HashMap(); - final private Set localSeen = new HashSet(); + final private Set localSeen = new HashSet(); private double buffer() { diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 431633775..7ffb6bf58 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -39,10 +39,10 @@ public class GridStorageCache implements IStorageGrid { final private SetMultimap interests = HashMultimap.create(); - final public GenericInterestManager interestManager = new GenericInterestManager( interests ); + final public GenericInterestManager interestManager = new GenericInterestManager( interests ); - final HashSet activeCellProviders = new HashSet(); - final HashSet inactiveCellProviders = new HashSet(); + final HashSet activeCellProviders = new HashSet(); + final HashSet inactiveCellProviders = new HashSet(); final public IGrid myGrid; private NetworkInventoryHandler myItemNetwork; @@ -95,7 +95,7 @@ public class GridStorageCache implements IStorageGrid private class CellChangeTracker { - List data = new LinkedList(); + List data = new LinkedList(); public void postChanges(StorageChannel channel, int i, IMEInventoryHandler h, BaseActionSource actionSrc) { diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java index addaa3168..d94824f33 100644 --- a/src/main/java/appeng/me/cache/P2PCache.java +++ b/src/main/java/appeng/me/cache/P2PCache.java @@ -22,7 +22,7 @@ import com.google.common.collect.Multimap; public class P2PCache implements IGridCache { - final private HashMap inputs = new HashMap(); + final private HashMap inputs = new HashMap(); final private Multimap outputs = LinkedHashMultimap.create(); final private TunnelCollection NullColl = new TunnelCollection( null, null ); diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index b011f61f4..8cfed617d 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -43,7 +43,7 @@ public class PathGridCache implements IPathingGrid boolean updateNetwork = true; boolean booting = false; - final LinkedList active = new LinkedList(); + final LinkedList active = new LinkedList(); ControllerState controllerState = ControllerState.NO_CONTROLLER; @@ -53,13 +53,13 @@ public class PathGridCache implements IPathingGrid public int channelsInUse = 0; int lastChannels = 0; - final Set controllers = new HashSet(); - final Set requireChannels = new HashSet(); - final Set blockDense = new HashSet(); + final Set controllers = new HashSet(); + final Set requireChannels = new HashSet(); + final Set blockDense = new HashSet(); final IGrid myGrid; - private HashSet semiOpen = new HashSet(); - private HashSet closedList = new HashSet(); + private HashSet semiOpen = new HashSet(); + private HashSet closedList = new HashSet(); public int channelsByBlocks = 0; public double channelPowerUsage = 0.0; diff --git a/src/main/java/appeng/me/cache/SecurityCache.java b/src/main/java/appeng/me/cache/SecurityCache.java index 68e860230..0aad933fd 100644 --- a/src/main/java/appeng/me/cache/SecurityCache.java +++ b/src/main/java/appeng/me/cache/SecurityCache.java @@ -22,7 +22,7 @@ import appeng.me.GridNode; public class SecurityCache implements IGridCache, ISecurityGrid { - final private List securityProvider = new ArrayList(); + final private List securityProvider = new ArrayList(); final private HashMap> playerPerms = new HashMap>(); public SecurityCache(IGrid g) { diff --git a/src/main/java/appeng/me/cache/SpatialPylonCache.java b/src/main/java/appeng/me/cache/SpatialPylonCache.java index 9102b9c45..2ed3946bc 100644 --- a/src/main/java/appeng/me/cache/SpatialPylonCache.java +++ b/src/main/java/appeng/me/cache/SpatialPylonCache.java @@ -29,8 +29,8 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache DimensionalCoord captureMax; boolean isValid = false; - List ioPorts = new LinkedList(); - HashMap clusters = new HashMap(); + List ioPorts = new LinkedList(); + HashMap clusters = new HashMap(); boolean needsUpdate = false; @@ -80,8 +80,8 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache double minPower = 0; double maxPower = 0; - clusters = new HashMap(); - ioPorts = new LinkedList(); + clusters = new HashMap(); + ioPorts = new LinkedList(); for (IGridNode gm : grid.getMachines( TileSpatialIOPort.class )) { diff --git a/src/main/java/appeng/me/cache/helpers/Connections.java b/src/main/java/appeng/me/cache/helpers/Connections.java index 83ab1ea83..03fbe38ce 100644 --- a/src/main/java/appeng/me/cache/helpers/Connections.java +++ b/src/main/java/appeng/me/cache/helpers/Connections.java @@ -10,7 +10,7 @@ public class Connections implements Callable { final private PartP2PTunnelME me; - final public HashMap connections = new HashMap(); + final public HashMap connections = new HashMap(); public boolean create = false; public boolean destroy = false; diff --git a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java index c7dc50f73..ad2af703c 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java @@ -21,8 +21,8 @@ public class TunnelCollection implements Iterable public Iterator iterator() { if ( tunnelSources == null ) - return new NullIterator(); - return new TunnelIterator( tunnelSources, clz ); + return new NullIterator(); + return new TunnelIterator( tunnelSources, clz ); } public void setSource(Collection c) diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 6b7369ad0..a3bf7bd39 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -1,11 +1,7 @@ package appeng.me.cluster.implementations; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -83,7 +79,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU IItemList waitingFor = AEApi.instance().storage().createItemList(); // instance sate - final private LinkedList tiles = new LinkedList(); + final private LinkedList tiles = new LinkedList(); final private LinkedList storage = new LinkedList(); final private LinkedList status = new LinkedList(); @@ -290,9 +286,11 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU if ( sg.interestManager.containsKey( diff ) ) { Set list = sg.interestManager.get( diff ); + if ( !list.isEmpty() ) { for (CraftingWatcher iw : list) + iw.getHost().onRequestChange( sg, diff ); } } diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java index 3f9cc18f1..687ae07b7 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java @@ -23,7 +23,7 @@ public class SpatialPylonCluster implements IAECluster public Axis currentAxis = Axis.UNFORMED; - final List line = new ArrayList(); + final List line = new ArrayList(); public boolean isValid; public boolean hasPower; public boolean hasChannel; diff --git a/src/main/java/appeng/me/energy/EnergyWatcher.java b/src/main/java/appeng/me/energy/EnergyWatcher.java index 684c2c16e..068fc7782 100644 --- a/src/main/java/appeng/me/energy/EnergyWatcher.java +++ b/src/main/java/appeng/me/energy/EnergyWatcher.java @@ -50,7 +50,7 @@ public class EnergyWatcher implements IEnergyWatcher EnergyGridCache gsc; IEnergyWatcherHost myObject; - HashSet myInterests = new HashSet(); + HashSet myInterests = new HashSet(); public void post(EnergyGridCache energyGridCache) { diff --git a/src/main/java/appeng/me/helpers/GenericInterestManager.java b/src/main/java/appeng/me/helpers/GenericInterestManager.java index 7c4f0eade..37dd217cc 100644 --- a/src/main/java/appeng/me/helpers/GenericInterestManager.java +++ b/src/main/java/appeng/me/helpers/GenericInterestManager.java @@ -35,7 +35,7 @@ public class GenericInterestManager public void enableTransactions() { if ( transDepth == 0 ) - transactions = new LinkedList(); + transactions = new LinkedList(); transDepth++; } diff --git a/src/main/java/appeng/me/pathfinding/PathSegment.java b/src/main/java/appeng/me/pathfinding/PathSegment.java index 6511f951e..31629dd0d 100644 --- a/src/main/java/appeng/me/pathfinding/PathSegment.java +++ b/src/main/java/appeng/me/pathfinding/PathSegment.java @@ -25,7 +25,7 @@ public class PathSegment PathGridCache pgc; - public PathSegment(PathGridCache myPGC, List open, Set semiOpen, Set closed) + public PathSegment(PathGridCache myPGC, List open, Set semiOpen, Set closed) { this.open = open; this.semiOpen = semiOpen; @@ -41,7 +41,7 @@ public class PathSegment public boolean step() { List oldOpen = open; - open = new LinkedList(); + open = new LinkedList(); for (IPathItem i : oldOpen) { diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java index d487f37a3..8a4e1448d 100644 --- a/src/main/java/appeng/me/storage/CellInventory.java +++ b/src/main/java/appeng/me/storage/CellInventory.java @@ -335,7 +335,7 @@ public class CellInventory implements ICellInventory return 8 - div; } - private static HashSet blackList = new HashSet(); + private static HashSet blackList = new HashSet(); public static void addBasicBlackList(int itemID, int Meta) { diff --git a/src/main/java/appeng/me/storage/ItemWatcher.java b/src/main/java/appeng/me/storage/ItemWatcher.java index ab52643f9..fab396b9b 100644 --- a/src/main/java/appeng/me/storage/ItemWatcher.java +++ b/src/main/java/appeng/me/storage/ItemWatcher.java @@ -50,7 +50,7 @@ public class ItemWatcher implements IStackWatcher GridStorageCache gsc; IStackWatcherHost myObject; - HashSet myInterests = new HashSet(); + HashSet myInterests = new HashSet(); public ItemWatcher(GridStorageCache cache, IStackWatcherHost host) { gsc = cache; diff --git a/src/main/java/appeng/me/storage/MEIInventoryWrapper.java b/src/main/java/appeng/me/storage/MEIInventoryWrapper.java index 194e90941..f1561e402 100644 --- a/src/main/java/appeng/me/storage/MEIInventoryWrapper.java +++ b/src/main/java/appeng/me/storage/MEIInventoryWrapper.java @@ -184,7 +184,7 @@ public class MEIInventoryWrapper implements IMEInventory } @Override - public IItemList getAvailableItems(IItemList out) + public IItemList getAvailableItems(IItemList out) { for (int x = 0; x < target.getSizeInventory(); x++) { diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java index 0091a9695..c30179b3a 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java +++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java @@ -52,7 +52,7 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit final TreeMap memory; final IItemList list = AEApi.instance().storage().createItemList(); - final HashMap, Object> listeners = new HashMap(); + final HashMap, Object> listeners = new HashMap, Object>(); public BaseActionSource mySource; public StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY; @@ -72,7 +72,7 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit public MEMonitorIInventory(InventoryAdaptor adaptor) { this.adaptor = adaptor; - memory = new TreeMap(); + memory = new TreeMap(); } @Override diff --git a/src/main/java/appeng/me/storage/MEMonitorPassThrough.java b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java index a2907b2a9..83993953d 100644 --- a/src/main/java/appeng/me/storage/MEMonitorPassThrough.java +++ b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java @@ -18,7 +18,7 @@ import appeng.util.inv.ItemListIgnoreCrafting; public class MEMonitorPassThrough> extends MEPassThrough implements IMEMonitor, IMEMonitorHandlerReceiver { - HashMap, Object> listeners = new HashMap(); + HashMap, Object> listeners = new HashMap, Object>(); IMEMonitor monitor; public BaseActionSource changeSource; diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index 9f7cfca4b..6ceefbf10 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -26,7 +26,7 @@ import appeng.util.ItemSorters; public class NetworkInventoryHandler> implements IMEInventoryHandler { - private final static Comparator prioritySorter = new Comparator() { + private final static Comparator prioritySorter = new Comparator() { @Override public int compare(Integer o1, Integer o2) @@ -45,7 +45,7 @@ public class NetworkInventoryHandler> implements IMEInvent public NetworkInventoryHandler(StorageChannel chan, SecurityCache security) { myChannel = chan; this.security = security; - priorityInventory = new TreeMap( prioritySorter ); // TreeMultimap.create( prioritySorter, hashSorter ); + priorityInventory = new TreeMap>>( prioritySorter ); // TreeMultimap.create( prioritySorter, hashSorter ); } public void addNewStorage(IMEInventoryHandler h) @@ -53,7 +53,7 @@ public class NetworkInventoryHandler> implements IMEInvent int priority = h.getPriority(); List> list = priorityInventory.get( priority ); if ( list == null ) - priorityInventory.put( priority, list = new ArrayList() ); + priorityInventory.put( priority, list = new ArrayList>() ); list.add( h ); } diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 0ffe79f00..3dc064f73 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -444,7 +444,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea { if ( is.stackSize > 0 ) { - List items = new ArrayList(); + List items = new ArrayList(); items.add( is.copy() ); host.removePart( side, false ); Platform.spawnDrops( tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, items ); diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 178a23214..1b5a4b28d 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -321,7 +321,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I return null; } - private static final ThreadLocal isLoading = new ThreadLocal(); + private static final ThreadLocal isLoading = new ThreadLocal(); public static boolean isLoading() { @@ -916,7 +916,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I { if ( getCenter() == null ) { - List facades = new LinkedList(); + List facades = new LinkedList(); IFacadeContainer fc = getFacadeContainer(); for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 9e6ff2ac4..f699f83c5 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -142,7 +142,7 @@ public class PartPlacement MovingObjectPosition mop = block.collisionRayTrace( world, x, y, z, dir.a, dir.b ); if ( mop != null ) { - List is = new LinkedList(); + List is = new LinkedList(); SelectedPart sp = selectPart( player, host, mop.hitVec.addVector( -mop.blockX, -mop.blockY, -mop.blockZ ) ); if ( sp.part != null ) diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index 2b567a90e..c9bd0df76 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -170,7 +170,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab } boolean breaking = false; - LinkedList Buffer = new LinkedList(); + LinkedList Buffer = new LinkedList(); BaseActionSource mySrc = new MachineSource( this ); @Override diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index 84575b45d..ccc1bc0e0 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -249,11 +249,11 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine { if ( proxy.isActive() && channel == StorageChannel.ITEMS ) { - List Handler = new ArrayList( 1 ); + List Handler = new ArrayList( 1 ); Handler.add( myHandler ); return Handler; } - return new ArrayList(); + return new ArrayList(); } @Override diff --git a/src/main/java/appeng/parts/layers/LayerISidedInventory.java b/src/main/java/appeng/parts/layers/LayerISidedInventory.java index eb784b696..750d0d9e8 100644 --- a/src/main/java/appeng/parts/layers/LayerISidedInventory.java +++ b/src/main/java/appeng/parts/layers/LayerISidedInventory.java @@ -42,7 +42,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory List inventories = null; List slots = null; - inventories = new ArrayList(); + inventories = new ArrayList(); int slotCount = 0; for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index 666f60e0e..056a36761 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -236,7 +236,7 @@ public class PartToggleBus extends PartBasicState { if ( is.stackSize > 0 ) { - List items = new ArrayList(); + List items = new ArrayList(); items.add( is.copy() ); host.removePart( side, false ); Platform.spawnDrops( tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, items ); diff --git a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java index e5908c700..36931dd8a 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java +++ b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java @@ -146,7 +146,7 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i if ( outs.isEmpty() ) return amount; - LinkedList Options = new LinkedList(); + LinkedList Options = new LinkedList(); for (PartP2PIC2Power o : outs) { if ( o.OutputEnergyA <= 0.01 ) diff --git a/src/main/java/appeng/recipes/GroupIngredient.java b/src/main/java/appeng/recipes/GroupIngredient.java index 8c7bcac4e..75f713ad7 100644 --- a/src/main/java/appeng/recipes/GroupIngredient.java +++ b/src/main/java/appeng/recipes/GroupIngredient.java @@ -65,7 +65,7 @@ public class GroupIngredient implements IIngredient if ( isInside ) return new ItemStack[0]; - List out = new LinkedList(); + List out = new LinkedList(); isInside = true; try { diff --git a/src/main/java/appeng/recipes/IngredientSet.java b/src/main/java/appeng/recipes/IngredientSet.java index fb823a331..bda49571c 100644 --- a/src/main/java/appeng/recipes/IngredientSet.java +++ b/src/main/java/appeng/recipes/IngredientSet.java @@ -52,7 +52,7 @@ public class IngredientSet implements IIngredient if ( isInside ) return new ItemStack[0]; - List out = new LinkedList(); + List out = new LinkedList(); out.addAll( items ); if ( out.size() == 0 ) diff --git a/src/main/java/appeng/recipes/RecipeData.java b/src/main/java/appeng/recipes/RecipeData.java index adb59caf4..cfc90fdd1 100644 --- a/src/main/java/appeng/recipes/RecipeData.java +++ b/src/main/java/appeng/recipes/RecipeData.java @@ -20,6 +20,6 @@ public class RecipeData public boolean exceptions = true; public boolean erroronmissing = true; - public Set knownItem = new HashSet(); + public Set knownItem = new HashSet(); } diff --git a/src/main/java/appeng/recipes/handlers/Inscribe.java b/src/main/java/appeng/recipes/handlers/Inscribe.java index 077898c29..76d42008d 100644 --- a/src/main/java/appeng/recipes/handlers/Inscribe.java +++ b/src/main/java/appeng/recipes/handlers/Inscribe.java @@ -39,9 +39,9 @@ public class Inscribe implements ICraftHandler, IWebsiteSerializer public boolean usePlates = false; - public static HashSet plates = new HashSet(); - public static HashSet inputs = new HashSet(); - public static LinkedList recipes = new LinkedList(); + public static HashSet plates = new HashSet(); + public static HashSet inputs = new HashSet(); + public static LinkedList recipes = new LinkedList(); IIngredient imprintable; diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/main/java/appeng/server/ServerHelper.java index 6d89c715e..b7ae28f06 100644 --- a/src/main/java/appeng/server/ServerHelper.java +++ b/src/main/java/appeng/server/ServerHelper.java @@ -42,7 +42,7 @@ public class ServerHelper extends CommonHelper return server.getConfigurationManager().playerEntityList; } - return new ArrayList(); + return new ArrayList(); } @Override diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index eafc5cb88..c9c143994 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -234,7 +234,7 @@ public class CompassService implements ThreadFactory return executor.submit( new CMUpdatePost( w, cx, cz, cdy, false ) ); } - HashMap worldSet = new HashMap(); + HashMap worldSet = new HashMap(); ExecutorService executor; final File rootFolder; diff --git a/src/main/java/appeng/services/helpers/CompassReader.java b/src/main/java/appeng/services/helpers/CompassReader.java index ac8d5aaf1..3b3467e1e 100644 --- a/src/main/java/appeng/services/helpers/CompassReader.java +++ b/src/main/java/appeng/services/helpers/CompassReader.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; public class CompassReader { - HashMap regions = new HashMap(); + HashMap regions = new HashMap(); final int id; final File rootFolder; diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 45db31624..e9634d051 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -159,7 +159,7 @@ public class CachedPlane for (int cx = 0; cx < cx_size; cx++) for (int cz = 0; cz < cz_size; cz++) { - LinkedList> rwarTiles = new LinkedList(); + LinkedList> rwarTiles = new LinkedList>(); LinkedList deadTiles = new LinkedList(); Chunk c = w.getChunkFromChunkCoords( minCX + cx, minCZ + cz ); diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index ad05835a1..6aa7e30f0 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -40,12 +40,12 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, { static private final HashMap>> handlers = new HashMap>>(); - static private final HashMap myItem = new HashMap(); + static private final HashMap myItem = new HashMap(); private ForgeDirection forward = ForgeDirection.UNKNOWN; private ForgeDirection up = ForgeDirection.UNKNOWN; - public static ThreadLocal> dropNoItems = new ThreadLocal(); + public static ThreadLocal> dropNoItems = new ThreadLocal>(); public void disableDrops() { @@ -122,7 +122,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, List list = handlerSet.get( value ); if ( list == null ) - handlerSet.put( value, list = new ArrayList() ); + handlerSet.put( value, list = new ArrayList() ); list.add( new AETileEventHandler( m, value ) ); } diff --git a/src/main/java/appeng/tile/grindstone/TileGrinder.java b/src/main/java/appeng/tile/grindstone/TileGrinder.java index a47a1c034..0c78db6f2 100644 --- a/src/main/java/appeng/tile/grindstone/TileGrinder.java +++ b/src/main/java/appeng/tile/grindstone/TileGrinder.java @@ -45,7 +45,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable wc.add( getForward(), 1 ); - List out = new ArrayList(); + List out = new ArrayList(); out.add( notAdded ); Platform.spawnDrops( worldObj, wc.x, wc.y, wc.z, out ); diff --git a/src/main/java/appeng/tile/misc/TileCharger.java b/src/main/java/appeng/tile/misc/TileCharger.java index a01523751..9ba993f01 100644 --- a/src/main/java/appeng/tile/misc/TileCharger.java +++ b/src/main/java/appeng/tile/misc/TileCharger.java @@ -229,7 +229,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable } else { - List drops = new ArrayList(); + List drops = new ArrayList(); drops.add( myItem ); setInventorySlotContents( 0, null ); Platform.spawnDrops( worldObj, xCoord + getForward().offsetX, yCoord + getForward().offsetY, zCoord + getForward().offsetZ, drops ); diff --git a/src/main/java/appeng/tile/misc/TilePaint.java b/src/main/java/appeng/tile/misc/TilePaint.java index 1ae90be31..623a48294 100644 --- a/src/main/java/appeng/tile/misc/TilePaint.java +++ b/src/main/java/appeng/tile/misc/TilePaint.java @@ -182,7 +182,7 @@ public class TilePaint extends AEBaseTile boolean lit = ipb.isLumen( type ); if ( dots == null ) - dots = new ArrayList(); + dots = new ArrayList(); if ( dots.size() > 20 ) dots.remove( 0 ); diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/TileDrive.java index ec149df5b..d5cd9d4d5 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/TileDrive.java @@ -48,8 +48,8 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior boolean isCached = false; ICellHandler handlersBySlot[] = new ICellHandler[10]; DriveWatcher invBySlot[] = new DriveWatcher[10]; - List items = new LinkedList(); - List fluids = new LinkedList(); + List items = new LinkedList(); + List fluids = new LinkedList(); BaseActionSource mySrc; long lastStateChange = 0; diff --git a/src/main/java/appeng/util/ConfigManager.java b/src/main/java/appeng/util/ConfigManager.java index 5b8d2c20c..fb95f3190 100644 --- a/src/main/java/appeng/util/ConfigManager.java +++ b/src/main/java/appeng/util/ConfigManager.java @@ -10,7 +10,7 @@ import appeng.core.AELog; public class ConfigManager implements IConfigManager { - HashMap Settings = new HashMap(); + HashMap Settings = new HashMap(); IConfigManagerHost target; public ConfigManager(IConfigManagerHost tile) { diff --git a/src/main/java/appeng/util/InventoryAdaptor.java b/src/main/java/appeng/util/InventoryAdaptor.java index bac64ebf7..ac5d0126b 100644 --- a/src/main/java/appeng/util/InventoryAdaptor.java +++ b/src/main/java/appeng/util/InventoryAdaptor.java @@ -55,7 +55,7 @@ public abstract class InventoryAdaptor implements Iterable } else if ( te instanceof ArrayList ) { - return new AdaptorList( (ArrayList) te ); + return new AdaptorList( (ArrayList) te ); } else if ( bs != null && bs.isStorageCrate( te ) ) { diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index daa83ae59..5011c7638 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -499,7 +499,7 @@ public class Platform AELog.error( t ); } - return new ArrayList(); + return new ArrayList(); } /* @@ -1445,7 +1445,7 @@ public class Platform static public > void postListChanges(IItemList before, IItemList after, IMEMonitorHandlerReceiver meMonitorPassthrough, BaseActionSource source) { - LinkedList changes = new LinkedList(); + LinkedList changes = new LinkedList(); for (T is : before) is.setStackSize( -is.getStackSize() ); diff --git a/src/main/java/appeng/util/ReadOnlyCollection.java b/src/main/java/appeng/util/ReadOnlyCollection.java index 2410147ef..c0ee46248 100644 --- a/src/main/java/appeng/util/ReadOnlyCollection.java +++ b/src/main/java/appeng/util/ReadOnlyCollection.java @@ -15,7 +15,7 @@ public class ReadOnlyCollection implements IReadOnlyCollection } @Override - public Iterator iterator() + public Iterator iterator() { return c.iterator(); } diff --git a/src/main/java/appeng/util/inv/AdaptorBCPipe.java b/src/main/java/appeng/util/inv/AdaptorBCPipe.java index 5d7ed8249..8672c8fbb 100644 --- a/src/main/java/appeng/util/inv/AdaptorBCPipe.java +++ b/src/main/java/appeng/util/inv/AdaptorBCPipe.java @@ -90,7 +90,7 @@ public class AdaptorBCPipe extends InventoryAdaptor @Override public Iterator iterator() { - return new NullIterator(); + return new NullIterator(); } } diff --git a/src/main/java/appeng/util/inv/AdaptorIInventory.java b/src/main/java/appeng/util/inv/AdaptorIInventory.java index 3dd6692e7..005b48f48 100644 --- a/src/main/java/appeng/util/inv/AdaptorIInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorIInventory.java @@ -175,24 +175,24 @@ public class AdaptorIInventory extends InventoryAdaptor ItemStack is = i.getStackInSlot( x ); if ( is != null && canRemoveStackFromSlot( x, is ) && (filter == null || Platform.isSameItemPrecise( is, filter )) ) { - int boundAount = amount; - if ( boundAount > is.stackSize ) - boundAount = is.stackSize; + int boundAmount = amount; + if ( boundAmount > is.stackSize ) + boundAmount = is.stackSize; if ( destination != null && !destination.canInsert( is ) ) - boundAount = 0; + boundAmount = 0; - if ( boundAount > 0 ) + if ( boundAmount > 0 ) { if ( rv == null ) { rv = is.copy(); - rv.stackSize = boundAount; - amount -= boundAount; + rv.stackSize = boundAmount; + amount -= boundAmount; } else { - rv.stackSize += boundAount; - amount -= boundAount; + rv.stackSize += boundAmount; + amount -= boundAmount; } } } diff --git a/src/main/java/appeng/util/inv/AdaptorPlayerHand.java b/src/main/java/appeng/util/inv/AdaptorPlayerHand.java index 547a7e27a..e3039c0fc 100644 --- a/src/main/java/appeng/util/inv/AdaptorPlayerHand.java +++ b/src/main/java/appeng/util/inv/AdaptorPlayerHand.java @@ -180,6 +180,6 @@ public class AdaptorPlayerHand extends InventoryAdaptor @Override public Iterator iterator() { - return new NullIterator(); + return new NullIterator(); } } diff --git a/src/main/java/appeng/util/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index d07ba3bfc..7acc256f2 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperChainedInventory.java @@ -38,7 +38,7 @@ public class WrapperChainedInventory implements IInventory { if ( l.size() > 1 ) { - List newOrder = new ArrayList( l.size() ); + List newOrder = new ArrayList( l.size() ); newOrder.add( l.get( l.size() - 1 ) ); for (int x = 0; x < l.size() - 1; x++) newOrder.add( l.get( x ) ); diff --git a/src/main/java/appeng/util/item/AESharedNBT.java b/src/main/java/appeng/util/item/AESharedNBT.java index fa54d27cb..329cb4018 100644 --- a/src/main/java/appeng/util/item/AESharedNBT.java +++ b/src/main/java/appeng/util/item/AESharedNBT.java @@ -122,7 +122,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound /* * Shared Tag Compound Cache. */ - private static WeakHashMap> sharedTagCompounds = new WeakHashMap(); + private static WeakHashMap> sharedTagCompounds = new WeakHashMap>(); /* * Debug purposes. diff --git a/src/main/java/appeng/util/item/ItemList.java b/src/main/java/appeng/util/item/ItemList.java index 5965b8906..719703e3a 100644 --- a/src/main/java/appeng/util/item/ItemList.java +++ b/src/main/java/appeng/util/item/ItemList.java @@ -18,7 +18,7 @@ import appeng.api.storage.data.IItemList; public final class ItemList implements IItemList { - private final TreeMap records = new TreeMap(); + private final TreeMap records = new TreeMap(); private final Class clz; // private int currentPriority = Integer.MIN_VALUE; @@ -154,9 +154,9 @@ public final class ItemList implements IItemList iterator() { - return new MeaningfulIterator( records.values().iterator() ); + return new MeaningfulIterator( records.values().iterator() ); } @Override @@ -197,7 +197,7 @@ public final class ItemList implements IItemList findFuzzy(StackType filter, FuzzyMode fuzzy) { if ( checkStackType( filter ) ) - return new ArrayList(); + return new ArrayList(); if ( filter instanceof IAEFluidStack ) return filter.equals( this ) ? (List) Arrays.asList( new IAEFluidStack[] { (IAEFluidStack) filter } ) : (List) Arrays @@ -214,7 +214,7 @@ public final class ItemList implements IItemList output = new LinkedList(); + Collection output = new LinkedList(); for (IAEItemStack is : or.getAEEquivalents()) output.addAll( findFuzzyDamage( (AEItemStack) is, fuzzy, is.getItemDamage() == OreDictionary.WILDCARD_VALUE ) ); diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index c895dd776..afefc2a2c 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -53,7 +53,7 @@ public class OreHelper } - HashMap references = new HashMap(); + HashMap references = new HashMap(); public OreReference isOre(ItemStack ItemStack) { diff --git a/src/main/java/appeng/util/prioitylist/MergedPriorityList.java b/src/main/java/appeng/util/prioitylist/MergedPriorityList.java index f8ec53c61..c5881198c 100644 --- a/src/main/java/appeng/util/prioitylist/MergedPriorityList.java +++ b/src/main/java/appeng/util/prioitylist/MergedPriorityList.java @@ -8,8 +8,8 @@ import appeng.api.storage.data.IAEStack; public class MergedPriorityList> implements IPartitionList { - final List> positive = new ArrayList(); - final List> negative = new ArrayList(); + final List> positive = new ArrayList>(); + final List> negative = new ArrayList>(); public void addNewList(IPartitionList list, boolean isWhitelist) {