From d7b97fa7b8e506bac0df9a68ed3e48147246785d Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 27 May 2018 21:15:50 +0200 Subject: [PATCH] Replaced LinkedList with ArrayList or ArrayDeque when applicable. (#3392) --- .../java/appeng/client/gui/AEBaseGui.java | 4 ++-- .../gui/implementations/GuiCraftConfirm.java | 3 +-- .../gui/implementations/GuiCraftingCPU.java | 3 +-- src/main/java/appeng/core/api/ApiPart.java | 4 ++-- .../registries/MovableTileRegistry.java | 7 ++++--- .../registries/RecipeHandlerRegistry.java | 4 ++-- .../sync/packets/PacketMEInventoryUpdate.java | 4 ++-- .../java/appeng/core/worlddata/SpawnData.java | 4 ++-- .../appeng/crafting/CraftingTreeNode.java | 3 +-- src/main/java/appeng/debug/TileItemGen.java | 4 ++-- src/main/java/appeng/debug/ToolEraser.java | 6 +++--- .../java/appeng/helpers/DualityInterface.java | 6 +++--- src/main/java/appeng/hooks/TickHandler.java | 15 ++++++++------- .../integration/IntegrationRegistry.java | 4 ++-- .../modules/jei/RecipeTransferHandler.java | 4 ++-- .../appeng/items/materials/ItemMaterial.java | 4 ++-- .../tools/powered/ToolColorApplicator.java | 6 +++--- src/main/java/appeng/me/GridNode.java | 13 +++++++------ .../appeng/me/cache/GridStorageCache.java | 6 +++--- .../java/appeng/me/cache/PathGridCache.java | 6 +++--- .../appeng/me/cache/SpatialPylonCache.java | 6 +++--- .../implementations/CraftingCPUCluster.java | 10 +++++----- .../me/helpers/GenericInterestManager.java | 9 +++++---- .../appeng/me/pathfinding/PathSegment.java | 4 ++-- .../me/storage/NetworkInventoryHandler.java | 19 ++++++++++--------- .../java/appeng/parts/CableBusContainer.java | 10 +++++----- src/main/java/appeng/parts/PartPlacement.java | 4 ++-- .../parts/networking/PartQuartzFiber.java | 4 ++-- .../java/appeng/parts/p2p/PartP2PFluids.java | 7 ++++--- .../appeng/parts/p2p/PartP2PIC2Power.java | 4 ++-- .../appeng/parts/p2p/PartP2PTunnelME.java | 6 +++--- src/main/java/appeng/spatial/CachedPlane.java | 16 ++++++++-------- .../tile/crafting/TileCraftingTile.java | 6 +++--- src/main/java/appeng/util/Platform.java | 9 ++++----- src/main/java/appeng/util/item/ItemList.java | 4 ++-- .../java/appeng/util/item/OreReference.java | 3 +-- .../java/appeng/worldgen/MeteoritePlacer.java | 4 ++-- 37 files changed, 118 insertions(+), 117 deletions(-) diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 52f9aeac6..b399553b9 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -22,11 +22,11 @@ package appeng.client.gui; import java.io.IOException; import java.text.DecimalFormat; import java.text.ParseException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -84,7 +84,7 @@ import appeng.helpers.InventoryAction; public abstract class AEBaseGui extends GuiContainer { - private final List meSlots = new LinkedList<>(); + private final List meSlots = new ArrayList<>(); // drag y private final Set drag_click = new HashSet<>(); private final StackSizeRenderer stackSizeRenderer = new StackSizeRenderer(); diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index ef6b729ef..9eb962ae5 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.text.NumberFormat; import java.util.ArrayList; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import com.google.common.base.Joiner; @@ -238,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 ArrayList<>(); 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 8f06b5f62..f51a7a9a4 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -22,7 +22,6 @@ package appeng.client.gui.implementations; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -212,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 ArrayList<>(); int toolPosX = 0; int toolPosY = 0; diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index a8b580674..1805edec1 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -22,9 +22,9 @@ package appeng.core.api; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -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 ArrayList<>(); /** * 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/MovableTileRegistry.java b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java index 28b0048ba..e0359c0cc 100644 --- a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java +++ b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java @@ -19,9 +19,10 @@ package appeng.core.features.registries; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; @@ -39,8 +40,8 @@ public class MovableTileRegistry implements IMovableRegistry private final HashSet blacklisted = new HashSet<>(); private final HashMap, IMovableHandler> Valid = new HashMap<>(); - private final LinkedList> test = new LinkedList<>(); - private final LinkedList handlers = new LinkedList<>(); + private final List> test = new ArrayList<>(); + private final List handlers = new ArrayList<>(); private final DefaultSpatialHandler dsh = new DefaultSpatialHandler(); private final IMovableHandler nullHandler = new DefaultSpatialHandler(); diff --git a/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java b/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java index db5dfdb84..5f89f14c5 100644 --- a/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java +++ b/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java @@ -19,9 +19,9 @@ package appeng.core.features.registries; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.LinkedList; import java.util.Locale; import java.util.Map; @@ -44,7 +44,7 @@ import appeng.recipes.RecipeHandler; public class RecipeHandlerRegistry implements IRecipeHandlerRegistry { private final Map> handlers = new HashMap<>( 20 ); - private final Collection resolvers = new LinkedList<>(); + private final Collection resolvers = new ArrayList<>(); @Override public void addNewCraftHandler( final String name, final Class handler ) diff --git a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java index e31b1e38a..d1b9021f8 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java +++ b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.BufferOverflowException; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; @@ -77,7 +77,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket { this.data = null; this.compressFrame = null; - this.list = new LinkedList<>(); + this.list = new ArrayList<>(); 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 89ccf4b03..f0f35bbe4 100644 --- a/src/main/java/appeng/core/worlddata/SpawnData.java +++ b/src/main/java/appeng/core/worlddata/SpawnData.java @@ -23,8 +23,8 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedList; import javax.annotation.Nonnull; @@ -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 ArrayList<>(); synchronized( SpawnData.class ) { diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/main/java/appeng/crafting/CraftingTreeNode.java index cd6c4024e..d9d6149b3 100644 --- a/src/main/java/appeng/crafting/CraftingTreeNode.java +++ b/src/main/java/appeng/crafting/CraftingTreeNode.java @@ -21,7 +21,6 @@ package appeng.crafting; import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedList; import java.util.List; import com.google.common.collect.Lists; @@ -122,7 +121,7 @@ public class CraftingTreeNode { this.job.handlePausing(); - final List thingsUsed = new LinkedList<>(); + final List thingsUsed = new ArrayList<>(); this.what.setStackSize( l ); if( this.getSlot() >= 0 && this.parent != null && this.parent.details.isCraftable() ) diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index 68776088a..92819aedb 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -19,7 +19,7 @@ package appeng.debug; -import java.util.LinkedList; +import java.util.ArrayDeque; import java.util.Queue; import javax.annotation.Nonnull; @@ -40,7 +40,7 @@ import appeng.tile.AEBaseTile; public class TileItemGen extends AEBaseTile { - private static final Queue POSSIBLE_ITEMS = new LinkedList<>(); + private static final Queue POSSIBLE_ITEMS = new ArrayDeque<>(); private final IItemHandler handler = new QueuedItemHandler(); diff --git a/src/main/java/appeng/debug/ToolEraser.java b/src/main/java/appeng/debug/ToolEraser.java index 0f201d17c..4d4f29f1b 100644 --- a/src/main/java/appeng/debug/ToolEraser.java +++ b/src/main/java/appeng/debug/ToolEraser.java @@ -19,7 +19,7 @@ package appeng.debug; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import net.minecraft.block.state.IBlockState; @@ -50,14 +50,14 @@ public class ToolEraser extends AEBaseItem final IBlockState state = world.getBlockState( pos ); - List next = new LinkedList<>(); + List next = new ArrayList<>(); next.add( pos ); int blocks = 0; while( blocks < BLOCK_ERASE_LIMIT && !next.isEmpty() ) { final List c = next; - next = new LinkedList<>(); + next = new ArrayList<>(); for( final BlockPos wc : c ) { diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 9228e8027..52b4bb5d7 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -19,11 +19,11 @@ package appeng.helpers; +import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Optional; @@ -274,7 +274,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn if( this.waitingToSend == null ) { - this.waitingToSend = new LinkedList<>(); + this.waitingToSend = new ArrayList<>(); } this.waitingToSend.add( is ); @@ -491,7 +491,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn { if( this.craftingList == null ) { - this.craftingList = new LinkedList<>(); + this.craftingList = new ArrayList<>(); } this.craftingList.add( details ); diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index 36024aaeb..97ced90dd 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -19,11 +19,13 @@ package appeng.hooks; +import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; +import java.util.List; import java.util.Queue; import java.util.Set; import java.util.WeakHashMap; @@ -60,7 +62,7 @@ public class TickHandler { public static final TickHandler INSTANCE = new TickHandler(); - private final Queue> serverQueue = new LinkedList<>(); + private final Queue> serverQueue = new ArrayDeque<>(); private final Multimap craftingJobs = LinkedListMultimap.create(); private final WeakHashMap>> callQueue = new WeakHashMap<>(); private final HandlerRep server = new HandlerRep(); @@ -90,7 +92,7 @@ public class TickHandler if( queue == null ) { - queue = new LinkedList<>(); + queue = new ArrayDeque<>(); this.callQueue.put( w, queue ); } @@ -146,7 +148,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 List toDestroy = new ArrayList<>(); this.getRepo().updateNetworks(); for( final Grid g : this.getRepo().networks ) @@ -296,15 +298,14 @@ public class TickHandler private static class HandlerRep { - private Queue tiles = new LinkedList<>(); - + private Queue tiles = new ArrayDeque<>(); private Set networks = new HashSet<>(); private Set toAdd = new HashSet<>(); private Set toRemove = new HashSet<>(); private void clear() { - this.tiles = new LinkedList<>(); + this.tiles = new ArrayDeque<>(); this.networks = new HashSet<>(); this.toAdd = new HashSet<>(); this.toRemove = new HashSet<>(); diff --git a/src/main/java/appeng/integration/IntegrationRegistry.java b/src/main/java/appeng/integration/IntegrationRegistry.java index b1e64c86e..d4cfbf453 100644 --- a/src/main/java/appeng/integration/IntegrationRegistry.java +++ b/src/main/java/appeng/integration/IntegrationRegistry.java @@ -19,8 +19,8 @@ package appeng.integration; +import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedList; import net.minecraftforge.fml.relauncher.FMLLaunchHandler; import net.minecraftforge.fml.relauncher.Side; @@ -30,7 +30,7 @@ public enum IntegrationRegistry { INSTANCE; - private final Collection modules = new LinkedList<>(); + private final Collection modules = new ArrayList<>(); 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 1e3ccd4fb..4bda1835e 100644 --- a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java +++ b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java @@ -20,7 +20,7 @@ package appeng.integration.modules.jei; import java.io.IOException; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -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 ArrayList<>(); final ItemStack displayed = ingredient.getDisplayedIngredient(); // prefer currently displayed item diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java index 419a3794b..7bcabff62 100644 --- a/src/main/java/appeng/items/materials/ItemMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMaterial.java @@ -19,11 +19,11 @@ package appeng.items.materials; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -106,7 +106,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 ArrayList<>(); for( final Entry j : u.getSupported().entrySet() ) { String name = null; diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 705ab7872..f1d7fd089 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -357,7 +357,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe if( blk instanceof BlockColored ) { - final EnumDyeColor color = (EnumDyeColor) state.getValue( BlockColored.COLOR ); + final EnumDyeColor color = state.getValue( BlockColored.COLOR ); if( newColor.dye == color ) { @@ -374,7 +374,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe if( blk == Blocks.STAINED_GLASS ) { - final EnumDyeColor color = (EnumDyeColor) state.getValue( BlockStainedGlass.COLOR ); + final EnumDyeColor color = state.getValue( BlockStainedGlass.COLOR ); if( newColor.dye == color ) { @@ -391,7 +391,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe if( blk == Blocks.STAINED_GLASS_PANE ) { - final EnumDyeColor color = (EnumDyeColor) state.getValue( BlockStainedGlassPane.COLOR ); + final EnumDyeColor color = state.getValue( BlockStainedGlassPane.COLOR ); if( newColor.dye == color ) { diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index d2c31eee1..6dc863a48 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -19,11 +19,12 @@ package appeng.me; +import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.Deque; import java.util.EnumSet; -import java.util.LinkedList; import java.util.List; import net.minecraft.nbt.NBTTagCompound; @@ -64,7 +65,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 ArrayList<>(); private final IGridBlock gridProxy; // old power draw, used to diff private double previousDraw = 0.0; @@ -163,14 +164,14 @@ public class GridNode implements IGridNode, IPathItem { final Object tracker = new Object(); - LinkedList nextRun = new LinkedList<>(); + Deque nextRun = new ArrayDeque<>(); nextRun.add( this ); this.visitorIterationNumber = tracker; if( g instanceof IGridConnectionVisitor ) { - final LinkedList nextConn = new LinkedList<>(); + final Deque nextConn = new ArrayDeque<>(); final IGridConnectionVisitor gcv = (IGridConnectionVisitor) g; while( !nextRun.isEmpty() ) @@ -181,7 +182,7 @@ public class GridNode implements IGridNode, IPathItem } final Iterable thisRun = nextRun; - nextRun = new LinkedList<>(); + nextRun = new ArrayDeque<>(); for( final GridNode n : thisRun ) { @@ -194,7 +195,7 @@ public class GridNode implements IGridNode, IPathItem while( !nextRun.isEmpty() ) { final Iterable thisRun = nextRun; - nextRun = new LinkedList<>(); + nextRun = new ArrayDeque<>(); for( final GridNode n : thisRun ) { diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 43b478ba8..6693b80b8 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -19,10 +19,10 @@ package appeng.me.cache; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.IdentityHashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -215,7 +215,7 @@ public class GridStorageCache implements IStorageGrid { this.storageNetworks.clear(); - final List ll = new LinkedList(); + final List ll = new ArrayList(); ll.addAll( this.inactiveCellProviders ); ll.addAll( this.activeCellProviders ); @@ -331,7 +331,7 @@ public class GridStorageCache implements IStorageGrid private class CellChangeTracker> { - final List> data = new LinkedList<>(); + final List> data = new ArrayList<>(); public void postChanges( final IStorageChannel channel, final int i, final IMEInventoryHandler h, final IActionSource actionSrc ) { diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index ec36033eb..0ee8faff0 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -19,10 +19,10 @@ package appeng.me.cache; +import java.util.ArrayList; import java.util.EnumSet; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -63,7 +63,7 @@ import appeng.tile.networking.TileController; public class PathGridCache implements IPathingGrid { - private final LinkedList active = new LinkedList<>(); + private final List active = new ArrayList<>(); private final Set controllers = new HashSet<>(); private final Set requireChannels = new HashSet<>(); private final Set blockDense = new HashSet<>(); @@ -154,7 +154,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 ArrayList<>(); closedList.add( gc ); open.add( gc ); gc.setControllerRoute( (GridNode) node, true ); diff --git a/src/main/java/appeng/me/cache/SpatialPylonCache.java b/src/main/java/appeng/me/cache/SpatialPylonCache.java index a10fea2de..7bc2f9d29 100644 --- a/src/main/java/appeng/me/cache/SpatialPylonCache.java +++ b/src/main/java/appeng/me/cache/SpatialPylonCache.java @@ -19,8 +19,8 @@ package appeng.me.cache; +import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import appeng.api.networking.IGrid; @@ -47,7 +47,7 @@ public class SpatialPylonCache implements ISpatialCache private DimensionalCoord captureMin; private DimensionalCoord captureMax; private boolean isValid = false; - private List ioPorts = new LinkedList<>(); + private List ioPorts = new ArrayList<>(); private HashMap clusters = new HashMap<>(); public SpatialPylonCache( final IGrid g ) @@ -65,7 +65,7 @@ public class SpatialPylonCache implements ISpatialCache { this.clusters = new HashMap<>(); - this.ioPorts = new LinkedList<>(); + this.ioPorts = new ArrayList<>(); for( final IGridNode gm : grid.getMachines( TileSpatialIOPort.class ) ) { diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 86766b091..0820ba588 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedList; +import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -90,9 +90,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU private final int[] usedOps = new int[3]; 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 List tiles = new ArrayList<>(); + private final List storage = new ArrayList<>(); + private final List status = new ArrayList<>(); private final HashMap, Object> listeners = new HashMap<>(); private ICraftingLink myLastLink; private String myName = ""; @@ -207,7 +207,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU te.setCoreBlock( false ); te.markDirty(); - this.tiles.push( te ); + this.tiles.add( 0, te ); if( te.isStorage() ) { diff --git a/src/main/java/appeng/me/helpers/GenericInterestManager.java b/src/main/java/appeng/me/helpers/GenericInterestManager.java index 1d7a7d4e7..7042dfb66 100644 --- a/src/main/java/appeng/me/helpers/GenericInterestManager.java +++ b/src/main/java/appeng/me/helpers/GenericInterestManager.java @@ -19,8 +19,9 @@ package appeng.me.helpers; +import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedList; +import java.util.List; import com.google.common.collect.Multimap; @@ -31,7 +32,7 @@ public class GenericInterestManager { private final Multimap container; - private LinkedList transactions = null; + private List transactions = null; private int transDepth = 0; public GenericInterestManager( final Multimap interests ) @@ -43,7 +44,7 @@ public class GenericInterestManager { if( this.transDepth == 0 ) { - this.transactions = new LinkedList<>(); + this.transactions = new ArrayList<>(); } this.transDepth++; @@ -55,7 +56,7 @@ public class GenericInterestManager if( this.transDepth == 0 ) { - final LinkedList myActions = this.transactions; + final List myActions = this.transactions; this.transactions = null; for( final SavedTransactions t : myActions ) diff --git a/src/main/java/appeng/me/pathfinding/PathSegment.java b/src/main/java/appeng/me/pathfinding/PathSegment.java index 652cf7816..6209fc60c 100644 --- a/src/main/java/appeng/me/pathfinding/PathSegment.java +++ b/src/main/java/appeng/me/pathfinding/PathSegment.java @@ -19,9 +19,9 @@ package appeng.me.pathfinding; +import java.util.ArrayList; import java.util.EnumSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -52,7 +52,7 @@ public class PathSegment public boolean step() { final List oldOpen = this.open; - this.open = new LinkedList<>(); + this.open = new ArrayList<>(); for( final IPathItem i : oldOpen ) { diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index 914740dd0..7532df646 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -19,10 +19,11 @@ package appeng.me.storage; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Comparator; +import java.util.Deque; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.NavigableMap; import java.util.TreeMap; @@ -45,8 +46,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; @@ -125,7 +126,7 @@ public class NetworkInventoryHandler> implements IMEInvent private boolean diveList( final NetworkInventoryHandler networkInventoryHandler, final Actionable type ) { - final LinkedList cDepth = this.getDepth( type ); + final Deque cDepth = this.getDepth( type ); if( cDepth.contains( networkInventoryHandler ) ) { return true; @@ -180,15 +181,15 @@ public class NetworkInventoryHandler> implements IMEInvent } } - private LinkedList getDepth( final Actionable type ) + private Deque getDepth( final Actionable type ) { - final ThreadLocal depth = type == Actionable.MODULATE ? DEPTH_MOD : DEPTH_SIM; + final ThreadLocal depth = type == Actionable.MODULATE ? DEPTH_MOD : DEPTH_SIM; - LinkedList s = depth.get(); + Deque s = depth.get(); if( s == null ) { - depth.set( s = new LinkedList() ); + depth.set( s = new ArrayDeque<>() ); } return s; @@ -263,7 +264,7 @@ public class NetworkInventoryHandler> implements IMEInvent private boolean diveIteration( final NetworkInventoryHandler networkInventoryHandler, final Actionable type ) { - final LinkedList cDepth = this.getDepth( type ); + final Deque cDepth = this.getDepth( type ); if( cDepth.isEmpty() ) { currentPass++; diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 3b90ed0ee..5c6e3b86a 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -20,8 +20,8 @@ package appeng.parts; import java.io.IOException; +import java.util.ArrayList; import java.util.EnumSet; -import java.util.LinkedList; import java.util.List; import java.util.Random; import java.util.Set; @@ -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 ArrayList<>(); 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 ArrayList<>(); 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 ArrayList<>(); final IFacadeContainer fc = this.getFacadeContainer(); for( final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS ) @@ -735,7 +735,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 ArrayList<>(); 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 cb08a30ff..29b246785 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -19,7 +19,7 @@ package appeng.parts; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -103,7 +103,7 @@ public class PartPlacement if( mop != null ) { - final List is = new LinkedList<>(); + final List is = new ArrayList<>(); 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/networking/PartQuartzFiber.java b/src/main/java/appeng/parts/networking/PartQuartzFiber.java index 13af372d7..f29b80464 100644 --- a/src/main/java/appeng/parts/networking/PartQuartzFiber.java +++ b/src/main/java/appeng/parts/networking/PartQuartzFiber.java @@ -19,9 +19,9 @@ package appeng.parts.networking; +import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; -import java.util.LinkedList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -134,7 +134,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider @Override public Collection providers() { - Collection providers = new LinkedList<>(); + Collection providers = new ArrayList<>(); try { diff --git a/src/main/java/appeng/parts/p2p/PartP2PFluids.java b/src/main/java/appeng/parts/p2p/PartP2PFluids.java index 97cabdd14..0590ef63b 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PFluids.java +++ b/src/main/java/appeng/parts/p2p/PartP2PFluids.java @@ -19,9 +19,10 @@ package appeng.parts.p2p; +import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Deque; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import net.minecraft.item.ItemStack; @@ -252,7 +253,7 @@ public class PartP2PFluids extends PartP2PTunnel implements IFlui if( s == null ) { - DEPTH.set( s = new LinkedList<>() ); + DEPTH.set( s = new ArrayDeque<>() ); } return s; @@ -260,7 +261,7 @@ public class PartP2PFluids extends PartP2PTunnel implements IFlui private List getOutputs( final Fluid input ) { - final List outs = new LinkedList<>(); + final List outs = new ArrayList<>(); try { diff --git a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java index 08db403c6..e9ae8e27c 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java +++ b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java @@ -19,7 +19,7 @@ package appeng.parts.p2p; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; @@ -205,7 +205,7 @@ public class PartP2PIC2Power extends PartP2PTunnel return amount; } - LinkedList options = new LinkedList<>(); + List options = new ArrayList<>(); for( PartP2PIC2Power o : outs ) { if( o.bufferedEnergy1 <= 0.01 ) diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index 93fd8994c..e42dd630b 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -19,9 +19,9 @@ package appeng.parts.p2p; +import java.util.ArrayList; import java.util.EnumSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -224,7 +224,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I } } - final LinkedList newSides = new LinkedList<>(); + final List newSides = new ArrayList<>(); try { for( final PartP2PTunnelME me : this.getOutputs() ) @@ -247,7 +247,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I { final TileEntity start = this.getTile(); final TileEntity end = me.getTile(); - + AELog.debug( e ); AELog.warn( "Failed to establish a ME P2P Tunnel between the tunnels at [x=%d, y=%d, z=%d] and [x=%d, y=%d, z=%d]", diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index f3e256d60..b8ee6de75 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -19,8 +19,8 @@ package appeng.spatial; +import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; @@ -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 List tiles = new ArrayList<>(); + private final List ticks = new ArrayList<>(); private final World world; private final IMovableRegistry reg = AEApi.instance().registries().movable(); - private final LinkedList updates = new LinkedList<>(); + private final List updates = new ArrayList<>(); private int verticalBits; private final IBlockState matrixBlockState; @@ -122,8 +122,8 @@ public class CachedPlane { for( int cz = 0; cz < this.cz_size; cz++ ) { - final LinkedList> rawTiles = new LinkedList<>(); - final LinkedList deadTiles = new LinkedList<>(); + final List> rawTiles = new ArrayList<>(); + final List deadTiles = new ArrayList<>(); final Chunk c = w.getChunkFromChunkCoords( minCX + cx, minCZ + cz ); this.myChunks[cx][cz] = c; @@ -380,7 +380,7 @@ public class CachedPlane } } - LinkedList getUpdates() + List getUpdates() { return this.updates; } @@ -460,7 +460,7 @@ public class CachedPlane { if( this.skipThese == null ) { - this.skipThese = new LinkedList<>(); + this.skipThese = new ArrayList<>(); } this.skipThese.add( yCoord ); } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/TileCraftingTile.java index ef6278e31..f07312d4f 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingTile.java @@ -188,7 +188,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP { if( Platform.isClient() ) { - return (boolean) this.world.getBlockState( this.pos ).getValue( BlockCraftingUnit.FORMED ); + return this.world.getBlockState( this.pos ).getValue( BlockCraftingUnit.FORMED ); } return this.cluster != null; } @@ -218,7 +218,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP } else { - this.setPreviousState( (NBTTagCompound) data.copy() ); + this.setPreviousState( data.copy() ); } } } @@ -343,7 +343,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP { if( Platform.isClient() ) { - return (boolean) this.world.getBlockState( this.pos ).getValue( BlockCraftingUnit.POWERED ); + return this.world.getBlockState( this.pos ).getValue( BlockCraftingUnit.POWERED ); } return this.getProxy().isActive(); } diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 4fc208a4c..cc7f75192 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.EnumSet; -import java.util.LinkedList; import java.util.List; import java.util.Random; import java.util.WeakHashMap; @@ -1134,7 +1133,7 @@ public class Platform public static > T poweredExtraction( final IEnergySource energy, final IMEInventory cell, final T request, final IActionSource src ) { - final T possible = cell.extractItems( (T) request.copy(), Actionable.SIMULATE, src ); + final T possible = cell.extractItems( request.copy(), Actionable.SIMULATE, src ); long retrieved = 0; if( possible != null ) @@ -1166,7 +1165,7 @@ public class Platform public static > T poweredInsert( final IEnergySource energy, final IMEInventory cell, final T input, final IActionSource src ) { - final T possible = cell.injectItems( (T) input.copy(), Actionable.SIMULATE, src ); + final T possible = cell.injectItems( input.copy(), Actionable.SIMULATE, src ); long stored = input.getStackSize(); if( possible != null ) @@ -1185,7 +1184,7 @@ public class Platform if( itemToAdd < input.getStackSize() ) { final long original = input.getStackSize(); - final T split = (T) input.copy(); + final T split = input.copy(); split.decStackSize( itemToAdd ); input.setStackSize( itemToAdd ); split.add( cell.injectItems( input, Actionable.MODULATE, src ) ); @@ -1266,7 +1265,7 @@ public class Platform public static > void postListChanges( final IItemList before, final IItemList after, final IMEMonitorHandlerReceiver meMonitorPassthrough, final IActionSource source ) { - final LinkedList changes = new LinkedList<>(); + final List changes = new ArrayList<>(); for( final T is : before ) { diff --git a/src/main/java/appeng/util/item/ItemList.java b/src/main/java/appeng/util/item/ItemList.java index 7b8eac791..98cc75195 100644 --- a/src/main/java/appeng/util/item/ItemList.java +++ b/src/main/java/appeng/util/item/ItemList.java @@ -19,10 +19,10 @@ package appeng.util.item; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Iterator; -import java.util.LinkedList; import java.util.NavigableMap; import java.util.concurrent.ConcurrentSkipListMap; @@ -90,7 +90,7 @@ public final class ItemList implements IItemList } else { - final Collection output = new LinkedList<>(); + final Collection output = new ArrayList<>(); for( final IAEItemStack is : or.getAEEquivalents() ) { diff --git a/src/main/java/appeng/util/item/OreReference.java b/src/main/java/appeng/util/item/OreReference.java index 05391cccf..a32fa58b1 100644 --- a/src/main/java/appeng/util/item/OreReference.java +++ b/src/main/java/appeng/util/item/OreReference.java @@ -22,7 +22,6 @@ package appeng.util.item; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -35,7 +34,7 @@ import appeng.api.storage.data.IAEItemStack; public class OreReference { - private final List otherOptions = new LinkedList<>(); + private final List otherOptions = new ArrayList<>(); private final Set ores = new HashSet<>(); private List aeOtherOptions = null; diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index d1a75c8db..d4c401fcb 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -19,9 +19,9 @@ package appeng.worldgen; +import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import net.minecraft.block.Block; @@ -295,7 +295,7 @@ public final class MeteoritePlacer this.skyStoneDefinition.maybeStack( amount ).ifPresent( ap::addItems ); break; case 1: - final List possibles = new LinkedList<>(); + final List possibles = new ArrayList<>(); possibles.addAll( OreDictionary.getOres( "nuggetIron" ) ); possibles.addAll( OreDictionary.getOres( "nuggetCopper" ) ); possibles.addAll( OreDictionary.getOres( "nuggetTin" ) );