Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add filter support to ExprItemsIn #4614

Merged
merged 4 commits into from
Dec 21, 2023
Merged

Conversation

Pikachu920
Copy link
Member

@Pikachu920 Pikachu920 commented Feb 20, 2022

Description

Adds supports to get only certain item types when using ExprItemIn (e.g. all swords in player's inventory).


Target Minecraft Versions: All
Requirements: None
Related Issues: #4612

@Pikachu920 Pikachu920 changed the title Feature/filteritemsin Add filter support to ExprItemsIn Feb 20, 2022
@Pikachu920 Pikachu920 marked this pull request as draft February 20, 2022 01:20
@TPGamesNL TPGamesNL added the enhancement Feature request, an issue about something that could be improved, or a PR improving something. label Feb 20, 2022
@Pikachu920 Pikachu920 marked this pull request as ready for review February 21, 2022 16:58
Copy link
Member

@APickledWalrus APickledWalrus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a few minor things

I like this feature :D

src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/test/skript/tests/syntaxes/expressions/ExprItemsIn.sk Outdated Show resolved Hide resolved
@Pikachu920
Copy link
Member Author

Pikachu920 commented Apr 5, 2022

have a sec to review pls? @APickledWalrus

Copy link
Member

@APickledWalrus APickledWalrus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me :)

Copy link
Member

@AyhamAl-Ali AyhamAl-Ali left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice PR :D
Just some formatting stuff

src/main/java/ch/njol/skript/expressions/ExprAmount.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
@TheLimeGlass TheLimeGlass self-requested a review August 1, 2022 21:37
@Pikachu920 Pikachu920 requested review from TPGamesNL, APickledWalrus, AyhamAl-Ali and TheLimeGlass and removed request for TheLimeGlass October 12, 2022 00:18
@Pikachu920
Copy link
Member Author

Pikachu920 commented Oct 12, 2022

Addressed reviews, but this is now pending #5077 as the test is failing due to an NPE in ExprSets

@Pikachu920 Pikachu920 requested a review from TPGamesNL October 12, 2022 23:25
Copy link
Member

@APickledWalrus APickledWalrus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor formatting !

Nice work :)

src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
@Pikachu920 Pikachu920 requested a review from APickledWalrus May 3, 2023 02:56
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/expressions/ExprItemsIn.java Outdated Show resolved Hide resolved
@TheLimeGlass
Copy link
Collaborator

ExprXOf.sk is failing when it shouldn't be. Changes made in this pull request have affected that test.

@Moderocky Moderocky force-pushed the master branch 2 times, most recently from bd134d0 to 3f08853 Compare September 16, 2023 16:59
@Moderocky Moderocky changed the base branch from master to dev/feature September 18, 2023 09:14
@Pikachu920 Pikachu920 force-pushed the feature/filteritemsin branch from f8ac120 to 7134ccb Compare December 21, 2023 03:26
@Pikachu920 Pikachu920 merged commit be39093 into dev/feature Dec 21, 2023
5 checks passed
@Pikachu920 Pikachu920 deleted the feature/filteritemsin branch December 21, 2023 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Feature request, an issue about something that could be improved, or a PR improving something.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants