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.

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

Minecraft Tags #7127

Open
wants to merge 29 commits into
base: dev/feature
Choose a base branch
from
Open

Minecraft Tags #7127

wants to merge 29 commits into from
+1,760 −37

Conversation

sovdeeth
Copy link
Member

@sovdeeth sovdeeth commented Oct 3, 2024 •
edited
Loading

Description

Adds support for minecraft's tag system.
Currently supports block, item, and entity type tags. Fluid and GameEvent are simple to add, but Fluid is useless and GameEvent is not in Skript just yet.

  • Support's Paper's material and entity tags. Paper tags look like paper:name_settag naturally. This converts them so the user sees and uses paper:name.
  • Supports the ability to get all tags of a item, block, or entity
  • Supports the ability to get all tags of a specific category (item/block/entity)
  • Supports the ability to get all the tags, period.
  • Allows filtering of tags by minecraft, datapack, paper, or custom (skript)
  • Namespaces are auto-populated if omitted, based on filtering settings:
    • No filtering, minecraft tags, and datapack tags all get the default "minecraft" namespace
    • Paper tags get "paper"
    • Custom tags get "skript"
    • This allows paper tag "wooden_doors" to resolve to paper:wooden_doors.
  • registering custom tags

Target Minecraft Versions: any
Requirements: none
Related Issues: #4924

@sovdeeth sovdeeth added the feature Pull request adding a new feature. label Oct 3, 2024
@sovdeeth sovdeeth marked this pull request as ready for review October 4, 2024 01:21
@sovdeeth sovdeeth requested a review from Fusezion October 4, 2024 01:22
@sovdeeth
basic tests and fix comparisons
fcf4c88 
Tests are kept deliberately small due to the volatile nature of tag contents.
@sovdeeth
custom tags!
c19703e
APickledWalrus
APickledWalrus requested changes Nov 20, 2024
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.

Excellent work and great use of a module. Here's what I found.

src/main/java/org/skriptlang/skript/bukkit/tags/SkriptTag.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/SkriptTag.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/TagModule.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/TagModule.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/TagType.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTag.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOf.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOf.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOfType.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOfType.java Show resolved Hide resolved
APickledWalrus
APickledWalrus requested changes Dec 15, 2024
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.

Looking very good

src/main/java/org/skriptlang/skript/bukkit/tags/TagModule.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/sources/TagOrigin.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/sources/TagOrigin.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/sources/TagOrigin.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOfType.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/TagType.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/CondIsTagged.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/EffRegisterTag.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/EffRegisterTag.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagContents.java Outdated Show resolved Hide resolved
APickledWalrus
APickledWalrus requested changes Dec 16, 2024
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.

Should be just about ready

src/main/java/org/skriptlang/skript/bukkit/tags/sources/SkriptTagSource.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOfType.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagContents.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/TagType.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/TagRegistry.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/TagRegistry.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/TagRegistry.java Show resolved Hide resolved
@sovdeeth sovdeeth added the 2.10 Targeting a 2.10.X version release label Dec 17, 2024
Efnilite
Efnilite approved these changes Dec 27, 2024
View reviewed changes
Copy link
Member

@Efnilite Efnilite left a comment

Choose a reason for hiding this comment

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

tags. brexit. get it done.

src/main/java/ch/njol/util/Pair.java Outdated Show resolved Hide resolved
sovdeeth and others added 2 commits December 27, 2024 15:41
@sovdeeth @Efnilite
Update src/main/java/ch/njol/util/Pair.java
a85d420 
Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
@sovdeeth
Merge branch 'dev/feature' into feature/block-tags
f60090a
APickledWalrus
APickledWalrus approved these changes Dec 29, 2024
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.

excellent work

src/main/java/org/skriptlang/skript/bukkit/tags/TagType.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/tags/sources/SkriptTagSource.java
/**
* @return Skript tag source for item contexts
*/
public static SkriptTagSource<Material> ITEMS() {
Copy link
Member

Choose a reason for hiding this comment

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

Should these methods be named as items, blocks, entities?

Copy link
Member Author

Choose a reason for hiding this comment

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

you tell me
i like caps but it's probably not code standards

Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't static final caps? Not just static

Copy link
Member Author

Choose a reason for hiding this comment

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

for fields yes

@sovdeeth @APickledWalrus
Update src/main/java/org/skriptlang/skript/bukkit/tags/TagType.java
89f40e3 
Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>
@sovdeeth sovdeeth added the feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. label Dec 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fusezion Fusezion Fusezion requested changes

@ShaneBeee ShaneBeee ShaneBeee left review comments

@TheLimeGlass TheLimeGlass TheLimeGlass requested changes

@erenkarakal erenkarakal erenkarakal approved these changes

@Efnilite Efnilite Efnilite approved these changes

@APickledWalrus APickledWalrus APickledWalrus approved these changes

@Moderocky Moderocky Moderocky approved these changes

@Romitou Romitou Awaiting requested review from Romitou

@Pesekjak Pesekjak Awaiting requested review from Pesekjak

@Pikachu920 Pikachu920 Awaiting requested review from Pikachu920

@UnderscoreTud UnderscoreTud Awaiting requested review from UnderscoreTud

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
2.10 Targeting a 2.10.X version release feature Pull request adding a new feature. feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@sovdeeth @Moderocky @TheLimeGlass @ShaneBeee @APickledWalrus @Efnilite @erenkarakal @Fusezion