From db76915b7e75d30ebfb060918d80dc54b27b0f81 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sun, 27 Sep 2015 00:00:50 +0200 Subject: [PATCH] sort modifier --- .../gui/implementations/GuiCraftingCPU.java | 34 +++++++++---------- .../render/blocks/RenderBlockSkyChest.java | 6 ++-- .../automation/PartAnnihilationPlane.java | 8 ++--- .../PartIdentityAnnihilationPlane.java | 2 +- .../parts/reporting/AbstractPartPanel.java | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index 824d5d4f..f4f86233 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 appeng.util.ReadableNumberConverter; 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 14d812a2..488f2f81 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java @@ -39,9 +39,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/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index 72df8398..54db03b3 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -72,10 +72,10 @@ import appeng.util.item.AEItemStack; public class PartAnnihilationPlane extends PartBasicState implements IGridTickable, IWorldCallable { - private final static IIcon SIDE_ICON = CableBusTextures.PartPlaneSides.getIcon(); - private final static IIcon BACK_ICON = CableBusTextures.PartTransitionPlaneBack.getIcon(); - private final static IIcon STATUS_ICON = CableBusTextures.PartMonitorSidesStatus.getIcon(); - private final static IIcon ACTIVE_ICON = CableBusTextures.BlockAnnihilationPlaneOn.getIcon(); + private static final IIcon SIDE_ICON = CableBusTextures.PartPlaneSides.getIcon(); + private static final IIcon BACK_ICON = CableBusTextures.PartTransitionPlaneBack.getIcon(); + private static final IIcon STATUS_ICON = CableBusTextures.PartMonitorSidesStatus.getIcon(); + private static final IIcon 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 99372628..1838962d 100644 --- a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java @@ -44,7 +44,7 @@ import appeng.client.texture.CableBusTextures; public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane { - private final static IIcon ACTIVE_ICON = CableBusTextures.BlockIdentityAnnihilationPlaneOn.getIcon(); + private static final IIcon 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 b5f9513f..647d064a 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartPanel.java @@ -128,6 +128,6 @@ public abstract class AbstractPartPanel extends AbstractPartReporting * * @return the brightness to be used. */ - abstract protected int getBrightnessColor(); + protected abstract int getBrightnessColor(); }