Reworked expansion #86
Closed
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
…ted) and time_since_join(_formatted)
iGabyTM
requested changes
Aug 27, 2023
| import org.bukkit.event.player.PlayerJoinEvent; | ||
| import org.bukkit.event.player.PlayerQuitEvent; | ||
|
|
||
| public record PlayerListener(PlayerExpansion expansion) implements Listener { |
There was a problem hiding this comment.
Use java 8, this applies to the rest of the files too.
Comment on lines
+23
to
+24
| compileOnly 'org.projectlombok:lombok:1.18.28' | ||
| annotationProcessor 'org.projectlombok:lombok:1.18.28' |
Comment on lines
+59
to
+60
| defaults = new HashMap<>() {{ | ||
| put("ping",new HashMap<>() {{ |
There was a problem hiding this comment.
There is ImmutableMap#Builder from guava, please avoid using anonymous classes like this.
Comment on lines
+286
to
+291
| if (identifier.startsWith("item_in_hand")) yield requestItem(identifier,12,versionHelper.getItemInHand(p)); | ||
| if (identifier.startsWith("item_in_offhand")) yield requestItem(identifier,15,p.getInventory().getItemInOffHand()); | ||
| if (identifier.startsWith("armor_helmet")) yield requestItem(identifier,12,p.getInventory().getHelmet()); | ||
| if (identifier.startsWith("armor_chestplate")) yield requestItem(identifier,16,p.getInventory().getChestplate()); | ||
| if (identifier.startsWith("armor_leggings")) yield requestItem(identifier,14,p.getInventory().getLeggings()); | ||
| if (identifier.startsWith("armor_boots")) yield requestItem(identifier,11,p.getInventory().getBoots()); |
There was a problem hiding this comment.
Please avoid using magic numbers (12, 15, 16 have no meaning)
|
|
||
| public static String getLocale(final Player player) { | ||
| return PLAYER_GET_LOCALE.apply(player); | ||
| public static String msToSToStr(double ms) { |
| return version; | ||
| public int getPing(Player player) { | ||
| if (IS_1_17_OR_NEWER) return player.getPing(); | ||
| try {return (int) ping.get(getHandle.invoke(player));} |
| } | ||
| @SuppressWarnings("deprecation") | ||
| public int getItemDamage(ItemStack item) { | ||
| return VERSION >= 1_13_0 ? item.getItemMeta() instanceof Damageable damageable |
There was a problem hiding this comment.
Put this statement on multiple lines, it is confusing to read.
Comment on lines
-214
to
+112
| if (level <= 15) { | ||
| return (level << 1) + 7; | ||
| } | ||
| if (level <= 30) { | ||
| return (level * 5) - 38; | ||
| } | ||
| return (level * 9) - 158; | ||
| return level <= 15 | ||
| ? (level << 1) + 7 | ||
| : level <= 30 | ||
| ? (level * 5) - 38 | ||
| : (level * 9) - 158; |
There was a problem hiding this comment.
Revert these changes, not everything has to be done using ternary operator.
Comment on lines
+115
to
+119
| return output == null ? null | ||
| : output instanceof Boolean bool ? | ||
| bool ? PlaceholderAPIPlugin.booleanTrue() | ||
| : PlaceholderAPIPlugin.booleanFalse() | ||
| : String.valueOf(output); |
There was a problem hiding this comment.
Again, don't use ternary operator like this.
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.
Lots of changes 😅
Moved to Gradle
Added
%player_health_full(_rounded)%,%player_time_since_last_played(/join)%,%player_time_since_join%,%player_item_in_hand_lore%with its offhand and armor variants (closes #64) and%player_last_damage_given%(closes #13, can't believe it took 4 years just for that)Since I'm using enhanced switch statements now (lots of them :D) I'm guessing this now requires at least Java 14, though most servers should have updated to 17 now and other expansions bumped their Java version as well so this should be fine.
Reworked
%player_colored_ping%'s config to use ranges of numbers to make it much more customizable, default config:Closes #85 #77
Included #84, #83, #65 and #37
If anyone wants to try, I tested it but just in case
Player-Expansion-2.1.0.zip