ExprArmorSlot With EquipmentSlots #7906
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Absolutionism
requested review from
APickledWalrus and
erenkarakal
and removed request for
a team
skriptlang-automation
bot
added
the
needs reviews
sovdeeth
requested changes
May 31, 2025
sovdeeth
requested changes
May 31, 2025
sovdeeth
approved these changes
Jun 1, 2025
|
|
||
| static { | ||
| if (Material.getMaterial("WOLF_ARMOR") != null) | ||
| bodyEntities.add(Wolf.class); | ||
|
|
||
| register(ExprArmorSlot.class, Slot.class, "((boots:(boots|shoes)|leggings:leg[ging]s|chestplate:chestplate[s]|helmet:helmet[s]) [(item|:slot)]|armour:armo[u]r[s]|bodyarmor:body armo[u]r)", "livingentities"); | ||
| register(ExprArmorSlot.class, Slot.class, "(%-*equipmentslots%|[the] armo[u]r[s]) [item:item[s]]", "livingentities"); |
There was a problem hiding this comment.
I'm a little tenative to allow so few keywords here
%livingentities%'[s] %-*equipmentslots% and %-*equipmentslots% of %livingentities% are slightly scary but probably ok? @APickledWalrus any thoughts?
There was a problem hiding this comment.
It would conflict with ExprXOf if not for the literal requirement, so that's probably ok, but I worry there may be parsing slowdowns in there? Are the test parse/run times any noticeably different before/after?
There was a problem hiding this comment.
These are the build timings I got:
dev/feature
- quickTest: 55s
- skriptTestJava17: 1m 5s
- skriptTestJava21: 2m 29s
- JUnitQuick: 25s
- JUnitJava17: 30s
- JUnitJava21: 1m 12s
ExprArmorSlot
- quickTest: 46s
- skriptTestJava17: 56s
- skriptTestJava21: 2m 13s
- JUnitQuick: 24s
- JUnitJava17: 31s
- JUnitJava21: 1m 11s
There was a problem hiding this comment.
patterns should be ok, but we can consider bumping up the priority if necessary
sovdeeth
added
enhancement
sovdeeth
removed
the
dependencies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
The pattern for
ExprArmorSlotwas getting clunky and would become hard to follow for any other slots that would be added.Solution
This PR revamps the pattern to allow
EquipmentSlotto be used and multiple.To reduce breaking changes, extra patterns were added to the
types.equipment slotsto reflect what was available in the prior pattern ofExprArmorSlotAlso adds support for the new
saddleequipment slot.Testing Completed
ExprArmorSlot.skManual spawning of select entities to ensure the new
saddleequipment slot would be visible on these entities for the restriction of getting saddle slots of entities that don't.Supporting Information
N/A
Completes: none
Related: none