mirror of
https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git
synced 2026-11-14 01:14:11 +00:00
Move the AeColors into ColorUtils (#1721)
This commit is contained in:
Ranzu authored and GitHub committed
1 parent
ff7876a240
commit
bb93728126
3 files changed
+194
-20
No files matched your search
@@ -18,6 +18,7 @@ import java.util.List;
|
||||
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import appeng.core.localization.ColorUtils;
|
||||
import appeng.core.localization.Localization;
|
||||
|
||||
/**
|
||||
@@ -27,40 +28,126 @@ import appeng.core.localization.Localization;
|
||||
*/
|
||||
public enum AEColor implements Localization {
|
||||
|
||||
White("gui.appliedenergistics2.White", 0xBEBEBE, 0xDBDBDB, 0xFAFAFA, 0xBEBEBE),
|
||||
// spotless:off
|
||||
White("gui.appliedenergistics2.White",
|
||||
ColorUtils.aeColorWhite_blackVariant.getColor(),
|
||||
ColorUtils.aeColorWhite_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorWhite_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorWhite_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Orange("gui.appliedenergistics2.Orange", 0xF99739, 0xFAAE44, 0xF4DEC3, 0xDC9856),
|
||||
Orange("gui.appliedenergistics2.Orange",
|
||||
ColorUtils.aeColorOrange_blackVariant.getColor(),
|
||||
ColorUtils.aeColorOrange_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorOrange_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorOrange_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Magenta("gui.appliedenergistics2.Magenta", 0x821E82, 0xB82AB8, 0xC598C8, 0x732D73),
|
||||
Magenta("gui.appliedenergistics2.Magenta",
|
||||
ColorUtils.aeColorMagenta_blackVariant.getColor(),
|
||||
ColorUtils.aeColorMagenta_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorMagenta_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorMagenta_driveVariant.getColor()
|
||||
),
|
||||
|
||||
LightBlue("gui.appliedenergistics2.LightBlue", 0x628DCB, 0x82ACE7, 0xD8F6FF, 0x7290BB),
|
||||
LightBlue("gui.appliedenergistics2.LightBlue",
|
||||
ColorUtils.aeColorLightBlue_blackVariant.getColor(),
|
||||
ColorUtils.aeColorLightBlue_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorLightBlue_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorLightBlue_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Yellow("gui.appliedenergistics2.Yellow", 0xFFF7AA, 0xF8FF4A, 0xFFFFE8, 0xF2EDB7),
|
||||
Yellow("gui.appliedenergistics2.Yellow",
|
||||
ColorUtils.aeColorYellow_blackVariant.getColor(),
|
||||
ColorUtils.aeColorYellow_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorYellow_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorYellow_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Lime("gui.appliedenergistics2.Lime", 0x7CFF4A, 0xBBFF51, 0xE7F7D7, 0x88e465),
|
||||
Lime("gui.appliedenergistics2.Lime",
|
||||
ColorUtils.aeColorLime_blackVariant.getColor(),
|
||||
ColorUtils.aeColorLime_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorLime_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorLime_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Pink("gui.appliedenergistics2.Pink", 0xDC8DB5, 0xF8B5D7, 0xF7DEEB, 0xD099B5),
|
||||
Pink("gui.appliedenergistics2.Pink",
|
||||
ColorUtils.aeColorPink_blackVariant.getColor(),
|
||||
ColorUtils.aeColorPink_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorPink_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorPink_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Gray("gui.appliedenergistics2.Gray", 0x7C7C7C, 0xA0A0A0, 0xC9C9C9, 0x7C7C7C),
|
||||
Gray("gui.appliedenergistics2.Gray",
|
||||
ColorUtils.aeColorGray_blackVariant.getColor(),
|
||||
ColorUtils.aeColorGray_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorGray_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorGray_driveVariant.getColor()
|
||||
),
|
||||
|
||||
LightGray("gui.appliedenergistics2.LightGray", 0x9D9D9D, 0xCDCDCD, 0xEFEFEF, 0x9D9D9D),
|
||||
LightGray("gui.appliedenergistics2.LightGray",
|
||||
ColorUtils.aeColorLightGray_blackVariant.getColor(),
|
||||
ColorUtils.aeColorLightGray_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorLightGray_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorLightGray_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Cyan("gui.appliedenergistics2.Cyan", 0x2F9BA5, 0x51AAC6, 0xAEDDF4, 0x418c93),
|
||||
Cyan("gui.appliedenergistics2.Cyan",
|
||||
ColorUtils.aeColorCyan_blackVariant.getColor(),
|
||||
ColorUtils.aeColorCyan_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorCyan_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorCyan_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Purple("gui.appliedenergistics2.Purple", 0x8230B2, 0xA453CE, 0xC7A3CC, 0x7D449E),
|
||||
Purple("gui.appliedenergistics2.Purple",
|
||||
ColorUtils.aeColorPurple_blackVariant.getColor(),
|
||||
ColorUtils.aeColorPurple_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorPurple_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorPurple_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Blue("gui.appliedenergistics2.Blue", 0x2D29A0, 0x514AFF, 0xDDE6FF, 0x3E3B8E),
|
||||
Blue("gui.appliedenergistics2.Blue",
|
||||
ColorUtils.aeColorBlue_blackVariant.getColor(),
|
||||
ColorUtils.aeColorBlue_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorBlue_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorBlue_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Brown("gui.appliedenergistics2.Brown", 0x724E35, 0xB7967F, 0xE0D2C8, 0x695030),
|
||||
Brown("gui.appliedenergistics2.Brown",
|
||||
ColorUtils.aeColorBrown_blackVariant.getColor(),
|
||||
ColorUtils.aeColorBrown_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorBrown_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorBrown_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Green("gui.appliedenergistics2.Green", 0x45A021, 0x60E32E, 0xE3F2E3, 0x4D8D34),
|
||||
Green("gui.appliedenergistics2.Green",
|
||||
ColorUtils.aeColorGreen_blackVariant.getColor(),
|
||||
ColorUtils.aeColorGreen_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorGreen_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorGreen_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Red("gui.appliedenergistics2.Red", 0xA50029, 0xFF003C, 0xFFE6ED, 0x8C1935),
|
||||
Red("gui.appliedenergistics2.Red",
|
||||
ColorUtils.aeColorRed_blackVariant.getColor(),
|
||||
ColorUtils.aeColorRed_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorRed_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorRed_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Black("gui.appliedenergistics2.Black", 0x2B2B2B, 0x565656, 0x848484, 0x2B2B2B),
|
||||
|
||||
Transparent("gui.appliedenergistics2.Fluix", 0x1B2344, 0x895CA8, 0xD7BBEC, 0xffffff);
|
||||
Black("gui.appliedenergistics2.Black",
|
||||
ColorUtils.aeColorBlack_blackVariant.getColor(),
|
||||
ColorUtils.aeColorBlack_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorBlack_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorBlack_driveVariant.getColor()
|
||||
),
|
||||
|
||||
Transparent("gui.appliedenergistics2.Fluix",
|
||||
ColorUtils.aeColorFluix_blackVariant.getColor(),
|
||||
ColorUtils.aeColorFluix_mediumVariant.getColor(),
|
||||
ColorUtils.aeColorFluix_whiteVariant.getColor(),
|
||||
ColorUtils.aeColorFluix_driveVariant.getColor()
|
||||
);
|
||||
// spotless:on
|
||||
public static final AEColor[] VALUES = values();
|
||||
|
||||
public static final List<AEColor> VALID_COLORS = Arrays.asList(
|
||||
|
||||
@@ -31,9 +31,9 @@ public class GuiColorButton extends GuiAeButton {
|
||||
&& mouseY < this.yPosition + this.height;
|
||||
int color;
|
||||
if (this.field_146123_n) {
|
||||
color = this.color.blackVariant - 16777216;
|
||||
color = this.color.blackVariant | 0xFF000000;
|
||||
} else {
|
||||
color = this.color.mediumVariant - 16777216;
|
||||
color = this.color.mediumVariant | 0xFF000000;
|
||||
}
|
||||
drawRect(this.xPosition, this.yPosition, this.xPosition + this.width, this.yPosition + this.height, color);
|
||||
|
||||
|
||||
@@ -8,6 +8,93 @@ public class ColorUtils {
|
||||
|
||||
public static final ColorResource
|
||||
// spotless:off
|
||||
|
||||
// AEColor
|
||||
aeColorWhite_blackVariant = color.rgb("aeColorWhite_blackVariant", "0xBEBEBE"),
|
||||
aeColorWhite_mediumVariant = color.rgb("aeColorWhite_mediumVariant", "0xDBDBDB"),
|
||||
aeColorWhite_whiteVariant = color.rgb("aeColorWhite_whiteVariant", "0xFAFAFA"),
|
||||
aeColorWhite_driveVariant = color.rgb("aeColorWhite_driveVariant", "0xBEBEBE"),
|
||||
|
||||
aeColorOrange_blackVariant = color.rgb("aeColorOrange_blackVariant", "0xF99739"),
|
||||
aeColorOrange_mediumVariant = color.rgb("aeColorOrange_mediumVariant", "0xFAAE44"),
|
||||
aeColorOrange_whiteVariant = color.rgb("aeColorOrange_whiteVariant", "0xF4DEC3"),
|
||||
aeColorOrange_driveVariant = color.rgb("aeColorOrange_driveVariant", "0xDC9856"),
|
||||
|
||||
aeColorMagenta_blackVariant = color.rgb("aeColorMagenta_blackVariant", "0x821E82"),
|
||||
aeColorMagenta_mediumVariant = color.rgb("aeColorMagenta_mediumVariant", "0xB82AB8"),
|
||||
aeColorMagenta_whiteVariant = color.rgb("aeColorMagenta_whiteVariant", "0xC598C8"),
|
||||
aeColorMagenta_driveVariant = color.rgb("aeColorMagenta_driveVariant", "0x732D73"),
|
||||
|
||||
aeColorLightBlue_blackVariant = color.rgb("aeColorLightBlue_blackVariant", "0x628DCB"),
|
||||
aeColorLightBlue_mediumVariant = color.rgb("aeColorLightBlue_mediumVariant", "0x82ACE7"),
|
||||
aeColorLightBlue_whiteVariant = color.rgb("aeColorLightBlue_whiteVariant", "0xD8F6FF"),
|
||||
aeColorLightBlue_driveVariant = color.rgb("aeColorLightBlue_driveVariant", "0x7290BB"),
|
||||
|
||||
aeColorYellow_blackVariant = color.rgb("aeColorYellow_blackVariant", "0xFFF7AA"),
|
||||
aeColorYellow_mediumVariant = color.rgb("aeColorYellow_mediumVariant", "0xF8FF4A"),
|
||||
aeColorYellow_whiteVariant = color.rgb("aeColorYellow_whiteVariant", "0xFFFFE8"),
|
||||
aeColorYellow_driveVariant = color.rgb("aeColorYellow_driveVariant", "0xF2EDB7"),
|
||||
|
||||
aeColorLime_blackVariant = color.rgb("aeColorLime_blackVariant", "0x7CFF4A"),
|
||||
aeColorLime_mediumVariant = color.rgb("aeColorLime_mediumVariant", "0xBBFF51"),
|
||||
aeColorLime_whiteVariant = color.rgb("aeColorLime_whiteVariant", "0xE7F7D7"),
|
||||
aeColorLime_driveVariant = color.rgb("aeColorLime_driveVariant", "0x88e465"),
|
||||
|
||||
aeColorPink_blackVariant = color.rgb("aeColorPink_blackVariant", "0xDC8DB5"),
|
||||
aeColorPink_mediumVariant = color.rgb("aeColorPink_mediumVariant", "0xF8B5D7"),
|
||||
aeColorPink_whiteVariant = color.rgb("aeColorPink_whiteVariant", "0xF7DEEB"),
|
||||
aeColorPink_driveVariant = color.rgb("aeColorPink_driveVariant", "0xD099B5"),
|
||||
|
||||
aeColorGray_blackVariant = color.rgb("aeColorGray_blackVariant", "0x7C7C7C"),
|
||||
aeColorGray_mediumVariant = color.rgb("aeColorGray_mediumVariant", "0xA0A0A0"),
|
||||
aeColorGray_whiteVariant = color.rgb("aeColorGray_whiteVariant", "0xC9C9C9"),
|
||||
aeColorGray_driveVariant = color.rgb("aeColorGray_driveVariant", "0x7C7C7C"),
|
||||
|
||||
aeColorLightGray_blackVariant = color.rgb("aeColorLightGray_blackVariant", "0x9D9D9D"),
|
||||
aeColorLightGray_mediumVariant = color.rgb("aeColorLightGray_mediumVariant", "0xCDCDCD"),
|
||||
aeColorLightGray_whiteVariant = color.rgb("aeColorLightGray_whiteVariant", "0xEFEFEF"),
|
||||
aeColorLightGray_driveVariant = color.rgb("aeColorLightGray_driveVariant", "0x9D9D9D"),
|
||||
|
||||
aeColorCyan_blackVariant = color.rgb("aeColorCyan_blackVariant", "0x2F9BA5"),
|
||||
aeColorCyan_mediumVariant = color.rgb("aeColorCyan_mediumVariant", "0x51AAC6"),
|
||||
aeColorCyan_whiteVariant = color.rgb("aeColorCyan_whiteVariant", "0xAEDDF4"),
|
||||
aeColorCyan_driveVariant = color.rgb("aeColorCyan_driveVariant", "0x418c93"),
|
||||
|
||||
aeColorPurple_blackVariant = color.rgb("aeColorPurple_blackVariant", "0x8230B2"),
|
||||
aeColorPurple_mediumVariant = color.rgb("aeColorPurple_mediumVariant", "0xA453CE"),
|
||||
aeColorPurple_whiteVariant = color.rgb("aeColorPurple_whiteVariant", "0xC7A3CC"),
|
||||
aeColorPurple_driveVariant = color.rgb("aeColorPurple_driveVariant", "0x7D449E"),
|
||||
|
||||
aeColorBlue_blackVariant = color.rgb("aeColorBlue_blackVariant", "0x2D29A0"),
|
||||
aeColorBlue_mediumVariant = color.rgb("aeColorBlue_mediumVariant", "0x514AFF"),
|
||||
aeColorBlue_whiteVariant = color.rgb("aeColorBlue_whiteVariant", "0xDDE6FF"),
|
||||
aeColorBlue_driveVariant = color.rgb("aeColorBlue_driveVariant", "0x3E3B8E"),
|
||||
|
||||
aeColorBrown_blackVariant = color.rgb("aeColorBrown_blackVariant", "0x724E35"),
|
||||
aeColorBrown_mediumVariant = color.rgb("aeColorBrown_mediumVariant", "0xB7967F"),
|
||||
aeColorBrown_whiteVariant = color.rgb("aeColorBrown_whiteVariant", "0xE0D2C8"),
|
||||
aeColorBrown_driveVariant = color.rgb("aeColorBrown_driveVariant", "0x695030"),
|
||||
|
||||
aeColorGreen_blackVariant = color.rgb("aeColorGreen_blackVariant", "0x45A021"),
|
||||
aeColorGreen_mediumVariant = color.rgb("aeColorGreen_mediumVariant", "0x60E32E"),
|
||||
aeColorGreen_whiteVariant = color.rgb("aeColorGreen_whiteVariant", "0xE3F2E3"),
|
||||
aeColorGreen_driveVariant = color.rgb("aeColorGreen_driveVariant", "0x4D8D34"),
|
||||
|
||||
aeColorRed_blackVariant = color.rgb("aeColorRed_blackVariant", "0xA50029"),
|
||||
aeColorRed_mediumVariant = color.rgb("aeColorRed_mediumVariant", "0xFF003C"),
|
||||
aeColorRed_whiteVariant = color.rgb("aeColorRed_whiteVariant", "0xFFE6ED"),
|
||||
aeColorRed_driveVariant = color.rgb("aeColorRed_driveVariant", "0x8C1935"),
|
||||
|
||||
aeColorBlack_blackVariant = color.rgb("aeColorBlack_blackVariant", "0x2B2B2B"),
|
||||
aeColorBlack_mediumVariant = color.rgb("aeColorBlack_mediumVariant", "0x565656"),
|
||||
aeColorBlack_whiteVariant = color.rgb("aeColorBlack_whiteVariant", "0x848484"),
|
||||
aeColorBlack_driveVariant = color.rgb("aeColorBlack_driveVariant", "0x2B2B2B"),
|
||||
|
||||
aeColorFluix_blackVariant = color.rgb("aeColorFluix_blackVariant", "0x1B2344"),
|
||||
aeColorFluix_mediumVariant = color.rgb("aeColorFluix_mediumVariant", "0x895CA8"),
|
||||
aeColorFluix_whiteVariant = color.rgb("aeColorFluix_whiteVariant", "0xD7BBEC"),
|
||||
aeColorFluix_driveVariant = color.rgb("aeColorFluix_driveVariant", "0xffffff"),
|
||||
|
||||
guiTextColorGray = color.rgb("guiTextColorGray", "0x404040"),
|
||||
guiTextColorBlack = color.rgb("guiTextColorBlack", "0x000000"),
|
||||
searchboxText = color.rgb("searchboxText", "0xFFFFFF"),
|
||||
|
||||
Reference in new issue
Block a user