Colours Are Cool 🌈

src/main/java/ch/njol/skript/Skript.java

@@ -91,6 +91,7 @@
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.structure.Structure;
 import org.skriptlang.skript.lang.structure.StructureInfo;
+import org.skriptlang.skript.common.colors.ColorModule;
 import org.skriptlang.skript.log.runtime.RuntimeErrorManager;
 import org.skriptlang.skript.registration.SyntaxInfo;
 import org.skriptlang.skript.registration.SyntaxOrigin;
@@ -557,6 +558,7 @@ public void onEnable() {
 			BreedingModule.load();
 			DisplayModule.load();
 			InputModule.load();
+			ColorModule.load();
 			TagModule.load();
 			FurnaceModule.load();
 			LootTableModule.load();

src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java

@@ -7,6 +7,7 @@
 import ch.njol.skript.lang.util.SimpleLiteral;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.registrations.DefaultClasses;
+import ch.njol.skript.util.Contract;
 import ch.njol.skript.util.Date;
 import ch.njol.skript.util.*;
 import ch.njol.util.Math2;
@@ -503,29 +504,6 @@ public Long[] executeSimple(Object[][] params) {
 		}.description("Calculates the total amount of experience needed to achieve given level from scratch in Minecraft.")
 			.since("2.2-dev32"));
 
-		Functions.registerFunction(new SimpleJavaFunction<Color>("rgb", new Parameter[] {
-			new Parameter<>("red", DefaultClasses.LONG, true, null),
-			new Parameter<>("green", DefaultClasses.LONG, true, null),
-			new Parameter<>("blue", DefaultClasses.LONG, true, null),
-			new Parameter<>("alpha", DefaultClasses.LONG, true, new SimpleLiteral<>(255L,true))
-		}, DefaultClasses.COLOR, true) {
-			@Override
-			public ColorRGB[] executeSimple(Object[][] params) {
-				Long red = (Long) params[0][0];
-				Long green = (Long) params[1][0];
-				Long blue = (Long) params[2][0];
-				Long alpha = (Long) params[3][0];
-
-				return CollectionUtils.array(ColorRGB.fromRGBA(red.intValue(), green.intValue(), blue.intValue(), alpha.intValue()));
-			}
-		}).description("Returns a RGB color from the given red, green and blue parameters. Alpha values can be added optionally, " +
-						"but these only take affect in certain situations, like text display backgrounds.")
-			.examples(
-				"dye player's leggings rgb(120, 30, 45)",
-				"set the colour of a text display to rgb(10, 50, 100, 50)"
-			)
-			.since("2.5, 2.10 (alpha)");
-
 		Functions.registerFunction(new SimpleJavaFunction<Player>("player", new Parameter[] {
 			new Parameter<>("nameOrUUID", DefaultClasses.STRING, true, null),
 			new Parameter<>("getExactPlayer", DefaultClasses.BOOLEAN, true, new SimpleLiteral<Boolean>(false, true)) // getExactPlayer -- grammar ¯\_ (ツ)_/¯

src/main/java/ch/njol/skript/classes/data/SkriptClasses.java

@@ -29,6 +29,7 @@
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.common.colors.ColorUtils;
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.util.SkriptQueue;
 import org.skriptlang.skript.util.Executable;
@@ -65,8 +66,7 @@ public SkriptClasses() {}
 				.supplier(() -> (Iterator) Classes.getClassInfos().iterator())
 				.parser(new Parser<ClassInfo>() {
 					@Override
-					@Nullable
-					public ClassInfo parse(final String s, final ParseContext context) {
+					public @Nullable ClassInfo parse(final String s, final ParseContext context) {
 						return Classes.getClassInfoFromUserInput(Noun.stripIndefiniteArticle(s));
 					}
 
@@ -114,11 +114,9 @@ protected ClassInfo deserialize(final Fields fields) throws StreamCorruptedExcep
 							throw new StreamCorruptedException("Invalid ClassInfo " + codeName);
 						return ci;
 					}
-
-//					return c.getCodeName();
+
 					@Override
-					@Nullable
-					public ClassInfo deserialize(final String s) {
+					public @Nullable ClassInfo deserialize(final String s) {
 						return Classes.getClassInfoNoError(s);
 					}
 
@@ -140,8 +138,7 @@ public boolean mustSyncDeserialization() {
 				.defaultExpression(new SimpleLiteral<>(WeatherType.CLEAR, true))
 				.parser(new Parser<WeatherType>() {
 					@Override
-					@Nullable
-					public WeatherType parse(final String s, final ParseContext context) {
+					public @Nullable WeatherType parse(final String s, final ParseContext context) {
 						return WeatherType.parse(s);
 					}
 
@@ -152,7 +149,7 @@ public String toString(final WeatherType o, final int flags) {
 
 					@Override
 					public String toVariableNameString(final WeatherType o) {
-						return "" + o.name().toLowerCase(Locale.ENGLISH);
+						return o.name().toLowerCase(Locale.ENGLISH);
 					}
 
 				})
@@ -178,8 +175,7 @@ public String toVariableNameString(final WeatherType o) {
 					.iterator())
 				.parser(new Parser<ItemType>() {
 					@Override
-					@Nullable
-					public ItemType parse(final String s, final ParseContext context) {
+					public @Nullable ItemType parse(final String s, final ParseContext context) {
 						return Aliases.parseItemType(s);
 					}
 
@@ -213,7 +209,7 @@ public String toVariableNameString(final ItemType t) {
 								b.append(":" + ench.getLevel());
 							}
 						}
-						return "" + b.toString();
+						return b.toString();
 					}
 				})
 				.cloner(ItemType::clone)
@@ -233,8 +229,7 @@ public String toVariableNameString(final ItemType t) {
 				.defaultExpression(new EventValueExpression<>(Time.class))
 				.parser(new Parser<Time>() {
 					@Override
-					@Nullable
-					public Time parse(final String s, final ParseContext context) {
+					public @Nullable Time parse(final String s, final ParseContext context) {
 						return Time.parse(s);
 					}
 
@@ -266,8 +261,7 @@ public String toVariableNameString(final Time o) {
 				.since("1.0, 2.6.1 (weeks, months, years)")
 				.parser(new Parser<Timespan>() {
 					@Override
-					@Nullable
-					public Timespan parse(final String s, final ParseContext context) {
+					public @Nullable Timespan parse(final String s, final ParseContext context) {
 						try {
 							return Timespan.parse(s, context);
 						} catch (IllegalArgumentException e) {
@@ -301,8 +295,7 @@ public String toVariableNameString(final Timespan o) {
 				.defaultExpression(new SimpleLiteral<>(new Timeperiod(0, 23999), true))
 				.parser(new Parser<Timeperiod>() {
 					@Override
-					@Nullable
-					public Timeperiod parse(final String s, final ParseContext context) {
+					public @Nullable Timeperiod parse(final String s, final ParseContext context) {
 						if (s.equalsIgnoreCase("day")) {
 							return new Timeperiod(0, 11999);
 						} else if (s.equalsIgnoreCase("dusk")) {
@@ -398,8 +391,7 @@ protected boolean canBeInstantiated() {
 				.defaultExpression(new SimpleLiteral<>(new Direction(new double[] {0, 0, 0}), true))
 				.parser(new Parser<Direction>() {
 					@Override
-					@Nullable
-					public Direction parse(final String s, final ParseContext context) {
+					public @Nullable Direction parse(final String s, final ParseContext context) {
 						return null;
 					}
 
@@ -437,10 +429,9 @@ public String toVariableNameString(final Direction o) {
 				.since("")
 				.defaultExpression(new EventValueExpression<>(Slot.class))
 				.changer(new Changer<Slot>() {
-					@SuppressWarnings("unchecked")
 					@Override
-					@Nullable
-					public Class<Object>[] acceptChange(final ChangeMode mode) {
+					@SuppressWarnings("unchecked")
+					public @Nullable Class<Object>[] acceptChange(final ChangeMode mode) {
 						if (mode == ChangeMode.RESET)
 							return null;
 						if (mode == ChangeMode.SET)
@@ -543,14 +534,13 @@ public String toVariableNameString(Slot o) {
 				.description("Wool, dye and chat colors.")
 				.usage("black, dark grey/dark gray, grey/light grey/gray/light gray/silver, white, blue/dark blue, cyan/aqua/dark cyan/dark aqua, light blue/light cyan/light aqua, green/dark green, light green/lime/lime green, yellow/light yellow, orange/gold/dark yellow, red/dark red, pink/light red, purple/dark purple, magenta/light purple, brown/indigo")
 				.examples("color of the sheep is red or black",
-						"set the color of the block to green",
-						"message \"You're holding a <%color of tool%>%color of tool%<reset> wool block\"")
+					"set the color of the block to green",
+					"message \"You're holding a <%color of tool%>%color of tool%<reset> wool block\"")
 				.since("")
 				.supplier(SkriptColor.values())
 				.parser(new Parser<Color>() {
 					@Override
-					@Nullable
-					public Color parse(String input, ParseContext context) {
+					public @Nullable Color parse(String input, ParseContext context) {
 						Color rgbColor = ColorRGB.fromString(input);
 						if (rgbColor != null)
 							return rgbColor;
@@ -564,7 +554,7 @@ public String toString(Color c, int flags) {
 
 					@Override
 					public String toVariableNameString(Color color) {
-						return "" + color.getName().toLowerCase(Locale.ENGLISH).replace('_', ' ');
+						return color.getName().toLowerCase(Locale.ENGLISH).replace('_', ' ');
 					}
 				}));
 
@@ -579,8 +569,7 @@ public String toVariableNameString(Color color) {
 				.defaultExpression(new SimpleLiteral<>(StructureType.TREE, true))
 				.parser(new Parser<StructureType>() {
 					@Override
-					@Nullable
-					public StructureType parse(final String s, final ParseContext context) {
+					public @Nullable StructureType parse(final String s, final ParseContext context) {
 						return StructureType.fromName(s);
 					}
 
@@ -591,7 +580,7 @@ public String toString(final StructureType o, final int flags) {
 
 					@Override
 					public String toVariableNameString(final StructureType o) {
-						return "" + o.name().toLowerCase(Locale.ENGLISH);
+						return o.name().toLowerCase(Locale.ENGLISH);
 					}
 				}).serializer(new EnumSerializer<>(StructureType.class)));
 
@@ -634,8 +623,7 @@ public String toVariableNameString(final EnchantmentType o) {
 					private final RegexMessage pattern = new RegexMessage("types.experience.pattern", Pattern.CASE_INSENSITIVE);
 
 					@Override
-					@Nullable
-					public Experience parse(String s, final ParseContext context) {
+					public @Nullable Experience parse(String s, final ParseContext context) {
 						int xp = -1;
 						if (s.matches("\\d+ .+")) {
 							xp = Utils.parseInt("" + s.substring(0, s.indexOf(' ')));
@@ -670,8 +658,7 @@ public String toVariableNameString(final Experience xp) {
 				.after("itemtype")
 				.parser(new Parser<VisualEffect>() {
 					@Override
-					@Nullable
-					public VisualEffect parse(String s, ParseContext context) {
+					public @Nullable VisualEffect parse(String s, ParseContext context) {
 						return VisualEffects.parse(s);
 					}
 
@@ -695,7 +682,7 @@ public String toVariableNameString(VisualEffect e) {
 				.usage("")
 				.examples("")
 				.since("2.5")
-				.serializer(new YggdrasilSerializer<GameruleValue>())
+				.serializer(new YggdrasilSerializer<>())
 		);
 
 		Classes.registerClass(new ClassInfo<>(SkriptQueue.class, "queue")

src/main/java/ch/njol/skript/expressions/ExprARGB.java

@@ -28,7 +28,7 @@
 public class ExprARGB extends SimplePropertyExpression<Color, Integer> {
 
 	static {
-		register(ExprARGB.class, Integer.class, "(:alpha|:red|:green|:blue) (value|component)", "colors");
+		register(ExprARGB.class, Integer.class, "(:alpha|:red|:green|:blue) (value|component|channel)", "colors");
 	}
 
 	private RGB color;

src/main/java/ch/njol/skript/util/Color.java

@@ -1,34 +1,53 @@
 package ch.njol.skript.util;
 
-import ch.njol.yggdrasil.YggdrasilSerializable.YggdrasilExtendedSerializable;
 import org.bukkit.DyeColor;
 import org.jetbrains.annotations.Nullable;
 
-public interface Color extends YggdrasilExtendedSerializable {
+public interface Color {
 
 	/**
-	 * Gets Bukkit color representing this color.
-	 * @return Bukkit color.
+	 * @return The Bukkit color representing this color.
 	 */
 	org.bukkit.Color asBukkitColor();
 
 	/**
-	 * @return The alpha component of this color.
+	 * @return The hexadecimal code representing this color. Can be used to color text.
+	 */
+	default String getHex() {
+		return String.format("#%02X%02X%02X", getRed(), getGreen(), getBlue());
+	}
+
+	/**
+	 * @return The hexadecimal code representing this color, including the alpha channel. Cannot be used to color text.
+	 */
+	default String getFullHex() {
+		return String.format("#%02X%02X%02X%02X", getAlpha(), getRed(), getGreen(), getBlue());
+	}
+
+	/**
+	 * @return The integer representing this color.
+	 */
+	default int asInt() {
+		return (getAlpha() << 24) | (getRed() << 16) | (getGreen() << 8) | getBlue();
+	}
+
+	/**
+	 * @return The alpha channel of this color.
 	 */
 	int getAlpha();
 
 	/**
-	 * @return The red component of this color.
+	 * @return The red channel of this color.
 	 */
 	int getRed();
 
 	/**
-	 * @return The green component of this color.
+	 * @return The green channel of this color.
 	 */
 	int getGreen();
 
 	/**
-	 * @return The blue component of this color.
+	 * @return The blue channel of this color.
 	 */
 	int getBlue();