Some tidying up of constants#6389
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR centralizes a couple of previously hard-coded constants by reusing existing/shared values (e.g., Bedrock’s max stack size) and deriving a sentinel “invalid” enchantment ID from the current enum size.
Changes:
- Replaced hard-coded Bedrock max stack size checks/clamps (
64) withItem.BEDROCK_MAX_STACK_SIZE. - Updated the custom item validation warning to reference the max stack size constant in its message.
- Made
BedrockEnchantment.INVALIDderive from the enum’s current size instead of a fixed literal.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java | Uses Item.BEDROCK_MAX_STACK_SIZE when clamping custom item stack sizes. |
| core/src/main/java/org/geysermc/geyser/registry/populator/custom/CustomItemContext.java | Uses Item.BEDROCK_MAX_STACK_SIZE for the “stack sizes above …” warning message. |
| core/src/main/java/org/geysermc/geyser/inventory/item/BedrockEnchantment.java | Derives the INVALID enchantment sentinel from the enum’s size. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| @@ -469,8 +469,8 @@ private static void setupBasicItemInfo(CustomItemDefinition definition, DataComp | |||
| } | |||
| } | |||
| // Bedrock's stack size can be at most 64 | |||
Comment on lines
76
to
79
| public static final int INVALID = BedrockEnchantment.values().length + 1; | ||
|
|
||
| private static final BedrockEnchantment[] VALUES = values(); | ||
|
|
onebeastchris
approved these changes
May 11, 2026
Member
onebeastchris
left a comment
onebeastchris
left a comment
There was a problem hiding this comment.
LGTM, thanks for following up!
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
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.
No description provided.