Modifier are now using a consistent order based on the java conventions

src/main/java/appeng/me/GridNodeCollection.java

@@ -30,7 +30,7 @@ import appeng.api.util.IReadOnlyCollection;
 
 public class GridNodeCollection implements IReadOnlyCollection<IGridNode>
 {
-	final private Map<Class<? extends IGridHost>, MachineSet> machines;
+	private final Map<Class<? extends IGridHost>, MachineSet> machines;
 
 	public GridNodeCollection( Map<Class<? extends IGridHost>, MachineSet> machines )
 	{

src/main/java/appeng/me/GridPropagator.java

@@ -25,7 +25,7 @@ import appeng.api.networking.IGridVisitor;
 
 public class GridPropagator implements IGridVisitor
 {
-	final private Grid g;
+	private final Grid g;
 
 	public GridPropagator( Grid g )
 	{

src/main/java/appeng/me/cache/CraftingGridCache.java

@@ -89,7 +89,7 @@ import appeng.util.ItemSorters;
 public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler<IAEStack>
 {
 
-	final public static ExecutorService CRAFTING_POOL;
+	public static final ExecutorService CRAFTING_POOL;
 	static final Comparator<ICraftingPatternDetails> COMPARATOR = new Comparator<ICraftingPatternDetails>()
 	{
 		@Override

src/main/java/appeng/me/cache/EnergyGridCache.java

@@ -58,14 +58,14 @@ import appeng.me.energy.EnergyWatcher;
 public class EnergyGridCache implements IEnergyGrid
 {
 
-	final public TreeSet<EnergyThreshold> interests = new TreeSet<EnergyThreshold>();
+	public final TreeSet<EnergyThreshold> interests = new TreeSet<EnergyThreshold>();
 	final double AvgLength = 40.0;
 	final Set<IAEPowerStorage> providers = new LinkedHashSet<IAEPowerStorage>();
 	final Set<IAEPowerStorage> requesters = new LinkedHashSet<IAEPowerStorage>();
 	final Multiset<IEnergyGridProvider> energyGridProviders = HashMultiset.create();
 	final IGrid myGrid;
-	final private HashMap<IGridNode, IEnergyWatcher> watchers = new HashMap<IGridNode, IEnergyWatcher>();
-	final private Set<IEnergyGrid> localSeen = new HashSet<IEnergyGrid>();
+	private final HashMap<IGridNode, IEnergyWatcher> watchers = new HashMap<IGridNode, IEnergyWatcher>();
+	private final Set<IEnergyGrid> localSeen = new HashSet<IEnergyGrid>();
 	/**
 	 * estimated power available.
 	 */

src/main/java/appeng/me/cache/GridStorageCache.java

@@ -58,11 +58,11 @@ import appeng.me.storage.NetworkInventoryHandler;
 public class GridStorageCache implements IStorageGrid
 {
 
-	final public IGrid myGrid;
+	public final IGrid myGrid;
 	final HashSet<ICellProvider> activeCellProviders = new HashSet<ICellProvider>();
 	final HashSet<ICellProvider> inactiveCellProviders = new HashSet<ICellProvider>();
-	final private SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create();
-	final public GenericInterestManager<ItemWatcher> interestManager = new GenericInterestManager<ItemWatcher>( this.interests );
+	private final SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create();
+	public final GenericInterestManager<ItemWatcher> interestManager = new GenericInterestManager<ItemWatcher>( this.interests );
 	private final NetworkMonitor<IAEItemStack> itemMonitor = new NetworkMonitor<IAEItemStack>( this, StorageChannel.ITEMS );
 	private final NetworkMonitor<IAEFluidStack> fluidMonitor = new NetworkMonitor<IAEFluidStack>( this, StorageChannel.FLUIDS );
 	private final HashMap<IGridNode, IStackWatcher> watchers = new HashMap<IGridNode, IStackWatcher>();

src/main/java/appeng/me/cache/NetworkMonitor.java

@@ -39,9 +39,9 @@ import appeng.me.storage.ItemWatcher;
 public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
 {
 
-	private final static Deque<NetworkMonitor<?>> DEPTH = new LinkedList<NetworkMonitor<?>>();
-	final private GridStorageCache myGridCache;
-	final private StorageChannel myChannel;
+	private static final Deque<NetworkMonitor<?>> DEPTH = new LinkedList<NetworkMonitor<?>>();
+	private final GridStorageCache myGridCache;
+	private final StorageChannel myChannel;
 	boolean sendEvent = false;
 
 	public NetworkMonitor( GridStorageCache cache, StorageChannel chan )

src/main/java/appeng/me/cache/P2PCache.java

@@ -43,9 +43,9 @@ public class P2PCache implements IGridCache
 {
 
 	final IGrid myGrid;
-	final private HashMap<Long, PartP2PTunnel> inputs = new HashMap<Long, PartP2PTunnel>();
-	final private Multimap<Long, PartP2PTunnel> outputs = LinkedHashMultimap.create();
-	final private TunnelCollection NullColl = new TunnelCollection<PartP2PTunnel>( null, null );
+	private final HashMap<Long, PartP2PTunnel> inputs = new HashMap<Long, PartP2PTunnel>();
+	private final Multimap<Long, PartP2PTunnel> outputs = LinkedHashMultimap.create();
+	private final TunnelCollection NullColl = new TunnelCollection<PartP2PTunnel>( null, null );
 
 	public P2PCache( IGrid g )
 	{

src/main/java/appeng/me/cache/SecurityCache.java

@@ -43,8 +43,8 @@ public class SecurityCache implements ISecurityGrid
 {
 
 	public final IGrid myGrid;
-	final private List<ISecurityProvider> securityProvider = new ArrayList<ISecurityProvider>();
-	final private HashMap<Integer, EnumSet<SecurityPermissions>> playerPerms = new HashMap<Integer, EnumSet<SecurityPermissions>>();
+	private final List<ISecurityProvider> securityProvider = new ArrayList<ISecurityProvider>();
+	private final HashMap<Integer, EnumSet<SecurityPermissions>> playerPerms = new HashMap<Integer, EnumSet<SecurityPermissions>>();
 	private long securityKey = -1;
 
 	public SecurityCache( IGrid g )

src/main/java/appeng/me/cache/helpers/Connections.java

@@ -29,8 +29,8 @@ import appeng.parts.p2p.PartP2PTunnelME;
 public class Connections implements Callable
 {
 
-	final public HashMap<IGridNode, TunnelConnection> connections = new HashMap<IGridNode, TunnelConnection>();
-	final private PartP2PTunnelME me;
+	public final HashMap<IGridNode, TunnelConnection> connections = new HashMap<IGridNode, TunnelConnection>();
+	private final PartP2PTunnelME me;
 	public boolean create = false;
 	public boolean destroy = false;
 

src/main/java/appeng/me/cache/helpers/TunnelConnection.java

@@ -26,8 +26,8 @@ import appeng.parts.p2p.PartP2PTunnelME;
 public class TunnelConnection
 {
 
-	final public PartP2PTunnelME tunnel;
-	final public IGridConnection c;
+	public final PartP2PTunnelME tunnel;
+	public final IGridConnection c;
 
 	public TunnelConnection( PartP2PTunnelME t, IGridConnection con )
 	{

src/main/java/appeng/me/cluster/MBCalculator.java

@@ -31,7 +31,7 @@ import appeng.util.Platform;
 public abstract class MBCalculator
 {
 
-	final private IAEMultiBlock target;
+	private final IAEMultiBlock target;
 
 	public MBCalculator( IAEMultiBlock t )
 	{

src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java

@@ -88,9 +88,9 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
 	final int[] usedOps = new int[3];
 	final Map<ICraftingPatternDetails, TaskProgress> tasks = new HashMap<ICraftingPatternDetails, TaskProgress>();
 	// INSTANCE sate
-	final private LinkedList<TileCraftingTile> tiles = new LinkedList<TileCraftingTile>();
-	final private LinkedList<TileCraftingTile> storage = new LinkedList<TileCraftingTile>();
-	final private LinkedList<TileCraftingMonitorTile> status = new LinkedList<TileCraftingMonitorTile>();
+	private final LinkedList<TileCraftingTile> tiles = new LinkedList<TileCraftingTile>();
+	private final LinkedList<TileCraftingTile> storage = new LinkedList<TileCraftingTile>();
+	private final LinkedList<TileCraftingMonitorTile> status = new LinkedList<TileCraftingMonitorTile>();
 	private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object>();
 	public ICraftingLink myLastLink;
 	public String myName = "";

src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java

@@ -37,7 +37,7 @@ import appeng.tile.qnb.TileQuantumBridge;
 public class QuantumCalculator extends MBCalculator
 {
 
-	final private TileQuantumBridge tqb;
+	private final TileQuantumBridge tqb;
 
 	public QuantumCalculator( IAEMultiBlock t )
 	{

src/main/java/appeng/me/cluster/implementations/QuantumCluster.java

@@ -48,8 +48,8 @@ import appeng.util.iterators.ChainedIterator;
 public class QuantumCluster implements ILocatable, IAECluster
 {
 
-	final public WorldCoord min;
-	final public WorldCoord max;
+	public final WorldCoord min;
+	public final WorldCoord max;
 	public boolean isDestroyed = false;
 	public boolean updateStatus = true;
 	public TileQuantumBridge[] Ring;

src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java

@@ -32,8 +32,8 @@ import appeng.tile.spatial.TileSpatialPylon;
 public class SpatialPylonCluster implements IAECluster
 {
 
-	final public DimensionalCoord min;
-	final public DimensionalCoord max;
+	public final DimensionalCoord min;
+	public final DimensionalCoord max;
 	final List<TileSpatialPylon> line = new ArrayList<TileSpatialPylon>();
 	public boolean isDestroyed = false;
 

src/main/java/appeng/me/helpers/AENetworkProxy.java

@@ -56,9 +56,9 @@ import appeng.util.Platform;
 public class AENetworkProxy implements IGridBlock
 {
 
-	final private IGridProxyable gp;
-	final private boolean worldNode;
-	final private String nbtName; // name
+	private final IGridProxyable gp;
+	private final boolean worldNode;
+	private final String nbtName; // name
 	public AEColor myColor = AEColor.Transparent;
 	NBTTagCompound data = null; // input
 	private ItemStack myRepInstance;

src/main/java/appeng/me/pathfinding/AdHocChannelUpdater.java

@@ -29,7 +29,7 @@ import appeng.me.GridNode;
 public class AdHocChannelUpdater implements IGridConnectionVisitor
 {
 
-	final private int usedChannels;
+	private final int usedChannels;
 
 	public AdHocChannelUpdater( int used )
 	{

src/main/java/appeng/me/storage/CellInventory.java

@@ -57,10 +57,10 @@ public class CellInventory implements ICellInventory
 	static final String ITEM_PRE_FORMATTED_NAME = "PN";
 	static final String ITEM_PRE_FORMATTED_FUZZY = "FP";
 	private static final HashSet<Integer> BLACK_LIST = new HashSet<Integer>();
-	static protected String[] ITEM_SLOT_ARR;
-	static protected String[] ITEM_SLOT_COUNT_ARR;
-	final protected NBTTagCompound tagCompound;
-	final protected ISaveProvider container;
+	protected static String[] ITEM_SLOT_ARR;
+	protected static String[] ITEM_SLOT_COUNT_ARR;
+	protected final NBTTagCompound tagCompound;
+	protected final ISaveProvider container;
 	protected int MAX_ITEM_TYPES = 63;
 	protected short storedItems = 0;
 	protected int storedItemCount = 0;

src/main/java/appeng/me/storage/MEInventoryHandler.java

@@ -36,8 +36,8 @@ import appeng.util.prioitylist.IPartitionList;
 public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHandler<T>
 {
 
-	final protected IMEMonitor<T> monitor;
-	final protected IMEInventoryHandler<T> internal;
+	protected final IMEMonitor<T> monitor;
+	protected final IMEInventoryHandler<T> internal;
 	final StorageChannel channel;
 	private int myPriority;
 	private IncludeExclude myWhitelist;

src/main/java/appeng/me/storage/MEPassThrough.java

@@ -32,7 +32,7 @@ import appeng.api.storage.data.IItemList;
 public class MEPassThrough<T extends IAEStack<T>> implements IMEInventoryHandler<T>
 {
 
-	final protected StorageChannel channel;
+	protected final StorageChannel channel;
 	private IMEInventory<T> internal;
 
 	public MEPassThrough( IMEInventory<T> i, StorageChannel channel )

src/main/java/appeng/me/storage/NetworkInventoryHandler.java

@@ -49,7 +49,7 @@ public class NetworkInventoryHandler<T extends IAEStack<T>> implements IMEInvent
 
 	static final ThreadLocal<LinkedList> DEPTH_MOD = new ThreadLocal<LinkedList>();
 	static final ThreadLocal<LinkedList> DEPTH_SIM = new ThreadLocal<LinkedList>();
-	private final static Comparator<Integer> PRIORITY_SORTER = new Comparator<Integer>()
+	private static final Comparator<Integer> PRIORITY_SORTER = new Comparator<Integer>()
 	{
 
 		@Override

src/main/java/appeng/me/storage/SecurityInventory.java

@@ -39,7 +39,7 @@ import appeng.tile.misc.TileSecurity;
 public class SecurityInventory implements IMEInventoryHandler<IAEItemStack>
 {
 
-	final public IItemList<IAEItemStack> storedItems = AEApi.instance().storage().createItemList();
+	public final IItemList<IAEItemStack> storedItems = AEApi.instance().storage().createItemList();
 	final TileSecurity securityTile;
 
 	public SecurityInventory( TileSecurity ts )