Update for nullable spawner types, editMeta util
#2514
Merged
Conversation
This file contains 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
mcmonkey4eva
reviewed
Aug 5, 2023
| mechanism.echoError("Mechanism 'LocationTag.spawner_type' is only valid for spawners."); | ||
| return; | ||
| } | ||
| if (mechanism.value == null && NMSHandler.getVersion().isAtLeast(NMSVersion.v1_20)) { |
mcmonkey4eva
reviewed
Aug 5, 2023
| @@ -33,4 +35,10 @@ public void setItemStack(ItemStack item) { | |||
| public void setItemMeta(ItemMeta meta) { | |||
| object.setItemMeta(meta); | |||
| } | |||
|
|
|||
| public <T extends ItemMeta> void editMeta(Class<T> metaType, Consumer<T> editor) { | |||
| T meta = metaType.cast(getItemMeta()); | |||
There was a problem hiding this comment.
Is there a specific reason to use this over just (T)? I ask specifically because I generally worry about reflection calls having unexpected performance issues, so it's preferable to avoid if not needed
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.
Changes
ItemSpawnerTypeto modern property format, and changed it to account for the spawner type being nullable internally on 1.20+ (previously just threw an NPE), including support for setting it to null in the mechanism.LocationTag.spawner_typefor the type being nullable, including updating the mech to modern registration.This also includes a workaround (this has since been fixed.makeBlockStateRaw) for setting it to null in the mechanism due to a Spigot bug - I have already opened an issue @ Spigot for thisItemInstrument:allows custom instrumentsfrom the meta, as Spigot uses hard-coded ones :/ponderwhen unset (which is effectively random because it's based on the internal order of stuff - it grabs the first entry from the horn instruments tag/the instrument registry).getMusicInstrumentin favor of just getting it directly.setMusicInstrumentin favor of the newItemProperty#editMeta.setPropertyValue's param name to match the usual one (param->value).ElementTag#asStringcall insetPropertyValue's error message, and slightly cleaned it up.describesinto ainstanceofcheck instead of a material check.Additions
ItemProperty#editMeta(Class metaType, Consumer editor)- a util method to avoid boilerplateget/setItemMetacalls & casts.