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
@@ -55,7 +55,7 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon
public static final double TUNNEL_POWER_LOSS = 0.05;
public static final String VERSION = "@version@";
public static final String CHANNEL = "@aechannel@";
public final static String PACKET_CHANNEL = "AE";
public static final String PACKET_CHANNEL = "AE";
public static AEConfig instance;
public final IConfigManager settings = new ConfigManager( this );
public final EnumSet<AEFeature> featureFlags = EnumSet.noneOf( AEFeature.class );
@@ -63,7 +63,7 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon
public final int[] priorityByStacks = new int[] { 1, 10, 100, 1000 };
public final int[] levelByStacks = new int[] { 1, 10, 100, 1000 };
private final double WirelessHighWirelessCount = 64;
final private File configFile;
private final File configFile;
public int storageBiomeID = -1;
public int storageProviderID = -1;
public int formationPlaneEntityLimit = 128;
+3 -3
View File
@@ -55,9 +55,9 @@ import appeng.util.Platform;
@Mod( modid = AppEng.MOD_ID, acceptedMinecraftVersions = "[1.7.10]", name = AppEng.MOD_NAME, version = AEConfig.VERSION, dependencies = AppEng.MOD_DEPENDENCIES, guiFactory = "appeng.client.gui.config.AEConfigGuiFactory" )
public class AppEng
{
public final static String MOD_ID = "appliedenergistics2";
public final static String MOD_NAME = "Applied Energistics 2";
public final static String MOD_DEPENDENCIES =
public static final String MOD_ID = "appliedenergistics2";
public static final String MOD_NAME = "Applied Energistics 2";
public static final String MOD_DEPENDENCIES =
// a few mods, AE should load after, probably.
// required-after:AppliedEnergistics2API|all;
// "after:gregtech_addon;after:Mekanism;after:IC2;after:ThermalExpansion;after:BuildCraft|Core;" +
+1 -1
View File
@@ -121,7 +121,7 @@ import appeng.worldgen.QuartzWorldGen;
public final class Registration
{
final public static Registration INSTANCE = new Registration();
public static final Registration INSTANCE = new Registration();
private final RecipeHandler recipeHandler;
private final DefinitionConverter converter;
@@ -31,7 +31,7 @@ import appeng.core.AELog;
public class GridCacheRegistry implements IGridCacheRegistry
{
final private HashMap<Class<? extends IGridCache>, Class<? extends IGridCache>> caches = new HashMap<Class<? extends IGridCache>, Class<? extends IGridCache>>();
private final HashMap<Class<? extends IGridCache>, Class<? extends IGridCache>> caches = new HashMap<Class<? extends IGridCache>, Class<? extends IGridCache>>();
@Override
public void registerGridCache( Class<? extends IGridCache> iface, Class<? extends IGridCache> implementation )
@@ -25,8 +25,8 @@ import net.minecraft.tileentity.TileEntity;
public class WirelessRangeResult
{
final public float dist;
final public TileEntity te;
public final float dist;
public final TileEntity te;
public WirelessRangeResult( TileEntity t, float d )
{
@@ -30,7 +30,7 @@ import appeng.api.features.IWorldGen;
public final class WorldGenRegistry implements IWorldGen
{
static final public WorldGenRegistry INSTANCE = new WorldGenRegistry();
public static final WorldGenRegistry INSTANCE = new WorldGenRegistry();
final TypeSet[] types;
private WorldGenRegistry()
@@ -43,7 +43,7 @@ public abstract class AppEngPacket
throw new RuntimeException( "This packet ( " + this.getPacketID() + " does not implement a server side handler." );
}
final public int getPacketID()
public final int getPacketID()
{
return AppEngPacketHandlerBase.PacketTypes.getID( this.getClass() ).ordinal();
}
@@ -40,11 +40,11 @@ import appeng.util.item.AEItemStack;
public class PacketAssemblerAnimation extends AppEngPacket
{
final public int x;
final public int y;
final public int z;
final public byte rate;
final public IAEItemStack is;
public final int x;
public final int y;
public final int z;
public final byte rate;
public final IAEItemStack is;
// automatic.
public PacketAssemblerAnimation( ByteBuf stream ) throws IOException
@@ -36,10 +36,10 @@ import appeng.services.compass.ICompassCallback;
public class PacketCompassRequest extends AppEngPacket implements ICompassCallback
{
final public long attunement;
final public int cx;
final public int cz;
final public int cdy;
public final long attunement;
public final int cx;
public final int cz;
public final int cdy;
EntityPlayer talkBackTo;
@@ -33,10 +33,10 @@ import appeng.hooks.CompassResult;
public class PacketCompassResponse extends AppEngPacket
{
final public long attunement;
final public int cx;
final public int cz;
final public int cdy;
public final long attunement;
public final int cx;
public final int cz;
public final int cdy;
public CompassResult cr;
@@ -50,8 +50,8 @@ public class PacketCompressedNBT extends AppEngPacket
// input.
final NBTTagCompound in;
// output...
final private ByteBuf data;
final private GZIPOutputStream compressFrame;
private final ByteBuf data;
private final GZIPOutputStream compressFrame;
int writtenBytes = 0;
boolean empty = true;
@@ -37,8 +37,8 @@ import appeng.util.Platform;
public class PacketConfigButton extends AppEngPacket
{
final public Settings option;
final public boolean rotationDirection;
public final Settings option;
public final boolean rotationDirection;
// automatic.
public PacketConfigButton( ByteBuf stream )
@@ -46,8 +46,8 @@ import appeng.util.Platform;
public class PacketCraftRequest extends AppEngPacket
{
final public long amount;
final public boolean heldShift;
public final long amount;
public final boolean heldShift;
// automatic.
public PacketCraftRequest( ByteBuf stream )
@@ -44,10 +44,10 @@ import appeng.util.item.AEItemStack;
public class PacketInventoryAction extends AppEngPacket
{
final public InventoryAction action;
final public int slot;
final public long id;
final public IAEItemStack slotItem;
public final InventoryAction action;
public final int slot;
public final long id;
public final IAEItemStack slotItem;
// automatic.
public PacketInventoryAction( ByteBuf stream ) throws IOException
@@ -36,9 +36,9 @@ import appeng.core.sync.network.INetworkInfo;
public class PacketMockExplosion extends AppEngPacket
{
final public double x;
final public double y;
final public double z;
public final double x;
public final double y;
public final double z;
// automatic.
public PacketMockExplosion( ByteBuf stream )
@@ -39,11 +39,11 @@ import appeng.util.item.AEItemStack;
public class PacketPatternSlot extends AppEngPacket
{
final public IAEItemStack slotItem;
public final IAEItemStack slotItem;
final public IAEItemStack[] pattern = new IAEItemStack[9];
public final IAEItemStack[] pattern = new IAEItemStack[9];
final public boolean shift;
public final boolean shift;
// automatic.
public PacketPatternSlot( ByteBuf stream ) throws IOException
@@ -45,7 +45,7 @@ import appeng.util.Platform;
public class PacketTransitionEffect extends AppEngPacket
{
final public boolean mode;
public final boolean mode;
final double x;
final double y;
final double z;
@@ -59,8 +59,8 @@ import appeng.helpers.IMouseWheelItem;
public class PacketValueConfig extends AppEngPacket
{
final public String Name;
final public String Value;
public final String Name;
public final String Value;
// automatic.
public PacketValueConfig( ByteBuf stream ) throws IOException