From 7dee5699cf066f94cf2bd55dbace767962defc83 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Wed, 30 Sep 2015 14:27:21 +0200 Subject: [PATCH] sort modifier --- src/main/java/appeng/block/AEBaseBlock.java | 4 +-- .../block/crafting/BlockCraftingUnit.java | 2 +- .../gui/implementations/GuiCraftingCPU.java | 34 +++++++++---------- .../render/blocks/RenderBlockSkyChest.java | 6 ++-- .../java/appeng/client/texture/BaseIcon.java | 2 +- .../appeng/core/sync/PacketCallState.java | 2 +- .../automation/PartAnnihilationPlane.java | 8 ++--- .../PartIdentityAnnihilationPlane.java | 2 +- .../parts/reporting/AbstractPartPanel.java | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index e798ac39d..9e51f71dc 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -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 ) diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index 2f2e3dddb..a7d7968ac 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -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 ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index 39badc715..98d2da0cd 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -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; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java index f3a6c9434..09beb98c9 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java @@ -42,9 +42,9 @@ import appeng.tile.storage.TileSkyChest; public class RenderBlockSkyChest extends BaseBlockRender { - 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 }; diff --git a/src/main/java/appeng/client/texture/BaseIcon.java b/src/main/java/appeng/client/texture/BaseIcon.java index 437fdeffc..9f76ea0f1 100644 --- a/src/main/java/appeng/client/texture/BaseIcon.java +++ b/src/main/java/appeng/client/texture/BaseIcon.java @@ -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 ) { diff --git a/src/main/java/appeng/core/sync/PacketCallState.java b/src/main/java/appeng/core/sync/PacketCallState.java index 349237f51..a7bfd452c 100644 --- a/src/main/java/appeng/core/sync/PacketCallState.java +++ b/src/main/java/appeng/core/sync/PacketCallState.java @@ -1,6 +1,6 @@ package appeng.core.sync; -abstract public class PacketCallState +public abstract class PacketCallState { public abstract void call( AppEngPacket appEngPacket ); diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index 02c1ec8a4..3beb8b051 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -73,10 +73,10 @@ import appeng.util.item.AEItemStack; public class PartAnnihilationPlane extends PartBasicState implements IGridTickable, IWorldCallable { - 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; diff --git a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java index 66dbaf1a7..d454d14e1 100644 --- a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java @@ -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; diff --git a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java b/src/main/java/appeng/parts/reporting/AbstractPartPanel.java index 17dd49e55..ed33654fa 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartPanel.java @@ -127,6 +127,6 @@ public abstract class AbstractPartPanel extends AbstractPartReporting * * @return the brightness to be used. */ - abstract protected int getBrightnessColor(); + protected abstract int getBrightnessColor(); }