tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

sort modifier

This commit is contained in:
thatsIch 2015-09-30 14:27:21 +02:00
parent ebda927fb5
commit 7dee5699cf
9 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/appeng/block/AEBaseBlock.java
View File

@ -137,13 +137,13 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
public static final UnlistedBlockAccess AE_BLOCK_ACCESS = new UnlistedBlockAccess();
@Override
final protected BlockState createBlockState()
protected final BlockState createBlockState()
{
return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { AE_BLOCK_POS, AE_BLOCK_ACCESS} );
}
@Override
final public IBlockState getExtendedState(
public final IBlockState getExtendedState(
final IBlockState state,
final IBlockAccess world,
final BlockPos pos )

2
src/main/java/appeng/block/crafting/BlockCraftingUnit.java
View File

@ -59,7 +59,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
public static final PropertyBool POWERED = PropertyBool.create( "powered" );
public static final PropertyBool FORMED = PropertyBool.create( "formed" );
final public CraftingUnitType type;
public final CraftingUnitType type;
public BlockCraftingUnit( final CraftingUnitType type )
{

34
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
View File

@ -57,30 +57,30 @@ import com.google.common.base.Joiner;
public class GuiCraftingCPU extends AEBaseGui implements ISortSource
{
private final static int GUI_HEIGHT = 184;
private final static int GUI_WIDTH = 238;
private static final int GUI_HEIGHT = 184;
private static final int GUI_WIDTH = 238;
private final static int DISPLAYED_ROWS = 6;
private static final int DISPLAYED_ROWS = 6;
private final static int TEXT_COLOR = 0x404040;
private final static int BACKGROUND_ALPHA = 0x5A000000;
private static final int TEXT_COLOR = 0x404040;
private static final int BACKGROUND_ALPHA = 0x5A000000;
private final static int SECTION_LENGTH = 67;
private static final int SECTION_LENGTH = 67;
private final static int SCROLLBAR_TOP = 19;
private final static int SCROLLBAR_LEFT = 218;
private final static int SCROLLBAR_HEIGHT = 137;
private static final int SCROLLBAR_TOP = 19;
private static final int SCROLLBAR_LEFT = 218;
private static final int SCROLLBAR_HEIGHT = 137;
private final static int CANCEL_LEFT_OFFSET = 163;
private final static int CANCEL_TOP_OFFSET = 25;
private final static int CANCEL_HEIGHT = 20;
private final static int CANCEL_WIDTH = 50;
private static final int CANCEL_LEFT_OFFSET = 163;
private static final int CANCEL_TOP_OFFSET = 25;
private static final int CANCEL_HEIGHT = 20;
private static final int CANCEL_WIDTH = 50;
private final static int TITLE_TOP_OFFSET = 7;
private final static int TITLE_LEFT_OFFSET = 8;
private static final int TITLE_TOP_OFFSET = 7;
private static final int TITLE_LEFT_OFFSET = 8;
private final static int ITEMSTACK_LEFT_OFFSET = 9;
private final static int ITEMSTACK_TOP_OFFSET = 22;
private static final int ITEMSTACK_LEFT_OFFSET = 9;
private static final int ITEMSTACK_TOP_OFFSET = 22;
private final ContainerCraftingCPU craftingCpu;

6
src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java
View File

@ -42,9 +42,9 @@ import appeng.tile.storage.TileSkyChest;
public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyChest>
{
private final static ResourceLocation SKY_STONE_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" );
private final static ResourceLocation SKY_BLOCK_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" );
private final static ResourceLocation[] METADATA_TO_TEXTURE = {
private static final ResourceLocation SKY_STONE_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" );
private static final ResourceLocation SKY_BLOCK_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" );
private static final ResourceLocation[] METADATA_TO_TEXTURE = {
SKY_STONE_CHEST,
SKY_BLOCK_CHEST
};

2
src/main/java/appeng/client/texture/BaseIcon.java
View File

@ -4,7 +4,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
public class BaseIcon implements IAESprite
{
final private TextureAtlasSprite spite;
private final TextureAtlasSprite spite;
public BaseIcon( final TextureAtlasSprite src )
{

2
src/main/java/appeng/core/sync/PacketCallState.java
View File

@ -1,6 +1,6 @@
package appeng.core.sync;
abstract public class PacketCallState
public abstract class PacketCallState
{
public abstract void call( AppEngPacket appEngPacket );

8
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
View File

@ -73,10 +73,10 @@ import appeng.util.item.AEItemStack;
public class PartAnnihilationPlane extends PartBasicState implements IGridTickable, IWorldCallable<TickRateModulation>
{
private final static IAESprite SIDE_ICON = CableBusTextures.PartPlaneSides.getIcon();
private final static IAESprite BACK_ICON = CableBusTextures.PartTransitionPlaneBack.getIcon();
private final static IAESprite STATUS_ICON = CableBusTextures.PartMonitorSidesStatus.getIcon();
private final static IAESprite ACTIVE_ICON = CableBusTextures.BlockAnnihilationPlaneOn.getIcon();
private static final IAESprite SIDE_ICON = CableBusTextures.PartPlaneSides.getIcon();
private static final IAESprite BACK_ICON = CableBusTextures.PartTransitionPlaneBack.getIcon();
private static final IAESprite STATUS_ICON = CableBusTextures.PartMonitorSidesStatus.getIcon();
private static final IAESprite ACTIVE_ICON = CableBusTextures.BlockAnnihilationPlaneOn.getIcon();
private final BaseActionSource mySrc = new MachineSource( this );
private boolean isAccepting = true;

2
src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java
View File

@ -43,7 +43,7 @@ import appeng.client.texture.IAESprite;
public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane
{
private final static IAESprite ACTIVE_ICON = CableBusTextures.BlockIdentityAnnihilationPlaneOn.getIcon();
private static final IAESprite ACTIVE_ICON = CableBusTextures.BlockIdentityAnnihilationPlaneOn.getIcon();
private static final float SILK_TOUCH_FACTOR = 16;

2
src/main/java/appeng/parts/reporting/AbstractPartPanel.java
View File

@ -127,6 +127,6 @@ public abstract class AbstractPartPanel extends AbstractPartReporting
*
* @return the brightness to be used.
*/
abstract protected int getBrightnessColor();
protected abstract int getBrightnessColor();
}