From 77fb8346e7478b9c01cc33656b87dba4b5d05920 Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Tue, 31 Jan 2012 01:42:28 +0000 Subject: [PATCH] Organization: variable renaming for clarity in FSkin and related. --- src/main/java/forge/view/match/ViewField.java | 12 +- .../forge/view/toolbox/CardFaceSymbols.java | 110 +++++++------- src/main/java/forge/view/toolbox/FSkin.java | 143 +++++++++--------- 3 files changed, 133 insertions(+), 132 deletions(-) diff --git a/src/main/java/forge/view/match/ViewField.java b/src/main/java/forge/view/match/ViewField.java index 69e0a8ba3bc..1f70445a341 100644 --- a/src/main/java/forge/view/match/ViewField.java +++ b/src/main/java/forge/view/match/ViewField.java @@ -303,27 +303,27 @@ public class ViewField extends FRoundedPanel { poolArea.add(ViewField.this.lblPoison, constraintsR); // Black, Blue, Colorless, Green, Red, White mana labels - ViewField.this.lblBlack = new DetailLabel(FSkin.ManaIcons.ICO_BLACK, "99"); + ViewField.this.lblBlack = new DetailLabel(FSkin.ManaImages.IMG_BLACK, "99"); ViewField.this.lblBlack.setToolTipText("Black mana"); poolArea.add(ViewField.this.lblBlack, constraintsL); - ViewField.this.lblBlue = new DetailLabel(FSkin.ManaIcons.ICO_BLUE, "99"); + ViewField.this.lblBlue = new DetailLabel(FSkin.ManaImages.IMG_BLUE, "99"); ViewField.this.lblBlue.setToolTipText("Blue mana"); poolArea.add(ViewField.this.lblBlue, constraintsR); - ViewField.this.lblGreen = new DetailLabel(FSkin.ManaIcons.ICO_GREEN, "99"); + ViewField.this.lblGreen = new DetailLabel(FSkin.ManaImages.IMG_GREEN, "99"); ViewField.this.lblGreen.setToolTipText("Green mana"); poolArea.add(ViewField.this.lblGreen, constraintsL); - ViewField.this.lblRed = new DetailLabel(FSkin.ManaIcons.ICO_RED, "99"); + ViewField.this.lblRed = new DetailLabel(FSkin.ManaImages.IMG_RED, "99"); ViewField.this.lblRed.setToolTipText("Red mana"); poolArea.add(ViewField.this.lblRed, constraintsR); - ViewField.this.lblWhite = new DetailLabel(FSkin.ManaIcons.ICO_WHITE, "99"); + ViewField.this.lblWhite = new DetailLabel(FSkin.ManaImages.IMG_WHITE, "99"); ViewField.this.lblWhite.setToolTipText("White mana"); poolArea.add(ViewField.this.lblWhite, constraintsL); - ViewField.this.lblColorless = new DetailLabel(FSkin.ManaIcons.ICO_COLORLESS, "99"); + ViewField.this.lblColorless = new DetailLabel(FSkin.ManaImages.IMG_COLORLESS, "99"); ViewField.this.lblColorless.setToolTipText("Colorless mana"); poolArea.add(ViewField.this.lblColorless, constraintsR); } diff --git a/src/main/java/forge/view/toolbox/CardFaceSymbols.java b/src/main/java/forge/view/toolbox/CardFaceSymbols.java index 3aa77460655..1a32c9a7fed 100644 --- a/src/main/java/forge/view/toolbox/CardFaceSymbols.java +++ b/src/main/java/forge/view/toolbox/CardFaceSymbols.java @@ -48,63 +48,63 @@ public class CardFaceSymbols { */ public static void loadImages() { final FSkin skin = Singletons.getView().getSkin(); - MANA_IMAGES.put("0", skin.getImage(FSkin.ColorlessManaIcons.ICO_0)); - MANA_IMAGES.put("1", skin.getImage(FSkin.ColorlessManaIcons.ICO_1)); - MANA_IMAGES.put("2", skin.getImage(FSkin.ColorlessManaIcons.ICO_2)); - MANA_IMAGES.put("3", skin.getImage(FSkin.ColorlessManaIcons.ICO_3)); - MANA_IMAGES.put("4", skin.getImage(FSkin.ColorlessManaIcons.ICO_4)); - MANA_IMAGES.put("5", skin.getImage(FSkin.ColorlessManaIcons.ICO_5)); - MANA_IMAGES.put("6", skin.getImage(FSkin.ColorlessManaIcons.ICO_6)); - MANA_IMAGES.put("7", skin.getImage(FSkin.ColorlessManaIcons.ICO_7)); - MANA_IMAGES.put("8", skin.getImage(FSkin.ColorlessManaIcons.ICO_8)); - MANA_IMAGES.put("9", skin.getImage(FSkin.ColorlessManaIcons.ICO_9)); - MANA_IMAGES.put("10", skin.getImage(FSkin.ColorlessManaIcons.ICO_10)); - MANA_IMAGES.put("11", skin.getImage(FSkin.ColorlessManaIcons.ICO_11)); - MANA_IMAGES.put("12", skin.getImage(FSkin.ColorlessManaIcons.ICO_12)); - MANA_IMAGES.put("15", skin.getImage(FSkin.ColorlessManaIcons.ICO_15)); - MANA_IMAGES.put("16", skin.getImage(FSkin.ColorlessManaIcons.ICO_16)); - MANA_IMAGES.put("20", skin.getImage(FSkin.ColorlessManaIcons.ICO_20)); - MANA_IMAGES.put("X", skin.getImage(FSkin.ColorlessManaIcons.ICO_X)); - MANA_IMAGES.put("Y", skin.getImage(FSkin.ColorlessManaIcons.ICO_Y)); - MANA_IMAGES.put("Z", skin.getImage(FSkin.ColorlessManaIcons.ICO_Z)); + MANA_IMAGES.put("0", skin.getImage(FSkin.ColorlessManaImages.IMG_0)); + MANA_IMAGES.put("1", skin.getImage(FSkin.ColorlessManaImages.IMG_1)); + MANA_IMAGES.put("2", skin.getImage(FSkin.ColorlessManaImages.IMG_2)); + MANA_IMAGES.put("3", skin.getImage(FSkin.ColorlessManaImages.IMG_3)); + MANA_IMAGES.put("4", skin.getImage(FSkin.ColorlessManaImages.IMG_4)); + MANA_IMAGES.put("5", skin.getImage(FSkin.ColorlessManaImages.IMG_5)); + MANA_IMAGES.put("6", skin.getImage(FSkin.ColorlessManaImages.IMG_6)); + MANA_IMAGES.put("7", skin.getImage(FSkin.ColorlessManaImages.IMG_7)); + MANA_IMAGES.put("8", skin.getImage(FSkin.ColorlessManaImages.IMG_8)); + MANA_IMAGES.put("9", skin.getImage(FSkin.ColorlessManaImages.IMG_9)); + MANA_IMAGES.put("10", skin.getImage(FSkin.ColorlessManaImages.IMG_10)); + MANA_IMAGES.put("11", skin.getImage(FSkin.ColorlessManaImages.IMG_11)); + MANA_IMAGES.put("12", skin.getImage(FSkin.ColorlessManaImages.IMG_12)); + MANA_IMAGES.put("15", skin.getImage(FSkin.ColorlessManaImages.IMG_15)); + MANA_IMAGES.put("16", skin.getImage(FSkin.ColorlessManaImages.IMG_16)); + MANA_IMAGES.put("20", skin.getImage(FSkin.ColorlessManaImages.IMG_20)); + MANA_IMAGES.put("X", skin.getImage(FSkin.ColorlessManaImages.IMG_X)); + MANA_IMAGES.put("Y", skin.getImage(FSkin.ColorlessManaImages.IMG_Y)); + MANA_IMAGES.put("Z", skin.getImage(FSkin.ColorlessManaImages.IMG_Z)); - MANA_IMAGES.put("B", skin.getImage(FSkin.ManaIcons.ICO_BLACK)); - MANA_IMAGES.put("BG", skin.getImage(FSkin.ManaIcons.ICO_BLACK_GREEN)); - MANA_IMAGES.put("BR", skin.getImage(FSkin.ManaIcons.ICO_BLACK_RED)); - MANA_IMAGES.put("G", skin.getImage(FSkin.ManaIcons.ICO_GREEN)); - MANA_IMAGES.put("GU", skin.getImage(FSkin.ManaIcons.ICO_GREEN_BLUE)); - MANA_IMAGES.put("GW", skin.getImage(FSkin.ManaIcons.ICO_GREEN_WHITE)); - MANA_IMAGES.put("R", skin.getImage(FSkin.ManaIcons.ICO_RED)); - MANA_IMAGES.put("RG", skin.getImage(FSkin.ManaIcons.ICO_RED_GREEN)); - MANA_IMAGES.put("RW", skin.getImage(FSkin.ManaIcons.ICO_RED_WHITE)); - MANA_IMAGES.put("U", skin.getImage(FSkin.ManaIcons.ICO_BLUE)); - MANA_IMAGES.put("UB", skin.getImage(FSkin.ManaIcons.ICO_BLUE_BLACK)); - MANA_IMAGES.put("UR", skin.getImage(FSkin.ManaIcons.ICO_BLUE_RED)); - MANA_IMAGES.put("W", skin.getImage(FSkin.ManaIcons.ICO_WHITE)); - MANA_IMAGES.put("WB", skin.getImage(FSkin.ManaIcons.ICO_WHITE_BLACK)); - MANA_IMAGES.put("WU", skin.getImage(FSkin.ManaIcons.ICO_WHITE_BLUE)); - MANA_IMAGES.put("PW", skin.getImage(FSkin.ManaIcons.ICO_PHRYX_WHITE)); - MANA_IMAGES.put("PR", skin.getImage(FSkin.ManaIcons.ICO_PHRYX_RED)); - MANA_IMAGES.put("PU", skin.getImage(FSkin.ManaIcons.ICO_PHRYX_BLUE)); - MANA_IMAGES.put("PB", skin.getImage(FSkin.ManaIcons.ICO_PHRYX_BLACK)); - MANA_IMAGES.put("PG", skin.getImage(FSkin.ManaIcons.ICO_PHRYX_GREEN)); - MANA_IMAGES.put("2W", skin.getImage(FSkin.ManaIcons.ICO_2W)); - MANA_IMAGES.put("2U", skin.getImage(FSkin.ManaIcons.ICO_2U)); - MANA_IMAGES.put("2R", skin.getImage(FSkin.ManaIcons.ICO_2R)); - MANA_IMAGES.put("2G", skin.getImage(FSkin.ManaIcons.ICO_2G)); - MANA_IMAGES.put("2B", skin.getImage(FSkin.ManaIcons.ICO_2B)); + MANA_IMAGES.put("B", skin.getImage(FSkin.ManaImages.IMG_BLACK)); + MANA_IMAGES.put("BG", skin.getImage(FSkin.ManaImages.IMG_BLACK_GREEN)); + MANA_IMAGES.put("BR", skin.getImage(FSkin.ManaImages.IMG_BLACK_RED)); + MANA_IMAGES.put("G", skin.getImage(FSkin.ManaImages.IMG_GREEN)); + MANA_IMAGES.put("GU", skin.getImage(FSkin.ManaImages.IMG_GREEN_BLUE)); + MANA_IMAGES.put("GW", skin.getImage(FSkin.ManaImages.IMG_GREEN_WHITE)); + MANA_IMAGES.put("R", skin.getImage(FSkin.ManaImages.IMG_RED)); + MANA_IMAGES.put("RG", skin.getImage(FSkin.ManaImages.IMG_RED_GREEN)); + MANA_IMAGES.put("RW", skin.getImage(FSkin.ManaImages.IMG_RED_WHITE)); + MANA_IMAGES.put("U", skin.getImage(FSkin.ManaImages.IMG_BLUE)); + MANA_IMAGES.put("UB", skin.getImage(FSkin.ManaImages.IMG_BLUE_BLACK)); + MANA_IMAGES.put("UR", skin.getImage(FSkin.ManaImages.IMG_BLUE_RED)); + MANA_IMAGES.put("W", skin.getImage(FSkin.ManaImages.IMG_WHITE)); + MANA_IMAGES.put("WB", skin.getImage(FSkin.ManaImages.IMG_WHITE_BLACK)); + MANA_IMAGES.put("WU", skin.getImage(FSkin.ManaImages.IMG_WHITE_BLUE)); + MANA_IMAGES.put("PW", skin.getImage(FSkin.ManaImages.IMG_PHRYX_WHITE)); + MANA_IMAGES.put("PR", skin.getImage(FSkin.ManaImages.IMG_PHRYX_RED)); + MANA_IMAGES.put("PU", skin.getImage(FSkin.ManaImages.IMG_PHRYX_BLUE)); + MANA_IMAGES.put("PB", skin.getImage(FSkin.ManaImages.IMG_PHRYX_BLACK)); + MANA_IMAGES.put("PG", skin.getImage(FSkin.ManaImages.IMG_PHRYX_GREEN)); + MANA_IMAGES.put("2W", skin.getImage(FSkin.ManaImages.IMG_2W)); + MANA_IMAGES.put("2U", skin.getImage(FSkin.ManaImages.IMG_2U)); + MANA_IMAGES.put("2R", skin.getImage(FSkin.ManaImages.IMG_2R)); + MANA_IMAGES.put("2G", skin.getImage(FSkin.ManaImages.IMG_2G)); + MANA_IMAGES.put("2B", skin.getImage(FSkin.ManaImages.IMG_2B)); - MANA_IMAGES.put("S", skin.getImage(FSkin.GameplayIcons.ICO_SNOW)); - MANA_IMAGES.put("T", skin.getImage(FSkin.GameplayIcons.ICO_TAP)); - MANA_IMAGES.put("slash", skin.getImage(FSkin.GameplayIcons.ICO_SLASH)); - MANA_IMAGES.put("attack", skin.getImage(FSkin.GameplayIcons.ICO_ATTACK)); - MANA_IMAGES.put("defend", skin.getImage(FSkin.GameplayIcons.ICO_DEFEND)); - MANA_IMAGES.put("summonsick", skin.getImage(FSkin.GameplayIcons.ICO_SUMMONSICK)); - MANA_IMAGES.put("phasing", skin.getImage(FSkin.GameplayIcons.ICO_PHASING)); - MANA_IMAGES.put("counters1", skin.getImage(FSkin.GameplayIcons.ICO_COUNTERS1)); - MANA_IMAGES.put("counters2", skin.getImage(FSkin.GameplayIcons.ICO_COUNTERS2)); - MANA_IMAGES.put("counters3", skin.getImage(FSkin.GameplayIcons.ICO_COUNTERS3)); - MANA_IMAGES.put("countersMulti", skin.getImage(FSkin.GameplayIcons.ICO_COUNTERS_MULTI)); + MANA_IMAGES.put("S", skin.getImage(FSkin.GameplayImages.IMG_SNOW)); + MANA_IMAGES.put("T", skin.getImage(FSkin.GameplayImages.IMG_TAP)); + MANA_IMAGES.put("slash", skin.getImage(FSkin.GameplayImages.IMG_SLASH)); + MANA_IMAGES.put("attack", skin.getImage(FSkin.GameplayImages.IMG_ATTACK)); + MANA_IMAGES.put("defend", skin.getImage(FSkin.GameplayImages.IMG_DEFEND)); + MANA_IMAGES.put("summonsick", skin.getImage(FSkin.GameplayImages.IMG_SUMMONSICK)); + MANA_IMAGES.put("phasing", skin.getImage(FSkin.GameplayImages.IMG_PHASING)); + MANA_IMAGES.put("counters1", skin.getImage(FSkin.GameplayImages.IMG_COUNTERS1)); + MANA_IMAGES.put("counters2", skin.getImage(FSkin.GameplayImages.IMG_COUNTERS2)); + MANA_IMAGES.put("counters3", skin.getImage(FSkin.GameplayImages.IMG_COUNTERS3)); + MANA_IMAGES.put("countersMulti", skin.getImage(FSkin.GameplayImages.IMG_COUNTERS_MULTI)); MANA_IMAGES.put("foil01", skin.getImage(FSkin.Foils.FOIL_01)); MANA_IMAGES.put("foil02", skin.getImage(FSkin.Foils.FOIL_02)); diff --git a/src/main/java/forge/view/toolbox/FSkin.java b/src/main/java/forge/view/toolbox/FSkin.java index df89459bca2..567c708480f 100644 --- a/src/main/java/forge/view/toolbox/FSkin.java +++ b/src/main/java/forge/view/toolbox/FSkin.java @@ -90,88 +90,88 @@ public class FSkin { } /** int[] can hold [xcoord, ycoord, width, height, newwidth, newheight]. */ - public enum ManaIcons implements SkinProp, Coords { /** */ - ICO_BLACK (new int[] {360, 160, 40, 40, 13, 13}), /** */ - ICO_RED (new int[] {400, 160, 40, 40, 13, 13}), /** */ - ICO_COLORLESS (new int[] {440, 160, 40, 40, 13, 13}), /** */ - ICO_BLUE (new int[] {360, 200, 40, 40, 13, 13}), /** */ - ICO_GREEN (new int[] {400, 200, 40, 40, 13, 13}), /** */ - ICO_WHITE (new int[] {440, 200, 40, 40, 13, 13}), /** */ - ICO_2B (new int[] {360, 400, 40, 40, 13, 13}), /** */ - ICO_2G (new int[] {400, 400, 40, 40, 13, 13}), /** */ - ICO_2R (new int[] {440, 360, 40, 40, 13, 13}), /** */ - ICO_2U (new int[] {440, 360, 40, 40, 13, 13}), /** */ - ICO_2W (new int[] {400, 360, 40, 40, 13, 13}), /** */ - ICO_BLACK_GREEN (new int[] {360, 240, 40, 40, 13, 13}), /** */ - ICO_BLACK_RED (new int[] {400, 240, 40, 40, 13, 13}), /** */ - ICO_GREEN_BLUE (new int[] {360, 280, 40, 40, 13, 13}), /** */ - ICO_GREEN_WHITE (new int[] {440, 280, 40, 40, 13, 13}), /** */ - ICO_RED_GREEN (new int[] {360, 320, 40, 40, 13, 13}), /** */ - ICO_RED_WHITE (new int[] {400, 320, 40, 40, 13, 13}), /** */ - ICO_BLUE_BLACK (new int[] {440, 240, 40, 40, 13, 13}), /** */ - ICO_BLUE_RED (new int[] {440, 320, 40, 40, 13, 13}), /** */ - ICO_WHITE_BLACK (new int[] {400, 280, 40, 40, 13, 13}), /** */ - ICO_WHITE_BLUE (new int[] {360, 360, 40, 40, 13, 13}), /** */ - ICO_PHRYX_BLUE (new int[] {320, 200, 40, 40, 13, 13}), /** */ - ICO_PHRYX_WHITE (new int[] {320, 240, 40, 40, 13, 13}), /** */ - ICO_PHRYX_RED (new int[] {320, 280, 40, 40, 13, 13}), /** */ - ICO_PHRYX_GREEN (new int[] {320, 320, 40, 40, 13, 13}), /** */ - ICO_PHRYX_BLACK (new int[] {320, 360, 40, 40, 13, 13}); + public enum ManaImages implements SkinProp, Coords { /** */ + IMG_BLACK (new int[] {360, 160, 40, 40, 13, 13}), /** */ + IMG_RED (new int[] {400, 160, 40, 40, 13, 13}), /** */ + IMG_COLORLESS (new int[] {440, 160, 40, 40, 13, 13}), /** */ + IMG_BLUE (new int[] {360, 200, 40, 40, 13, 13}), /** */ + IMG_GREEN (new int[] {400, 200, 40, 40, 13, 13}), /** */ + IMG_WHITE (new int[] {440, 200, 40, 40, 13, 13}), /** */ + IMG_2B (new int[] {360, 400, 40, 40, 13, 13}), /** */ + IMG_2G (new int[] {400, 400, 40, 40, 13, 13}), /** */ + IMG_2R (new int[] {440, 360, 40, 40, 13, 13}), /** */ + IMG_2U (new int[] {440, 360, 40, 40, 13, 13}), /** */ + IMG_2W (new int[] {400, 360, 40, 40, 13, 13}), /** */ + IMG_BLACK_GREEN (new int[] {360, 240, 40, 40, 13, 13}), /** */ + IMG_BLACK_RED (new int[] {400, 240, 40, 40, 13, 13}), /** */ + IMG_GREEN_BLUE (new int[] {360, 280, 40, 40, 13, 13}), /** */ + IMG_GREEN_WHITE (new int[] {440, 280, 40, 40, 13, 13}), /** */ + IMG_RED_GREEN (new int[] {360, 320, 40, 40, 13, 13}), /** */ + IMG_RED_WHITE (new int[] {400, 320, 40, 40, 13, 13}), /** */ + IMG_BLUE_BLACK (new int[] {440, 240, 40, 40, 13, 13}), /** */ + IMG_BLUE_RED (new int[] {440, 320, 40, 40, 13, 13}), /** */ + IMG_WHITE_BLACK (new int[] {400, 280, 40, 40, 13, 13}), /** */ + IMG_WHITE_BLUE (new int[] {360, 360, 40, 40, 13, 13}), /** */ + IMG_PHRYX_BLUE (new int[] {320, 200, 40, 40, 13, 13}), /** */ + IMG_PHRYX_WHITE (new int[] {320, 240, 40, 40, 13, 13}), /** */ + IMG_PHRYX_RED (new int[] {320, 280, 40, 40, 13, 13}), /** */ + IMG_PHRYX_GREEN (new int[] {320, 320, 40, 40, 13, 13}), /** */ + IMG_PHRYX_BLACK (new int[] {320, 360, 40, 40, 13, 13}); private int[] coords; /** @param xy   int[] coordinates */ - ManaIcons(int[] xy) { this.coords = xy; } + ManaImages(int[] xy) { this.coords = xy; } /** @return int[] */ public int[] getCoords() { return coords; } } /** int[] can hold [xcoord, ycoord, width, height, newwidth, newheight]. */ - public enum ColorlessManaIcons implements SkinProp, Coords { /** */ - ICO_0 (new int[] {640, 200, 20, 20, 13, 13}), /** */ - ICO_1 (new int[] {660, 200, 20, 20, 13, 13}), /** */ - ICO_2 (new int[] {640, 220, 20, 20, 13, 13}), /** */ - ICO_3 (new int[] {660, 220, 20, 20, 13, 13}), /** */ - ICO_4 (new int[] {640, 240, 20, 20, 13, 13}), /** */ - ICO_5 (new int[] {660, 240, 20, 20, 13, 13}), /** */ - ICO_6 (new int[] {640, 260, 20, 20, 13, 13}), /** */ - ICO_7 (new int[] {660, 260, 20, 20, 13, 13}), /** */ - ICO_8 (new int[] {640, 280, 20, 20, 13, 13}), /** */ - ICO_9 (new int[] {660, 280, 20, 20, 13, 13}), /** */ - ICO_10 (new int[] {640, 300, 20, 20, 13, 13}), /** */ - ICO_11 (new int[] {660, 300, 20, 20, 13, 13}), /** */ - ICO_12 (new int[] {640, 320, 20, 20, 13, 13}), /** */ - ICO_15 (new int[] {660, 340, 20, 20, 13, 13}), /** */ - ICO_16 (new int[] {640, 360, 20, 20, 13, 13}), /** */ - ICO_20 (new int[] {640, 400, 20, 20, 13, 13}), /** */ - ICO_X (new int[] {640, 420, 20, 20, 13, 13}), /** */ - ICO_Y (new int[] {660, 420, 20, 20, 13, 13}), /** */ - ICO_Z (new int[] {640, 440, 20, 20, 13, 13}); + public enum ColorlessManaImages implements SkinProp, Coords { /** */ + IMG_0 (new int[] {640, 200, 20, 20, 13, 13}), /** */ + IMG_1 (new int[] {660, 200, 20, 20, 13, 13}), /** */ + IMG_2 (new int[] {640, 220, 20, 20, 13, 13}), /** */ + IMG_3 (new int[] {660, 220, 20, 20, 13, 13}), /** */ + IMG_4 (new int[] {640, 240, 20, 20, 13, 13}), /** */ + IMG_5 (new int[] {660, 240, 20, 20, 13, 13}), /** */ + IMG_6 (new int[] {640, 260, 20, 20, 13, 13}), /** */ + IMG_7 (new int[] {660, 260, 20, 20, 13, 13}), /** */ + IMG_8 (new int[] {640, 280, 20, 20, 13, 13}), /** */ + IMG_9 (new int[] {660, 280, 20, 20, 13, 13}), /** */ + IMG_10 (new int[] {640, 300, 20, 20, 13, 13}), /** */ + IMG_11 (new int[] {660, 300, 20, 20, 13, 13}), /** */ + IMG_12 (new int[] {640, 320, 20, 20, 13, 13}), /** */ + IMG_15 (new int[] {660, 340, 20, 20, 13, 13}), /** */ + IMG_16 (new int[] {640, 360, 20, 20, 13, 13}), /** */ + IMG_20 (new int[] {640, 400, 20, 20, 13, 13}), /** */ + IMG_X (new int[] {640, 420, 20, 20, 13, 13}), /** */ + IMG_Y (new int[] {660, 420, 20, 20, 13, 13}), /** */ + IMG_Z (new int[] {640, 440, 20, 20, 13, 13}); private int[] coords; /** @param xy   int[] coordinates */ - ColorlessManaIcons(int[] xy) { this.coords = xy; } + ColorlessManaImages(int[] xy) { this.coords = xy; } /** @return int[] */ public int[] getCoords() { return coords; } } /** int[] can hold [xcoord, ycoord, width, height, newwidth, newheight]. */ - public enum GameplayIcons implements SkinProp, Coords { /** */ - ICO_SNOW (new int[] {320, 160, 40, 40}), /** */ - ICO_TAP (new int[] {660, 440, 20, 20}), /** */ - ICO_UNTAP (new int[] {640, 460, 20, 20}), /** */ - ICO_SLASH (new int[] {660, 400, 10, 13}), /** */ - ICO_ATTACK (new int[] {160, 320, 80, 80, 32, 32}), /** */ - ICO_DEFEND (new int[] {160, 400, 80, 80, 32, 32}), /** */ - ICO_SUMMONSICK (new int[] {240, 400, 80, 80, 32, 32}), /** */ - ICO_PHASING (new int[] {240, 320, 80, 80, 32, 32}), /** */ - ICO_COUNTERS1 (new int[] {0, 320, 80, 80}), /** */ - ICO_COUNTERS2 (new int[] {0, 400, 80, 80}), /** */ - ICO_COUNTERS3 (new int[] {80, 320, 80, 80}), /** */ - ICO_COUNTERS_MULTI (new int[] {80, 400, 80, 80}); + public enum GameplayImages implements SkinProp, Coords { /** */ + IMG_SNOW (new int[] {320, 160, 40, 40}), /** */ + IMG_TAP (new int[] {660, 440, 20, 20}), /** */ + IMG_UNTAP (new int[] {640, 460, 20, 20}), /** */ + IMG_SLASH (new int[] {660, 400, 10, 13}), /** */ + IMG_ATTACK (new int[] {160, 320, 80, 80, 32, 32}), /** */ + IMG_DEFEND (new int[] {160, 400, 80, 80, 32, 32}), /** */ + IMG_SUMMONSICK (new int[] {240, 400, 80, 80, 32, 32}), /** */ + IMG_PHASING (new int[] {240, 320, 80, 80, 32, 32}), /** */ + IMG_COUNTERS1 (new int[] {0, 320, 80, 80}), /** */ + IMG_COUNTERS2 (new int[] {0, 400, 80, 80}), /** */ + IMG_COUNTERS3 (new int[] {80, 320, 80, 80}), /** */ + IMG_COUNTERS_MULTI (new int[] {80, 400, 80, 80}); private int[] coords; /** @param xy   int[] coordinates */ - GameplayIcons(int[] xy) { this.coords = xy; } + GameplayImages(int[] xy) { this.coords = xy; } /** @return int[] */ public int[] getCoords() { return coords; } } @@ -516,14 +516,15 @@ public class FSkin { // Run through enums and load their coords. for (Colors e : Colors.values()) { this.setColor(e); } - for (ZoneIcons e : ZoneIcons.values()) { this.setIcon(e); } - for (ManaIcons e : ManaIcons.values()) { this.setImage(e); } - for (ColorlessManaIcons e : ColorlessManaIcons.values()) { this.setImage(e); } - for (GameplayIcons e : GameplayIcons.values()) { this.setImage(e); } - for (DockIcons e : DockIcons.values()) { this.setIcon(e); } - for (ForgeIcons e : ForgeIcons.values()) { this.setIcon(e); } - for (ButtonImages e : ButtonImages.values()) { this.setIcon(e); } - for (QuestIcons e : QuestIcons.values()) { this.setIcon(e); } + for (ZoneIcons e : ZoneIcons.values()) { this.setIcon(e); } + for (DockIcons e : DockIcons.values()) { this.setIcon(e); } + for (ForgeIcons e : ForgeIcons.values()) { this.setIcon(e); } + for (ButtonImages e : ButtonImages.values()) { this.setIcon(e); } + for (QuestIcons e : QuestIcons.values()) { this.setIcon(e); } + + for (ManaImages e : ManaImages.values()) { this.setImage(e); } + for (ColorlessManaImages e : ColorlessManaImages.values()) { this.setImage(e); } + for (GameplayImages e : GameplayImages.values()) { this.setImage(e); } // Foils and creatures have a separate sprite, so use specific methods. for (Foils e : Foils.values()) { this.setFoil(e); }