Modifier are now using a consistent order based on the java conventions
This commit is contained in:
yueh
parent
e2d0e5d424
commit
eaf57bedf6
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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() )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -81,8 +81,8 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
|
|||
{
|
||||
|
||||
private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
|
||||
static public Class<? extends TileEntity> noTesrTile;
|
||||
static public Class<? extends TileEntity> tesrTile;
|
||||
public static Class<? extends TileEntity> noTesrTile;
|
||||
public static Class<? extends TileEntity> tesrTile;
|
||||
/**
|
||||
* Immibis MB Support.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ import appeng.util.ItemSorters;
|
|||
public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>
|
||||
{
|
||||
|
||||
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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,11 +49,11 @@ import appeng.util.prioitylist.IPartitionList;
|
|||
public class ItemRepo
|
||||
{
|
||||
|
||||
final private IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
|
||||
final private ArrayList<IAEItemStack> view = new ArrayList<IAEItemStack>();
|
||||
final private ArrayList<ItemStack> dsp = new ArrayList<ItemStack>();
|
||||
final private IScrollSource src;
|
||||
final private ISortSource sortSrc;
|
||||
private final IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
|
||||
private final ArrayList<IAEItemStack> view = new ArrayList<IAEItemStack>();
|
||||
private final ArrayList<ItemStack> dsp = new ArrayList<ItemStack>();
|
||||
private final IScrollSource src;
|
||||
private final ISortSource sortSrc;
|
||||
|
||||
public int rowSize = 9;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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<Integer> locked = new HashSet<Integer>();
|
||||
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 ) )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;" +
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class CraftingTreeProcess
|
|||
final ICraftingPatternDetails details;
|
||||
final CraftingJob job;
|
||||
final Map<CraftingTreeNode, Long> nodes = new HashMap<CraftingTreeNode, Long>();
|
||||
final private int depth;
|
||||
private final int depth;
|
||||
public boolean possible = true;
|
||||
World world;
|
||||
long crafts = 0;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
|
|||
{
|
||||
|
||||
public static final ThreadLocal<Boolean> DISABLE_FACADE_OCCLUSION = new ThreadLocal<Boolean>();
|
||||
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),
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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<? extends AEBaseBlock> blk;
|
||||
final private Class<? extends TMultiPart> part;
|
||||
private final String name;
|
||||
private final Class<? extends AEBaseBlock> blk;
|
||||
private final Class<? extends TMultiPart> part;
|
||||
|
||||
PartRegistry( String name, Class<? extends AEBaseBlock> blk, Class<? extends TMultiPart> part )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
|
|||
{
|
||||
|
||||
static final Set<Block> badBlocks = new HashSet<Block>();
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
|
|||
}
|
||||
|
||||
@Override
|
||||
synchronized public boolean isValidItemForSlot( int slotIndex, ItemStack i, World w )
|
||||
public synchronized boolean isValidItemForSlot( int slotIndex, ItemStack i, World w )
|
||||
{
|
||||
if( !this.isCrafting )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@ import appeng.api.util.AEColor;
|
|||
public class Splotch
|
||||
{
|
||||
|
||||
final public ForgeDirection side;
|
||||
final public boolean lumen;
|
||||
final public AEColor color;
|
||||
final private int pos;
|
||||
public final ForgeDirection side;
|
||||
public final boolean lumen;
|
||||
public final AEColor color;
|
||||
private final int pos;
|
||||
|
||||
public Splotch( AEColor col, boolean lit, ForgeDirection side, Vec3 Pos )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ import net.minecraft.world.World;
|
|||
import appeng.entity.EntityTinyTNTPrimed;
|
||||
|
||||
|
||||
final public class DispenserBehaviorTinyTNT extends BehaviorDefaultDispenseItem
|
||||
public final class DispenserBehaviorTinyTNT extends BehaviorDefaultDispenseItem
|
||||
{
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import net.minecraft.world.WorldServer;
|
|||
import appeng.util.Platform;
|
||||
|
||||
|
||||
final public class DispenserBlockTool extends BehaviorDefaultDispenseItem
|
||||
public final class DispenserBlockTool extends BehaviorDefaultDispenseItem
|
||||
{
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ import appeng.items.tools.powered.ToolMassCannon;
|
|||
import appeng.util.Platform;
|
||||
|
||||
|
||||
final public class DispenserMatterCannon extends BehaviorDefaultDispenseItem
|
||||
public final class DispenserMatterCannon extends BehaviorDefaultDispenseItem
|
||||
{
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -64,11 +64,11 @@ public class TickHandler
|
|||
public static final TickHandler INSTANCE = new TickHandler();
|
||||
final Queue<Callable> serverQueue = new LinkedList<Callable>();
|
||||
final Multimap<World, CraftingJob> craftingJobs = LinkedListMultimap.create();
|
||||
final private WeakHashMap<World, Queue<Callable>> callQueue = new WeakHashMap<World, Queue<Callable>>();
|
||||
final private HandlerRep server = new HandlerRep();
|
||||
final private HandlerRep client = new HandlerRep();
|
||||
final private HashMap<Integer, PlayerColor> cliPlayerColors = new HashMap<Integer, PlayerColor>();
|
||||
final private HashMap<Integer, PlayerColor> srvPlayerColors = new HashMap<Integer, PlayerColor>();
|
||||
private final WeakHashMap<World, Queue<Callable>> callQueue = new WeakHashMap<World, Queue<Callable>>();
|
||||
private final HandlerRep server = new HandlerRep();
|
||||
private final HandlerRep client = new HandlerRep();
|
||||
private final HashMap<Integer, PlayerColor> cliPlayerColors = new HashMap<Integer, PlayerColor>();
|
||||
private final HashMap<Integer, PlayerColor> srvPlayerColors = new HashMap<Integer, PlayerColor>();
|
||||
CableRenderMode crm = CableRenderMode.Standard;
|
||||
|
||||
public HashMap<Integer, PlayerColor> getPlayerColors()
|
||||
|
|
@ -288,7 +288,7 @@ public class TickHandler
|
|||
}
|
||||
|
||||
|
||||
static public class PlayerColor
|
||||
public static class PlayerColor
|
||||
{
|
||||
|
||||
public final AEColor myColor;
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ import appeng.util.item.AEItemStack;
|
|||
public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem
|
||||
{
|
||||
|
||||
final static Map<Integer, AEColor> ORE_TO_COLOR = new HashMap<Integer, AEColor>();
|
||||
static final Map<Integer, AEColor> ORE_TO_COLOR = new HashMap<Integer, AEColor>();
|
||||
|
||||
static
|
||||
{
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import appeng.api.util.IReadOnlyCollection;
|
|||
|
||||
public class GridNodeCollection implements IReadOnlyCollection<IGridNode>
|
||||
{
|
||||
final private Map<Class<? extends IGridHost>, MachineSet> machines;
|
||||
private final Map<Class<? extends IGridHost>, MachineSet> machines;
|
||||
|
||||
public GridNodeCollection( Map<Class<? extends IGridHost>, MachineSet> machines )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ import appeng.util.ItemSorters;
|
|||
public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler<IAEStack>
|
||||
{
|
||||
|
||||
final public static ExecutorService CRAFTING_POOL;
|
||||
public static final ExecutorService CRAFTING_POOL;
|
||||
static final Comparator<ICraftingPatternDetails> COMPARATOR = new Comparator<ICraftingPatternDetails>()
|
||||
{
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -58,14 +58,14 @@ import appeng.me.energy.EnergyWatcher;
|
|||
public class EnergyGridCache implements IEnergyGrid
|
||||
{
|
||||
|
||||
final public TreeSet<EnergyThreshold> interests = new TreeSet<EnergyThreshold>();
|
||||
public final TreeSet<EnergyThreshold> interests = new TreeSet<EnergyThreshold>();
|
||||
final double AvgLength = 40.0;
|
||||
final Set<IAEPowerStorage> providers = new LinkedHashSet<IAEPowerStorage>();
|
||||
final Set<IAEPowerStorage> requesters = new LinkedHashSet<IAEPowerStorage>();
|
||||
final Multiset<IEnergyGridProvider> energyGridProviders = HashMultiset.create();
|
||||
final IGrid myGrid;
|
||||
final private HashMap<IGridNode, IEnergyWatcher> watchers = new HashMap<IGridNode, IEnergyWatcher>();
|
||||
final private Set<IEnergyGrid> localSeen = new HashSet<IEnergyGrid>();
|
||||
private final HashMap<IGridNode, IEnergyWatcher> watchers = new HashMap<IGridNode, IEnergyWatcher>();
|
||||
private final Set<IEnergyGrid> localSeen = new HashSet<IEnergyGrid>();
|
||||
/**
|
||||
* estimated power available.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -58,11 +58,11 @@ import appeng.me.storage.NetworkInventoryHandler;
|
|||
public class GridStorageCache implements IStorageGrid
|
||||
{
|
||||
|
||||
final public IGrid myGrid;
|
||||
public final IGrid myGrid;
|
||||
final HashSet<ICellProvider> activeCellProviders = new HashSet<ICellProvider>();
|
||||
final HashSet<ICellProvider> inactiveCellProviders = new HashSet<ICellProvider>();
|
||||
final private SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create();
|
||||
final public GenericInterestManager<ItemWatcher> interestManager = new GenericInterestManager<ItemWatcher>( this.interests );
|
||||
private final SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create();
|
||||
public final GenericInterestManager<ItemWatcher> interestManager = new GenericInterestManager<ItemWatcher>( this.interests );
|
||||
private final NetworkMonitor<IAEItemStack> itemMonitor = new NetworkMonitor<IAEItemStack>( this, StorageChannel.ITEMS );
|
||||
private final NetworkMonitor<IAEFluidStack> fluidMonitor = new NetworkMonitor<IAEFluidStack>( this, StorageChannel.FLUIDS );
|
||||
private final HashMap<IGridNode, IStackWatcher> watchers = new HashMap<IGridNode, IStackWatcher>();
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ import appeng.me.storage.ItemWatcher;
|
|||
public class NetworkMonitor<T extends IAEStack<T>> extends MEMonitorHandler<T>
|
||||
{
|
||||
|
||||
private final static Deque<NetworkMonitor<?>> DEPTH = new LinkedList<NetworkMonitor<?>>();
|
||||
final private GridStorageCache myGridCache;
|
||||
final private StorageChannel myChannel;
|
||||
private static final Deque<NetworkMonitor<?>> DEPTH = new LinkedList<NetworkMonitor<?>>();
|
||||
private final GridStorageCache myGridCache;
|
||||
private final StorageChannel myChannel;
|
||||
boolean sendEvent = false;
|
||||
|
||||
public NetworkMonitor( GridStorageCache cache, StorageChannel chan )
|
||||
|
|
|
|||
6
src/main/java/appeng/me/cache/P2PCache.java
vendored
6
src/main/java/appeng/me/cache/P2PCache.java
vendored
|
|
@ -43,9 +43,9 @@ public class P2PCache implements IGridCache
|
|||
{
|
||||
|
||||
final IGrid myGrid;
|
||||
final private HashMap<Long, PartP2PTunnel> inputs = new HashMap<Long, PartP2PTunnel>();
|
||||
final private Multimap<Long, PartP2PTunnel> outputs = LinkedHashMultimap.create();
|
||||
final private TunnelCollection NullColl = new TunnelCollection<PartP2PTunnel>( null, null );
|
||||
private final HashMap<Long, PartP2PTunnel> inputs = new HashMap<Long, PartP2PTunnel>();
|
||||
private final Multimap<Long, PartP2PTunnel> outputs = LinkedHashMultimap.create();
|
||||
private final TunnelCollection NullColl = new TunnelCollection<PartP2PTunnel>( null, null );
|
||||
|
||||
public P2PCache( IGrid g )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ public class SecurityCache implements ISecurityGrid
|
|||
{
|
||||
|
||||
public final IGrid myGrid;
|
||||
final private List<ISecurityProvider> securityProvider = new ArrayList<ISecurityProvider>();
|
||||
final private HashMap<Integer, EnumSet<SecurityPermissions>> playerPerms = new HashMap<Integer, EnumSet<SecurityPermissions>>();
|
||||
private final List<ISecurityProvider> securityProvider = new ArrayList<ISecurityProvider>();
|
||||
private final HashMap<Integer, EnumSet<SecurityPermissions>> playerPerms = new HashMap<Integer, EnumSet<SecurityPermissions>>();
|
||||
private long securityKey = -1;
|
||||
|
||||
public SecurityCache( IGrid g )
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ import appeng.parts.p2p.PartP2PTunnelME;
|
|||
public class Connections implements Callable
|
||||
{
|
||||
|
||||
final public HashMap<IGridNode, TunnelConnection> connections = new HashMap<IGridNode, TunnelConnection>();
|
||||
final private PartP2PTunnelME me;
|
||||
public final HashMap<IGridNode, TunnelConnection> connections = new HashMap<IGridNode, TunnelConnection>();
|
||||
private final PartP2PTunnelME me;
|
||||
public boolean create = false;
|
||||
public boolean destroy = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ import appeng.parts.p2p.PartP2PTunnelME;
|
|||
public class TunnelConnection
|
||||
{
|
||||
|
||||
final public PartP2PTunnelME tunnel;
|
||||
final public IGridConnection c;
|
||||
public final PartP2PTunnelME tunnel;
|
||||
public final IGridConnection c;
|
||||
|
||||
public TunnelConnection( PartP2PTunnelME t, IGridConnection con )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import appeng.util.Platform;
|
|||
public abstract class MBCalculator
|
||||
{
|
||||
|
||||
final private IAEMultiBlock target;
|
||||
private final IAEMultiBlock target;
|
||||
|
||||
public MBCalculator( IAEMultiBlock t )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -88,9 +88,9 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
|
|||
final int[] usedOps = new int[3];
|
||||
final Map<ICraftingPatternDetails, TaskProgress> tasks = new HashMap<ICraftingPatternDetails, TaskProgress>();
|
||||
// INSTANCE sate
|
||||
final private LinkedList<TileCraftingTile> tiles = new LinkedList<TileCraftingTile>();
|
||||
final private LinkedList<TileCraftingTile> storage = new LinkedList<TileCraftingTile>();
|
||||
final private LinkedList<TileCraftingMonitorTile> status = new LinkedList<TileCraftingMonitorTile>();
|
||||
private final LinkedList<TileCraftingTile> tiles = new LinkedList<TileCraftingTile>();
|
||||
private final LinkedList<TileCraftingTile> storage = new LinkedList<TileCraftingTile>();
|
||||
private final LinkedList<TileCraftingMonitorTile> status = new LinkedList<TileCraftingMonitorTile>();
|
||||
private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object>();
|
||||
public ICraftingLink myLastLink;
|
||||
public String myName = "";
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ import appeng.tile.spatial.TileSpatialPylon;
|
|||
public class SpatialPylonCluster implements IAECluster
|
||||
{
|
||||
|
||||
final public DimensionalCoord min;
|
||||
final public DimensionalCoord max;
|
||||
public final DimensionalCoord min;
|
||||
public final DimensionalCoord max;
|
||||
final List<TileSpatialPylon> line = new ArrayList<TileSpatialPylon>();
|
||||
public boolean isDestroyed = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -57,10 +57,10 @@ public class CellInventory implements ICellInventory
|
|||
static final String ITEM_PRE_FORMATTED_NAME = "PN";
|
||||
static final String ITEM_PRE_FORMATTED_FUZZY = "FP";
|
||||
private static final HashSet<Integer> BLACK_LIST = new HashSet<Integer>();
|
||||
static protected String[] ITEM_SLOT_ARR;
|
||||
static protected String[] ITEM_SLOT_COUNT_ARR;
|
||||
final protected NBTTagCompound tagCompound;
|
||||
final protected ISaveProvider container;
|
||||
protected static String[] ITEM_SLOT_ARR;
|
||||
protected static String[] ITEM_SLOT_COUNT_ARR;
|
||||
protected final NBTTagCompound tagCompound;
|
||||
protected final ISaveProvider container;
|
||||
protected int MAX_ITEM_TYPES = 63;
|
||||
protected short storedItems = 0;
|
||||
protected int storedItemCount = 0;
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ import appeng.util.prioitylist.IPartitionList;
|
|||
public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHandler<T>
|
||||
{
|
||||
|
||||
final protected IMEMonitor<T> monitor;
|
||||
final protected IMEInventoryHandler<T> internal;
|
||||
protected final IMEMonitor<T> monitor;
|
||||
protected final IMEInventoryHandler<T> internal;
|
||||
final StorageChannel channel;
|
||||
private int myPriority;
|
||||
private IncludeExclude myWhitelist;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ import appeng.api.storage.data.IItemList;
|
|||
public class MEPassThrough<T extends IAEStack<T>> implements IMEInventoryHandler<T>
|
||||
{
|
||||
|
||||
final protected StorageChannel channel;
|
||||
protected final StorageChannel channel;
|
||||
private IMEInventory<T> internal;
|
||||
|
||||
public MEPassThrough( IMEInventory<T> i, StorageChannel channel )
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class NetworkInventoryHandler<T extends IAEStack<T>> implements IMEInvent
|
|||
|
||||
static final ThreadLocal<LinkedList> DEPTH_MOD = new ThreadLocal<LinkedList>();
|
||||
static final ThreadLocal<LinkedList> DEPTH_SIM = new ThreadLocal<LinkedList>();
|
||||
private final static Comparator<Integer> PRIORITY_SORTER = new Comparator<Integer>()
|
||||
private static final Comparator<Integer> PRIORITY_SORTER = new Comparator<Integer>()
|
||||
{
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ import appeng.tile.misc.TileSecurity;
|
|||
public class SecurityInventory implements IMEInventoryHandler<IAEItemStack>
|
||||
{
|
||||
|
||||
final public IItemList<IAEItemStack> storedItems = AEApi.instance().storage().createItemList();
|
||||
public final IItemList<IAEItemStack> storedItems = AEApi.instance().storage().createItemList();
|
||||
final TileSecurity securityTile;
|
||||
|
||||
public SecurityInventory( TileSecurity ts )
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ public class BusCollisionHelper implements IPartCollisionHelper
|
|||
|
||||
final List<AxisAlignedBB> 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<AxisAlignedBB> boxes, ForgeDirection x, ForgeDirection y, ForgeDirection z, Entity e, boolean visual )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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<ISidedInventory> inventories;
|
||||
final private List<InvSot> slots;
|
||||
private final int[][] sides;
|
||||
private final List<ISidedInventory> inventories;
|
||||
private final List<InvSot> slots;
|
||||
|
||||
public InvLayerData( int[][] a, List<ISidedInventory> b, List<InvSot> c )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
|
|||
{
|
||||
|
||||
static final ThreadLocal<Stack<PartP2PLiquids>> DEPTH = new ThreadLocal<Stack<PartP2PLiquids>>();
|
||||
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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@ import appeng.api.recipes.ICraftHandler;
|
|||
public class RecipeData
|
||||
{
|
||||
|
||||
final public HashMap<String, String> aliases = new HashMap<String, String>();
|
||||
final public HashMap<String, GroupIngredient> groups = new HashMap<String, GroupIngredient>();
|
||||
public final HashMap<String, String> aliases = new HashMap<String, String>();
|
||||
public final HashMap<String, GroupIngredient> groups = new HashMap<String, GroupIngredient>();
|
||||
|
||||
final public List<ICraftHandler> Handlers = new LinkedList<ICraftHandler>();
|
||||
public final List<ICraftHandler> Handlers = new LinkedList<ICraftHandler>();
|
||||
public final Set<String> knownItem = new HashSet<String>();
|
||||
public boolean crash = true;
|
||||
public boolean exceptions = true;
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ import appeng.recipes.handlers.OreRegistration;
|
|||
public class RecipeHandler implements IRecipeHandler
|
||||
{
|
||||
|
||||
final public List<String> tokens = new LinkedList<String>();
|
||||
public final List<String> tokens = new LinkedList<String>();
|
||||
final RecipeData data;
|
||||
|
||||
public RecipeHandler()
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -61,14 +61,14 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
|
|||
{
|
||||
|
||||
public static final ThreadLocal<WeakReference<AEBaseTile>> DROP_NO_ITEMS = new ThreadLocal<WeakReference<AEBaseTile>>();
|
||||
static private final HashMap<Class, EnumMap<TileEventType, List<AETileEventHandler>>> HANDLERS = new HashMap<Class, EnumMap<TileEventType, List<AETileEventHandler>>>();
|
||||
static private final HashMap<Class, ItemStackSrc> ITEM_STACKS = new HashMap<Class, ItemStackSrc>();
|
||||
private static final HashMap<Class, EnumMap<TileEventType, List<AETileEventHandler>>> HANDLERS = new HashMap<Class, EnumMap<TileEventType, List<AETileEventHandler>>>();
|
||||
private static final HashMap<Class, ItemStackSrc> ITEM_STACKS = new HashMap<Class, ItemStackSrc>();
|
||||
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
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 )
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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 ) );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 ) );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue