From 7de90ed0ae9bafc01a167033a64dd1016f6f3b69 Mon Sep 17 00:00:00 2001 From: yueh Date: Thu, 20 Jul 2017 21:21:45 +0200 Subject: [PATCH] Finally use Java7 <> --- .../appeng/api/storage/MEMonitorHandler.java | 2 +- src/main/java/appeng/block/AEBaseBlock.java | 2 +- .../java/appeng/block/AEBaseTileBlock.java | 2 +- .../java/appeng/client/gui/AEBaseGui.java | 4 +-- .../appeng/client/gui/config/AEConfigGui.java | 2 +- .../gui/implementations/GuiCraftConfirm.java | 4 +-- .../gui/implementations/GuiCraftingCPU.java | 6 ++--- .../implementations/GuiInterfaceTerminal.java | 12 ++++----- .../client/gui/widgets/GuiImgButton.java | 2 +- src/main/java/appeng/client/me/ItemRepo.java | 4 +-- .../client/render/model/UVLModelLoader.java | 2 +- .../appeng/container/AEBaseContainer.java | 12 ++++----- .../ContainerCellWorkbench.java | 2 +- .../ContainerCraftConfirm.java | 2 +- .../ContainerCraftingStatus.java | 2 +- .../ContainerInterfaceTerminal.java | 4 +-- .../implementations/ContainerPatternTerm.java | 2 +- .../implementations/ContainerStorageBus.java | 2 +- .../container/slot/SlotCraftingTerm.java | 4 +-- src/main/java/appeng/core/IMCHandler.java | 2 +- src/main/java/appeng/core/Registration.java | 6 ++--- src/main/java/appeng/core/api/ApiPart.java | 2 +- .../registries/GridCacheRegistry.java | 4 +-- .../registries/LocatableRegistry.java | 2 +- .../registries/MatterCannonAmmoRegistry.java | 2 +- .../registries/MovableTileRegistry.java | 8 +++--- .../registries/P2PTunnelRegistry.java | 2 +- .../registries/RecipeHandlerRegistry.java | 4 +-- .../registries/SpecialComparisonRegistry.java | 2 +- .../features/registries/WirelessRegistry.java | 2 +- .../features/registries/WorldGenRegistry.java | 6 ++--- .../registries/cell/CellRegistry.java | 2 +- .../registries/inscriber/InscriberRecipe.java | 2 +- .../inscriber/InscriberRegistry.java | 8 +++--- .../core/sync/AppEngPacketHandlerBase.java | 2 +- .../sync/packets/PacketMEInventoryUpdate.java | 2 +- .../java/appeng/core/worlddata/SpawnData.java | 2 +- .../appeng/core/worlddata/StorageData.java | 10 +++---- .../java/appeng/crafting/CraftingJob.java | 2 +- .../appeng/crafting/CraftingTreeNode.java | 4 +-- .../appeng/crafting/CraftingTreeProcess.java | 2 +- .../java/appeng/crafting/CraftingWatcher.java | 2 +- src/main/java/appeng/debug/TileItemGen.java | 2 +- src/main/java/appeng/debug/ToolDebugCard.java | 4 +-- src/main/java/appeng/debug/ToolEraser.java | 4 +-- .../java/appeng/helpers/DualityInterface.java | 10 +++---- .../appeng/helpers/MultiCraftingTracker.java | 2 +- .../java/appeng/helpers/PatternHelper.java | 12 ++++----- .../java/appeng/hooks/CompassManager.java | 2 +- src/main/java/appeng/hooks/TickHandler.java | 16 ++++++------ .../integration/IntegrationRegistry.java | 2 +- .../modules/jei/RecipeTransferHandler.java | 2 +- .../waila/part/ChannelWailaDataProvider.java | 2 +- .../tile/PowerStorageWailaDataProvider.java | 2 +- .../appeng/items/materials/ItemMaterial.java | 2 +- .../appeng/items/misc/ItemEncodedPattern.java | 4 +-- .../java/appeng/items/parts/ItemFacade.java | 2 +- .../java/appeng/items/parts/ItemPart.java | 2 +- .../items/storage/ItemBasicStorageCell.java | 2 +- .../appeng/items/storage/ItemViewCell.java | 6 ++--- .../appeng/items/tools/ToolBiometricCard.java | 4 +-- .../appeng/items/tools/ToolNetworkTool.java | 2 +- .../tools/powered/ToolColorApplicator.java | 4 +-- .../tools/powered/ToolEntropyManipulator.java | 12 ++++----- .../items/tools/powered/ToolMatterCannon.java | 12 ++++----- .../items/tools/powered/ToolPortableCell.java | 2 +- .../tools/powered/ToolWirelessTerminal.java | 2 +- .../tools/quartz/ToolQuartzCuttingKnife.java | 2 +- src/main/java/appeng/me/Grid.java | 6 ++--- src/main/java/appeng/me/GridConnection.java | 2 +- src/main/java/appeng/me/GridNode.java | 12 ++++----- src/main/java/appeng/me/GridStorage.java | 4 +-- src/main/java/appeng/me/NetworkEventBus.java | 8 +++--- src/main/java/appeng/me/NetworkList.java | 4 +-- .../appeng/me/cache/CraftingGridCache.java | 26 +++++++++---------- .../java/appeng/me/cache/EnergyGridCache.java | 10 +++---- .../appeng/me/cache/GridStorageCache.java | 18 ++++++------- .../java/appeng/me/cache/NetworkMonitor.java | 2 +- src/main/java/appeng/me/cache/P2PCache.java | 4 +-- .../java/appeng/me/cache/PathGridCache.java | 18 ++++++------- .../java/appeng/me/cache/SecurityCache.java | 4 +-- .../appeng/me/cache/SpatialPylonCache.java | 8 +++--- .../appeng/me/cache/TickManagerCache.java | 8 +++--- .../appeng/me/cache/helpers/Connections.java | 2 +- .../me/cache/helpers/TunnelCollection.java | 4 +-- .../implementations/CraftingCPUCluster.java | 10 +++---- .../implementations/QuantumCluster.java | 2 +- .../implementations/SpatialPylonCluster.java | 2 +- .../java/appeng/me/energy/EnergyWatcher.java | 2 +- .../me/helpers/AENetworkProxyMultiblock.java | 2 +- .../me/helpers/GenericInterestManager.java | 2 +- .../appeng/me/pathfinding/PathSegment.java | 2 +- .../java/appeng/me/storage/CellInventory.java | 2 +- .../me/storage/CellInventoryHandler.java | 4 +-- .../java/appeng/me/storage/ItemWatcher.java | 2 +- .../appeng/me/storage/MEInventoryHandler.java | 4 +-- .../me/storage/MEMonitorIInventory.java | 6 ++--- .../me/storage/MEMonitorPassThrough.java | 2 +- .../me/storage/NetworkInventoryHandler.java | 4 +-- src/main/java/appeng/parts/AEBasePart.java | 2 +- .../java/appeng/parts/CableBusContainer.java | 10 +++---- src/main/java/appeng/parts/PartPlacement.java | 4 +-- .../parts/automation/PartFormationPlane.java | 4 +-- .../PartIdentityAnnihilationPlane.java | 2 +- .../java/appeng/parts/misc/PartToggleBus.java | 2 +- .../java/appeng/parts/p2p/PartP2PItems.java | 4 +-- .../appeng/parts/p2p/PartP2PTunnelME.java | 2 +- .../java/appeng/recipes/GroupIngredient.java | 2 +- .../java/appeng/recipes/IngredientSet.java | 2 +- src/main/java/appeng/recipes/RecipeData.java | 8 +++--- .../java/appeng/recipes/RecipeHandler.java | 12 ++++----- .../recipes/game/DisassembleRecipe.java | 4 +-- .../appeng/recipes/game/ShapedRecipe.java | 2 +- .../appeng/recipes/game/ShapelessRecipe.java | 4 +-- .../appeng/recipes/handlers/Inscribe.java | 2 +- .../java/appeng/recipes/handlers/Press.java | 2 +- .../java/appeng/recipes/handlers/Shaped.java | 2 +- .../appeng/recipes/handlers/Shapeless.java | 2 +- .../recipes/loader/RecipeResourceCopier.java | 2 +- .../recipes/ores/OreDictionaryHandler.java | 2 +- src/main/java/appeng/server/ServerHelper.java | 2 +- .../java/appeng/services/CompassService.java | 2 +- .../services/compass/CompassReader.java | 2 +- src/main/java/appeng/spatial/CachedPlane.java | 12 ++++----- src/main/java/appeng/tile/AEBaseTile.java | 12 ++++----- .../tile/crafting/TileCraftingTile.java | 2 +- .../appeng/tile/grindstone/TileGrinder.java | 2 +- .../java/appeng/tile/misc/TileCharger.java | 2 +- src/main/java/appeng/tile/misc/TilePaint.java | 2 +- .../appeng/tile/misc/TileSecurityStation.java | 2 +- .../java/appeng/tile/storage/TileChest.java | 2 +- .../java/appeng/tile/storage/TileDrive.java | 4 +-- src/main/java/appeng/util/ConfigManager.java | 2 +- .../util/InWorldToolOperationResult.java | 2 +- src/main/java/appeng/util/Platform.java | 6 ++--- .../util/helpers/ItemComparisonHelper.java | 2 +- .../appeng/util/inv/AdaptorPlayerHand.java | 2 +- .../util/inv/WrapperChainedInventory.java | 4 +-- .../java/appeng/util/item/AESharedNBT.java | 4 +-- src/main/java/appeng/util/item/FluidList.java | 4 +-- src/main/java/appeng/util/item/ItemList.java | 6 ++--- src/main/java/appeng/util/item/OreHelper.java | 4 +-- .../java/appeng/util/item/OreReference.java | 6 ++--- .../util/prioritylist/MergedPriorityList.java | 4 +-- .../java/appeng/worldgen/MeteoritePlacer.java | 6 ++--- 145 files changed, 315 insertions(+), 315 deletions(-) diff --git a/src/api/java/appeng/api/storage/MEMonitorHandler.java b/src/api/java/appeng/api/storage/MEMonitorHandler.java index b962f3d1f..4cbae08b8 100644 --- a/src/api/java/appeng/api/storage/MEMonitorHandler.java +++ b/src/api/java/appeng/api/storage/MEMonitorHandler.java @@ -52,7 +52,7 @@ public class MEMonitorHandler implements IMEMonitor< private final IMEInventoryHandler internalHandler; private final IItemList cachedList; - private final HashMap, Object> listeners = new HashMap, Object>(); + private final HashMap, Object> listeners = new HashMap<>(); protected boolean hasChanged = true; diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 7fab3017f..4a93043af 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -122,7 +122,7 @@ public abstract class AEBaseBlock extends Block if( collisionHandler != null && bb != null ) { - final List tmp = new ArrayList(); + final List tmp = new ArrayList<>(); collisionHandler.addCollidingBlockToList( w, pos, bb, tmp, e ); for( final AxisAlignedBB b : tmp ) { diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 837ea284c..c7775a208 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -185,7 +185,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity final AEBaseTile te = this.getTileEntity( w, pos ); if( te != null ) { - final ArrayList drops = new ArrayList(); + final ArrayList drops = new ArrayList<>(); if( te.dropItems() ) { te.getDrops( w, pos, drops ); diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 9a66bb3cd..b875c9a1a 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -85,9 +85,9 @@ import appeng.helpers.InventoryAction; public abstract class AEBaseGui extends GuiContainer { private static boolean switchingGuis; - private final List meSlots = new LinkedList(); + private final List meSlots = new LinkedList<>(); // drag y - private final Set drag_click = new HashSet(); + private final Set drag_click = new HashSet<>(); private final StackSizeRenderer stackSizeRenderer = new StackSizeRenderer(); private GuiScrollbar myScrollBar = null; private boolean disableShiftClick = false; diff --git a/src/main/java/appeng/client/gui/config/AEConfigGui.java b/src/main/java/appeng/client/gui/config/AEConfigGui.java index 90b5eb01d..461a5a71b 100644 --- a/src/main/java/appeng/client/gui/config/AEConfigGui.java +++ b/src/main/java/appeng/client/gui/config/AEConfigGui.java @@ -42,7 +42,7 @@ public class AEConfigGui extends GuiConfig private static List getConfigElements() { - final List list = new ArrayList(); + final List list = new ArrayList<>(); for( final String cat : AEConfig.instance().getCategoryNames() ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index 38aa0f17c..a1ee1f500 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -66,7 +66,7 @@ public class GuiCraftConfirm extends AEBaseGui private final IItemList pending = AEApi.instance().storage().createItemList(); private final IItemList missing = AEApi.instance().storage().createItemList(); - private final List visual = new ArrayList(); + private final List visual = new ArrayList<>(); private GuiBridge OriginalGui; private GuiButton cancel; @@ -237,7 +237,7 @@ public class GuiCraftConfirm extends AEBaseGui final int viewEnd = viewStart + 3 * this.rows; String dspToolTip = ""; - final List lineList = new LinkedList(); + final 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 c39029e80..fbc39136c 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -88,7 +88,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource private IItemList active = AEApi.instance().storage().createItemList(); private IItemList pending = AEApi.instance().storage().createItemList(); - private List visual = new ArrayList(); + private List visual = new ArrayList<>(); private GuiButton cancel; private int tooltip = -1; @@ -113,7 +113,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource this.storage = AEApi.instance().storage().createItemList(); this.active = AEApi.instance().storage().createItemList(); this.pending = AEApi.instance().storage().createItemList(); - this.visual = new ArrayList(); + this.visual = new ArrayList<>(); } @Override @@ -211,7 +211,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource final int viewEnd = viewStart + 3 * 6; String dspToolTip = ""; - final List lineList = new LinkedList(); + final 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 1a3ab608b..9b233f3cd 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java @@ -58,12 +58,12 @@ public class GuiInterfaceTerminal extends AEBaseGui // TODO: copied from GuiMEMonitorable. It looks not changed, maybe unneeded? private final int offsetX = 9; - private final HashMap byId = new HashMap(); + private final HashMap byId = new HashMap<>(); private final HashMultimap byName = HashMultimap.create(); - private final ArrayList names = new ArrayList(); - private final ArrayList lines = new ArrayList(); + private final ArrayList names = new ArrayList<>(); + private final ArrayList lines = new ArrayList<>(); - private final Map> cachedSearches = new WeakHashMap>(); + private final Map> cachedSearches = new WeakHashMap<>(); private boolean refreshList = false; private MEGuiTextField searchField; @@ -313,7 +313,7 @@ public class GuiInterfaceTerminal extends AEBaseGui { this.lines.add( n ); - final ArrayList clientInventories = new ArrayList(); + final ArrayList clientInventories = new ArrayList<>(); clientInventories.addAll( this.byName.get( n ) ); Collections.sort( clientInventories ); @@ -371,7 +371,7 @@ public class GuiInterfaceTerminal extends AEBaseGui { if( !this.cachedSearches.containsKey( searchTerm ) ) { - this.cachedSearches.put( searchTerm, new HashSet() ); + this.cachedSearches.put( searchTerm, new HashSet<>() ); } final Set cache = this.cachedSearches.get( searchTerm ); diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index 1349a18d0..f76e421a0 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java @@ -75,7 +75,7 @@ public class GuiImgButton extends GuiButton implements ITooltip if( appearances == null ) { - appearances = new HashMap(); + appearances = new HashMap<>(); this.registerApp( 16 * 7, Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash ); this.registerApp( 16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOutput.MATTER_BALLS, ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls ); this.registerApp( 16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOutput.SINGULARITY, ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity ); diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index bfb68fd4f..796b173b6 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -49,8 +49,8 @@ public class ItemRepo { private final IItemList list = AEApi.instance().storage().createItemList(); - private final ArrayList view = new ArrayList(); - private final ArrayList dsp = new ArrayList(); + private final ArrayList view = new ArrayList<>(); + private final ArrayList dsp = new ArrayList<>(); private final IScrollSource src; private final ISortSource sortSrc; diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index dc810ee44..df683e362 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -334,7 +334,7 @@ public enum UVLModelLoader implements ICustomModelLoader return null; } object = object.get( "uvlightmap" ).getAsJsonObject(); - return new ImmutablePair( JsonUtils.getFloat( object, "sky", 0 ), JsonUtils.getFloat( object, "block", 0 ) ); + return new ImmutablePair<>( JsonUtils.getFloat( object, "sky", 0 ), JsonUtils.getFloat( object, "block", 0 ) ); } } diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index f62241a9a..91db0c810 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -87,12 +87,12 @@ public abstract class AEBaseContainer extends Container private final InventoryPlayer invPlayer; private final BaseActionSource mySrc; - private final HashSet locked = new HashSet(); + private final HashSet locked = new HashSet<>(); private final TileEntity tileEntity; private final IPart part; private final IGuiItemObject obj; - private final List dataChunks = new LinkedList(); - private final HashMap syncData = new HashMap(); + private final List dataChunks = new LinkedList<>(); + private final HashMap syncData = new HashMap<>(); private boolean isContainerValid = true; private String customName; private ContainerOpenContext openContext; @@ -245,7 +245,7 @@ public abstract class AEBaseContainer extends Container CompressedStreamTools.writeCompressed( item, stream ); final int maxChunkSize = 30000; - final List miniPackets = new LinkedList(); + final List miniPackets = new LinkedList<>(); final byte[] data = stream.toByteArray(); @@ -488,7 +488,7 @@ public abstract class AEBaseContainer extends Container return ItemStack.EMPTY; } - final List selectedSlots = new ArrayList(); + final List selectedSlots = new ArrayList<>(); /** * Gather a list of valid destinations. @@ -825,7 +825,7 @@ public abstract class AEBaseContainer extends Container if( action == InventoryAction.MOVE_REGION ) { - final List from = new LinkedList(); + final List from = new LinkedList<>(); for( final Object j : this.inventorySlots ) { diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index 954bcb8c8..3b213f551 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -234,7 +234,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory( this.getUpgradeable().getInventoryByName( "cell" ).getStackInSlot( 0 ), null, StorageChannel.ITEMS ); - Iterator i = new NullIterator(); + Iterator i = new NullIterator<>(); if( cellInv != null ) { final IItemList list = cellInv.getAvailableItems( AEApi.instance().storage().createItemList() ); diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index 4ca58454f..9438782f1 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -69,7 +69,7 @@ import appeng.util.Platform; public class ContainerCraftConfirm extends AEBaseContainer { - private final ArrayList cpus = new ArrayList(); + private final ArrayList cpus = new ArrayList<>(); private Future job; private ICraftingJob result; @GuiSync( 0 ) diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java b/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java index 9ebc4a5b2..c534a16d5 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java @@ -37,7 +37,7 @@ import appeng.util.Platform; public class ContainerCraftingStatus extends ContainerCraftingCPU { - private final List cpus = new ArrayList(); + private final List cpus = new ArrayList<>(); @GuiSync( 5 ) public int selectedCpu = -1; @GuiSync( 6 ) diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index 93746cbdb..26d602054 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -62,8 +62,8 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer */ private static long autoBase = Long.MIN_VALUE; - private final Map diList = new HashMap(); - private final Map byId = new HashMap(); + private final Map diList = new HashMap<>(); + private final Map byId = new HashMap<>(); private IGrid grid; private NBTTagCompound data = new NBTTagCompound(); diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index 66892bf9e..1dc12af9c 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -282,7 +282,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA } else { - final List list = new ArrayList( 3 ); + final List list = new ArrayList<>( 3 ); boolean hasValue = false; for( final OptionalSlotFake outputSlot : this.outputSlots ) diff --git a/src/main/java/appeng/container/implementations/ContainerStorageBus.java b/src/main/java/appeng/container/implementations/ContainerStorageBus.java index 2cf53ad1c..156a1c754 100644 --- a/src/main/java/appeng/container/implementations/ContainerStorageBus.java +++ b/src/main/java/appeng/container/implementations/ContainerStorageBus.java @@ -157,7 +157,7 @@ public class ContainerStorageBus extends ContainerUpgradeable final IMEInventory cellInv = this.storageBus.getInternalHandler(); - Iterator i = new NullIterator(); + Iterator i = new NullIterator<>(); if( cellInv != null ) { final IItemList list = cellInv.getAvailableItems( AEApi.instance().storage().createItemList() ); diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java index a4e7925d5..20911fdea 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java @@ -141,7 +141,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot final ItemStack extra = ia.addItems( this.craftItem( who, rs, inv, all ) ); if( !extra.isEmpty() ) { - final List drops = new ArrayList(); + final List drops = new ArrayList<>(); drops.add( extra ); Platform.spawnDrops( who.world, new BlockPos( (int) who.posX, (int) who.posY, (int) who.posZ ), drops ); return; @@ -250,7 +250,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot private void postCraft( final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, final ItemStack result ) { - final List drops = new ArrayList(); + final List drops = new ArrayList<>(); // add one of each item to the items on the board... if( Platform.isServer() ) diff --git a/src/main/java/appeng/core/IMCHandler.java b/src/main/java/appeng/core/IMCHandler.java index 49ffd2787..592da5cae 100644 --- a/src/main/java/appeng/core/IMCHandler.java +++ b/src/main/java/appeng/core/IMCHandler.java @@ -57,7 +57,7 @@ public class IMCHandler */ public IMCHandler() { - this.processors = new HashMap( INITIAL_PROCESSORS_CAPACITY ); + this.processors = new HashMap<>( INITIAL_PROCESSORS_CAPACITY ); this.processors.put( "blacklist-block-spatial", new IMCBlackListSpatial() ); this.processors.put( "whitelist-spatial", new IMCSpatial() ); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index a90528571..ee5b1699a 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -124,9 +124,9 @@ public final class Registration private Biome storageBiome; // TODO : 1.12 Improve - private static List blocksToRegister = new ArrayList(); - private static List itemsToRegister = new ArrayList(); - private static List recipesToRegister = new ArrayList(); + private static List blocksToRegister = new ArrayList<>(); + private static List itemsToRegister = new ArrayList<>(); + private static List recipesToRegister = new ArrayList<>(); private File recipeDirectory; private CustomRecipeConfig customRecipeConfig; diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index 527ebd280..8bfaec1aa 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -75,7 +75,7 @@ public class ApiPart implements IPartHelper } ); private final Map, String> interfaces2Layer = new HashMap<>(); - private final List desc = new LinkedList(); + private final List desc = new LinkedList<>(); /** * Conceptually this method will build a new class hierarchy that is rooted at the given base class, and includes a diff --git a/src/main/java/appeng/core/features/registries/GridCacheRegistry.java b/src/main/java/appeng/core/features/registries/GridCacheRegistry.java index e8d5e21d6..4135c1dd9 100644 --- a/src/main/java/appeng/core/features/registries/GridCacheRegistry.java +++ b/src/main/java/appeng/core/features/registries/GridCacheRegistry.java @@ -32,7 +32,7 @@ import appeng.core.AELog; public final class GridCacheRegistry implements IGridCacheRegistry { - private final Map, Class> caches = new HashMap, Class>(); + private final Map, Class> caches = new HashMap<>(); @Override public void registerGridCache( final Class iface, final Class implementation ) @@ -50,7 +50,7 @@ public final class GridCacheRegistry implements IGridCacheRegistry @Override public HashMap, IGridCache> createCacheInstance( final IGrid g ) { - final HashMap, IGridCache> map = new HashMap, IGridCache>(); + final HashMap, IGridCache> map = new HashMap<>(); for( final Class iface : this.caches.keySet() ) { diff --git a/src/main/java/appeng/core/features/registries/LocatableRegistry.java b/src/main/java/appeng/core/features/registries/LocatableRegistry.java index 1a0993071..c82244643 100644 --- a/src/main/java/appeng/core/features/registries/LocatableRegistry.java +++ b/src/main/java/appeng/core/features/registries/LocatableRegistry.java @@ -38,7 +38,7 @@ public final class LocatableRegistry implements ILocatableRegistry public LocatableRegistry() { - this.set = new HashMap(); + this.set = new HashMap<>(); MinecraftForge.EVENT_BUS.register( this ); } diff --git a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java index 0e70c8bf1..feda186d2 100644 --- a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java +++ b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java @@ -33,7 +33,7 @@ import appeng.util.Platform; public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmoRegistry { - private final HashMap DamageModifiers = new HashMap(); + private final HashMap DamageModifiers = new HashMap<>(); public MatterCannonAmmoRegistry() { diff --git a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java index 0af4439c5..28b0048ba 100644 --- a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java +++ b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java @@ -36,11 +36,11 @@ import appeng.spatial.DefaultSpatialHandler; public class MovableTileRegistry implements IMovableRegistry { - private final HashSet blacklisted = new HashSet(); + private final HashSet blacklisted = new HashSet<>(); - private final HashMap, IMovableHandler> Valid = new HashMap, IMovableHandler>(); - private final LinkedList> test = new LinkedList>(); - private final LinkedList handlers = new LinkedList(); + private final HashMap, IMovableHandler> Valid = new HashMap<>(); + private final LinkedList> test = new LinkedList<>(); + private final LinkedList handlers = new LinkedList<>(); private final DefaultSpatialHandler dsh = new DefaultSpatialHandler(); private final IMovableHandler nullHandler = new DefaultSpatialHandler(); diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index 06a550f78..4a6921fbc 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -48,7 +48,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry { private static final int INITIAL_CAPACITY = 40; - private final Map tunnels = new HashMap( INITIAL_CAPACITY ); + private final Map tunnels = new HashMap<>( INITIAL_CAPACITY ); private final Map modIdTunnels = new HashMap<>( INITIAL_CAPACITY ); public void configure() diff --git a/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java b/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java index e67a97114..db5dfdb84 100644 --- a/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java +++ b/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java @@ -43,8 +43,8 @@ import appeng.recipes.RecipeHandler; */ public class RecipeHandlerRegistry implements IRecipeHandlerRegistry { - private final Map> handlers = new HashMap>( 20 ); - private final Collection resolvers = new LinkedList(); + private final Map> handlers = new HashMap<>( 20 ); + private final Collection resolvers = new LinkedList<>(); @Override public void addNewCraftHandler( final String name, final Class handler ) diff --git a/src/main/java/appeng/core/features/registries/SpecialComparisonRegistry.java b/src/main/java/appeng/core/features/registries/SpecialComparisonRegistry.java index 9b02ec853..d62fa3871 100644 --- a/src/main/java/appeng/core/features/registries/SpecialComparisonRegistry.java +++ b/src/main/java/appeng/core/features/registries/SpecialComparisonRegistry.java @@ -36,7 +36,7 @@ public class SpecialComparisonRegistry implements ISpecialComparisonRegistry public SpecialComparisonRegistry() { - this.CompRegistry = new ArrayList(); + this.CompRegistry = new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/core/features/registries/WirelessRegistry.java b/src/main/java/appeng/core/features/registries/WirelessRegistry.java index 68779e616..3a32ea3a9 100644 --- a/src/main/java/appeng/core/features/registries/WirelessRegistry.java +++ b/src/main/java/appeng/core/features/registries/WirelessRegistry.java @@ -41,7 +41,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry public WirelessRegistry() { - this.handlers = new ArrayList(); + this.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 aea4e7812..3425cd442 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -115,8 +115,8 @@ public final class WorldGenRegistry implements IWorldGen private static class TypeSet { - final HashSet> badProviders = new HashSet>(); - final HashSet badDimensions = new HashSet(); - final HashSet enabledDimensions = new HashSet(); + final HashSet> badProviders = new HashSet<>(); + final HashSet badDimensions = new HashSet<>(); + final HashSet enabledDimensions = new HashSet<>(); } } diff --git a/src/main/java/appeng/core/features/registries/cell/CellRegistry.java b/src/main/java/appeng/core/features/registries/cell/CellRegistry.java index 3c887d9aa..391ae5ee4 100644 --- a/src/main/java/appeng/core/features/registries/cell/CellRegistry.java +++ b/src/main/java/appeng/core/features/registries/cell/CellRegistry.java @@ -38,7 +38,7 @@ public class CellRegistry implements ICellRegistry public CellRegistry() { - this.handlers = new ArrayList(); + this.handlers = new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/core/features/registries/inscriber/InscriberRecipe.java b/src/main/java/appeng/core/features/registries/inscriber/InscriberRecipe.java index a3735a04b..820ae8a55 100644 --- a/src/main/java/appeng/core/features/registries/inscriber/InscriberRecipe.java +++ b/src/main/java/appeng/core/features/registries/inscriber/InscriberRecipe.java @@ -59,7 +59,7 @@ public class InscriberRecipe implements IInscriberRecipe InscriberRecipe( @Nonnull final Collection inputs, @Nonnull final ItemStack output, @Nullable final ItemStack top, @Nullable final ItemStack bot, @Nonnull final InscriberProcessType type ) { - this.inputs = new ArrayList( inputs.size() ); + this.inputs = new ArrayList<>( inputs.size() ); this.inputs.addAll( inputs ); this.output = output; diff --git a/src/main/java/appeng/core/features/registries/inscriber/InscriberRegistry.java b/src/main/java/appeng/core/features/registries/inscriber/InscriberRegistry.java index 594b788c6..fe43794b1 100644 --- a/src/main/java/appeng/core/features/registries/inscriber/InscriberRegistry.java +++ b/src/main/java/appeng/core/features/registries/inscriber/InscriberRegistry.java @@ -50,9 +50,9 @@ public final class InscriberRegistry implements IInscriberRegistry public InscriberRegistry() { - this.inputs = new HashSet(); - this.optionals = new HashSet(); - this.recipes = new HashSet(); + this.inputs = new HashSet<>(); + this.optionals = new HashSet<>(); + this.recipes = new HashSet<>(); } @Nonnull @@ -128,7 +128,7 @@ public final class InscriberRegistry implements IInscriberRegistry @Override public Builder withInputs( @Nonnull final Collection inputs ) { - this.inputs = new ArrayList( inputs.size() ); + this.inputs = new ArrayList<>( inputs.size() ); this.inputs.addAll( inputs ); return this; diff --git a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java index f32972a88..3528b61fd 100644 --- a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java +++ b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java @@ -53,7 +53,7 @@ import appeng.core.sync.packets.PacketValueConfig; public class AppEngPacketHandlerBase { - private static final Map, PacketTypes> REVERSE_LOOKUP = new HashMap, AppEngPacketHandlerBase.PacketTypes>(); + private static final Map, PacketTypes> REVERSE_LOOKUP = new HashMap<>(); public enum PacketTypes { diff --git a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java index b48e26541..85d4fc384 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java +++ b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java @@ -77,7 +77,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket { this.data = null; this.compressFrame = null; - this.list = new LinkedList(); + this.list = new LinkedList<>(); this.ref = stream.readByte(); // int originalBytes = stream.readableBytes(); diff --git a/src/main/java/appeng/core/worlddata/SpawnData.java b/src/main/java/appeng/core/worlddata/SpawnData.java index c2e8be853..89ccf4b03 100644 --- a/src/main/java/appeng/core/worlddata/SpawnData.java +++ b/src/main/java/appeng/core/worlddata/SpawnData.java @@ -101,7 +101,7 @@ final class SpawnData implements IWorldSpawnData @Override public Collection getNearByMeteorites( final int dim, final int chunkX, final int chunkZ ) { - final Collection ll = new LinkedList(); + final Collection ll = new LinkedList<>(); synchronized( SpawnData.class ) { diff --git a/src/main/java/appeng/core/worlddata/StorageData.java b/src/main/java/appeng/core/worlddata/StorageData.java index 5cbd14cb4..59e2c99a8 100644 --- a/src/main/java/appeng/core/worlddata/StorageData.java +++ b/src/main/java/appeng/core/worlddata/StorageData.java @@ -49,7 +49,7 @@ final class StorageData implements IWorldGridStorageData, IOnWorldStartable, IOn private static final String GRID_STORAGE_CATEGORY = "gridstorage"; - private final Map> loadedStorage = new WeakHashMap>( 10 ); + private final Map> loadedStorage = new WeakHashMap<>( 10 ); private final Configuration config; private long lastGridStorage; @@ -80,8 +80,8 @@ final class StorageData implements IWorldGridStorageData, IOnWorldStartable, IOn final String id = String.valueOf( storageID ); final String data = this.config.get( "gridstorage", id, "" ).getString(); final GridStorage thisStorage = new GridStorage( data, storageID, gss ); - gss.setGridStorage( new WeakReference( thisStorage ) ); - this.loadedStorage.put( gss, new WeakReference( gss ) ); + gss.setGridStorage( new WeakReference<>( thisStorage ) ); + this.loadedStorage.put( gss, new WeakReference<>( gss ) ); return thisStorage; } @@ -98,8 +98,8 @@ final class StorageData implements IWorldGridStorageData, IOnWorldStartable, IOn final long storageID = this.nextGridStorage(); final GridStorageSearch gss = new GridStorageSearch( storageID ); final GridStorage newStorage = new GridStorage( storageID, gss ); - gss.setGridStorage( new WeakReference( newStorage ) ); - this.loadedStorage.put( gss, new WeakReference( gss ) ); + gss.setGridStorage( new WeakReference<>( newStorage ) ); + this.loadedStorage.put( gss, new WeakReference<>( gss ) ); return newStorage; } diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 875a25473..c4ea012b9 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -58,7 +58,7 @@ public class CraftingJob implements Runnable, ICraftingJob private final World world; private final IItemList crafting = AEApi.instance().storage().createItemList(); private final IItemList missing = AEApi.instance().storage().createItemList(); - private final HashMap opsAndMultiplier = new HashMap(); + private final HashMap opsAndMultiplier = new HashMap<>(); private final Object monitor = new Object(); private final Stopwatch watch = Stopwatch.createUnstarted(); private CraftingTreeNode tree; diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/main/java/appeng/crafting/CraftingTreeNode.java index 55e07381d..750e40682 100644 --- a/src/main/java/appeng/crafting/CraftingTreeNode.java +++ b/src/main/java/appeng/crafting/CraftingTreeNode.java @@ -52,7 +52,7 @@ public class CraftingTreeNode // what item is this? private final IAEItemStack what; // what are the crafting patterns for this? - private final ArrayList nodes = new ArrayList(); + private final ArrayList nodes = new ArrayList<>(); private int bytes = 0; private boolean canEmit = false; private long missing = 0; @@ -121,7 +121,7 @@ public class CraftingTreeNode { this.job.handlePausing(); - final List thingsUsed = new LinkedList(); + final List thingsUsed = new LinkedList<>(); this.what.setStackSize( l ); if( this.getSlot() >= 0 && this.parent != null && this.parent.details.isCraftable() ) diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index 3712cf74d..e456576b8 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -47,7 +47,7 @@ public class CraftingTreeProcess private final CraftingTreeNode parent; final ICraftingPatternDetails details; private final CraftingJob job; - private final Map nodes = new HashMap(); + private final Map nodes = new HashMap<>(); private final int depth; boolean possible = true; private World world; diff --git a/src/main/java/appeng/crafting/CraftingWatcher.java b/src/main/java/appeng/crafting/CraftingWatcher.java index 0fa5bec08..650fb1a94 100644 --- a/src/main/java/appeng/crafting/CraftingWatcher.java +++ b/src/main/java/appeng/crafting/CraftingWatcher.java @@ -37,7 +37,7 @@ public class CraftingWatcher implements ICraftingWatcher private final CraftingGridCache gsc; private final ICraftingWatcherHost host; - private final Set myInterests = new HashSet(); + private final Set myInterests = new HashSet<>(); public CraftingWatcher( final CraftingGridCache cache, final ICraftingWatcherHost host ) { diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index a87f1476a..b59003742 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -36,7 +36,7 @@ import appeng.tile.AEBaseTile; public class TileItemGen extends AEBaseTile implements IInventory { - private static final Queue POSSIBLE_ITEMS = new LinkedList(); + private static final Queue POSSIBLE_ITEMS = new LinkedList<>(); public TileItemGen() { diff --git a/src/main/java/appeng/debug/ToolDebugCard.java b/src/main/java/appeng/debug/ToolDebugCard.java index acbf2e11e..57c8e4767 100644 --- a/src/main/java/appeng/debug/ToolDebugCard.java +++ b/src/main/java/appeng/debug/ToolDebugCard.java @@ -95,7 +95,7 @@ public class ToolDebugCard extends AEBaseItem if( pg.getControllerState() == ControllerState.CONTROLLER_ONLINE ) { - Set next = new HashSet(); + Set next = new HashSet<>(); next.add( node ); final int maxLength = 10000; @@ -105,7 +105,7 @@ public class ToolDebugCard extends AEBaseItem while( !next.isEmpty() ) { final Iterable current = next; - next = new HashSet(); + next = new HashSet<>(); for( final IGridNode n : current ) { diff --git a/src/main/java/appeng/debug/ToolEraser.java b/src/main/java/appeng/debug/ToolEraser.java index f26284946..0f201d17c 100644 --- a/src/main/java/appeng/debug/ToolEraser.java +++ b/src/main/java/appeng/debug/ToolEraser.java @@ -50,14 +50,14 @@ public class ToolEraser extends AEBaseItem final IBlockState state = world.getBlockState( pos ); - List next = new LinkedList(); + List next = new LinkedList<>(); next.add( pos ); int blocks = 0; while( blocks < BLOCK_ERASE_LIMIT && !next.isEmpty() ) { final List c = next; - next = new LinkedList(); + next = new LinkedList<>(); for( final BlockPos wc : c ) { diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 5574aa231..45e4e7c33 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -116,7 +116,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn public static final int NUMBER_OF_CONFIG_SLOTS = 9; public static final int NUMBER_OF_PATTERN_SLOTS = 9; - private static final Collection BAD_BLOCKS = new HashSet( 100 ); + private static final Collection BAD_BLOCKS = new HashSet<>( 100 ); private final int[] sides = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; private final IAEItemStack[] requireWork = { null, null, null, null, null, null, null, null, null }; private final MultiCraftingTracker craftingTracker; @@ -129,8 +129,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn private final AppEngInternalInventory storage = new AppEngInternalInventory( this, NUMBER_OF_STORAGE_SLOTS ); private final AppEngInternalInventory patterns = new AppEngInternalInventory( this, NUMBER_OF_PATTERN_SLOTS ); private final WrapperInvSlot slotInv = new WrapperInvSlot( this.storage ); - private final MEMonitorPassThrough items = new MEMonitorPassThrough( new NullInventory(), StorageChannel.ITEMS ); - private final MEMonitorPassThrough fluids = new MEMonitorPassThrough( new NullInventory(), StorageChannel.FLUIDS ); + private final MEMonitorPassThrough items = new MEMonitorPassThrough<>( new NullInventory(), StorageChannel.ITEMS ); + private final MEMonitorPassThrough fluids = new MEMonitorPassThrough<>( new NullInventory(), StorageChannel.FLUIDS ); private final UpgradeInventory upgrades; private boolean hasConfig = false; private int priority; @@ -272,7 +272,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn if( this.waitingToSend == null ) { - this.waitingToSend = new LinkedList(); + this.waitingToSend = new LinkedList<>(); } this.waitingToSend.add( is ); @@ -489,7 +489,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn { if( this.craftingList == null ) { - this.craftingList = new LinkedList(); + this.craftingList = new LinkedList<>(); } this.craftingList.add( details ); diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index b70d306a2..68250a64d 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -146,7 +146,7 @@ public class MultiCraftingTracker return ImmutableSet.of(); } - return ImmutableSet.copyOf( new NonNullArrayIterator( this.links ) ); + return ImmutableSet.copyOf( new NonNullArrayIterator<>( this.links ) ); } public void jobStateChange( final ICraftingLink link ) diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index dc9564548..3ba938fcd 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -58,8 +58,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable failCache = new HashSet(); - private final Set passCache = new HashSet(); + private final Set failCache = new HashSet<>(); + private final Set passCache = new HashSet<>(); private final IAEItemStack pattern; private int priority = 0; @@ -80,8 +80,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable in = new ArrayList(); - final List out = new ArrayList(); + final List in = new ArrayList<>(); + final List out = new ArrayList<>(); for( int x = 0; x < inTag.tagCount(); x++ ) { @@ -131,7 +131,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable tmpOutputs = new HashMap(); + final Map tmpOutputs = new HashMap<>(); for( final IAEItemStack io : this.outputs ) { @@ -152,7 +152,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable tmpInputs = new HashMap(); + final Map tmpInputs = new HashMap<>(); for( final IAEItemStack io : this.inputs ) { diff --git a/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java index fa31ca9ac..25379ed2f 100644 --- a/src/main/java/appeng/hooks/CompassManager.java +++ b/src/main/java/appeng/hooks/CompassManager.java @@ -30,7 +30,7 @@ public class CompassManager { public static final CompassManager INSTANCE = new CompassManager(); - private final HashMap requests = new HashMap(); + private final HashMap requests = new HashMap<>(); public void postResult( final long attunement, final int x, final int y, final int z, final CompassResult result ) { diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index 24c6f2cbf..4e2f5c696 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -60,13 +60,13 @@ public class TickHandler { public static final TickHandler INSTANCE = new TickHandler(); - private final Queue> serverQueue = new LinkedList>(); + private final Queue> serverQueue = new LinkedList<>(); private final Multimap craftingJobs = LinkedListMultimap.create(); - private final WeakHashMap>> callQueue = new WeakHashMap>>(); + private final WeakHashMap>> callQueue = new WeakHashMap<>(); private final HandlerRep server = new HandlerRep(); private final HandlerRep client = new HandlerRep(); - private final HashMap cliPlayerColors = new HashMap(); - private final HashMap srvPlayerColors = new HashMap(); + private final HashMap cliPlayerColors = new HashMap<>(); + private final HashMap srvPlayerColors = new HashMap<>(); private CableRenderMode crm = CableRenderMode.STANDARD; public HashMap getPlayerColors() @@ -90,7 +90,7 @@ public class TickHandler if( queue == null ) { - queue = new LinkedList>(); + queue = new LinkedList<>(); this.callQueue.put( w, queue ); } @@ -146,7 +146,7 @@ public class TickHandler { if( Platform.isServer() ) // for no there is no reason to care about this on the client... { - final LinkedList toDestroy = new LinkedList(); + final LinkedList toDestroy = new LinkedList<>(); for( final Grid g : this.getRepo().networks ) { @@ -306,13 +306,13 @@ public class TickHandler private static class HandlerRep { - private Queue tiles = new LinkedList(); + private Queue tiles = new LinkedList<>(); private Collection networks = new NetworkList(); private void clear() { - this.tiles = new LinkedList(); + this.tiles = new LinkedList<>(); this.networks = new NetworkList(); } } diff --git a/src/main/java/appeng/integration/IntegrationRegistry.java b/src/main/java/appeng/integration/IntegrationRegistry.java index 0a2dcf540..d805e3bff 100644 --- a/src/main/java/appeng/integration/IntegrationRegistry.java +++ b/src/main/java/appeng/integration/IntegrationRegistry.java @@ -30,7 +30,7 @@ public enum IntegrationRegistry { INSTANCE; - private final Collection modules = new LinkedList(); + private final Collection modules = new LinkedList<>(); public void add( final IntegrationType type ) { diff --git a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java index e870169e5..f78e487f0 100644 --- a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java +++ b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java @@ -92,7 +92,7 @@ class RecipeTransferHandler implements IRecipeTransferHandl if( slot.getSlotIndex() == slotIndex ) { final NBTTagList tags = new NBTTagList(); - final List list = new LinkedList(); + final List list = new LinkedList<>(); // prefer pure crystals. for( ItemStack stack : ingredient.getAllIngredients() ) diff --git a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java index 6064daf44..127ae648c 100644 --- a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java @@ -60,7 +60,7 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider *

* The cache will be updated from the server. */ - private final TObjectByteMap cache = new TObjectByteHashMap(); + private final TObjectByteMap cache = new TObjectByteHashMap<>(); /** * Adds the used and max channel to the tool tip diff --git a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java index 7b8942eb8..79653ea2a 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java @@ -62,7 +62,7 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider *

* The cache will be updated from the server. */ - private final TObjectLongMap cache = new TObjectLongHashMap(); + private final TObjectLongMap cache = new TObjectLongHashMap<>(); /** * Adds the current and max power to the tool tip diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java index fe37aa648..2768feceb 100644 --- a/src/main/java/appeng/items/materials/ItemMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMaterial.java @@ -105,7 +105,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, final Upgrades u = this.getType( stack ); if( u != null ) { - final List textList = new LinkedList(); + final List textList = new LinkedList<>(); for( final Entry j : u.getSupported().entrySet() ) { String name = null; diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index 96ec78515..53cb31897 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -51,7 +51,7 @@ import appeng.util.Platform; public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternItem { // rather simple client side caching. - private static final Map SIMPLE_CACHE = new WeakHashMap(); + private static final Map SIMPLE_CACHE = new WeakHashMap<>(); public ItemEncodedPattern() { @@ -63,7 +63,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt { this.clearPattern( player.getHeldItem( hand ), player ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); } @Override diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index 8faffb809..1ec0da45a 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -105,7 +105,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte { if( this.subTypes == null ) { - this.subTypes = new ArrayList( 1000 ); + this.subTypes = new ArrayList<>( 1000 ); for( final Object blk : Block.REGISTRY ) { final Block b = (Block) blk; diff --git a/src/main/java/appeng/items/parts/ItemPart.java b/src/main/java/appeng/items/parts/ItemPart.java index 37dcd2919..d54b3aff0 100644 --- a/src/main/java/appeng/items/parts/ItemPart.java +++ b/src/main/java/appeng/items/parts/ItemPart.java @@ -197,7 +197,7 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup @Override protected void getCheckedSubItems( final CreativeTabs creativeTab, final NonNullList itemStacks ) { - final List> types = new ArrayList>( this.registered.entrySet() ); + final List> types = new ArrayList<>( this.registered.entrySet() ); Collections.sort( types, REGISTERED_COMPARATOR ); for( final Entry part : types ) diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index dd273341b..fd46e0fa9 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -223,7 +223,7 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe public ActionResult onItemRightClick( final World world, final EntityPlayer player, final EnumHand hand ) { this.disassembleDrive( player.getHeldItem( hand ), world, player ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); } private boolean disassembleDrive( final ItemStack stack, final World world, final EntityPlayer player ) diff --git a/src/main/java/appeng/items/storage/ItemViewCell.java b/src/main/java/appeng/items/storage/ItemViewCell.java index 898664580..a6ac43b96 100644 --- a/src/main/java/appeng/items/storage/ItemViewCell.java +++ b/src/main/java/appeng/items/storage/ItemViewCell.java @@ -51,7 +51,7 @@ public class ItemViewCell extends AEBaseItem implements ICellWorkbenchItem { IPartitionList myPartitionList = null; - final MergedPriorityList myMergedList = new MergedPriorityList(); + final MergedPriorityList myMergedList = new MergedPriorityList<>(); for( final ItemStack currentViewCell : list ) { @@ -107,11 +107,11 @@ public class ItemViewCell extends AEBaseItem implements ICellWorkbenchItem { if( hasFuzzy ) { - myMergedList.addNewList( new FuzzyPriorityList( priorityList, fzMode ), !hasInverter ); + myMergedList.addNewList( new FuzzyPriorityList<>( priorityList, fzMode ), !hasInverter ); } else { - myMergedList.addNewList( new PrecisePriorityList( priorityList ), !hasInverter ); + myMergedList.addNewList( new PrecisePriorityList<>( priorityList ), !hasInverter ); } myPartitionList = myMergedList; diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index fdd3e6c38..0740090d4 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -60,10 +60,10 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard { this.encode( p.getHeldItem( hand ), p ); p.swingArm( hand ); - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } - return new ActionResult( EnumActionResult.PASS, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.PASS, p.getHeldItem( hand ) ); } @Override diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index c938bc558..2f8c4a30a 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -90,7 +90,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / } } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } @Override diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 050dce9d9..2e18418fc 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -87,7 +87,7 @@ import appeng.util.item.AEItemStack; public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem { - private static final Map ORE_TO_COLOR = new HashMap(); + private static final Map ORE_TO_COLOR = new HashMap<>(); static { @@ -279,7 +279,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe } else { - final LinkedList list = new LinkedList(); + final LinkedList list = new LinkedList<>(); for( final IAEItemStack i : itemList ) { diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 97556f7f5..d812ab33e 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -63,8 +63,8 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT { super( AEConfig.instance().getEntropyManipulatorBattery() ); - this.heatUp = new HashMap(); - this.coolDown = new HashMap(); + this.heatUp = new HashMap<>(); + this.coolDown = new HashMap<>(); this.coolDown.put( new InWorldToolOperationIngredient( Blocks.STONE.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.COBBLESTONE ) ) ); @@ -75,7 +75,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT new InWorldToolOperationResult( new ItemStack( Blocks.OBSIDIAN ) ) ); this.coolDown.put( new InWorldToolOperationIngredient( Blocks.GRASS, true ), new InWorldToolOperationResult( new ItemStack( Blocks.DIRT ) ) ); - final List snowBalls = new ArrayList(); + final List snowBalls = new ArrayList<>(); snowBalls.add( new ItemStack( Items.SNOWBALL ) ); this.coolDown.put( new InWorldToolOperationIngredient( Blocks.FLOWING_WATER, true ), new InWorldToolOperationResult( ItemStack.EMPTY, snowBalls ) ); this.coolDown.put( new InWorldToolOperationIngredient( Blocks.WATER, true ), new InWorldToolOperationResult( new ItemStack( Blocks.ICE ) ) ); @@ -218,7 +218,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT if( target == null ) { - return new ActionResult( EnumActionResult.FAIL, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.FAIL, p.getHeldItem( hand ) ); } else { @@ -235,7 +235,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT } } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } @Override @@ -290,7 +290,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT } final ItemStack[] stack = Platform.getBlockDrops( w, pos ); - final List out = new ArrayList(); + final List out = new ArrayList<>(); boolean hasFurnaceable = false; boolean canFurnaceable = true; diff --git a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java index 1cf22ae62..c383de55e 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java @@ -136,21 +136,21 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell if( Platform.isClient() ) { - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } aeAmmo.setStackSize( 1 ); final ItemStack ammo = ( (IAEItemStack) aeAmmo ).getItemStack(); if( ammo == null ) { - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } ammo.setCount( 1 ); aeAmmo = inv.extractItems( aeAmmo, Actionable.MODULATE, new PlayerSource( p, null ) ); if( aeAmmo == null ) { - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } final LookDirection dir = Platform.getPlayerRay( p, p.getEyeHeight() ); @@ -172,7 +172,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell { this.shootPaintBalls( type, w, p, Vec3d, Vec3d1, direction, d0, d1, d2 ); } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } else { @@ -186,11 +186,11 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell { p.sendMessage( PlayerMessages.AmmoDepleted.get() ); } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } } } - return new ActionResult( EnumActionResult.FAIL, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.FAIL, p.getHeldItem( hand ) ); } private void shootPaintBalls( final ItemStack type, final World w, final EntityPlayer p, final Vec3d Vec3d, final Vec3d Vec3d1, final Vec3d direction, final double d0, final double d1, final double d2 ) diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index 4f820c3e9..225a3660f 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -68,7 +68,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, public ActionResult onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) { Platform.openGUI( player, null, AEPartLocation.INTERNAL, GuiBridge.GUI_PORTABLE_CELL ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); } @SideOnly( Side.CLIENT ) diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index 3a9b3df80..785b2f8a9 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -60,7 +60,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless public ActionResult onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) { AEApi.instance().registries().wireless().openWirelessTerminalGui( player.getHeldItem( hand ), w, player ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, player.getHeldItem( hand ) ); } @SideOnly( Side.CLIENT ) diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java index 085fe28f7..0fd8fb449 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java @@ -67,7 +67,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem Platform.openGUI( p, null, AEPartLocation.INTERNAL, GuiBridge.GUI_QUARTZ_KNIFE ); } p.swingArm( hand ); - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); + return new ActionResult<>( EnumActionResult.SUCCESS, p.getHeldItem( hand ) ); } @Override diff --git a/src/main/java/appeng/me/Grid.java b/src/main/java/appeng/me/Grid.java index 066d9d552..daab0dbd5 100644 --- a/src/main/java/appeng/me/Grid.java +++ b/src/main/java/appeng/me/Grid.java @@ -44,8 +44,8 @@ import appeng.util.ReadOnlyCollection; public class Grid implements IGrid { private final NetworkEventBus eventBus = new NetworkEventBus(); - private final Map, MachineSet> machines = new HashMap, MachineSet>(); - private final Map, GridCacheWrapper> caches = new HashMap, GridCacheWrapper>(); + private final Map, MachineSet> machines = new HashMap<>(); + private final Map, GridCacheWrapper> caches = new HashMap<>(); private GridNode pivot; private int priority; // how import is this network? private GridStorage myStorage; @@ -233,7 +233,7 @@ public class Grid implements IGrid { final Set> machineKeys = this.machines.keySet(); - return new ReadOnlyCollection>( machineKeys ); + return new ReadOnlyCollection<>( machineKeys ); } @Override diff --git a/src/main/java/appeng/me/GridConnection.java b/src/main/java/appeng/me/GridConnection.java index cde195820..a243f4a09 100644 --- a/src/main/java/appeng/me/GridConnection.java +++ b/src/main/java/appeng/me/GridConnection.java @@ -242,7 +242,7 @@ public class GridConnection implements IGridConnection, IPathItem @Override public IReadOnlyCollection getPossibleOptions() { - return new ReadOnlyCollection( Arrays.asList( (IPathItem) this.a(), (IPathItem) this.b() ) ); + return new ReadOnlyCollection<>( Arrays.asList( (IPathItem) this.a(), (IPathItem) this.b() ) ); } @Override diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 6a8939351..504aa2950 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -62,7 +62,7 @@ public class GridNode implements IGridNode, IPathItem private static final MENetworkChannelsChanged EVENT = new MENetworkChannelsChanged(); private static final int[] CHANNEL_COUNT = { 0, 8, 32 }; - private final List connections = new LinkedList(); + private final List connections = new LinkedList<>(); private final IGridBlock gridProxy; // old power draw, used to diff private double previousDraw = 0.0; @@ -161,14 +161,14 @@ public class GridNode implements IGridNode, IPathItem { final Object tracker = new Object(); - LinkedList nextRun = new LinkedList(); + LinkedList nextRun = new LinkedList<>(); nextRun.add( this ); this.visitorIterationNumber = tracker; if( g instanceof IGridConnectionVisitor ) { - final LinkedList nextConn = new LinkedList(); + final LinkedList nextConn = new LinkedList<>(); final IGridConnectionVisitor gcv = (IGridConnectionVisitor) g; while( !nextRun.isEmpty() ) @@ -179,7 +179,7 @@ public class GridNode implements IGridNode, IPathItem } final Iterable thisRun = nextRun; - nextRun = new LinkedList(); + nextRun = new LinkedList<>(); for( final GridNode n : thisRun ) { @@ -192,7 +192,7 @@ public class GridNode implements IGridNode, IPathItem while( !nextRun.isEmpty() ) { final Iterable thisRun = nextRun; - nextRun = new LinkedList(); + nextRun = new LinkedList<>(); for( final GridNode n : thisRun ) { @@ -301,7 +301,7 @@ public class GridNode implements IGridNode, IPathItem @Override public IReadOnlyCollection getConnections() { - return new ReadOnlyCollection( this.connections ); + return new ReadOnlyCollection<>( this.connections ); } @Override diff --git a/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java index 057f7c5ac..65b91e41e 100644 --- a/src/main/java/appeng/me/GridStorage.java +++ b/src/main/java/appeng/me/GridStorage.java @@ -40,7 +40,7 @@ public class GridStorage implements IGridStorage private final long myID; private final NBTTagCompound data; private final GridStorageSearch mySearchEntry; // keep myself in the list until I'm - private final WeakHashMap divided = new WeakHashMap(); + private final WeakHashMap divided = new WeakHashMap<>(); private WeakReference internalGrid = null; // lost... @@ -123,7 +123,7 @@ public class GridStorage implements IGridStorage void setGrid( final Grid grid ) { - this.internalGrid = new WeakReference( grid ); + this.internalGrid = new WeakReference<>( grid ); } @Override diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index ebbb34285..42247b63d 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/src/main/java/appeng/me/NetworkEventBus.java @@ -36,8 +36,8 @@ import appeng.core.AELog; public class NetworkEventBus { - private static final Collection READ_CLASSES = new HashSet(); - private static final Map, Map> EVENTS = new HashMap, Map>(); + private static final Collection READ_CLASSES = new HashSet<>(); + private static final Map, Map> EVENTS = new HashMap<>(); void readClass( final Class listAs, final Class c ) { @@ -63,7 +63,7 @@ public class NetworkEventBus Map classEvents = EVENTS.get( types[0] ); if( classEvents == null ) { - EVENTS.put( types[0], classEvents = new HashMap() ); + EVENTS.put( types[0], classEvents = new HashMap<>() ); } MENetworkEventInfo thisEvent = classEvents.get( listAs ); @@ -201,7 +201,7 @@ public class NetworkEventBus private class MENetworkEventInfo { - private final List methods = new ArrayList(); + private final List methods = new ArrayList<>(); private void Add( final Class Event, final Class ObjClass, final Method ObjMethod ) { diff --git a/src/main/java/appeng/me/NetworkList.java b/src/main/java/appeng/me/NetworkList.java index f71fe97fb..baa88b436 100644 --- a/src/main/java/appeng/me/NetworkList.java +++ b/src/main/java/appeng/me/NetworkList.java @@ -31,7 +31,7 @@ import java.util.List; public class NetworkList implements Collection { - private List networks = new LinkedList(); + private List networks = new LinkedList<>(); @Override public int size() @@ -108,6 +108,6 @@ public class NetworkList implements Collection @Override public void clear() { - this.networks = new LinkedList(); + this.networks = new LinkedList<>(); } } diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index 17949bbac..e9e30a8e1 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -114,16 +114,16 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper CRAFTING_POOL = Executors.newCachedThreadPool( factory ); } - private final Set craftingCPUClusters = new HashSet(); - private final Set craftingProviders = new HashSet(); - private final Map craftingWatchers = new HashMap(); + private final Set craftingCPUClusters = new HashSet<>(); + private final Set craftingProviders = new HashSet<>(); + private final Map craftingWatchers = new HashMap<>(); private final IGrid grid; - private final Map> craftingMethods = new HashMap>(); - private final Map> craftableItems = new HashMap>(); - private final Set emitableItems = new HashSet(); - private final Map craftingLinks = new HashMap(); + private final Map> craftingMethods = new HashMap<>(); + private final Map> craftableItems = new HashMap<>(); + private final Set emitableItems = new HashSet<>(); + private final Map craftingLinks = new HashMap<>(); private final Multimap interests = HashMultimap.create(); - private final GenericInterestManager interestManager = new GenericInterestManager( this.interests ); + private final GenericInterestManager interestManager = new GenericInterestManager<>( this.interests ); private IStorageGrid storageGrid; private IEnergyGrid energyGrid; private boolean updateList = false; @@ -271,7 +271,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper provider.provideCrafting( this ); } - final Map> tmpCraft = new HashMap>(); + final Map> tmpCraft = new HashMap<>(); // new craftables! for( final ICraftingPatternDetails details : this.craftingMethods.keySet() ) @@ -286,7 +286,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper if( methods == null ) { - tmpCraft.put( out, methods = new TreeSet( COMPARATOR ) ); + tmpCraft.put( out, methods = new TreeSet<>( COMPARATOR ) ); } methods.add( details ); @@ -357,7 +357,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper List details = this.craftingMethods.get( api ); if( details == null ) { - details = new ArrayList(); + details = new ArrayList<>(); details.add( medium ); this.craftingMethods.put( api, details ); } @@ -376,7 +376,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper @Override public List getCellArray( final StorageChannel channel ) { - final List list = new ArrayList( 1 ); + final List list = new ArrayList<>( 1 ); if( channel == StorageChannel.ITEMS ) { @@ -527,7 +527,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper if( target == null ) { - final List validCpusClusters = new ArrayList(); + final List validCpusClusters = new ArrayList<>(); for( final CraftingCPUCluster cpu : this.craftingCPUClusters ) { if( cpu.isActive() && !cpu.isBusy() && cpu.getAvailableStorage() >= job.getByteTotal() ) diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java index d998ac1a6..81d65528b 100644 --- a/src/main/java/appeng/me/cache/EnergyGridCache.java +++ b/src/main/java/appeng/me/cache/EnergyGridCache.java @@ -61,12 +61,12 @@ public class EnergyGridCache implements IEnergyGrid private final NavigableSet interests = Sets.newTreeSet(); private final double averageLength = 40.0; - private final Set providers = new LinkedHashSet(); - private final Set requesters = new LinkedHashSet(); + private final Set providers = new LinkedHashSet<>(); + private final Set requesters = new LinkedHashSet<>(); private final Multiset energyGridProviders = HashMultiset.create(); private final IGrid myGrid; - private final HashMap watchers = new HashMap(); - private final Set localSeen = new HashSet(); + private final HashMap watchers = new HashMap<>(); + private final Set localSeen = new HashSet<>(); /** * estimated power available. */ @@ -354,7 +354,7 @@ public class EnergyGridCache implements IEnergyGrid while( amt > 0 && i.hasNext() ) { final IEnergyGridProvider what = i.next(); - final Set listCopy = new HashSet(); + final Set listCopy = new HashSet<>(); listCopy.addAll( seen ); final double cannotHold = what.injectAEPower( amt, Actionable.SIMULATE, listCopy ); diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 79a2faf4d..543927062 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -59,13 +59,13 @@ public class GridStorageCache implements IStorageGrid { private final IGrid myGrid; - private final HashSet activeCellProviders = new HashSet(); - private final HashSet inactiveCellProviders = new HashSet(); + private final HashSet activeCellProviders = new HashSet<>(); + private final HashSet inactiveCellProviders = new HashSet<>(); private final SetMultimap interests = HashMultimap.create(); - private final GenericInterestManager interestManager = new GenericInterestManager( this.interests ); - private final NetworkMonitor itemMonitor = new NetworkMonitor( this, StorageChannel.ITEMS ); - private final NetworkMonitor fluidMonitor = new NetworkMonitor( this, StorageChannel.FLUIDS ); - private final HashMap watchers = new HashMap(); + private final GenericInterestManager interestManager = new GenericInterestManager<>( this.interests ); + private final NetworkMonitor itemMonitor = new NetworkMonitor<>( this, StorageChannel.ITEMS ); + private final NetworkMonitor fluidMonitor = new NetworkMonitor<>( this, StorageChannel.FLUIDS ); + private final HashMap watchers = new HashMap<>(); private NetworkInventoryHandler myItemNetwork; private NetworkInventoryHandler myFluidNetwork; @@ -284,7 +284,7 @@ public class GridStorageCache implements IStorageGrid switch( chan ) { case FLUIDS: - this.myFluidNetwork = new NetworkInventoryHandler( StorageChannel.FLUIDS, security ); + this.myFluidNetwork = new NetworkInventoryHandler<>( StorageChannel.FLUIDS, security ); for( final ICellProvider cc : this.activeCellProviders ) { for( final IMEInventoryHandler h : cc.getCellArray( chan ) ) @@ -294,7 +294,7 @@ public class GridStorageCache implements IStorageGrid } break; case ITEMS: - this.myItemNetwork = new NetworkInventoryHandler( StorageChannel.ITEMS, security ); + this.myItemNetwork = new NetworkInventoryHandler<>( StorageChannel.ITEMS, security ); for( final ICellProvider cc : this.activeCellProviders ) { for( final IMEInventoryHandler h : cc.getCellArray( chan ) ) @@ -402,7 +402,7 @@ public class GridStorageCache implements IStorageGrid private class CellChangeTracker { - final List data = new LinkedList(); + final List data = new LinkedList<>(); public void postChanges( final StorageChannel channel, final int i, final IMEInventoryHandler h, final BaseActionSource actionSrc ) { diff --git a/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java index e423dea5c..76bab5c9f 100644 --- a/src/main/java/appeng/me/cache/NetworkMonitor.java +++ b/src/main/java/appeng/me/cache/NetworkMonitor.java @@ -70,7 +70,7 @@ public class NetworkMonitor> implements IMEMonitor this.myGridCache = cache; this.myChannel = chan; this.cachedList = (IItemList) chan.createList(); - this.listeners = new HashMap, Object>(); + this.listeners = new HashMap<>(); } @Override diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java index 43fe5c120..a491a8bee 100644 --- a/src/main/java/appeng/me/cache/P2PCache.java +++ b/src/main/java/appeng/me/cache/P2PCache.java @@ -43,9 +43,9 @@ public class P2PCache implements IGridCache { private final IGrid myGrid; - private final HashMap inputs = new HashMap(); + private final HashMap inputs = new HashMap<>(); private final Multimap outputs = LinkedHashMultimap.create(); - private final TunnelCollection NullColl = new TunnelCollection( null, null ); + private final TunnelCollection NullColl = new TunnelCollection<>( null, null ); public P2PCache( final IGrid g ) { diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index 5290f25a6..7617f26af 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -58,10 +58,10 @@ import appeng.tile.networking.TileController; public class PathGridCache implements IPathingGrid { - private final LinkedList active = new LinkedList(); - private final Set controllers = new HashSet(); - private final Set requireChannels = new HashSet(); - private final Set blockDense = new HashSet(); + private final LinkedList active = new LinkedList<>(); + private final Set controllers = new HashSet<>(); + private final Set requireChannels = new HashSet<>(); + private final Set blockDense = new HashSet<>(); private final IGrid myGrid; private int channelsInUse = 0; private int channelsByBlocks = 0; @@ -72,7 +72,7 @@ public class PathGridCache implements IPathingGrid private ControllerState controllerState = ControllerState.NO_CONTROLLER; private int ticksUntilReady = 20; private int lastChannels = 0; - private HashSet semiOpen = new HashSet(); + private HashSet semiOpen = new HashSet<>(); public PathGridCache( final IGrid g ) { @@ -136,8 +136,8 @@ public class PathGridCache implements IPathingGrid { final int nodes = this.myGrid.getNodes().size(); this.ticksUntilReady = 20 + Math.max( 0, nodes / 100 - 20 ); - final HashSet closedList = new HashSet(); - this.semiOpen = new HashSet(); + final HashSet closedList = new HashSet<>(); + this.semiOpen = new HashSet<>(); // myGrid.getPivot().beginVisit( new AdHocChannelUpdater( 0 ) // ); @@ -149,7 +149,7 @@ public class PathGridCache implements IPathingGrid final GridConnection gc = (GridConnection) gcc; if( !( gc.getOtherSide( node ).getMachine() instanceof TileController ) ) { - final List open = new LinkedList(); + final List open = new LinkedList<>(); closedList.add( gc ); open.add( gc ); gc.setControllerRoute( (GridNode) node, true ); @@ -344,7 +344,7 @@ public class PathGridCache implements IPathingGrid final Achievements lastBracket = this.getAchievementBracket( this.lastChannels ); if( currentBracket != lastBracket && currentBracket != null ) { - final Set players = new HashSet(); + final Set players = new HashSet<>(); for( final IGridNode n : this.requireChannels ) { players.add( n.getPlayerID() ); diff --git a/src/main/java/appeng/me/cache/SecurityCache.java b/src/main/java/appeng/me/cache/SecurityCache.java index 4dcb911ee..529f90528 100644 --- a/src/main/java/appeng/me/cache/SecurityCache.java +++ b/src/main/java/appeng/me/cache/SecurityCache.java @@ -46,8 +46,8 @@ public class SecurityCache implements ISecurityGrid { private final IGrid myGrid; - private final List securityProvider = new ArrayList(); - private final HashMap> playerPerms = new HashMap>(); + private final List securityProvider = new ArrayList<>(); + private final HashMap> playerPerms = new HashMap<>(); private long securityKey = -1; public SecurityCache( final IGrid g ) diff --git a/src/main/java/appeng/me/cache/SpatialPylonCache.java b/src/main/java/appeng/me/cache/SpatialPylonCache.java index 6b51aaf82..a10fea2de 100644 --- a/src/main/java/appeng/me/cache/SpatialPylonCache.java +++ b/src/main/java/appeng/me/cache/SpatialPylonCache.java @@ -47,8 +47,8 @@ public class SpatialPylonCache implements ISpatialCache private DimensionalCoord captureMin; private DimensionalCoord captureMax; private boolean isValid = false; - private List ioPorts = new LinkedList(); - private HashMap clusters = new HashMap(); + private List ioPorts = new LinkedList<>(); + private HashMap clusters = new HashMap<>(); public SpatialPylonCache( final IGrid g ) { @@ -64,8 +64,8 @@ public class SpatialPylonCache implements ISpatialCache private void reset( final IGrid grid ) { - this.clusters = new HashMap(); - this.ioPorts = new LinkedList(); + this.clusters = new HashMap<>(); + this.ioPorts = new LinkedList<>(); for( final IGridNode gm : grid.getMachines( TileSpatialIOPort.class ) ) { diff --git a/src/main/java/appeng/me/cache/TickManagerCache.java b/src/main/java/appeng/me/cache/TickManagerCache.java index 4740a9a63..ab5760dcd 100644 --- a/src/main/java/appeng/me/cache/TickManagerCache.java +++ b/src/main/java/appeng/me/cache/TickManagerCache.java @@ -41,10 +41,10 @@ public class TickManagerCache implements ITickManager { private final IGrid myGrid; - private final HashMap alertable = new HashMap(); - private final HashMap sleeping = new HashMap(); - private final HashMap awake = new HashMap(); - private final PriorityQueue upcomingTicks = new PriorityQueue(); + private final HashMap alertable = new HashMap<>(); + private final HashMap sleeping = new HashMap<>(); + private final HashMap awake = new HashMap<>(); + private final PriorityQueue upcomingTicks = new PriorityQueue<>(); private long currentTick = 0; public TickManagerCache( final IGrid g ) diff --git a/src/main/java/appeng/me/cache/helpers/Connections.java b/src/main/java/appeng/me/cache/helpers/Connections.java index 5ea373d89..295cb7ae5 100644 --- a/src/main/java/appeng/me/cache/helpers/Connections.java +++ b/src/main/java/appeng/me/cache/helpers/Connections.java @@ -31,7 +31,7 @@ import appeng.util.IWorldCallable; public class Connections implements IWorldCallable { - private final HashMap connections = new HashMap(); + private final HashMap connections = new HashMap<>(); private final PartP2PTunnelME me; private boolean create = false; private 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 c0caad44e..7763eee28 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java @@ -53,9 +53,9 @@ public class TunnelCollection implements Iterable { if( this.tunnelSources == null ) { - return new NullIterator(); + return new NullIterator<>(); } - return new TunnelIterator( this.tunnelSources, this.clz ); + return new TunnelIterator<>( this.tunnelSources, this.clz ); } public boolean matches( final Class c ) diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 010b4fcc7..20d75d269 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -87,12 +87,12 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU private final WorldCoord min; private final WorldCoord max; private final int[] usedOps = new int[3]; - private final Map tasks = new HashMap(); + private final Map tasks = new HashMap<>(); // INSTANCE sate - private final LinkedList tiles = new LinkedList(); - private final LinkedList storage = new LinkedList(); - private final LinkedList status = new LinkedList(); - private final HashMap, Object> listeners = new HashMap, Object>(); + private final LinkedList tiles = new LinkedList<>(); + private final LinkedList storage = new LinkedList<>(); + private final LinkedList status = new LinkedList<>(); + private final HashMap, Object> listeners = new HashMap<>(); private ICraftingLink myLastLink; private String myName = ""; private boolean isDestroyed = false; diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index d6a97ee96..5f7f38a92 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -260,7 +260,7 @@ public class QuantumCluster implements ILocatable, IAECluster @Override public Iterator getTiles() { - return new ChainedIterator( this.getRing()[0], this.getRing()[1], this.getRing()[2], this.getRing()[3], this.getRing()[4], this + return new ChainedIterator<>( this.getRing()[0], this.getRing()[1], this.getRing()[2], this.getRing()[3], this.getRing()[4], this .getRing()[5], this.getRing()[6], this.getRing()[7], this.center ); } diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java index 0febdedad..c01ba90d3 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java @@ -34,7 +34,7 @@ public class SpatialPylonCluster implements IAECluster private final DimensionalCoord min; private final DimensionalCoord max; - private final List line = new ArrayList(); + private final List line = new ArrayList<>(); private boolean isDestroyed = false; private Axis currentAxis = Axis.UNFORMED; diff --git a/src/main/java/appeng/me/energy/EnergyWatcher.java b/src/main/java/appeng/me/energy/EnergyWatcher.java index ae5c89cf0..881279f45 100644 --- a/src/main/java/appeng/me/energy/EnergyWatcher.java +++ b/src/main/java/appeng/me/energy/EnergyWatcher.java @@ -36,7 +36,7 @@ public class EnergyWatcher implements IEnergyWatcher private final EnergyGridCache gsc; private final IEnergyWatcherHost watcherHost; - private final Set myInterests = new HashSet(); + private final Set myInterests = new HashSet<>(); public EnergyWatcher( final EnergyGridCache cache, final IEnergyWatcherHost host ) { diff --git a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java b/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java index f50a14dc6..a0a14e77d 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java @@ -44,7 +44,7 @@ public class AENetworkProxyMultiblock extends AENetworkProxy implements IGridMul { if( this.getCluster() == null ) { - return new ChainedIterator(); + return new ChainedIterator<>(); } return new ProxyNodeIterator( this.getCluster().getTiles() ); diff --git a/src/main/java/appeng/me/helpers/GenericInterestManager.java b/src/main/java/appeng/me/helpers/GenericInterestManager.java index 21a9be403..1d7a7d4e7 100644 --- a/src/main/java/appeng/me/helpers/GenericInterestManager.java +++ b/src/main/java/appeng/me/helpers/GenericInterestManager.java @@ -43,7 +43,7 @@ public class GenericInterestManager { if( this.transDepth == 0 ) { - this.transactions = new LinkedList(); + this.transactions = new LinkedList<>(); } this.transDepth++; diff --git a/src/main/java/appeng/me/pathfinding/PathSegment.java b/src/main/java/appeng/me/pathfinding/PathSegment.java index f4c78683f..652cf7816 100644 --- a/src/main/java/appeng/me/pathfinding/PathSegment.java +++ b/src/main/java/appeng/me/pathfinding/PathSegment.java @@ -52,7 +52,7 @@ public class PathSegment public boolean step() { final List oldOpen = this.open; - this.open = new LinkedList(); + this.open = new LinkedList<>(); for( final IPathItem i : oldOpen ) { diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java index 981f10ca4..22c9ef67c 100644 --- a/src/main/java/appeng/me/storage/CellInventory.java +++ b/src/main/java/appeng/me/storage/CellInventory.java @@ -58,7 +58,7 @@ public class CellInventory implements ICellInventory private static final String ITEM_PRE_FORMATTED_SLOT = "PF#"; private static final String ITEM_PRE_FORMATTED_NAME = "PN"; private static final String ITEM_PRE_FORMATTED_FUZZY = "FP"; - private static final HashSet BLACK_LIST = new HashSet(); + private static final HashSet BLACK_LIST = new HashSet<>(); private static String[] itemSlots; private static String[] itemSlotCount; private final NBTTagCompound tagCompound; diff --git a/src/main/java/appeng/me/storage/CellInventoryHandler.java b/src/main/java/appeng/me/storage/CellInventoryHandler.java index f019390ac..40a0b563a 100644 --- a/src/main/java/appeng/me/storage/CellInventoryHandler.java +++ b/src/main/java/appeng/me/storage/CellInventoryHandler.java @@ -96,11 +96,11 @@ public class CellInventoryHandler extends MEInventoryHandler imple { if( hasFuzzy ) { - this.setPartitionList( new FuzzyPriorityList( priorityList, fzMode ) ); + this.setPartitionList( new FuzzyPriorityList<>( priorityList, fzMode ) ); } else { - this.setPartitionList( new PrecisePriorityList( priorityList ) ); + this.setPartitionList( new PrecisePriorityList<>( priorityList ) ); } } } diff --git a/src/main/java/appeng/me/storage/ItemWatcher.java b/src/main/java/appeng/me/storage/ItemWatcher.java index fbe9ae642..6889f45bf 100644 --- a/src/main/java/appeng/me/storage/ItemWatcher.java +++ b/src/main/java/appeng/me/storage/ItemWatcher.java @@ -37,7 +37,7 @@ public class ItemWatcher implements IStackWatcher private final GridStorageCache gsc; private final IStackWatcherHost myObject; - private final Set myInterests = new HashSet(); + private final Set myInterests = new HashSet<>(); public ItemWatcher( final GridStorageCache cache, final IStackWatcherHost host ) { diff --git a/src/main/java/appeng/me/storage/MEInventoryHandler.java b/src/main/java/appeng/me/storage/MEInventoryHandler.java index cc7f9a26c..3049daef1 100644 --- a/src/main/java/appeng/me/storage/MEInventoryHandler.java +++ b/src/main/java/appeng/me/storage/MEInventoryHandler.java @@ -53,13 +53,13 @@ public class MEInventoryHandler> implements IMEInventoryHa } else { - this.internal = new MEPassThrough( i, channel ); + this.internal = new MEPassThrough<>( i, channel ); } this.myPriority = 0; this.myWhitelist = IncludeExclude.WHITELIST; this.setBaseAccess( AccessRestriction.READ_WRITE ); - this.myPartitionList = new DefaultPriorityList(); + this.myPartitionList = new DefaultPriorityList<>(); } IncludeExclude getWhitelist() diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java index e3167fdfa..80c0721cf 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java +++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java @@ -49,7 +49,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo private final InventoryAdaptor adaptor; private final IItemList list = AEApi.instance().storage().createItemList(); - private final HashMap, Object> listeners = new HashMap, Object>(); + private final HashMap, Object> listeners = new HashMap<>(); private final NavigableMap memory; private BaseActionSource mySource; private StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY; @@ -57,7 +57,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo public MEMonitorIInventory( final InventoryAdaptor adaptor ) { this.adaptor = adaptor; - this.memory = new ConcurrentSkipListMap(); + this.memory = new ConcurrentSkipListMap<>(); } @Override @@ -143,7 +143,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo public TickRateModulation onTick() { - final LinkedList changes = new LinkedList(); + final LinkedList changes = new LinkedList<>(); this.list.resetStatus(); int high = 0; diff --git a/src/main/java/appeng/me/storage/MEMonitorPassThrough.java b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java index faadc973e..8b41d0b1e 100644 --- a/src/main/java/appeng/me/storage/MEMonitorPassThrough.java +++ b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java @@ -38,7 +38,7 @@ import appeng.util.inv.ItemListIgnoreCrafting; public class MEMonitorPassThrough> extends MEPassThrough implements IMEMonitor, IMEMonitorHandlerReceiver { - private final HashMap, Object> listeners = new HashMap, Object>(); + private final HashMap, Object> listeners = new HashMap<>(); private BaseActionSource changeSource; private IMEMonitor monitor; diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index ea495ca7a..63a799319 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -47,8 +47,8 @@ import appeng.util.ItemSorters; public class NetworkInventoryHandler> implements IMEInventoryHandler { - private static final ThreadLocal DEPTH_MOD = new ThreadLocal(); - private static final ThreadLocal DEPTH_SIM = new ThreadLocal(); + private static final ThreadLocal DEPTH_MOD = new ThreadLocal<>(); + private static final ThreadLocal DEPTH_SIM = new ThreadLocal<>(); private static final Comparator PRIORITY_SORTER = ( o1, o2 ) -> ItemSorters.compareInt( o2, o1 ); private static int currentPass = 0; diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index ce6094ac8..3933bdecf 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -121,7 +121,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, { if( this.getItemStack().getCount() > 0 ) { - final List items = new ArrayList(); + final List items = new ArrayList<>(); items.add( this.is.copy() ); this.host.removePart( this.side, false ); Platform.spawnDrops( this.tile.getWorld(), this.tile.getPos(), items ); diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 1abd4c766..18cd5ebcb 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -79,7 +79,7 @@ import appeng.util.Platform; public class CableBusContainer extends CableBusStorage implements AEMultiTile, ICableBusContainer { - private static final ThreadLocal IS_LOADING = new ThreadLocal(); + private static final ThreadLocal IS_LOADING = new ThreadLocal<>(); private final EnumSet myLayerFlags = EnumSet.noneOf( LayerFlags.class ); private YesNo hasRedstone = YesNo.UNDECIDED; private IPartHost tcb; @@ -412,7 +412,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I final IPart p = this.getPart( side ); if( p != null ) { - final List boxes = new LinkedList(); + final List boxes = new LinkedList<>(); final IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true ); p.getBoxes( bch ); @@ -435,7 +435,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I final IFacadePart p = fc.getFacade( side ); if( p != null ) { - final List boxes = new LinkedList(); + final List boxes = new LinkedList<>(); final IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true ); p.getBoxes( bch, null ); @@ -465,7 +465,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I { if( this.getCenter() == null ) { - final List facades = new LinkedList(); + final List facades = new LinkedList<>(); final IFacadeContainer fc = this.getFacadeContainer(); for( final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS ) @@ -734,7 +734,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I public Iterable getSelectedBoundingBoxesFromPool( final boolean ignoreConnections, final boolean includeFacades, final Entity e, final boolean visual ) { - final List boxes = new LinkedList(); + final List boxes = new LinkedList<>(); final IFacadeContainer fc = this.getFacadeContainer(); for( final AEPartLocation s : AEPartLocation.values() ) diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 65b012fb9..9429ab075 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -68,7 +68,7 @@ public class PartPlacement { private static float eyeHeight = 0.0f; - private final ThreadLocal placing = new ThreadLocal(); + private final ThreadLocal placing = new ThreadLocal<>(); private boolean wasCanceled = false; public static EnumActionResult place( final ItemStack held, final BlockPos pos, EnumFacing side, final EntityPlayer player, final EnumHand hand, final World world, PlaceType pass, final int depth ) @@ -103,7 +103,7 @@ public class PartPlacement if( mop != null ) { - final List is = new LinkedList(); + final List is = new LinkedList<>(); final SelectedPart sp = selectPart( player, host, mop.hitVec.addVector( -mop.getBlockPos().getX(), -mop.getBlockPos().getY(), -mop.getBlockPos().getZ() ) ); diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index ca658b3b5..6d79bb373 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -396,11 +396,11 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine { if( this.getProxy().isActive() && channel == StorageChannel.ITEMS ) { - final List Handler = new ArrayList( 1 ); + final List Handler = new ArrayList<>( 1 ); Handler.add( this.myHandler ); return Handler; } - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java index 8d1b0a2d9..96b94b702 100644 --- a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java @@ -84,7 +84,7 @@ public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane if( state.getBlock().canSilkHarvest( w, pos, state, fakePlayer ) ) { - final List out = new ArrayList( 1 ); + final List out = new ArrayList<>( 1 ); final Item item = Item.getItemFromBlock( state.getBlock() ); if( item != Items.AIR ) diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index 5d6ef2a92..fdc789a2f 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -107,7 +107,7 @@ public class PartToggleBus extends PartBasicState { if( this.getItemStack().getCount() > 0 ) { - final List items = new ArrayList(); + final List items = new ArrayList<>(); items.add( this.getItemStack().copy() ); this.getHost().removePart( this.getSide(), false ); Platform.spawnDrops( this.getTile().getWorld(), this.getTile().getPos(), items ); diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 9110fe171..0aca2c959 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -69,7 +69,7 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip return MODELS.getModels(); } - private final LinkedList which = new LinkedList(); + private final LinkedList which = new LinkedList<>(); private int oldSize = 0; private boolean requested; private IInventory cachedInv; @@ -99,7 +99,7 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip return this.cachedInv; } - final List outs = new LinkedList(); + final List outs = new LinkedList<>(); final TunnelCollection itemTunnels; try diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index ef53b27be..e3185c57d 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -224,7 +224,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I } } - final LinkedList newSides = new LinkedList(); + final LinkedList newSides = new LinkedList<>(); try { for( final PartP2PTunnelME me : this.getOutputs() ) diff --git a/src/main/java/appeng/recipes/GroupIngredient.java b/src/main/java/appeng/recipes/GroupIngredient.java index 926f053fd..4634bd186 100644 --- a/src/main/java/appeng/recipes/GroupIngredient.java +++ b/src/main/java/appeng/recipes/GroupIngredient.java @@ -89,7 +89,7 @@ public class GroupIngredient implements IIngredient return new ItemStack[0]; } - final List out = new LinkedList(); + final List out = new LinkedList<>(); this.isInside = true; try { diff --git a/src/main/java/appeng/recipes/IngredientSet.java b/src/main/java/appeng/recipes/IngredientSet.java index 01b54d525..b6dfe3103 100644 --- a/src/main/java/appeng/recipes/IngredientSet.java +++ b/src/main/java/appeng/recipes/IngredientSet.java @@ -73,7 +73,7 @@ public class IngredientSet implements IIngredient return new ItemStack[0]; } - final List out = new LinkedList(); + final List out = new LinkedList<>(); out.addAll( this.items ); if( out.isEmpty() ) diff --git a/src/main/java/appeng/recipes/RecipeData.java b/src/main/java/appeng/recipes/RecipeData.java index f88cfe98d..06542e207 100644 --- a/src/main/java/appeng/recipes/RecipeData.java +++ b/src/main/java/appeng/recipes/RecipeData.java @@ -32,11 +32,11 @@ import appeng.api.recipes.ICraftHandler; public class RecipeData { - final Map aliases = new HashMap(); - final Map groups = new HashMap(); + final Map aliases = new HashMap<>(); + final Map groups = new HashMap<>(); - final List handlers = new LinkedList(); - final Set knownItem = new HashSet(); + final List handlers = new LinkedList<>(); + final Set knownItem = new HashSet<>(); boolean crash = true; boolean exceptions = true; boolean errorOnMissing = true; diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 2cc9fe7a7..00a70b321 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -84,7 +84,7 @@ import appeng.recipes.handlers.OreRegistration; public class RecipeHandler implements IRecipeHandler { private final RecipeData data; - private final List tokens = new LinkedList(); + private final List tokens = new LinkedList<>(); public RecipeHandler() { @@ -379,7 +379,7 @@ public class RecipeHandler implements IRecipeHandler throw new IllegalStateException( "Recipes must now be loaded in Init." ); } - final Map processed = new HashMap(); + final Map processed = new HashMap<>(); for( final ICraftHandler ch : this.data.handlers ) { try @@ -505,7 +505,7 @@ public class RecipeHandler implements IRecipeHandler private List findRecipe( final ItemStack output ) { - final List out = new LinkedList(); + final List out = new LinkedList<>(); for( final ICraftHandler ch : this.data.handlers ) { @@ -683,8 +683,8 @@ public class RecipeHandler implements IRecipeHandler private List> parseLines( final Iterable subList ) throws RecipeError { - final List> out = new LinkedList>(); - List cList = new LinkedList(); + final List> out = new LinkedList<>(); + List cList = new LinkedList<>(); boolean hasQty = false; int qty = 1; @@ -701,7 +701,7 @@ public class RecipeHandler implements IRecipeHandler { out.add( cList ); } - cList = new LinkedList(); + cList = new LinkedList<>(); } else { diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index 0faa39883..868d51300 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -60,8 +60,8 @@ public final class DisassembleRecipe extends net.minecraftforge.registries.IForg final IItems items = definitions.items(); final IMaterials mats = definitions.materials(); - this.cellMappings = new HashMap( 4 ); - this.nonCellMappings = new HashMap( 5 ); + this.cellMappings = new HashMap<>( 4 ); + this.nonCellMappings = new HashMap<>( 5 ); this.cellMappings.put( items.cell1k(), mats.cell1kPart() ); this.cellMappings.put( items.cell4k(), mats.cell4kPart() ); diff --git a/src/main/java/appeng/recipes/game/ShapedRecipe.java b/src/main/java/appeng/recipes/game/ShapedRecipe.java index 8d6464acc..14a617115 100644 --- a/src/main/java/appeng/recipes/game/ShapedRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapedRecipe.java @@ -105,7 +105,7 @@ public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEn throw new IllegalStateException( ret.toString() ); } - final Map itemMap = new HashMap(); + final Map itemMap = new HashMap<>(); for( ; idx < recipe.length; idx += 2 ) { diff --git a/src/main/java/appeng/recipes/game/ShapelessRecipe.java b/src/main/java/appeng/recipes/game/ShapelessRecipe.java index 53c09c6ce..7d2a8d453 100644 --- a/src/main/java/appeng/recipes/game/ShapelessRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapelessRecipe.java @@ -37,7 +37,7 @@ import appeng.api.recipes.IIngredient; public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistryEntry.Impl implements IRecipe, IRecipeBakeable { - private final ArrayList input = new ArrayList(); + private final ArrayList input = new ArrayList<>(); private ItemStack output = ItemStack.EMPTY; private boolean disable = false; @@ -77,7 +77,7 @@ public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistr return false; } - final ArrayList required = new ArrayList( this.input ); + final ArrayList required = new ArrayList<>( this.input ); for( int x = 0; x < var1.getSizeInventory(); x++ ) { diff --git a/src/main/java/appeng/recipes/handlers/Inscribe.java b/src/main/java/appeng/recipes/handlers/Inscribe.java index fac4fafe2..58a177f79 100644 --- a/src/main/java/appeng/recipes/handlers/Inscribe.java +++ b/src/main/java/appeng/recipes/handlers/Inscribe.java @@ -57,7 +57,7 @@ public final class Inscribe extends InscriberProcess final IInscriberRecipeBuilder builder = AEApi.instance().registries().inscriber().builder(); final ItemStack[] realInput = this.getImprintable().getItemStackSet(); - final List inputs = new ArrayList( realInput.length ); + final List inputs = new ArrayList<>( realInput.length ); Collections.addAll( inputs, realInput ); final ItemStack top = ( this.getTopOptional() == null ) ? ItemStack.EMPTY : this.getTopOptional().getItemStack(); final ItemStack bot = ( this.getBotOptional() == null ) ? ItemStack.EMPTY : this.getBotOptional().getItemStack(); diff --git a/src/main/java/appeng/recipes/handlers/Press.java b/src/main/java/appeng/recipes/handlers/Press.java index 7a7679388..8d1f07311 100644 --- a/src/main/java/appeng/recipes/handlers/Press.java +++ b/src/main/java/appeng/recipes/handlers/Press.java @@ -57,7 +57,7 @@ public final class Press extends InscriberProcess final IInscriberRecipeBuilder builder = AEApi.instance().registries().inscriber().builder(); final ItemStack[] realInput = this.getImprintable().getItemStackSet(); - final List inputs = new ArrayList( realInput.length ); + final List inputs = new ArrayList<>( realInput.length ); Collections.addAll( inputs, realInput ); final ItemStack top = ( this.getTopOptional() == null ) ? ItemStack.EMPTY : this.getTopOptional().getItemStack(); final ItemStack bot = ( this.getBotOptional() == null ) ? ItemStack.EMPTY : this.getBotOptional().getItemStack(); diff --git a/src/main/java/appeng/recipes/handlers/Shaped.java b/src/main/java/appeng/recipes/handlers/Shaped.java index d408b448a..48950bea1 100644 --- a/src/main/java/appeng/recipes/handlers/Shaped.java +++ b/src/main/java/appeng/recipes/handlers/Shaped.java @@ -84,7 +84,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer public void register() throws RegistrationError, MissingIngredientError { char first = 'A'; - final List args = new ArrayList(); + final List args = new ArrayList<>(); for( int y = 0; y < this.rows; y++ ) { diff --git a/src/main/java/appeng/recipes/handlers/Shapeless.java b/src/main/java/appeng/recipes/handlers/Shapeless.java index 22c82ff56..9c2585785 100644 --- a/src/main/java/appeng/recipes/handlers/Shapeless.java +++ b/src/main/java/appeng/recipes/handlers/Shapeless.java @@ -64,7 +64,7 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer @Override public void register() throws RegistrationError, MissingIngredientError { - final List args = new ArrayList(); + final List args = new ArrayList<>(); for( final IIngredient i : this.inputs ) { args.add( i ); diff --git a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java index b4c5c6e6a..ef64acdde 100644 --- a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java +++ b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java @@ -231,7 +231,7 @@ public class RecipeResourceCopier try { final Enumeration entries = jar.entries(); // gives ALL entries in jar - final Collection result = new HashSet( INITIAL_RESOURCE_CAPACITY ); // avoid + final Collection result = new HashSet<>( INITIAL_RESOURCE_CAPACITY ); // avoid // duplicates // in case it is a diff --git a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java index 8c4a5dcc5..3b05d50e4 100644 --- a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java +++ b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java @@ -36,7 +36,7 @@ public class OreDictionaryHandler public static final OreDictionaryHandler INSTANCE = new OreDictionaryHandler(); - private final List oreListeners = new ArrayList(); + private final List oreListeners = new ArrayList<>(); private boolean enableRebaking = false; diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/main/java/appeng/server/ServerHelper.java index d10d89ac1..64d0b3212 100644 --- a/src/main/java/appeng/server/ServerHelper.java +++ b/src/main/java/appeng/server/ServerHelper.java @@ -86,7 +86,7 @@ public class ServerHelper extends CommonHelper } } - 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 5472e343b..193f31f92 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -50,7 +50,7 @@ public final class CompassService { private static final int CHUNK_SIZE = 16; - private final Map worldSet = new HashMap( 10 ); + private final Map worldSet = new HashMap<>( 10 ); private final ExecutorService executor; /** diff --git a/src/main/java/appeng/services/compass/CompassReader.java b/src/main/java/appeng/services/compass/CompassReader.java index d360a3f89..f0d34c786 100644 --- a/src/main/java/appeng/services/compass/CompassReader.java +++ b/src/main/java/appeng/services/compass/CompassReader.java @@ -30,7 +30,7 @@ import com.google.common.base.Preconditions; public final class CompassReader { - private final Map regions = new HashMap( 100 ); + private final Map regions = new HashMap<>( 100 ); private final int dimensionId; private final File worldCompassFolder; diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 81890e508..4a2510b2d 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -56,11 +56,11 @@ public class CachedPlane private final int y_size; private final Chunk[][] myChunks; private final Column[][] myColumns; - private final LinkedList tiles = new LinkedList(); - private final LinkedList ticks = new LinkedList(); + private final LinkedList tiles = new LinkedList<>(); + private final LinkedList ticks = new LinkedList<>(); private final World world; private final IMovableRegistry reg = AEApi.instance().registries().movable(); - private final LinkedList updates = new LinkedList(); + private final LinkedList updates = new LinkedList<>(); private final IBlockDefinition matrixFrame = AEApi.instance().definitions().blocks().matrixFrame(); private int verticalBits; private final IBlockState matrixBlockState; @@ -123,8 +123,8 @@ public class CachedPlane { for( int cz = 0; cz < this.cz_size; cz++ ) { - final LinkedList> rawTiles = new LinkedList>(); - final LinkedList deadTiles = new LinkedList(); + final LinkedList> rawTiles = new LinkedList<>(); + final LinkedList deadTiles = new LinkedList<>(); final Chunk c = w.getChunkFromChunkCoords( minCX + cx, minCZ + cz ); this.myChunks[cx][cz] = c; @@ -452,7 +452,7 @@ public class CachedPlane { if( this.skipThese == null ) { - this.skipThese = new LinkedList(); + this.skipThese = new LinkedList<>(); } this.skipThese.add( yCoord ); } diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 923dc637c..94734de91 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -65,8 +65,8 @@ import appeng.util.SettingsFrom; public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, ICustomNameObject { - private static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal>(); - private static final Map, Map>> HANDLERS = new HashMap, Map>>(); + private static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal<>(); + private static final Map, Map>> HANDLERS = new HashMap<>(); private static final Map, IStackSrc> ITEM_STACKS = new HashMap<>(); private int renderFragment = 0; @Nullable @@ -394,7 +394,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, if( storedHandlers == null ) { - final Map> newStoredHandlers = new EnumMap>( TileEventType.class ); + final Map> newStoredHandlers = new EnumMap<>( TileEventType.class ); HANDLERS.put( clazz, newStoredHandlers ); @@ -422,7 +422,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, if( oldHandlers == null ) { - final List newHandlers = new LinkedList(); + final List newHandlers = new LinkedList<>(); eventToHandlers.put( event, newHandlers ); return newHandlers; @@ -439,7 +439,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, if( list == null ) { - list = new ArrayList(); + list = new ArrayList<>(); handlerSet.put( value, list ); } @@ -624,7 +624,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, public void disableDrops() { - DROP_NO_ITEMS.set( new WeakReference( this ) ); + DROP_NO_ITEMS.set( new WeakReference<>( this ) ); } public void saveChanges() diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/TileCraftingTile.java index 38d867c48..3a46deeeb 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingTile.java @@ -280,7 +280,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP this.cluster.cancel(); final IMEInventory inv = this.cluster.getInventory(); - final LinkedList places = new LinkedList(); + final LinkedList places = new LinkedList<>(); final Iterator i = this.cluster.getTiles(); while( i.hasNext() ) diff --git a/src/main/java/appeng/tile/grindstone/TileGrinder.java b/src/main/java/appeng/tile/grindstone/TileGrinder.java index 6c8c8cdfe..5251444cc 100644 --- a/src/main/java/appeng/tile/grindstone/TileGrinder.java +++ b/src/main/java/appeng/tile/grindstone/TileGrinder.java @@ -191,7 +191,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable final ItemStack notAdded = sia.addItems( output ); if( !notAdded.isEmpty() ) { - final List out = new ArrayList(); + final List out = new ArrayList<>(); out.add( notAdded ); Platform.spawnDrops( this.world, this.pos.offset( this.getForward() ), out ); diff --git a/src/main/java/appeng/tile/misc/TileCharger.java b/src/main/java/appeng/tile/misc/TileCharger.java index db97dbc33..6ad82f314 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, IGrid } else { - final List drops = new ArrayList(); + final List drops = new ArrayList<>(); drops.add( myItem ); this.setInventorySlotContents( 0, ItemStack.EMPTY ); Platform.spawnDrops( this.world, this.pos.offset( this.getForward() ), drops ); diff --git a/src/main/java/appeng/tile/misc/TilePaint.java b/src/main/java/appeng/tile/misc/TilePaint.java index bd38ba9d8..f7ca2edd3 100644 --- a/src/main/java/appeng/tile/misc/TilePaint.java +++ b/src/main/java/appeng/tile/misc/TilePaint.java @@ -245,7 +245,7 @@ public class TilePaint extends AEBaseTile if( this.dots == null ) { - this.dots = new ArrayList(); + this.dots = new ArrayList<>(); } if( this.dots.size() > 20 ) diff --git a/src/main/java/appeng/tile/misc/TileSecurityStation.java b/src/main/java/appeng/tile/misc/TileSecurityStation.java index 4a6b8d3f4..84e008dc0 100644 --- a/src/main/java/appeng/tile/misc/TileSecurityStation.java +++ b/src/main/java/appeng/tile/misc/TileSecurityStation.java @@ -87,7 +87,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost, private final AppEngInternalInventory configSlot = new AppEngInternalInventory( this, 1 ); private final IConfigManager cm = new ConfigManager( this ); private final SecurityStationInventory inventory = new SecurityStationInventory( this ); - private final MEMonitorHandler securityMonitor = new MEMonitorHandler( this.inventory ); + private final MEMonitorHandler securityMonitor = new MEMonitorHandler<>( this.inventory ); private long securityKey; private AEColor paintedColor = AEColor.TRANSPARENT; private boolean isActive = false; diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 6695baa7f..83c41b0e3 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -675,7 +675,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal // :P } } - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/TileDrive.java index 3c4cc70e7..5f54d903b 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/TileDrive.java @@ -73,8 +73,8 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior private final DriveWatcher[] invBySlot = new DriveWatcher[10]; private final BaseActionSource mySrc; private boolean isCached = false; - private List items = new LinkedList(); - private List fluids = new LinkedList(); + private List items = new LinkedList<>(); + private List fluids = new LinkedList<>(); private int priority = 0; private boolean wasActive = false; diff --git a/src/main/java/appeng/util/ConfigManager.java b/src/main/java/appeng/util/ConfigManager.java index 64c284870..c4c33a92e 100644 --- a/src/main/java/appeng/util/ConfigManager.java +++ b/src/main/java/appeng/util/ConfigManager.java @@ -34,7 +34,7 @@ import appeng.core.AELog; public final class ConfigManager implements IConfigManager { - private final Map> settings = new EnumMap>( Settings.class ); + private final Map> settings = new EnumMap<>( Settings.class ); private final IConfigManagerHost target; public ConfigManager( final IConfigManagerHost tile ) diff --git a/src/main/java/appeng/util/InWorldToolOperationResult.java b/src/main/java/appeng/util/InWorldToolOperationResult.java index 68daf2100..f6094f293 100644 --- a/src/main/java/appeng/util/InWorldToolOperationResult.java +++ b/src/main/java/appeng/util/InWorldToolOperationResult.java @@ -53,7 +53,7 @@ public class InWorldToolOperationResult public static InWorldToolOperationResult getBlockOperationResult( final ItemStack[] items ) { - final List temp = new ArrayList(); + final List temp = new ArrayList<>(); ItemStack b = ItemStack.EMPTY; for( final ItemStack l : items ) diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 555da42ae..a20766ace 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -155,7 +155,7 @@ public class Platform * random source, use it for item drop locations... */ private static final Random RANDOM_GENERATOR = new Random(); - private static final WeakHashMap FAKE_PLAYERS = new WeakHashMap(); + private static final WeakHashMap FAKE_PLAYERS = new WeakHashMap<>(); // private static Method getEntry; private static final ItemComparisonHelper ITEM_COMPARISON_HELPER = new ItemComparisonHelper(); @@ -452,7 +452,7 @@ public class Platform public static ItemStack[] getBlockDrops( final World w, final BlockPos pos ) { - List out = new ArrayList(); + List out = new ArrayList<>(); final IBlockState state = w.getBlockState( pos ); if( state != null ) @@ -1391,7 +1391,7 @@ public class Platform public static > void postListChanges( final IItemList before, final IItemList after, final IMEMonitorHandlerReceiver meMonitorPassthrough, final BaseActionSource source ) { - final LinkedList changes = new LinkedList(); + final LinkedList changes = new LinkedList<>(); for( final T is : before ) { diff --git a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java index f2cf61be7..f120b779f 100644 --- a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java +++ b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java @@ -448,7 +448,7 @@ public class ItemComparisonHelper AELog.debug( t ); } - return new ArrayList(); + return new ArrayList<>(); } } diff --git a/src/main/java/appeng/util/inv/AdaptorPlayerHand.java b/src/main/java/appeng/util/inv/AdaptorPlayerHand.java index ac13186ff..ad73113e7 100644 --- a/src/main/java/appeng/util/inv/AdaptorPlayerHand.java +++ b/src/main/java/appeng/util/inv/AdaptorPlayerHand.java @@ -232,6 +232,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 28fd543ec..c7522ee44 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperChainedInventory.java @@ -52,7 +52,7 @@ public class WrapperChainedInventory implements IInventory private void calculateSizes() { - this.offsets = new HashMap(); + this.offsets = new HashMap<>(); int offset = 0; for( final IInventory in : this.l ) @@ -88,7 +88,7 @@ public class WrapperChainedInventory implements IInventory { if( this.l.size() > 1 ) { - final List newOrder = new ArrayList( this.l.size() ); + final List newOrder = new ArrayList<>( this.l.size() ); newOrder.add( this.l.get( this.l.size() - 1 ) ); for( int x = 0; x < this.l.size() - 1; x++ ) { diff --git a/src/main/java/appeng/util/item/AESharedNBT.java b/src/main/java/appeng/util/item/AESharedNBT.java index fd6bdabba..ad9cce128 100644 --- a/src/main/java/appeng/util/item/AESharedNBT.java +++ b/src/main/java/appeng/util/item/AESharedNBT.java @@ -42,7 +42,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound /* * Shared Tag Compound Cache. */ - private static final WeakHashMap> SHARED_TAG_COMPOUND = new WeakHashMap>(); + private static final WeakHashMap> SHARED_TAG_COMPOUND = new WeakHashMap<>(); private final Item item; private final int meta; private SharedSearchObject sso; @@ -114,7 +114,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound sso.setShared( clone ); clone.sso = sso; - SHARED_TAG_COMPOUND.put( sso, new WeakReference( sso ) ); + SHARED_TAG_COMPOUND.put( sso, new WeakReference<>( sso ) ); return clone; } diff --git a/src/main/java/appeng/util/item/FluidList.java b/src/main/java/appeng/util/item/FluidList.java index e23b46272..4bef3aeff 100644 --- a/src/main/java/appeng/util/item/FluidList.java +++ b/src/main/java/appeng/util/item/FluidList.java @@ -33,7 +33,7 @@ import appeng.api.storage.data.IItemList; public final class FluidList implements IItemList { - private final Map records = new HashMap(); + private final Map records = new HashMap<>(); @Override public void add( final IAEFluidStack option ) @@ -177,7 +177,7 @@ public final class FluidList implements IItemList @Override public Iterator iterator() { - return new MeaningfulFluidIterator( this.records.values().iterator() ); + return new MeaningfulFluidIterator<>( this.records.values().iterator() ); } @Override diff --git a/src/main/java/appeng/util/item/ItemList.java b/src/main/java/appeng/util/item/ItemList.java index 61ae3990e..e6dc5d6fa 100644 --- a/src/main/java/appeng/util/item/ItemList.java +++ b/src/main/java/appeng/util/item/ItemList.java @@ -36,7 +36,7 @@ import appeng.api.storage.data.IItemList; public final class ItemList implements IItemList { - private final NavigableMap records = new ConcurrentSkipListMap(); + private final NavigableMap records = new ConcurrentSkipListMap<>(); @Override public void add( final IAEItemStack option ) @@ -92,7 +92,7 @@ public final class ItemList implements IItemList } else { - final Collection output = new LinkedList(); + final Collection output = new LinkedList<>(); for( final IAEItemStack is : or.getAEEquivalents() ) { @@ -205,7 +205,7 @@ public final class ItemList implements IItemList @Override public Iterator iterator() { - return new MeaningfulItemIterator( this.records.values().iterator() ); + return new MeaningfulItemIterator<>( this.records.values().iterator() ); } @Override diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index 6a3282b2c..a8cde0bdd 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -54,7 +54,7 @@ public class OreHelper } } ); - private final Map references = new HashMap(); + private final Map references = new HashMap<>(); /** * Test if the passed {@link ItemStack} is an ore. @@ -73,7 +73,7 @@ public class OreHelper final Collection ores = ref.getOres(); final Collection set = ref.getEquivalents(); - final Set toAdd = new HashSet(); + final Set toAdd = new HashSet<>(); for( final String ore : OreDictionary.getOreNames() ) { diff --git a/src/main/java/appeng/util/item/OreReference.java b/src/main/java/appeng/util/item/OreReference.java index 6280e3652..50fa19329 100644 --- a/src/main/java/appeng/util/item/OreReference.java +++ b/src/main/java/appeng/util/item/OreReference.java @@ -35,8 +35,8 @@ import appeng.api.storage.data.IAEItemStack; public class OreReference { - private final List otherOptions = new LinkedList(); - private final Set ores = new HashSet(); + private final List otherOptions = new LinkedList<>(); + private final Set ores = new HashSet<>(); private List aeOtherOptions = null; Collection getEquivalents() @@ -48,7 +48,7 @@ public class OreReference { if( this.aeOtherOptions == null ) { - this.aeOtherOptions = new ArrayList( this.otherOptions.size() ); + this.aeOtherOptions = new ArrayList<>( this.otherOptions.size() ); // SUMMON AE STACKS! for( final String oreName : this.otherOptions ) diff --git a/src/main/java/appeng/util/prioritylist/MergedPriorityList.java b/src/main/java/appeng/util/prioritylist/MergedPriorityList.java index 4b8784941..b893ba81e 100644 --- a/src/main/java/appeng/util/prioritylist/MergedPriorityList.java +++ b/src/main/java/appeng/util/prioritylist/MergedPriorityList.java @@ -28,8 +28,8 @@ import appeng.api.storage.data.IAEStack; public final class MergedPriorityList> implements IPartitionList { - private final Collection> positive = new ArrayList>(); - private final Collection> negative = new ArrayList>(); + private final Collection> positive = new ArrayList<>(); + private final Collection> negative = new ArrayList<>(); public void addNewList( final IPartitionList list, final boolean isWhitelist ) { diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index 28f756f7b..de28aeaa8 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -59,8 +59,8 @@ public final class MeteoritePlacer { private static final double PRESSES_SPAWN_CHANCE = 0.7; private static final int SKYSTONE_SPAWN_LIMIT = 12; - private final Collection validSpawn = new HashSet(); - private final Collection invalidSpawn = new HashSet(); + private final Collection validSpawn = new HashSet<>(); + private final Collection invalidSpawn = new HashSet<>(); private final IBlockDefinition skyChestDefinition; private final IBlockDefinition skyStoneDefinition; private final MeteoriteBlockPutter putter = new MeteoriteBlockPutter(); @@ -297,7 +297,7 @@ public final class MeteoritePlacer this.skyStoneDefinition.maybeStack( amount ).ifPresent( ap::addItems ); break; case 1: - final List possibles = new LinkedList(); + final List possibles = new LinkedList<>(); possibles.addAll( OreDictionary.getOres( "nuggetIron" ) ); possibles.addAll( OreDictionary.getOres( "nuggetCopper" ) ); possibles.addAll( OreDictionary.getOres( "nuggetTin" ) );