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

Asleeepp · 2024-08-31T20:35:21Z

Description

Ayham has kindly allowed me to take over his PR.
(Let's hope it can get approved)

Original 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+

I (hope) that I have at least addressed all suggested changes on Ayham's original PR.
I expect that a lot of things may need to be changed due to how old the original PR is, I hope I'm ready haha.

Target Minecraft Versions: any
Requirements: none
Related Issues:

PR #4335

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

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

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

…ture/dyed-expr

- 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

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

…ript into feature-dyed # Conflicts: # src/main/java/ch/njol/skript/classes/data/DefaultComparators.java

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

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

sovdeeth · 2024-08-31T20:51:23Z

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

+		if (mode == ChangeMode.ADD || mode == ChangeMode.REMOVE)
+			return null;


this is a bit in the weeds but maybe we could do add blue to {_a leather chestplate} and it would act how dying normally does in minecraft.

also above please fix the Nullable annotation on acceptChange

I think that if they want to add a color to the chestplate they should just use ExprDyed, adding a color to a variable sounds like it would add it as a separate element

~~that's fair~~ well we have no way to partially dye items right now, just fully change the color. Which is ok, but not ideal. So even if this isn't the route you think is good I think we should support that behavior in some way.

thought about [:partially] dye %itemtype% %color%?

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

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

sovdeeth · 2024-08-31T21:25:38Z

src/test/skript/tests/regressions/5682-colors.sk

@@ -0,0 +1,61 @@
+test "block colors":


needs to test what happens with beds, signs, banners, non-colourables, etc

needs to test what happens with beds, signs, banners, non-colourables, etc

beds and banners bug out, tried to fix it but I couldn't, make a TODO somewhere about it, do you still want me to add them to the test?

Well you need to handle that by not making them bug out. Either properly implement it or don't do anything if it's a bed/banner. So yes you still need to test for them.

sovdeeth · 2024-08-31T21:26:22Z

src/test/skript/tests/regressions/5682-colors.sk

+	# clean
+	set block at {_loc} to {_originalBlock}
+
+test "item colors":


same as above

Meapster1337 · 2024-09-07T13:46:30Z

this seems super helpful especially for building purposes since you can just change the colour of blocks freely, a handy use for this would be for a tool for a player to like change colours of like glass panes they've placed down or any colourable block so they don't have to go and make separate all the dye colors needed so if this gets added in the next skript release, that would be quite big

Asleeepp · 2024-09-07T13:57:00Z

this seems super helpful especially for building purposes since you can just change the colour of blocks freely, a handy use for this would be for a tool for a player to like change colours of like glass panes they've placed down or any colourable block so they don't have to go and make separate all the dye colors needed so if this gets added in the next skript release, that would be quite big

It would definitely be helpful, though proving to be a bit tricky to implement haha

Meapster1337 · 2024-09-07T14:09:25Z

this seems super helpful especially for building purposes since you can just change the colour of blocks freely, a handy use for this would be for a tool for a player to like change colours of like glass panes they've placed down or any colourable block so they don't have to go and make separate all the dye colors needed so if this gets added in the next skript release, that would be quite big

It would definitely be helpful, though proving to be a bit tricky to implement haha

yeah for sure, I had a code setup to color some blocks with an item in skript and it seems to of recently broken, was sometime after updating from 1.20.4 to 1.21.1 but I only just noticed it and then came across this so this is my hope going forward lol

Moderocky

Good start.

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

AyhamAl-Ali and others added 30 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

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

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

feb5a1f

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

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

a2ce91f

Support grabbing color of blocks - beta

f268c81

Update Since annotation

c1e924d

Fix the whole Skript literally :D

64d31c2

Clean up

170207b

Update tests - restore light blue chat color

920fae4

Clean up tests

7397cdd

Fix tests

a412d67

Add color comparator :)

284c9f0

Gotta sleep

5009ef9

Fix tests for real - fix Adjective.toString()

73a606f

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

b707236

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

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

b99a950

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

Address reviews

2a1748f

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

d040da2

…ture/dyed-expr

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

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

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

e96f91d

Address reviews

8599e0c

fix comment

1710e82

Merge branch 'feature/dyed-expr' of https://github.com/AyhamAl-Ali/Sk…

9fd33fb

…ript into feature-dyed # Conflicts: # src/main/java/ch/njol/skript/classes/data/DefaultComparators.java

Initial Commit

520fa8a

Remove License

833699b

AyhamAl-Ali 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 Aug 31, 2024

sovdeeth requested changes Aug 31, 2024

View reviewed changes

commit

8118018

Moderocky requested changes Sep 16, 2024

View reviewed changes

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

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

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

Asleeepp commented Aug 31, 2024 •

edited by TheLimeGlass

Loading

sovdeeth Aug 31, 2024

Asleeepp Sep 1, 2024

sovdeeth Sep 1, 2024 •

edited

Loading

Fusezion Sep 1, 2024

sovdeeth Aug 31, 2024

Asleeepp Aug 31, 2024

sovdeeth Sep 1, 2024

sovdeeth Aug 31, 2024

Meapster1337 commented Sep 7, 2024

Asleeepp commented Sep 7, 2024

Meapster1337 commented Sep 7, 2024

Moderocky left a comment

		if (mode == ChangeMode.ADD \|\| mode == ChangeMode.REMOVE)
		return null;

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

Are you sure you want to change the base?

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

Conversation

Asleeepp commented Aug 31, 2024 • edited by TheLimeGlass Loading

Description

sovdeeth Aug 31, 2024

Choose a reason for hiding this comment

Asleeepp Sep 1, 2024

Choose a reason for hiding this comment

sovdeeth Sep 1, 2024 • edited Loading

Choose a reason for hiding this comment

Fusezion Sep 1, 2024

Choose a reason for hiding this comment

sovdeeth Aug 31, 2024

Choose a reason for hiding this comment

Asleeepp Aug 31, 2024

Choose a reason for hiding this comment

sovdeeth Sep 1, 2024

Choose a reason for hiding this comment

sovdeeth Aug 31, 2024

Choose a reason for hiding this comment

Meapster1337 commented Sep 7, 2024

Asleeepp commented Sep 7, 2024

Meapster1337 commented Sep 7, 2024

Moderocky left a comment

Choose a reason for hiding this comment

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

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

Asleeepp commented Aug 31, 2024 •

edited by TheLimeGlass

Loading

sovdeeth Sep 1, 2024 •

edited

Loading