🚀 Added `%itemtypes% dyed %color%` expression & ExprColorOf Improvements #4335

AyhamAl-Ali · 2021-09-17T18:21:03Z

Description

This PR aims to add a new helpful expression to return itemtypes with colors directly using this pattern %itemtypes% (dyed|with color [of]) %color%

It also comes with some improvements and fixes to ExprColorOf:

✔️ Added support to return RGB colors of RGB colored items (see image below)
✔️ Fixed color of not working (getting and setting) with potions, maps and leather armor meta
✔️ Fixed color of not working (getting and setting) with blocks in MC 1.14+

Quick showcase of this PR's results

in the 2nd image the held item is the 2nd hotbar slot and the new given item is the 4th hotbar slot

Target Minecraft Versions: Any (HEX/RGB 1.16+)
Requirements: None
Related Issues:

- Also fixed `color of` not working (getting and setting) with potions, maps and leather armor meta - Improved changers of `color of` expr

APickledWalrus

Nothing too major. I also wonder if it would be beneficial to have some sort of dye utility methods (since there is a lot of repetition when it comes to the instanceof checks and such)

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

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

Co-authored-by: APickledWalrus <[email protected]>

AyhamAl-Ali · 2023-05-12T12:50:35Z

This PR now fixes the issue of grabbing block colors, see #5682
Changers support will be added as well

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

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

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

sovdeeth · 2024-04-07T13:49:07Z

Closing due to 7+ months of inactivity

…ture/dyed-expr

AyhamAl-Ali · 2024-04-08T01:49:55Z

- RGB pattern now don't require a space after the commas - renamed couple variables - added a fail shortcut for dying blocks with RGB - Removed color-color comparator as it's not the proper fix, it should be fixed in CondCompare

Fusezion

I'm not the best at reviewing so I'll leave the more important reviews to the team, this was just something I noticed right away

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

kept as a band aid fix until we fix it properly due to it breaking this PR

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

APickledWalrus · 2024-05-29T17:45:52Z

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

-		String hand = offHand ? "off hand" : "";
-		return String.format("%s tool of %s", hand, getExpr().toString(e, debug));
+	public String toString(final @Nullable Event event, final boolean debug) {
+		return offHand ? "off hand " : "" + "tool of " + getExpr().toString(event, debug);


Suggested change

return offHand ? "off hand " : "" + "tool of " + getExpr().toString(event, debug);

return (offHand ? "off hand " : "") + "tool of " + getExpr().toString(event, debug);

APickledWalrus · 2024-05-29T17:53:49Z

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

+		// TODO FIX
+		// this approach has couple issues, users can't use multiple types in source like
+		// 'broadcast colors of ((trailing burst firework colored blue and red) and targeted block)' and second
+		// this check doesn't work with variables as it's not converted yet


what do you mean by not converted yet?

APickledWalrus · 2024-05-29T17:54:11Z

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

-	protected Color[] get(Event e, Object[] source) {
+	protected Color[] get(Event event, Object[] source) {
+		// TODO FIX
+		// this approach has couple issues, users can't use multiple types in source like


would this be resolved by instead using a SimplePropertyExpression here? is there a reason it couldn't be one?

APickledWalrus · 2024-05-29T17:57:23Z

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

 public class ExprColorOf extends PropertyExpression<Object, Color> {

+	private static final boolean MAPS_AND_POTIONS_COLORS = Skript.methodExists(PotionMeta.class, "setColor", org.bukkit.Color.class);


This method seems to exist on 1.13 https://jd.papermc.io/paper/1.13/org/bukkit/inventory/meta/PotionMeta.html#setColor-org.bukkit.Color-

APickledWalrus · 2024-05-29T17:57:53Z

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

+							return ColorRGB.fromBukkitOrRgbColor(mapMeta.getColor());
+				} else if (meta instanceof PotionMeta && MAPS_AND_POTIONS_COLORS) {
+					PotionMeta potionMeta = (PotionMeta) meta;
+					if (potionMeta.getColor() != null)


Suggested change

if (potionMeta.getColor() != null)

if (potionMeta.hasColor())

You need to use this check per the javadoc of getColor

APickledWalrus · 2024-05-29T18:04:16Z

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

+		switch (mode) { // items/blocks/entities only accept these change modes
+			case RESET:
+			case DELETE:
+			case SET:
+				return CollectionUtils.array(Color.class);
+		}
+
 		return null;


Suggested change

switch (mode) { // items/blocks/entities only accept these change modes

case RESET:

case DELETE:

case SET:

return CollectionUtils.array(Color.class);

}

return null;

switch (mode) { // items/blocks/entities only accept these change modes

case RESET:

case DELETE:

case SET:

return CollectionUtils.array(Color.class);

default:

return null;

}

I think you can do this (can eventually be converted to a switch expression in the future)

APickledWalrus · 2024-05-29T18:07:58Z

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

-							"since different colored beds are different materials. " +
-							"Instead, set the block to right material, such as a blue bed."); // Let's just assume it's a bed
+					} catch (Exception ex) {
+						// TODO remove this as it's too old now


is there a reason not to remove it in this PR?

APickledWalrus · 2024-05-29T18:08:45Z

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

+				Material newBlock = setMaterialColor(block.getType(), color);
+				if (newBlock == null)
+					continue;
+				block.setType(newBlock);


how does this affect the BlockData (e.g. bed half)

APickledWalrus · 2024-05-29T18:09:42Z

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

+		"give player leather chestplate dyed red",
+		"give player potion of invisibility dyed rgb 200, 70, 88",
+		"give player filled map colored rgb(20, 60, 70)",
+		"give player wool painted red"


Suggested change

"give player leather chestplate dyed red",

"give player potion of invisibility dyed rgb 200, 70, 88",

"give player filled map colored rgb(20, 60, 70)",

"give player wool painted red"

"give player leather chestplate dyed red",

"give player potion of invisibility dyed rgb 200, 70, 88",

"give player filled map colored rgb(20, 60, 70)",

"give player wool painted red"

I think one line is okay for these annotations

APickledWalrus · 2024-05-29T18:10:25Z

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

+@Since("INSERT VERSION")
+public class ExprDyed extends SimpleExpression<ItemType> {
+
+	private static final boolean MAPS_AND_POTIONS_COLORS = Skript.methodExists(PotionMeta.class, "setColor", org.bukkit.Color.class);


This method seems to exist on 1.13 https://jd.papermc.io/paper/1.13/org/bukkit/inventory/meta/PotionMeta.html#setColor-org.bukkit.Color-

AyhamAl-Ali added 2 commits September 17, 2021 18:12

🚀 Added Dyed expression

a7491ac

- Also fixed `color of` not working (getting and setting) with potions, maps and leather armor meta - Improved changers of `color of` expr

🛠 Improved ExprColorOf to return RGB colors of RGB colored items

aa815d3

TPGamesNL added enhancement Feature request, an issue about something that could be improved, or a PR improving something. feature Pull request adding a new feature. labels Sep 19, 2021

APickledWalrus requested changes Mar 5, 2022

View reviewed changes

AyhamAl-Ali and others added 3 commits March 5, 2022 16:18

Apply suggestions from code review

aeb0bcd

Co-authored-by: APickledWalrus <[email protected]>

Merge branch 'master' into feature/dyed-expr

7018d1a

Merge branch 'master' into feature/dyed-expr

b2e10db

AyhamAl-Ali marked this pull request as draft June 24, 2022 12:16

Update src/main/java/ch/njol/skript/expressions/ExprDyed.java

feb5a1f

Co-authored-by: APickledWalrus <[email protected]>

AyhamAl-Ali mentioned this pull request Dec 24, 2022

ExprColorOf doesn't work and freezes the server #5260

Open

1 task

AyhamAl-Ali changed the title ~~🚀 Added %itemtypes% dyed %color% expression~~ 🚀 Added %itemtypes% dyed %color% expression & ExprColorOf Improvements Dec 24, 2022

TheLimeGlass mentioned this pull request Jan 6, 2023

Feature | ExprDye #5326

Open

1 task

AyhamAl-Ali added 2 commits May 12, 2023 15:14

Merge remote-tracking branch 'origin/master' into feature/dyed-expr

a2ce91f

Support grabbing color of blocks - beta

f268c81

AyhamAl-Ali added 2 commits May 12, 2023 15:51

Update Since annotation

c1e924d

Fix the whole Skript literally :D

64d31c2

AyhamAl-Ali marked this pull request as ready for review May 13, 2023 22:59

AyhamAl-Ali added 2 commits May 14, 2023 02:01

Clean up

170207b

Update tests - restore light blue chat color

920fae4

AyhamAl-Ali requested a review from APickledWalrus May 13, 2023 23:21

AyhamAl-Ali added 5 commits May 14, 2023 02:26

Clean up tests

7397cdd

Fix tests

a412d67

Add color comparator :)

284c9f0

Gotta sleep

5009ef9

Fix tests for real - fix Adjective.toString()

73a606f

AyhamAl-Ali added the bug An issue that needs to be fixed. Alternatively, a PR fixing an issue. label May 14, 2023

TheLimeGlass requested changes Aug 2, 2023

View reviewed changes

Moderocky force-pushed the master branch from 3f08853 to bd134d0 Compare September 16, 2023 15:59

sovdeeth closed this Apr 7, 2024

AyhamAl-Ali added 2 commits April 8, 2024 04:47

Address reviews

2a1748f

Merge remote-tracking branch 'AyhamAl-Ali/feature/dyed-expr' into fea…

d040da2

…ture/dyed-expr

AyhamAl-Ali reopened this Apr 8, 2024

AyhamAl-Ali added 3 commits April 8, 2024 04:53

Merge remote-tracking branch 'origin/dev/feature' into feature/dyed-expr

b382d48

Fix ExprDyed

fbd6b62

Improvements

e66ad6f

- RGB pattern now don't require a space after the commas - renamed couple variables - added a fail shortcut for dying blocks with RGB - Removed color-color comparator as it's not the proper fix, it should be fixed in CondCompare

AyhamAl-Ali requested review from TheLimeGlass, sovdeeth, Moderocky and Fusezion April 8, 2024 03:40

Fusezion reviewed Apr 8, 2024

View reviewed changes

src/main/java/ch/njol/skript/classes/data/DefaultComparators.java Show resolved Hide resolved

AyhamAl-Ali force-pushed the feature/dyed-expr branch from eeee8b4 to e66ad6f Compare April 8, 2024 14:15

Revert last commit to not include color-color removal

83a896c

kept as a band aid fix until we fix it properly due to it breaking this PR

sovdeeth reviewed Apr 8, 2024

View reviewed changes

src/main/java/ch/njol/skript/expressions/ExprColorOf.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/expressions/ExprColorOf.java Outdated Show resolved Hide resolved

Merge branch 'dev/feature' into feature/dyed-expr

e96f91d

Moderocky approved these changes Apr 8, 2024

View reviewed changes

Address reviews

8599e0c

AyhamAl-Ali requested a review from sovdeeth April 9, 2024 01:52

fix comment

1710e82

sovdeeth approved these changes Apr 9, 2024

View reviewed changes

AyhamAl-Ali added the feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. label Apr 23, 2024

APickledWalrus requested changes May 29, 2024

View reviewed changes

sovdeeth added 2.9 Targeting a 2.9.X version release and removed feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. 2.9 Targeting a 2.9.X version release labels Jul 1, 2024

AyhamAl-Ali closed this Aug 31, 2024

TheLimeGlass mentioned this pull request Aug 31, 2024

Added %itemtypes% dyed %color% expression & ExprColorOf Improvement #7021

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🚀 Added `%itemtypes% dyed %color%` expression & ExprColorOf Improvements #4335

🚀 Added `%itemtypes% dyed %color%` expression & ExprColorOf Improvements #4335

AyhamAl-Ali commented Sep 17, 2021 •

edited

Loading

APickledWalrus left a comment

AyhamAl-Ali commented May 12, 2023 •

edited

Loading

sovdeeth commented Apr 7, 2024

AyhamAl-Ali commented Apr 8, 2024 •

edited

Loading

Fusezion left a comment

APickledWalrus May 29, 2024

APickledWalrus May 29, 2024

APickledWalrus May 29, 2024

APickledWalrus May 29, 2024

APickledWalrus May 29, 2024

APickledWalrus May 29, 2024

APickledWalrus May 29, 2024

APickledWalrus May 29, 2024

APickledWalrus May 29, 2024

APickledWalrus May 29, 2024

	return offHand ? "off hand " : "" + "tool of " + getExpr().toString(event, debug);
	return (offHand ? "off hand " : "") + "tool of " + getExpr().toString(event, debug);

		public class ExprColorOf extends PropertyExpression<Object, Color> {

		private static final boolean MAPS_AND_POTIONS_COLORS = Skript.methodExists(PotionMeta.class, "setColor", org.bukkit.Color.class);

	if (potionMeta.getColor() != null)
	if (potionMeta.hasColor())

🚀 Added %itemtypes% dyed %color% expression & ExprColorOf Improvements #4335

🚀 Added %itemtypes% dyed %color% expression & ExprColorOf Improvements #4335

Conversation

AyhamAl-Ali commented Sep 17, 2021 • edited Loading

Description

APickledWalrus left a comment

Choose a reason for hiding this comment

AyhamAl-Ali commented May 12, 2023 • edited Loading

sovdeeth commented Apr 7, 2024

AyhamAl-Ali commented Apr 8, 2024 • edited Loading

Fusezion left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

🚀 Added `%itemtypes% dyed %color%` expression & ExprColorOf Improvements #4335

🚀 Added `%itemtypes% dyed %color%` expression & ExprColorOf Improvements #4335

AyhamAl-Ali commented Sep 17, 2021 •

edited

Loading

AyhamAl-Ali commented May 12, 2023 •

edited

Loading

AyhamAl-Ali commented Apr 8, 2024 •

edited

Loading