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

This commit is contained in:
yueh
2015-04-06 00:35:42 +02:00
parent e2d0e5d424
commit eaf57bedf6
109 changed files with 268 additions and 268 deletions
+2 -2
View File
@@ -150,7 +150,7 @@ public class Platform
/*
* random source, use it for item drop locations...
*/
static private final Random RANDOM_GENERATOR = new Random();
private static final Random RANDOM_GENERATOR = new Random();
private static final WeakHashMap<World, EntityPlayer> FAKE_PLAYERS = new WeakHashMap<World, EntityPlayer>();
private static Field tagList;
private static Class playerInstance;
@@ -1442,7 +1442,7 @@ public class Platform
gs.postAlterationOfStoredItems( StorageChannel.ITEMS, itemChanges, src );
}
static public <T extends IAEStack<T>> void postListChanges( IItemList<T> before, IItemList<T> after, IMEMonitorHandlerReceiver<T> meMonitorPassthrough, BaseActionSource source )
public static <T extends IAEStack<T>> void postListChanges( IItemList<T> before, IItemList<T> after, IMEMonitorHandlerReceiver<T> meMonitorPassthrough, BaseActionSource source )
{
LinkedList<T> changes = new LinkedList<T>();
@@ -36,9 +36,9 @@ import appeng.util.iterators.NullIterator;
public class AdaptorBCPipe extends InventoryAdaptor
{
final private IBC bc;
final private TileEntity i;
final private ForgeDirection d;
private final IBC bc;
private final TileEntity i;
private final ForgeDirection d;
public AdaptorBCPipe( TileEntity s, ForgeDirection dd )
{
@@ -33,9 +33,9 @@ import appeng.integration.abstraction.IBC;
public class WrapperBCPipe implements IInventory
{
final private IBC bc;
final private TileEntity ad;
final private ForgeDirection dir;
private final IBC bc;
private final TileEntity ad;
private final ForgeDirection dir;
public WrapperBCPipe( TileEntity te, ForgeDirection d )
{
@@ -74,7 +74,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound
/*
* Returns an NBT Compound that is used for accelerating comparisons.
*/
synchronized public static NBTTagCompound getSharedTagCompound( NBTTagCompound tagCompound, ItemStack s )
public static synchronized NBTTagCompound getSharedTagCompound( NBTTagCompound tagCompound, ItemStack s )
{
if( tagCompound.hasNoTags() )
return null;
+10 -10
View File
@@ -54,7 +54,7 @@ public final class ItemList<StackType extends IAEStack> implements IItemList<Sta
}
@Override
synchronized public void add( StackType option )
public synchronized void add( StackType option )
{
if( this.checkStackType( option ) )
return;
@@ -85,7 +85,7 @@ public final class ItemList<StackType extends IAEStack> implements IItemList<Sta
}
@Override
synchronized public StackType findPrecise( StackType i )
public synchronized StackType findPrecise( StackType i )
{
if( this.checkStackType( i ) )
return null;
@@ -154,7 +154,7 @@ public final class ItemList<StackType extends IAEStack> implements IItemList<Sta
}
@Override
synchronized public void addStorage( StackType option ) // adds a stack as
public synchronized void addStorage( StackType option ) // adds a stack as
// stored.
{
if( this.checkStackType( option ) )
@@ -175,12 +175,12 @@ public final class ItemList<StackType extends IAEStack> implements IItemList<Sta
}
/*
* synchronized public void clean() { Iterator<StackType> i = iterator(); while (i.hasNext()) { StackType AEI =
* public synchronized void clean() { Iterator<StackType> i = iterator(); while (i.hasNext()) { StackType AEI =
* i.next(); if ( !AEI.isMeaningful() ) i.remove(); } }
*/
@Override
synchronized public void addCrafting( StackType option ) // adds a stack as
public synchronized void addCrafting( StackType option ) // adds a stack as
// craftable.
{
if( this.checkStackType( option ) )
@@ -204,7 +204,7 @@ public final class ItemList<StackType extends IAEStack> implements IItemList<Sta
}
@Override
synchronized public void addRequestable( StackType option ) // adds a stack
public synchronized void addRequestable( StackType option ) // adds a stack
// as
// requestable.
{
@@ -230,7 +230,7 @@ public final class ItemList<StackType extends IAEStack> implements IItemList<Sta
}
@Override
synchronized public StackType getFirstItem()
public synchronized StackType getFirstItem()
{
for( StackType stackType : this )
{
@@ -240,19 +240,19 @@ public final class ItemList<StackType extends IAEStack> implements IItemList<Sta
}
@Override
synchronized public int size()
public synchronized int size()
{
return this.records.values().size();
}
@Override
synchronized public Iterator<StackType> iterator()
public synchronized Iterator<StackType> iterator()
{
return new MeaningfulIterator<StackType>( this.records.values().iterator() );
}
@Override
synchronized public void resetStatus()
public synchronized void resetStatus()
{
for( StackType i : this )
i.reset();
@@ -28,7 +28,7 @@ import appeng.api.storage.data.IAEStack;
public class DefaultPriorityList<T extends IAEStack<T>> implements IPartitionList<T>
{
final static List NULL_LIST = new ArrayList();
static final List NULL_LIST = new ArrayList();
@Override
public boolean isListed( T input )