Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch DyeColor firework Colors. Fixes BUKKIT-3382

Browse Source 
The firework colors were based on the respective wool data values. This
means the colors were in reverse order.
This commit is contained in:
Wesley Wolfe 2013-01-05 16:32:15 -06:00
parent 1c32f29760
commit a809f5bf0e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/org/bukkit/DyeColor.java
View File

@ -12,67 +12,67 @@ public enum DyeColor {
/** /**
* Represents white dye * Represents white dye
*/ */
WHITE(0x0, 0xF, Color.WHITE, Color.fromRGB(0x1E1B1B)), WHITE(0x0, 0xF, Color.WHITE, Color.fromRGB(0xF0F0F0)),
/** /**
* Represents orange dye * Represents orange dye
*/ */
ORANGE(0x1, 0xE, Color.fromRGB(0xD87f33), Color.fromRGB(0xB3312C)), ORANGE(0x1, 0xE, Color.fromRGB(0xD87F33), Color.fromRGB(0xEB8844)),
/** /**
* Represents magenta dye * Represents magenta dye
*/ */
MAGENTA(0x2, 0xD, Color.fromRGB(0xB24CD8), Color.fromRGB(0x3B511A)), MAGENTA(0x2, 0xD, Color.fromRGB(0xB24CD8), Color.fromRGB(0xC354CD)),
/** /**
* Represents light blue dye * Represents light blue dye
*/ */
LIGHT_BLUE(0x3, 0xC, Color.fromRGB(0x6699D8), Color.fromRGB(0x51301A)), LIGHT_BLUE(0x3, 0xC, Color.fromRGB(0x6699D8), Color.fromRGB(0x6689D3)),
/** /**
* Represents yellow dye * Represents yellow dye
*/ */
YELLOW(0x4, 0xB, Color.fromRGB(0xE5E533), Color.fromRGB(0x253192)), YELLOW(0x4, 0xB, Color.fromRGB(0xE5E533), Color.fromRGB(0xDECF2A)),
/** /**
* Represents lime dye * Represents lime dye
*/ */
LIME(0x5, 0xA, Color.fromRGB(0x7FCC19), Color.fromRGB(0x7B2FBE)), LIME(0x5, 0xA, Color.fromRGB(0x7FCC19), Color.fromRGB(0x41CD34)),
/** /**
* Represents pink dye * Represents pink dye
*/ */
PINK(0x6, 0x9, Color.fromRGB(0xF27FA5), Color.fromRGB(0x287697)), PINK(0x6, 0x9, Color.fromRGB(0xF27FA5), Color.fromRGB(0xD88198)),
/** /**
* Represents gray dye * Represents gray dye
*/ */
GRAY(0x7, 0x8, Color.fromRGB(0x4C4C4C), Color.fromRGB(0xABABAB)), GRAY(0x7, 0x8, Color.fromRGB(0x4C4C4C), Color.fromRGB(0x434343)),
/** /**
* Represents silver dye * Represents silver dye
*/ */
SILVER(0x8, 0x7, Color.fromRGB(0x999999), Color.fromRGB(0x434343)), SILVER(0x8, 0x7, Color.fromRGB(0x999999), Color.fromRGB(0xABABAB)),
/** /**
* Represents cyan dye * Represents cyan dye
*/ */
CYAN(0x9, 0x6, Color.fromRGB(0x4C7F99), Color.fromRGB(0xD88198)), CYAN(0x9, 0x6, Color.fromRGB(0x4C7F99), Color.fromRGB(0x287697)),
/** /**
* Represents purple dye * Represents purple dye
*/ */
PURPLE(0xA, 0x5, Color.fromRGB(0x7F3FB2), Color.fromRGB(0x41CD34)), PURPLE(0xA, 0x5, Color.fromRGB(0x7F3FB2), Color.fromRGB(0x7B2FBE)),
/** /**
* Represents blue dye * Represents blue dye
*/ */
BLUE(0xB, 0x4, Color.fromRGB(0x334CB2), Color.fromRGB(0xDECF2A)), BLUE(0xB, 0x4, Color.fromRGB(0x334CB2), Color.fromRGB(0x253192)),
/** /**
* Represents brown dye * Represents brown dye
*/ */
BROWN(0xC, 0x3, Color.fromRGB(0x664C33), Color.fromRGB(0x6689D3)), BROWN(0xC, 0x3, Color.fromRGB(0x664C33), Color.fromRGB(0x51301A)),
/** /**
* Represents green dye * Represents green dye
*/ */
GREEN(0xD, 0x2, Color.fromRGB(0x667F33), Color.fromRGB(0xC354CD)), GREEN(0xD, 0x2, Color.fromRGB(0x667F33), Color.fromRGB(0x3B511A)),
/** /**
* Represents red dye * Represents red dye
*/ */
RED(0xE, 0x1, Color.fromRGB(0x993333), Color.fromRGB(0xEB8844)), RED(0xE, 0x1, Color.fromRGB(0x993333), Color.fromRGB(0xB3312C)),
/** /**
* Represents black dye * Represents black dye
*/ */
BLACK(0xF, 0x0, Color.fromRGB(0x191919), Color.fromRGB(0xF0F0F0)); BLACK(0xF, 0x0, Color.fromRGB(0x191919), Color.fromRGB(0x1E1B1B));
private final byte woolData; private final byte woolData;
private final byte dyeData; private final byte dyeData;