MaterialTag.count bug fix, additions, and modernization #2784
Conversation
tal5
left a comment
tal5
left a comment
There was a problem hiding this comment.
Can also replace some of the isX/getX methods with instanceof pattern matching if you want to modernize a bit more, but not required for now.
| } | ||
| else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19) && material.getModernData() instanceof PinkPetals) { | ||
| else if ((NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19) && getBlockData() instanceof PinkPetals) | ||
| || (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && (getBlockData() instanceof FlowerBed) || getBlockData() instanceof LeafLitter) |
There was a problem hiding this comment.
The brackets around the FlowerBed check need to cover both FlowerBed and LeafLitter - it's version >= 1.21 && (flower bed || leaf litter)
| // TODO The PinkPetals interface was deprecated in 1.21.5 and merged into the FlowerBed interface. | ||
| // All references and checks involving them can be removed once 1.21 is the minimum supported version. |
There was a problem hiding this comment.
Just so that it's easier to find later on, we usually format these like // TODO once 1.21 is the minimum supported version, remove PinkPetals usage in favor of FlowerBed or something along these lines, can see other TODOs around the project for example.
| } | ||
| else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19) && material.getModernData() instanceof PinkPetals) { | ||
| else if ((NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19) && getBlockData() instanceof PinkPetals) | ||
| || (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21) && (getBlockData() instanceof FlowerBed) || getBlockData() instanceof LeafLitter) |
| // @name count | ||
| // @input ElementTag(Number) | ||
| // @description | ||
| // Controls the amount of pickles in a Sea Pickle material, eggs in a Turtle Egg material, charges in a Respawn Anchor material, candles in a Candle material, flowers in a flower bed, or leaves on the ground. |
There was a problem hiding this comment.
leaves on the ground is a bit vague, specify that this is about leaf litter like the other options do.
|
fixed |
2 participants
Mentioned in https://discord.com/channels/315163488085475337/1430419152589553736