Modifier are now using a consistent order based on the java conventions
This commit is contained in:
+1
-1
@@ -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
|
||||
|
||||
+3
-3
@@ -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.
|
||||
*/
|
||||
|
||||
+3
-3
@@ -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>();
|
||||
|
||||
+3
-3
@@ -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 )
|
||||
|
||||
+3
-3
@@ -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 )
|
||||
{
|
||||
|
||||
+2
-2
@@ -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 )
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
|
||||
@@ -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 )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user