Skip to content

EntityData Parse Tags #7972

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
Jun 30, 2025
Merged

EntityData Parse Tags #7972

merged 6 commits into from
Jun 30, 2025

Conversation

@Absolutionism
Copy link
Contributor

Problem

EntityData utilized the parse marks to determine the plurality and baby state of a pattern. This could be confusing when looking at the patterns and seeing 1, 2, 4 and 8 rather than specific terminology.

Solution

  • Removes all usages of parse marks in the entities section in the default.lang in favor of parse tags. Including the age pattern
    • 1 has been replaced with plural
    • 2 has been replaced with unknown_plural
    • 4 has been replaced with baby
    • 8 has been replaced with adult
    • The age pattern default with no specified age state now uses unknown_age
    • Updates the comments at the beginning of the entities section for describing the usages of these tags
  • Updates EntityData#init to remove the usage/check for parse marks in favor of parse tags

Testing Completed

quickTest

Supporting Information

N/A

Completes: none
Related: none

@Absolutionism Absolutionism requested a review from a team as a code owner June 26, 2025 05:07
@Absolutionism Absolutionism requested review from cheeezburga and erenkarakal and removed request for a team June 26, 2025 05:07
@skriptlang-automation skriptlang-automation bot added the needs reviews A PR that needs additional reviews label Jun 26, 2025
APickledWalrus
APickledWalrus approved these changes Jun 26, 2025
View reviewed changes
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, couple ideas i had while looking through (perhaps not in scope)

@skriptlang-automation skriptlang-automation bot added feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. and removed needs reviews A PR that needs additional reviews labels Jun 26, 2025
@Absolutionism Absolutionism added the enhancement Feature request, an issue about something that could be improved, or a PR improving something. label Jun 27, 2025
Absolutionism and others added 3 commits June 29, 2025 22:22
@Absolutionism
Merge remote-tracking branch 'upstream/dev/feature' into dev/EntityDa…
50ac695 
…taParseTags

# Conflicts:
#	src/main/resources/lang/default.lang
@sovdeeth
Merge branch 'dev/feature' into dev/EntityDataParseTags
2adf6c5
@Absolutionism
Merge remote-tracking branch 'upstream/dev/feature' into dev/EntityDa…
5c9adea 
…taParseTags

# Conflicts:
#	src/main/java/ch/njol/skript/entity/EntityData.java
#	src/main/resources/lang/default.lang
@sovdeeth sovdeeth merged commit 6d3f461 into SkriptLang:dev/feature Jun 30, 2025
5 checks passed
@skriptlang-automation skriptlang-automation bot added completed The issue has been fully resolved and the change will be in the next Skript update. and removed feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. labels Jun 30, 2025
@Absolutionism Absolutionism moved this to Done in 2.12 Releases Jul 2, 2025
Burbulinis pushed a commit to Burbulinis/Skript that referenced this pull request Jul 9, 2025
@Absolutionism @Burbulinis
EntityData Parse Tags (SkriptLang#7972)
49fa7aa 
* Initial Commit

* Additional Cleanup

* Update default.lang
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sovdeeth sovdeeth sovdeeth approved these changes

@APickledWalrus APickledWalrus APickledWalrus approved these changes

@Efnilite Efnilite Efnilite approved these changes

@cheeezburga cheeezburga Awaiting requested review from cheeezburga cheeezburga is a code owner automatically assigned from SkriptLang/core-developers

@erenkarakal erenkarakal Awaiting requested review from erenkarakal erenkarakal is a code owner automatically assigned from SkriptLang/core-developers

Assignees

No one assigned

Labels

completed The issue has been fully resolved and the change will be in the next Skript update. enhancement Feature request, an issue about something that could be improved, or a PR improving something.

Projects

2.12 Releases
Status: Done - Released

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Absolutionism @sovdeeth @APickledWalrus @Efnilite