diff --git a/src/api/java/appeng/api/config/FuzzyMode.java b/src/api/java/appeng/api/config/FuzzyMode.java index f59cb64b..c5f91e12 100644 --- a/src/api/java/appeng/api/config/FuzzyMode.java +++ b/src/api/java/appeng/api/config/FuzzyMode.java @@ -29,8 +29,8 @@ public enum FuzzyMode // Note that percentage damaged, is the inverse of percentage durability. IGNORE_ALL( -1 ), PERCENT_99( 0 ), PERCENT_75( 25 ), PERCENT_50( 50 ), PERCENT_25( 75 ); - final public float breakPoint; - final public float percentage; + public final float breakPoint; + public final float percentage; FuzzyMode( float p ) { diff --git a/src/api/java/appeng/api/config/PowerUnits.java b/src/api/java/appeng/api/config/PowerUnits.java index 9ba837c2..c1a46be8 100644 --- a/src/api/java/appeng/api/config/PowerUnits.java +++ b/src/api/java/appeng/api/config/PowerUnits.java @@ -35,7 +35,7 @@ public enum PowerUnits /** * unlocalized name for the power unit. */ - final public String unlocalizedName; + public final String unlocalizedName; /** * please do not edit this value, it is set when AE loads its config files. */ diff --git a/src/api/java/appeng/api/config/SecurityPermissions.java b/src/api/java/appeng/api/config/SecurityPermissions.java index 547fa39e..c3e69062 100644 --- a/src/api/java/appeng/api/config/SecurityPermissions.java +++ b/src/api/java/appeng/api/config/SecurityPermissions.java @@ -57,7 +57,7 @@ public enum SecurityPermissions */ SECURITY; - final private String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase(); + private final String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase(); public String getUnlocalizedName() { diff --git a/src/api/java/appeng/api/events/LocatableEventAnnounce.java b/src/api/java/appeng/api/events/LocatableEventAnnounce.java index 2d8a36a0..ee4a8c73 100644 --- a/src/api/java/appeng/api/events/LocatableEventAnnounce.java +++ b/src/api/java/appeng/api/events/LocatableEventAnnounce.java @@ -37,8 +37,8 @@ import appeng.api.features.ILocatable; public class LocatableEventAnnounce extends Event { - final public ILocatable target; - final public LocatableEvent change; + public final ILocatable target; + public final LocatableEvent change; public LocatableEventAnnounce( ILocatable o, LocatableEvent ev ) { diff --git a/src/api/java/appeng/api/recipes/ResolverResult.java b/src/api/java/appeng/api/recipes/ResolverResult.java index 4141f510..879efab5 100644 --- a/src/api/java/appeng/api/recipes/ResolverResult.java +++ b/src/api/java/appeng/api/recipes/ResolverResult.java @@ -30,9 +30,9 @@ import net.minecraft.nbt.NBTTagCompound; public class ResolverResult { - final public String itemName; - final public int damageValue; - final public NBTTagCompound compound; + public final String itemName; + public final int damageValue; + public final NBTTagCompound compound; public ResolverResult( String name, int damage ) { diff --git a/src/api/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java index 92c44dab..61c7f9c8 100644 --- a/src/api/java/appeng/api/util/AEColor.java +++ b/src/api/java/appeng/api/util/AEColor.java @@ -77,22 +77,22 @@ public enum AEColor /** * Unlocalized name for color. */ - final public String unlocalizedName; + public final String unlocalizedName; /** * Darkest Variant of the color, nearly black; as a RGB HEX Integer */ - final public int blackVariant; + public final int blackVariant; /** * The Variant of the color that is used to represent the color normally; as a RGB HEX Integer */ - final public int mediumVariant; + public final int mediumVariant; /** * Lightest Variant of the color, nearly white; as a RGB HEX Integer */ - final public int whiteVariant; + public final int whiteVariant; AEColor( String unlocalizedName, int blackHex, int medHex, int whiteHex ) { diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 40def1d3..4443b714 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -196,7 +196,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } @Override - final public IFeatureHandler handler() + public final IFeatureHandler handler() { return this.handler; } @@ -279,7 +279,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature @Override @SideOnly( Side.CLIENT ) - final public AxisAlignedBB getSelectedBoundingBoxFromPool( World w, int x, int y, int z ) + public final AxisAlignedBB getSelectedBoundingBoxFromPool( World w, int x, int y, int z ) { ICustomCollision collisionHandler = null; AxisAlignedBB b = null; @@ -360,7 +360,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } @Override - final public boolean isOpaqueCube() + public final boolean isOpaqueCube() { return this.isOpaque; } @@ -421,7 +421,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } @Override - final public boolean onBlockActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ ) + public final boolean onBlockActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ ) { if( player != null ) { @@ -566,13 +566,13 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } @Override - final public boolean isNormalCube( IBlockAccess world, int x, int y, int z ) + public final boolean isNormalCube( IBlockAccess world, int x, int y, int z ) { return this.isFullSize; } @Override - final public boolean rotateBlock( World w, int x, int y, int z, ForgeDirection axis ) + public final boolean rotateBlock( World w, int x, int y, int z, ForgeDirection axis ) { IOrientable rotatable = null; @@ -630,7 +630,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } @Override - final public ForgeDirection[] getValidRotations( World w, int x, int y, int z ) + public final ForgeDirection[] getValidRotations( World w, int x, int y, int z ) { if( this.hasBlockTileEntity() ) { @@ -787,7 +787,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature } @Override - final public TileEntity createNewTileEntity( World var1, int var2 ) + public final TileEntity createNewTileEntity( World var1, int var2 ) { if( this.hasBlockTileEntity() ) { diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 120fb6d5..7aba776b 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -81,8 +81,8 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection { private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer(); - static public Class noTesrTile; - static public Class tesrTile; + public static Class noTesrTile; + public static Class tesrTile; /** * Immibis MB Support. */ diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 9836e711..33df0786 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -270,7 +270,7 @@ public abstract class AEBaseGui extends GuiContainer } @Override - final protected void drawGuiContainerForegroundLayer( int x, int y ) + protected final void drawGuiContainerForegroundLayer( int x, int y ) { int ox = this.guiLeft; // (width - xSize) / 2; int oy = this.guiTop; // (height - ySize) / 2; @@ -285,7 +285,7 @@ public abstract class AEBaseGui extends GuiContainer public abstract void drawFG( int offsetX, int offsetY, int mouseX, int mouseY ); @Override - final protected void drawGuiContainerBackgroundLayer( float f, int x, int y ) + protected final void drawGuiContainerBackgroundLayer( float f, int x, int y ) { int ox = this.guiLeft; // (width - xSize) / 2; int oy = this.guiTop; // (height - ySize) / 2; diff --git a/src/main/java/appeng/client/me/ClientDCInternalInv.java b/src/main/java/appeng/client/me/ClientDCInternalInv.java index 5289b65a..2f440691 100644 --- a/src/main/java/appeng/client/me/ClientDCInternalInv.java +++ b/src/main/java/appeng/client/me/ClientDCInternalInv.java @@ -28,10 +28,10 @@ import appeng.util.ItemSorters; public class ClientDCInternalInv implements Comparable { - final public String unlocalizedName; - final public AppEngInternalInventory inv; - final public long id; - final public long sortBy; + public final String unlocalizedName; + public final AppEngInternalInventory inv; + public final long id; + public final long sortBy; public ClientDCInternalInv( int size, long id, long sortBy, String unlocalizedName ) { diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index f1e4bee7..a98ac0a4 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -49,11 +49,11 @@ import appeng.util.prioitylist.IPartitionList; public class ItemRepo { - final private IItemList list = AEApi.instance().storage().createItemList(); - final private ArrayList view = new ArrayList(); - final private ArrayList dsp = new ArrayList(); - final private IScrollSource src; - final private ISortSource sortSrc; + private final IItemList list = AEApi.instance().storage().createItemList(); + private final ArrayList view = new ArrayList(); + private final ArrayList dsp = new ArrayList(); + private final IScrollSource src; + private final ISortSource sortSrc; public int rowSize = 9; diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 5e7cab36..aa349c56 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -77,7 +77,7 @@ public class BaseBlockRender setOriMap(); } - static public void setOriMap() + public static void setOriMap() { // pointed up... ORIENTATION_MAP[0][3][1] = 0; @@ -309,7 +309,7 @@ public class BaseBlockRender renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; } - static public int getOrientation( ForgeDirection in, ForgeDirection forward, ForgeDirection up ) + public static int getOrientation( ForgeDirection in, ForgeDirection forward, ForgeDirection up ) { if( in == null || in == ForgeDirection.UNKNOWN // 1 || forward == null || forward == ForgeDirection.UNKNOWN // 2 diff --git a/src/main/java/appeng/client/render/BlockRenderInfo.java b/src/main/java/appeng/client/render/BlockRenderInfo.java index b9fb62b7..885655d9 100644 --- a/src/main/java/appeng/client/render/BlockRenderInfo.java +++ b/src/main/java/appeng/client/render/BlockRenderInfo.java @@ -29,7 +29,7 @@ import appeng.client.texture.TmpFlippableIcon; public class BlockRenderInfo { - final public BaseBlockRender rendererInstance; + public final BaseBlockRender rendererInstance; private final TmpFlippableIcon tmpTopIcon = new TmpFlippableIcon(); private final TmpFlippableIcon tmpBottomIcon = new TmpFlippableIcon(); private final TmpFlippableIcon tmpSouthIcon = new TmpFlippableIcon(); diff --git a/src/main/java/appeng/client/render/TESRWrapper.java b/src/main/java/appeng/client/render/TESRWrapper.java index beff5d29..849b1c81 100644 --- a/src/main/java/appeng/client/render/TESRWrapper.java +++ b/src/main/java/appeng/client/render/TESRWrapper.java @@ -40,7 +40,7 @@ import appeng.util.Platform; public class TESRWrapper extends TileEntitySpecialRenderer { - final public RenderBlocks renderBlocksInstance = new RenderBlocks(); + public final RenderBlocks renderBlocksInstance = new RenderBlocks(); final BaseBlockRender blkRender; final double MAX_DISTANCE; @@ -52,7 +52,7 @@ public class TESRWrapper extends TileEntitySpecialRenderer } @Override - final public void renderTileEntityAt( TileEntity te, double x, double y, double z, float f ) + public final void renderTileEntityAt( TileEntity te, double x, double y, double z, float f ) { if( te instanceof AEBaseTile ) { diff --git a/src/main/java/appeng/client/texture/CableBusTextures.java b/src/main/java/appeng/client/texture/CableBusTextures.java index 4f712df9..00c652df 100644 --- a/src/main/java/appeng/client/texture/CableBusTextures.java +++ b/src/main/java/appeng/client/texture/CableBusTextures.java @@ -75,7 +75,7 @@ public enum CableBusTextures PartWirelessSides( "PartWirelessSides" ), PartStorageSides( "PartStorageSides" ), PartStorageBack( "PartStorageBack" ); - final private String name; + private final String name; public IIcon IIcon; CableBusTextures( String name ) diff --git a/src/main/java/appeng/client/texture/ExtraBlockTextures.java b/src/main/java/appeng/client/texture/ExtraBlockTextures.java index 34a50b7b..066267f8 100644 --- a/src/main/java/appeng/client/texture/ExtraBlockTextures.java +++ b/src/main/java/appeng/client/texture/ExtraBlockTextures.java @@ -88,7 +88,7 @@ public enum ExtraBlockTextures BlockPaint2( "BlockPaint2" ), BlockPaint3( "BlockPaint3" ); - final private String name; + private final String name; public IIcon IIcon; ExtraBlockTextures( String name ) diff --git a/src/main/java/appeng/client/texture/ExtraItemTextures.java b/src/main/java/appeng/client/texture/ExtraItemTextures.java index 3794b65c..8c2cd3d8 100644 --- a/src/main/java/appeng/client/texture/ExtraItemTextures.java +++ b/src/main/java/appeng/client/texture/ExtraItemTextures.java @@ -38,7 +38,7 @@ public enum ExtraItemTextures ToolColorApplicatorTip_Light( "ToolColorApplicatorTip_Light" ); - final private String name; + private final String name; public IIcon IIcon; ExtraItemTextures( String name ) diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index 806a5987..3ab458f4 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -86,7 +86,7 @@ public abstract class AEBaseContainer extends Container { protected final InventoryPlayer invPlayer; - final protected BaseActionSource mySrc; + protected final BaseActionSource mySrc; protected final HashSet locked = new HashSet(); final TileEntity tileEntity; final IPart part; @@ -327,7 +327,7 @@ public abstract class AEBaseContainer extends Container return this.tileEntity; } - final public void updateFullProgressBar( int idx, long value ) + public final void updateFullProgressBar( int idx, long value ) { if( this.syncData.containsKey( idx ) ) { @@ -640,7 +640,7 @@ public abstract class AEBaseContainer extends Container } @Override - final public void updateProgressBar( int idx, int value ) + public final void updateProgressBar( int idx, int value ) { if( this.syncData.containsKey( idx ) ) { diff --git a/src/main/java/appeng/container/ContainerOpenContext.java b/src/main/java/appeng/container/ContainerOpenContext.java index b3b2304e..6ee41b10 100644 --- a/src/main/java/appeng/container/ContainerOpenContext.java +++ b/src/main/java/appeng/container/ContainerOpenContext.java @@ -29,7 +29,7 @@ import appeng.api.parts.IPart; public class ContainerOpenContext { - final public boolean isItem; + public final boolean isItem; public World w; public int x; public int y; diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index a5425ba0..96a3661d 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/SlotRestrictedInput.java @@ -224,7 +224,7 @@ public class SlotRestrictedInput extends AppEngSlot return super.getStack(); } - static public boolean isMetalIngot( ItemStack i ) + public static boolean isMetalIngot( ItemStack i ) { if( Platform.isSameItemPrecise( i, new ItemStack( Items.iron_ingot ) ) ) return true; diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 41f5fb76..c12bb014 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -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 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; diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 64e1c420..24b6629d 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -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;" + diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 6b3f8b87..8e605c4d 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -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; diff --git a/src/main/java/appeng/core/features/registries/GridCacheRegistry.java b/src/main/java/appeng/core/features/registries/GridCacheRegistry.java index dbe23d80..a44100c9 100644 --- a/src/main/java/appeng/core/features/registries/GridCacheRegistry.java +++ b/src/main/java/appeng/core/features/registries/GridCacheRegistry.java @@ -31,7 +31,7 @@ import appeng.core.AELog; public class GridCacheRegistry implements IGridCacheRegistry { - final private HashMap, Class> caches = new HashMap, Class>(); + private final HashMap, Class> caches = new HashMap, Class>(); @Override public void registerGridCache( Class iface, Class implementation ) diff --git a/src/main/java/appeng/core/features/registries/WirelessRangeResult.java b/src/main/java/appeng/core/features/registries/WirelessRangeResult.java index 0e372695..2895c47d 100644 --- a/src/main/java/appeng/core/features/registries/WirelessRangeResult.java +++ b/src/main/java/appeng/core/features/registries/WirelessRangeResult.java @@ -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 ) { diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 4d14df70..051e52fd 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -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() diff --git a/src/main/java/appeng/core/sync/AppEngPacket.java b/src/main/java/appeng/core/sync/AppEngPacket.java index 1cda7fbc..4408efe9 100644 --- a/src/main/java/appeng/core/sync/AppEngPacket.java +++ b/src/main/java/appeng/core/sync/AppEngPacket.java @@ -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(); } diff --git a/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java b/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java index 52584982..9129dabf 100644 --- a/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java +++ b/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java @@ -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 diff --git a/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java b/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java index 70ebb478..f90cad6a 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java +++ b/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java @@ -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; diff --git a/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java b/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java index 5d85981d..0307bf72 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java +++ b/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java @@ -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; diff --git a/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java b/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java index f5985fef..a2f3b906 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java +++ b/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java @@ -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; diff --git a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java b/src/main/java/appeng/core/sync/packets/PacketConfigButton.java index 056b3528..4125f1f9 100644 --- a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java +++ b/src/main/java/appeng/core/sync/packets/PacketConfigButton.java @@ -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 ) diff --git a/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java b/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java index cdb258fb..661cdcc6 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java +++ b/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java @@ -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 ) diff --git a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java b/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java index 9e02b5ba..c9fc43d8 100644 --- a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java +++ b/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java @@ -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 diff --git a/src/main/java/appeng/core/sync/packets/PacketMockExplosion.java b/src/main/java/appeng/core/sync/packets/PacketMockExplosion.java index 51578594..91e1b421 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMockExplosion.java +++ b/src/main/java/appeng/core/sync/packets/PacketMockExplosion.java @@ -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 ) diff --git a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java b/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java index 59be00d2..6c961012 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java +++ b/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java @@ -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 diff --git a/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java b/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java index 21931d0c..4669439d 100644 --- a/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java +++ b/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java @@ -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; diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java index 1069246f..9c89acf6 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java @@ -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 diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index e9d32257..55411309 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -49,7 +49,7 @@ public class CraftingTreeProcess final ICraftingPatternDetails details; final CraftingJob job; final Map nodes = new HashMap(); - final private int depth; + private final int depth; public boolean possible = true; World world; long crafts = 0; diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/EntityChargedQuartz.java index 90129bb7..40b60934 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/EntityChargedQuartz.java @@ -40,7 +40,7 @@ import appeng.helpers.Reflected; import appeng.util.Platform; -final public class EntityChargedQuartz extends AEBaseEntityItem +public final class EntityChargedQuartz extends AEBaseEntityItem { int delay = 0; diff --git a/src/main/java/appeng/entity/EntityFloatingItem.java b/src/main/java/appeng/entity/EntityFloatingItem.java index fe6e600f..21614db8 100644 --- a/src/main/java/appeng/entity/EntityFloatingItem.java +++ b/src/main/java/appeng/entity/EntityFloatingItem.java @@ -25,7 +25,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; -final public class EntityFloatingItem extends EntityItem +public final class EntityFloatingItem extends EntityItem { public static int ageStatic = 0; diff --git a/src/main/java/appeng/entity/EntityGrowingCrystal.java b/src/main/java/appeng/entity/EntityGrowingCrystal.java index 567c446d..bc59a747 100644 --- a/src/main/java/appeng/entity/EntityGrowingCrystal.java +++ b/src/main/java/appeng/entity/EntityGrowingCrystal.java @@ -37,7 +37,7 @@ import appeng.core.features.AEFeature; import appeng.util.Platform; -final public class EntityGrowingCrystal extends EntityItem +public final class EntityGrowingCrystal extends EntityItem { private int progress_1000 = 0; diff --git a/src/main/java/appeng/entity/EntitySingularity.java b/src/main/java/appeng/entity/EntitySingularity.java index 4eadca8c..857fbc94 100644 --- a/src/main/java/appeng/entity/EntitySingularity.java +++ b/src/main/java/appeng/entity/EntitySingularity.java @@ -39,10 +39,10 @@ import appeng.helpers.Reflected; import appeng.util.Platform; -final public class EntitySingularity extends AEBaseEntityItem +public final class EntitySingularity extends AEBaseEntityItem { - static private int randTickSeed = 0; + private static int randTickSeed = 0; @Reflected public EntitySingularity( World w ) diff --git a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java index bcd4e51d..28ae9202 100644 --- a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java @@ -44,7 +44,7 @@ import appeng.helpers.Reflected; import appeng.util.Platform; -final public class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntityAdditionalSpawnData +public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntityAdditionalSpawnData { @Reflected public EntityTinyTNTPrimed( World w ) diff --git a/src/main/java/appeng/fmp/CableBusPart.java b/src/main/java/appeng/fmp/CableBusPart.java index e1d35644..bd641627 100644 --- a/src/main/java/appeng/fmp/CableBusPart.java +++ b/src/main/java/appeng/fmp/CableBusPart.java @@ -87,7 +87,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds { public static final ThreadLocal DISABLE_FACADE_OCCLUSION = new ThreadLocal(); - private final static Cuboid6[] SIDE_TESTS = new Cuboid6[] { + private static final Cuboid6[] SIDE_TESTS = new Cuboid6[] { new Cuboid6( 6.0 / 16.0, 0, 6.0 / 16.0, 10.0 / 16.0, 6.0 / 16.0, 10.0 / 16.0 ), // DOWN(0, -1, 0), diff --git a/src/main/java/appeng/fmp/FMPPlacementHelper.java b/src/main/java/appeng/fmp/FMPPlacementHelper.java index 74fadf5d..bdfb212b 100644 --- a/src/main/java/appeng/fmp/FMPPlacementHelper.java +++ b/src/main/java/appeng/fmp/FMPPlacementHelper.java @@ -48,7 +48,7 @@ import appeng.util.Platform; public class FMPPlacementHelper implements IPartHost { - final private static CableBusStorage NULL_STORAGE = new NullStorage(); + private static final CableBusStorage NULL_STORAGE = new NullStorage(); private boolean hasPart = false; private TileMultipart myMP; private CableBusPart myPart; diff --git a/src/main/java/appeng/fmp/PartRegistry.java b/src/main/java/appeng/fmp/PartRegistry.java index eb3d8ba9..452061d0 100644 --- a/src/main/java/appeng/fmp/PartRegistry.java +++ b/src/main/java/appeng/fmp/PartRegistry.java @@ -33,9 +33,9 @@ public enum PartRegistry { QuartzTorchPart( "ae2_torch", BlockQuartzTorch.class, QuartzTorchPart.class ), CableBusPart( "ae2_cablebus", BlockCableBus.class, CableBusPart.class ); - final private String name; - final private Class blk; - final private Class part; + private final String name; + private final Class blk; + private final Class part; PartRegistry( String name, Class blk, Class part ) { diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 3e63c47b..8f8479e8 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -100,7 +100,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn { static final Set badBlocks = new HashSet(); - static private boolean interfaceRequest = false; + private static boolean interfaceRequest = false; final int[] sides = new int[] { 0, 1, 2, 3, 4, 5, 6, 7 }; final IAEItemStack[] requireWork = new IAEItemStack[] { null, null, null, null, null, null, null, null }; final MultiCraftingTracker craftingTracker; diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index 92a37845..a32ca6b9 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -178,7 +178,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable serverQueue = new LinkedList(); final Multimap craftingJobs = LinkedListMultimap.create(); - final private WeakHashMap> callQueue = new WeakHashMap>(); - final private HandlerRep server = new HandlerRep(); - final private HandlerRep client = new HandlerRep(); - final private HashMap cliPlayerColors = new HashMap(); - final private HashMap srvPlayerColors = new HashMap(); + private final WeakHashMap> callQueue = new WeakHashMap>(); + private final HandlerRep server = new HandlerRep(); + private final HandlerRep client = new HandlerRep(); + private final HashMap cliPlayerColors = new HashMap(); + private final HashMap srvPlayerColors = new HashMap(); CableRenderMode crm = CableRenderMode.Standard; public HashMap getPlayerColors() @@ -288,7 +288,7 @@ public class TickHandler } - static public class PlayerColor + public static class PlayerColor { public final AEColor myColor; diff --git a/src/main/java/appeng/integration/modules/RB.java b/src/main/java/appeng/integration/modules/RB.java index 245f3514..ec5e81fd 100644 --- a/src/main/java/appeng/integration/modules/RB.java +++ b/src/main/java/appeng/integration/modules/RB.java @@ -56,7 +56,7 @@ public class RB extends BaseModule implements IRB private class RBWrapper implements appeng.api.util.IOrientable { - final private IOrientable internal; + private final IOrientable internal; public RBWrapper( IOrientable ww ) { diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index bc177dce..68325f2e 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -82,7 +82,7 @@ import appeng.util.item.AEItemStack; public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem { - final static Map ORE_TO_COLOR = new HashMap(); + static final Map ORE_TO_COLOR = new HashMap(); static { diff --git a/src/main/java/appeng/me/GridNodeCollection.java b/src/main/java/appeng/me/GridNodeCollection.java index 7dde8dcd..6c11d15a 100644 --- a/src/main/java/appeng/me/GridNodeCollection.java +++ b/src/main/java/appeng/me/GridNodeCollection.java @@ -30,7 +30,7 @@ import appeng.api.util.IReadOnlyCollection; public class GridNodeCollection implements IReadOnlyCollection { - final private Map, MachineSet> machines; + private final Map, MachineSet> machines; public GridNodeCollection( Map, MachineSet> machines ) { diff --git a/src/main/java/appeng/me/GridPropagator.java b/src/main/java/appeng/me/GridPropagator.java index e14d5199..65d2e17a 100644 --- a/src/main/java/appeng/me/GridPropagator.java +++ b/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 ) { diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index 7678dcfd..1d732bcb 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -89,7 +89,7 @@ import appeng.util.ItemSorters; public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler { - final public static ExecutorService CRAFTING_POOL; + public static final ExecutorService CRAFTING_POOL; static final Comparator COMPARATOR = new Comparator() { @Override diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java index f964d346..578dba1a 100644 --- a/src/main/java/appeng/me/cache/EnergyGridCache.java +++ b/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 interests = new TreeSet(); + public final TreeSet interests = new TreeSet(); final double AvgLength = 40.0; final Set providers = new LinkedHashSet(); final Set requesters = new LinkedHashSet(); final Multiset energyGridProviders = HashMultiset.create(); final IGrid myGrid; - final private HashMap watchers = new HashMap(); - final private Set localSeen = new HashSet(); + private final HashMap watchers = new HashMap(); + private final Set localSeen = new HashSet(); /** * estimated power available. */ diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 8b0ebd33..b3bce2cc 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/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 activeCellProviders = new HashSet(); final HashSet inactiveCellProviders = new HashSet(); - final private SetMultimap interests = HashMultimap.create(); - final public GenericInterestManager interestManager = new GenericInterestManager( this.interests ); + private final SetMultimap interests = HashMultimap.create(); + public final GenericInterestManager interestManager = new GenericInterestManager( this.interests ); private final NetworkMonitor itemMonitor = new NetworkMonitor( this, StorageChannel.ITEMS ); private final NetworkMonitor fluidMonitor = new NetworkMonitor( this, StorageChannel.FLUIDS ); private final HashMap watchers = new HashMap(); diff --git a/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java index 09b4a889..642eeab4 100644 --- a/src/main/java/appeng/me/cache/NetworkMonitor.java +++ b/src/main/java/appeng/me/cache/NetworkMonitor.java @@ -39,9 +39,9 @@ import appeng.me.storage.ItemWatcher; public class NetworkMonitor> extends MEMonitorHandler { - private final static Deque> DEPTH = new LinkedList>(); - final private GridStorageCache myGridCache; - final private StorageChannel myChannel; + private static final Deque> DEPTH = new LinkedList>(); + private final GridStorageCache myGridCache; + private final StorageChannel myChannel; boolean sendEvent = false; public NetworkMonitor( GridStorageCache cache, StorageChannel chan ) diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java index 75c48934..6428a294 100644 --- a/src/main/java/appeng/me/cache/P2PCache.java +++ b/src/main/java/appeng/me/cache/P2PCache.java @@ -43,9 +43,9 @@ public class P2PCache implements IGridCache { final IGrid myGrid; - final private HashMap inputs = new HashMap(); - final private Multimap outputs = LinkedHashMultimap.create(); - final private TunnelCollection NullColl = new TunnelCollection( null, null ); + private final HashMap inputs = new HashMap(); + private final Multimap outputs = LinkedHashMultimap.create(); + private final TunnelCollection NullColl = new TunnelCollection( null, null ); public P2PCache( IGrid g ) { diff --git a/src/main/java/appeng/me/cache/SecurityCache.java b/src/main/java/appeng/me/cache/SecurityCache.java index 3cf6cbf5..30c647f6 100644 --- a/src/main/java/appeng/me/cache/SecurityCache.java +++ b/src/main/java/appeng/me/cache/SecurityCache.java @@ -43,8 +43,8 @@ public class SecurityCache implements ISecurityGrid { public final IGrid myGrid; - final private List securityProvider = new ArrayList(); - final private HashMap> playerPerms = new HashMap>(); + private final List securityProvider = new ArrayList(); + private final HashMap> playerPerms = new HashMap>(); private long securityKey = -1; public SecurityCache( IGrid g ) diff --git a/src/main/java/appeng/me/cache/helpers/Connections.java b/src/main/java/appeng/me/cache/helpers/Connections.java index 8a4d1cf0..5ba4fe46 100644 --- a/src/main/java/appeng/me/cache/helpers/Connections.java +++ b/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 connections = new HashMap(); - final private PartP2PTunnelME me; + public final HashMap connections = new HashMap(); + private final PartP2PTunnelME me; public boolean create = false; public boolean destroy = false; diff --git a/src/main/java/appeng/me/cache/helpers/TunnelConnection.java b/src/main/java/appeng/me/cache/helpers/TunnelConnection.java index f626266a..f1762baa 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelConnection.java +++ b/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 ) { diff --git a/src/main/java/appeng/me/cluster/MBCalculator.java b/src/main/java/appeng/me/cluster/MBCalculator.java index cc4b40f6..8f3f9d87 100644 --- a/src/main/java/appeng/me/cluster/MBCalculator.java +++ b/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 ) { diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index b91b2c10..f7ce461d 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/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 tasks = new HashMap(); // INSTANCE sate - final private LinkedList tiles = new LinkedList(); - final private LinkedList storage = new LinkedList(); - final private LinkedList status = new LinkedList(); + private final LinkedList tiles = new LinkedList(); + private final LinkedList storage = new LinkedList(); + private final LinkedList status = new LinkedList(); private final HashMap, Object> listeners = new HashMap, Object>(); public ICraftingLink myLastLink; public String myName = ""; diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java index fc270f21..d40a3626 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java +++ b/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 ) { diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index b2c0766a..4a663af3 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/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; diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java index 23dfa0f6..f4d40c3e 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java +++ b/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 line = new ArrayList(); public boolean isDestroyed = false; diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index 1a148cc1..7fd35024 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/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; diff --git a/src/main/java/appeng/me/pathfinding/AdHocChannelUpdater.java b/src/main/java/appeng/me/pathfinding/AdHocChannelUpdater.java index 828a0fa5..987f9ca7 100644 --- a/src/main/java/appeng/me/pathfinding/AdHocChannelUpdater.java +++ b/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 ) { diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java index 5e38b495..14c437f9 100644 --- a/src/main/java/appeng/me/storage/CellInventory.java +++ b/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 BLACK_LIST = new HashSet(); - 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; diff --git a/src/main/java/appeng/me/storage/MEInventoryHandler.java b/src/main/java/appeng/me/storage/MEInventoryHandler.java index 9ec4d25b..0eb4a21f 100644 --- a/src/main/java/appeng/me/storage/MEInventoryHandler.java +++ b/src/main/java/appeng/me/storage/MEInventoryHandler.java @@ -36,8 +36,8 @@ import appeng.util.prioitylist.IPartitionList; public class MEInventoryHandler> implements IMEInventoryHandler { - final protected IMEMonitor monitor; - final protected IMEInventoryHandler internal; + protected final IMEMonitor monitor; + protected final IMEInventoryHandler internal; final StorageChannel channel; private int myPriority; private IncludeExclude myWhitelist; diff --git a/src/main/java/appeng/me/storage/MEPassThrough.java b/src/main/java/appeng/me/storage/MEPassThrough.java index 2eeb6813..c3dde45d 100644 --- a/src/main/java/appeng/me/storage/MEPassThrough.java +++ b/src/main/java/appeng/me/storage/MEPassThrough.java @@ -32,7 +32,7 @@ import appeng.api.storage.data.IItemList; public class MEPassThrough> implements IMEInventoryHandler { - final protected StorageChannel channel; + protected final StorageChannel channel; private IMEInventory internal; public MEPassThrough( IMEInventory i, StorageChannel channel ) diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index 1db1ddae..2ed87919 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -49,7 +49,7 @@ public class NetworkInventoryHandler> implements IMEInvent static final ThreadLocal DEPTH_MOD = new ThreadLocal(); static final ThreadLocal DEPTH_SIM = new ThreadLocal(); - private final static Comparator PRIORITY_SORTER = new Comparator() + private static final Comparator PRIORITY_SORTER = new Comparator() { @Override diff --git a/src/main/java/appeng/me/storage/SecurityInventory.java b/src/main/java/appeng/me/storage/SecurityInventory.java index 9d072775..50eb1e1d 100644 --- a/src/main/java/appeng/me/storage/SecurityInventory.java +++ b/src/main/java/appeng/me/storage/SecurityInventory.java @@ -39,7 +39,7 @@ import appeng.tile.misc.TileSecurity; public class SecurityInventory implements IMEInventoryHandler { - final public IItemList storedItems = AEApi.instance().storage().createItemList(); + public final IItemList storedItems = AEApi.instance().storage().createItemList(); final TileSecurity securityTile; public SecurityInventory( TileSecurity ts ) diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index e7713379..e50e7808 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -480,7 +480,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - final public boolean onActivate( EntityPlayer player, Vec3 pos ) + public final boolean onActivate( EntityPlayer player, Vec3 pos ) { if( this.useMemoryCard( player ) ) return true; @@ -489,7 +489,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - final public boolean onShiftActivate( EntityPlayer player, Vec3 pos ) + public final boolean onShiftActivate( EntityPlayer player, Vec3 pos ) { if( this.useMemoryCard( player ) ) return true; diff --git a/src/main/java/appeng/parts/BusCollisionHelper.java b/src/main/java/appeng/parts/BusCollisionHelper.java index 0e5f75e1..85ca8353 100644 --- a/src/main/java/appeng/parts/BusCollisionHelper.java +++ b/src/main/java/appeng/parts/BusCollisionHelper.java @@ -33,12 +33,12 @@ public class BusCollisionHelper implements IPartCollisionHelper final List boxes; - final private ForgeDirection x; - final private ForgeDirection y; - final private ForgeDirection z; + private final ForgeDirection x; + private final ForgeDirection y; + private final ForgeDirection z; - final private Entity entity; - final private boolean isVisual; + private final Entity entity; + private final boolean isVisual; public BusCollisionHelper( List boxes, ForgeDirection x, ForgeDirection y, ForgeDirection z, Entity e, boolean visual ) { diff --git a/src/main/java/appeng/parts/layers/InvLayerData.java b/src/main/java/appeng/parts/layers/InvLayerData.java index adf87f5c..3acc83f1 100644 --- a/src/main/java/appeng/parts/layers/InvLayerData.java +++ b/src/main/java/appeng/parts/layers/InvLayerData.java @@ -30,12 +30,12 @@ public class InvLayerData { // a simple empty array for empty stuff.. - private final static int[] NULL_SIDES = new int[] {}; + private static final int[] NULL_SIDES = new int[] {}; // cache of inventory state. - final private int[][] sides; - final private List inventories; - final private List slots; + private final int[][] sides; + private final List inventories; + private final List slots; public InvLayerData( int[][] a, List b, List c ) { diff --git a/src/main/java/appeng/parts/layers/InvSot.java b/src/main/java/appeng/parts/layers/InvSot.java index 83872574..dc13911b 100644 --- a/src/main/java/appeng/parts/layers/InvSot.java +++ b/src/main/java/appeng/parts/layers/InvSot.java @@ -26,8 +26,8 @@ import net.minecraft.item.ItemStack; public class InvSot { - final public ISidedInventory partInv; - final public int index; + public final ISidedInventory partInv; + public final int index; public InvSot( ISidedInventory part, int slot ) { diff --git a/src/main/java/appeng/parts/layers/LayerISidedInventory.java b/src/main/java/appeng/parts/layers/LayerISidedInventory.java index de5a17ca..bc17777a 100644 --- a/src/main/java/appeng/parts/layers/LayerISidedInventory.java +++ b/src/main/java/appeng/parts/layers/LayerISidedInventory.java @@ -48,7 +48,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory { // a simple empty array for empty stuff.. - private final static int[] NULL_SIDES = new int[] {}; + private static final int[] NULL_SIDES = new int[] {}; InvLayerData invLayer = null; diff --git a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java index b2d6e496..b74ecba2 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java @@ -44,8 +44,8 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl { static final ThreadLocal> DEPTH = new ThreadLocal>(); - private final static FluidTankInfo[] ACTIVE_TANK = new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) }; - private final static FluidTankInfo[] INACTIVE_TANK = new FluidTankInfo[] { new FluidTankInfo( null, 0 ) }; + private static final FluidTankInfo[] ACTIVE_TANK = new FluidTankInfo[] { new FluidTankInfo( null, 10000 ) }; + private static final FluidTankInfo[] INACTIVE_TANK = new FluidTankInfo[] { new FluidTankInfo( null, 0 ) }; IFluidHandler cachedTank; private int tmpUsed; diff --git a/src/main/java/appeng/recipes/Ingredient.java b/src/main/java/appeng/recipes/Ingredient.java index 8984a028..58685d21 100644 --- a/src/main/java/appeng/recipes/Ingredient.java +++ b/src/main/java/appeng/recipes/Ingredient.java @@ -41,12 +41,12 @@ import appeng.api.recipes.ResolverResultSet; public class Ingredient implements IIngredient { - final public boolean isAir; + public final boolean isAir; - final public String nameSpace; - final public String itemName; - final public int meta; - final public int qty; + public final String nameSpace; + public final String itemName; + public final int meta; + public final int qty; NBTTagCompound nbt = null; ItemStack[] baked; diff --git a/src/main/java/appeng/recipes/RecipeData.java b/src/main/java/appeng/recipes/RecipeData.java index 6a7a56cb..cbeeaec4 100644 --- a/src/main/java/appeng/recipes/RecipeData.java +++ b/src/main/java/appeng/recipes/RecipeData.java @@ -31,10 +31,10 @@ import appeng.api.recipes.ICraftHandler; public class RecipeData { - final public HashMap aliases = new HashMap(); - final public HashMap groups = new HashMap(); + public final HashMap aliases = new HashMap(); + public final HashMap groups = new HashMap(); - final public List Handlers = new LinkedList(); + public final List Handlers = new LinkedList(); public final Set knownItem = new HashSet(); public boolean crash = true; public boolean exceptions = true; diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index fb14e1df..8e06998e 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -66,7 +66,7 @@ import appeng.recipes.handlers.OreRegistration; public class RecipeHandler implements IRecipeHandler { - final public List tokens = new LinkedList(); + public final List tokens = new LinkedList(); final RecipeData data; public RecipeHandler() diff --git a/src/main/java/appeng/recipes/handlers/Inscribe.java b/src/main/java/appeng/recipes/handlers/Inscribe.java index 83af0f88..58b76733 100644 --- a/src/main/java/appeng/recipes/handlers/Inscribe.java +++ b/src/main/java/appeng/recipes/handlers/Inscribe.java @@ -113,11 +113,11 @@ public class Inscribe implements ICraftHandler, IWebsiteSerializer public static class InscriberRecipe { - final public boolean usePlates; - final public ItemStack plateA; - final public ItemStack[] imprintable; - final public ItemStack plateB; - final public ItemStack output; + public final boolean usePlates; + public final ItemStack plateA; + public final ItemStack[] imprintable; + public final ItemStack plateB; + public final ItemStack output; public InscriberRecipe( ItemStack[] imprintable, ItemStack plateA, ItemStack plateB, ItemStack out, boolean usePlates ) { diff --git a/src/main/java/appeng/spatial/StorageChunkProvider.java b/src/main/java/appeng/spatial/StorageChunkProvider.java index 82172cab..661cb65c 100644 --- a/src/main/java/appeng/spatial/StorageChunkProvider.java +++ b/src/main/java/appeng/spatial/StorageChunkProvider.java @@ -36,7 +36,7 @@ import appeng.core.AEConfig; public class StorageChunkProvider extends ChunkProviderGenerate { public static final int SQUARE_CHUNK_SIZE = 256; - private final static Block[] BLOCKS; + private static final Block[] BLOCKS; static { diff --git a/src/main/java/appeng/tile/AEBaseInvTile.java b/src/main/java/appeng/tile/AEBaseInvTile.java index 12aa5089..8b517dfb 100644 --- a/src/main/java/appeng/tile/AEBaseInvTile.java +++ b/src/main/java/appeng/tile/AEBaseInvTile.java @@ -148,7 +148,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor public abstract void onChangeInventory( IInventory inv, int slot, InvOperation mc, ItemStack removed, ItemStack added ); @Override - final public int[] getAccessibleSlotsFromSide( int side ) + public final int[] getAccessibleSlotsFromSide( int side ) { Block blk = this.worldObj.getBlock( this.xCoord, this.yCoord, this.zCoord ); if( blk instanceof AEBaseBlock ) diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index a3ae7c15..5a10c436 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -61,14 +61,14 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, { public static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal>(); - static private final HashMap>> HANDLERS = new HashMap>>(); - static private final HashMap ITEM_STACKS = new HashMap(); + private static final HashMap>> HANDLERS = new HashMap>>(); + private static final HashMap ITEM_STACKS = new HashMap(); public int renderFragment = 0; public String customName; private ForgeDirection forward = ForgeDirection.UNKNOWN; private ForgeDirection up = ForgeDirection.UNKNOWN; - static public void registerTileItem( Class c, ItemStackSrc wat ) + public static void registerTileItem( Class c, ItemStackSrc wat ) { ITEM_STACKS.put( c, wat ); } @@ -97,7 +97,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, return src.stack( 1 ); } - final public void Tick() + public final void Tick() { } @@ -113,7 +113,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, @Override // NOTE: WAS FINAL, changed for Immibis - final public void readFromNBT( NBTTagCompound data ) + public final void readFromNBT( NBTTagCompound data ) { super.readFromNBT( data ); @@ -142,7 +142,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, @Override // NOTE: WAS FINAL, changed for Immibis - final public void writeToNBT( NBTTagCompound data ) + public final void writeToNBT( NBTTagCompound data ) { super.writeToNBT( data ); @@ -160,7 +160,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } @Override - final public void updateEntity() + public final void updateEntity() { for( AETileEventHandler h : this.getHandlerListFor( TileEventType.TICK ) ) h.Tick( this ); @@ -190,7 +190,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } @Override - final public boolean canUpdate() + public final boolean canUpdate() { return this.hasHandlerFor( TileEventType.TICK ); } @@ -220,7 +220,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, this.invalidate(); } - final public boolean readFromStream( ByteBuf data ) + public final boolean readFromStream( ByteBuf data ) { boolean output = false; @@ -271,7 +271,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } } - final public void writeToStream( ByteBuf data ) + public final void writeToStream( ByteBuf data ) { try { diff --git a/src/main/java/appeng/tile/grid/AENetworkTile.java b/src/main/java/appeng/tile/grid/AENetworkTile.java index 3dafaaf3..db76da81 100644 --- a/src/main/java/appeng/tile/grid/AENetworkTile.java +++ b/src/main/java/appeng/tile/grid/AENetworkTile.java @@ -36,7 +36,7 @@ import appeng.tile.events.TileEventType; public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxyable { - final protected AENetworkProxy gridProxy = this.createProxy(); + protected final AENetworkProxy gridProxy = this.createProxy(); @TileEvent( TileEventType.WORLD_NBT_READ ) public void readFromNBT_AENetwork( NBTTagCompound data ) diff --git a/src/main/java/appeng/tile/misc/TileCondenser.java b/src/main/java/appeng/tile/misc/TileCondenser.java index e521904a..8092ae50 100644 --- a/src/main/java/appeng/tile/misc/TileCondenser.java +++ b/src/main/java/appeng/tile/misc/TileCondenser.java @@ -48,7 +48,7 @@ import appeng.util.Platform; public class TileCondenser extends AEBaseInvTile implements IFluidHandler, IConfigManagerHost, IConfigurableObject { - static private final FluidTankInfo[] EMPTY = new FluidTankInfo[] { new FluidTankInfo( null, 10 ) }; + private static final FluidTankInfo[] EMPTY = new FluidTankInfo[] { new FluidTankInfo( null, 10 ) }; final int[] sides = new int[] { 0, 1 }; final AppEngInternalInventory inv = new AppEngInternalInventory( this, 3 ); final ConfigManager cm = new ConfigManager( this ); diff --git a/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java b/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java index 07a468cc..87704460 100644 --- a/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java +++ b/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java @@ -36,7 +36,7 @@ import appeng.tile.inventory.InvOperation; public class TileEnergyAcceptor extends AENetworkPowerTile { - final static AppEngInternalInventory INTERNAL_INVENTORY = new AppEngInternalInventory( null, 0 ); + static final AppEngInternalInventory INTERNAL_INVENTORY = new AppEngInternalInventory( null, 0 ); final int[] sides = new int[] {}; public TileEnergyAcceptor() diff --git a/src/main/java/appeng/tile/networking/TileEnergyCell.java b/src/main/java/appeng/tile/networking/TileEnergyCell.java index f3ac558a..c048150f 100644 --- a/src/main/java/appeng/tile/networking/TileEnergyCell.java +++ b/src/main/java/appeng/tile/networking/TileEnergyCell.java @@ -124,7 +124,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage } @Override - final public double injectAEPower( double amt, Actionable mode ) + public final double injectAEPower( double amt, Actionable mode ) { if( mode == Actionable.SIMULATE ) { @@ -179,7 +179,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage } @Override - final public double extractAEPower( double amt, Actionable mode, PowerMultiplier pm ) + public final double extractAEPower( double amt, Actionable mode, PowerMultiplier pm ) { return pm.divide( this.extractAEPower( pm.multiply( amt ), mode ) ); } diff --git a/src/main/java/appeng/tile/powersink/AERootPoweredTile.java b/src/main/java/appeng/tile/powersink/AERootPoweredTile.java index 752cee37..65d50ce2 100644 --- a/src/main/java/appeng/tile/powersink/AERootPoweredTile.java +++ b/src/main/java/appeng/tile/powersink/AERootPoweredTile.java @@ -71,7 +71,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe this.internalCurrentPower = data.getDouble( "internalCurrentPower" ); } - final protected double getExternalPowerDemand( PowerUnits externalUnit, double maxPowerRequired ) + protected final double getExternalPowerDemand( PowerUnits externalUnit, double maxPowerRequired ) { return PowerUnits.AE.convertTo( externalUnit, Math.max( 0.0, this.getFunnelPowerDemand( externalUnit.convertTo( PowerUnits.AE, maxPowerRequired ) ) ) ); } @@ -81,7 +81,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe return this.internalMaxPower - this.internalCurrentPower; } - final public double injectExternalPower( PowerUnits input, double amt ) + public final double injectExternalPower( PowerUnits input, double amt ) { return PowerUnits.AE.convertTo( input, this.funnelPowerIntoStorage( input.convertTo( PowerUnits.AE, amt ), Actionable.MODULATE ) ); } @@ -92,7 +92,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe } @Override - final public double injectAEPower( double amt, Actionable mode ) + public final double injectAEPower( double amt, Actionable mode ) { if( amt < 0.000001 ) return 0; @@ -129,31 +129,31 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe } @Override - final public double getAEMaxPower() + public final double getAEMaxPower() { return this.internalMaxPower; } @Override - final public double getAECurrentPower() + public final double getAECurrentPower() { return this.internalCurrentPower; } @Override - final public boolean isAEPublicPowerStorage() + public final boolean isAEPublicPowerStorage() { return this.internalPublicPowerStorage; } @Override - final public AccessRestriction getPowerFlow() + public final AccessRestriction getPowerFlow() { return this.internalPowerFlow; } @Override - final public double extractAEPower( double amt, Actionable mode, PowerMultiplier multiplier ) + public final double extractAEPower( double amt, Actionable mode, PowerMultiplier multiplier ) { return multiplier.divide( this.extractAEPower( multiplier.multiply( amt ), mode ) ); } diff --git a/src/main/java/appeng/tile/powersink/IC2.java b/src/main/java/appeng/tile/powersink/IC2.java index a241047b..32b5ac12 100644 --- a/src/main/java/appeng/tile/powersink/IC2.java +++ b/src/main/java/appeng/tile/powersink/IC2.java @@ -41,25 +41,25 @@ public abstract class IC2 extends AERootPoweredTile implements IEnergySink boolean isInIC2 = false; @Override - final public boolean acceptsEnergyFrom( TileEntity emitter, ForgeDirection direction ) + public final boolean acceptsEnergyFrom( TileEntity emitter, ForgeDirection direction ) { return this.getPowerSides().contains( direction ); } @Override - final public double getDemandedEnergy() + public final double getDemandedEnergy() { return this.getExternalPowerDemand( PowerUnits.EU, Double.MAX_VALUE ); } @Override - final public int getSinkTier() + public final int getSinkTier() { return Integer.MAX_VALUE; } @Override - final public double injectEnergy( ForgeDirection directionFrom, double amount, double voltage ) + public final double injectEnergy( ForgeDirection directionFrom, double amount, double voltage ) { // just store the excess in the current block, if I return the waste, // IC2 will just disintegrate it - Oct 20th 2013 diff --git a/src/main/java/appeng/tile/powersink/RedstoneFlux.java b/src/main/java/appeng/tile/powersink/RedstoneFlux.java index 4e18dcfd..663b42eb 100644 --- a/src/main/java/appeng/tile/powersink/RedstoneFlux.java +++ b/src/main/java/appeng/tile/powersink/RedstoneFlux.java @@ -31,7 +31,7 @@ import appeng.transformer.annotations.Integration.Interface; public abstract class RedstoneFlux extends RotaryCraft implements IEnergyReceiver { @Override - final public int receiveEnergy( ForgeDirection from, int maxReceive, boolean simulate ) + public final int receiveEnergy( ForgeDirection from, int maxReceive, boolean simulate ) { final int networkRFDemand = (int) Math.floor( this.getExternalPowerDemand( PowerUnits.RF, maxReceive ) ); final int usedRF = Math.min( maxReceive, networkRFDemand ); @@ -45,19 +45,19 @@ public abstract class RedstoneFlux extends RotaryCraft implements IEnergyReceive } @Override - final public int getEnergyStored( ForgeDirection from ) + public final int getEnergyStored( ForgeDirection from ) { return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.getAECurrentPower() ) ); } @Override - final public int getMaxEnergyStored( ForgeDirection from ) + public final int getMaxEnergyStored( ForgeDirection from ) { return (int) Math.floor( PowerUnits.AE.convertTo( PowerUnits.RF, this.getAEMaxPower() ) ); } @Override - final public boolean canConnectEnergy( ForgeDirection from ) + public final boolean canConnectEnergy( ForgeDirection from ) { return this.getPowerSides().contains( from ); } diff --git a/src/main/java/appeng/tile/powersink/RotaryCraft.java b/src/main/java/appeng/tile/powersink/RotaryCraft.java index 55dc7ac8..bdbf43d6 100644 --- a/src/main/java/appeng/tile/powersink/RotaryCraft.java +++ b/src/main/java/appeng/tile/powersink/RotaryCraft.java @@ -49,43 +49,43 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver } @Override - final public int getOmega() + public final int getOmega() { return this.omega; } @Override - final public int getTorque() + public final int getTorque() { return this.torque; } @Override - final public long getPower() + public final long getPower() { return this.power; } @Override - final public String getName() + public final String getName() { return "AE"; } @Override - final public int getIORenderAlpha() + public final int getIORenderAlpha() { return this.alpha; } @Override - final public void setIORenderAlpha( int io ) + public final void setIORenderAlpha( int io ) { this.alpha = io; } @Override - final public void setPower( long p ) + public final void setPower( long p ) { if( Platform.isClient() ) return; @@ -94,7 +94,7 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver } @Override - final public void noInputMachine() + public final void noInputMachine() { this.power = 0; this.torque = 0; @@ -102,18 +102,18 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver } @Override - final public void setTorque( int t ) + public final void setTorque( int t ) { this.torque = t; } @Override - final public void setOmega( int o ) + public final void setOmega( int o ) { this.omega = o; } - final public boolean canReadFromBlock( int x, int y, int z ) + public final boolean canReadFromBlock( int x, int y, int z ) { ForgeDirection side = ForgeDirection.UNKNOWN; @@ -134,19 +134,19 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver } @Override - final public boolean canReadFrom( ForgeDirection side ) + public final boolean canReadFrom( ForgeDirection side ) { return this.getPowerSides().contains( side ); } @Override - final public boolean isReceiving() + public final boolean isReceiving() { return true; } @Override - final public int getMinTorque( int available ) + public final int getMinTorque( int available ) { return 0; } diff --git a/src/main/java/appeng/tile/powersink/UniversalElectricity.java b/src/main/java/appeng/tile/powersink/UniversalElectricity.java index aa969a21..a1057961 100644 --- a/src/main/java/appeng/tile/powersink/UniversalElectricity.java +++ b/src/main/java/appeng/tile/powersink/UniversalElectricity.java @@ -28,13 +28,13 @@ public abstract class UniversalElectricity extends ThermalExpansion implements I { @Override - final public boolean canConnect(ForgeDirection direction) + public final boolean canConnect(ForgeDirection direction) { return internalCanAcceptPower && getPowerSides().contains( direction ); } @Override - final public float receiveElectricity(ForgeDirection from, ElectricityPack receive, boolean doReceive) + public final float receiveElectricity(ForgeDirection from, ElectricityPack receive, boolean doReceive) { float accepted = 0; double receivedPower = receive.getWatts(); @@ -56,25 +56,25 @@ public abstract class UniversalElectricity extends ThermalExpansion implements I } @Override - final public float getRequest(ForgeDirection direction) + public final float getRequest(ForgeDirection direction) { return (float) getExternalPowerDemand( PowerUnits.KJ ); } @Override - final public float getVoltage() + public final float getVoltage() { return 120; } @Override - final public ElectricityPack provideElectricity(ForgeDirection from, ElectricityPack request, boolean doProvide) + public final ElectricityPack provideElectricity(ForgeDirection from, ElectricityPack request, boolean doProvide) { return null; // cannot be dis-charged } @Override - final public float getProvide(ForgeDirection direction) + public final float getProvide(ForgeDirection direction) { return 0; } diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 72bdb08d..d6834215 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -783,7 +783,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan this.worldObj.markTileEntityChunkModified( this.xCoord, this.yCoord, this.zCoord, this ); } - static private class ChestNoHandler extends Exception + private static class ChestNoHandler extends Exception { private static final long serialVersionUID = 7995805326136526631L; diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index fb578509..e574653c 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -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 FAKE_PLAYERS = new WeakHashMap(); private static Field tagList; private static Class playerInstance; @@ -1442,7 +1442,7 @@ public class Platform gs.postAlterationOfStoredItems( StorageChannel.ITEMS, itemChanges, src ); } - static public > void postListChanges( IItemList before, IItemList after, IMEMonitorHandlerReceiver meMonitorPassthrough, BaseActionSource source ) + public static > void postListChanges( IItemList before, IItemList after, IMEMonitorHandlerReceiver meMonitorPassthrough, BaseActionSource source ) { LinkedList changes = new LinkedList(); diff --git a/src/main/java/appeng/util/inv/AdaptorBCPipe.java b/src/main/java/appeng/util/inv/AdaptorBCPipe.java index 3b157683..16ca23a0 100644 --- a/src/main/java/appeng/util/inv/AdaptorBCPipe.java +++ b/src/main/java/appeng/util/inv/AdaptorBCPipe.java @@ -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 ) { diff --git a/src/main/java/appeng/util/inv/WrapperBCPipe.java b/src/main/java/appeng/util/inv/WrapperBCPipe.java index 0b399044..8f5b58aa 100644 --- a/src/main/java/appeng/util/inv/WrapperBCPipe.java +++ b/src/main/java/appeng/util/inv/WrapperBCPipe.java @@ -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 ) { diff --git a/src/main/java/appeng/util/item/AESharedNBT.java b/src/main/java/appeng/util/item/AESharedNBT.java index 94eb519a..edea1ae8 100644 --- a/src/main/java/appeng/util/item/AESharedNBT.java +++ b/src/main/java/appeng/util/item/AESharedNBT.java @@ -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; diff --git a/src/main/java/appeng/util/item/ItemList.java b/src/main/java/appeng/util/item/ItemList.java index 0bfa56f1..baaa4eed 100644 --- a/src/main/java/appeng/util/item/ItemList.java +++ b/src/main/java/appeng/util/item/ItemList.java @@ -54,7 +54,7 @@ public final class ItemList implements IItemList implements IItemList implements IItemList implements IItemList i = iterator(); while (i.hasNext()) { StackType AEI = + * public synchronized void clean() { Iterator 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 implements IItemList implements IItemList implements IItemList iterator() + public synchronized Iterator iterator() { return new MeaningfulIterator( this.records.values().iterator() ); } @Override - synchronized public void resetStatus() + public synchronized void resetStatus() { for( StackType i : this ) i.reset(); diff --git a/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java b/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java index cd8394f4..4953d690 100644 --- a/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java +++ b/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java @@ -28,7 +28,7 @@ import appeng.api.storage.data.IAEStack; public class DefaultPriorityList> implements IPartitionList { - final static List NULL_LIST = new ArrayList(); + static final List NULL_LIST = new ArrayList(); @Override public boolean isListed( T input ) diff --git a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java index 2090265c..f2e0bfe7 100644 --- a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java +++ b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java @@ -38,7 +38,7 @@ import appeng.util.Platform; import appeng.worldgen.meteorite.ChunkOnly; -final public class MeteoriteWorldGen implements IWorldGenerator +public final class MeteoriteWorldGen implements IWorldGenerator { @Override public void generate( Random r, int chunkX, int chunkZ, World w, IChunkProvider chunkGenerator, IChunkProvider chunkProvider ) diff --git a/src/main/java/appeng/worldgen/QuartzWorldGen.java b/src/main/java/appeng/worldgen/QuartzWorldGen.java index 4dd57297..6bface26 100644 --- a/src/main/java/appeng/worldgen/QuartzWorldGen.java +++ b/src/main/java/appeng/worldgen/QuartzWorldGen.java @@ -37,7 +37,7 @@ import appeng.core.AEConfig; import appeng.core.features.registries.WorldGenRegistry; -final public class QuartzWorldGen implements IWorldGenerator +public final class QuartzWorldGen implements IWorldGenerator { private final WorldGenMinable oreNormal; private final WorldGenMinable oreCharged;