Implemented the ability to change titles to actionbar on plot entry #3060
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
NotMyFault
requested changes
May 20, 2021
Core/src/main/java/com/plotsquared/core/configuration/Settings.java
Outdated
Show resolved
Hide resolved
Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
Outdated
Show resolved
Hide resolved
… into features/v6/titles-as-actionbar
NotMyFault
reviewed
May 20, 2021
NotMyFault
approved these changes
May 20, 2021
SirYwell
requested changes
May 21, 2021
auto-merge was automatically disabled
May 21, 2021 19:57
Head branch was pushed to by a user without write access
|
This does not resolve inner template references, no? E.g. A |
SirYwell
requested changes
May 23, 2021
There was a problem hiding this comment.
I think the issue mentioned by @NotMyFault should be easy to fix, everything else is awesome!
NotMyFault
added a commit
that referenced
this pull request
Jun 21, 2021
* Fix /plot buy message and enhance it with player balance * Fix /plot download world not being clickable * Add tab completion for /plot cluster * Fix /plot leave requiring an arg when none is needed * Send message when attempting to leave an own plot This is a temporary workaround for the todo addressed below. * Add tab completion for /plot schematic * Add tab completion for /plot setowner * Update gradle.yml * Revert "Update gradle.yml" This reverts commit e12c83f. * Don't collapse imports * Add tab completion for /plot area * Improve tab completion, adjust permissions and more v6 changes * Update gradle to 6.7.1 * Make use of Permission class in tab completion Plus document a few more permission nodes * Update actions workflow * Update adventure * Improve wording of generation steps * Update ClassicPlotWorld.java * Add java version checker * Postpone java version during startup * Make JavaVersionCheck private * Fixes IntellectualSites/PlotSquaredSuggestions#110 * Follow up to 4ff5052 Skipping deprecation here, this exists for so long and and has been superseded by permissions now. * Update dependencies * Fix flag description * Initiate placeholder registry * Fixes IntellectualSites/PlotSquaredSuggestions#141 * Minor translation changes * Fix PlotRangeIterator * Add note about Nashorn * Clean up PlotPlatform a bit and make the placeholder registry injectible * Feature/v6/arkitektonika (#2916) * Start working on Arkitektonika support * Progress on Arkitektonika * Add license headers * Some QoL and javadocs * Fix maximum calculation * Fix minor formatting * Reimplement legacy webinterface support * Add documentation and fix deletion link * Resolve conflicts/gradle stuff * Fix links * Make message readable * Do not allow download of merged plots * Add an option to teleport the player on plot clearing or deletion * Add tab completion to like/dislike and fix more messages * Fixes IntellectualSites/PlotSquaredSuggestions#77 * Make titles duration configurable * Fix spelling * Add charts for complex components * Update java 8 notice * Don't spit NPEs on NonNull values * Add missing returns to /plot cluster * Ensure not to parse null parameters into templates for titles * Allow "Server" owner * Revert "Allow "Server" owner" as that has its own UUID This reverts commit 9ba9188. * Relight command is pointless as we'd just use FAWE for it anyway. * fix info for server-plots * Don't unclaim claimed plots with /p claim * allow "owned" road mobs to be killed as well (those that are leashed, being ridden, etc) * Fix merge issue * we want throwable to be null * Improve /plot info formatting * Use builder for flag list message * Fix more flag message issues. * another annoying cache thing * Fix publishing. I am an author. * don't double-up schematic x/z offsets * @Sauilitired can't spell properly * switch to InvendoPaster "library" * Add renovate.json * Delete dependabot.yml * Update Paster * Fix compiling * Add database type to debugpaste * Rename database chart id * fix purge <owner> * Make placeholders translatable * Beautify placeholder output for '*' permission * Rename placeholders matching more appropriately * Use builder for flags component * Expose legacy serializer for placeholders * Fix added_list and denied_list placeholders * cache bukkitworld * fix debugpaste with multiverse * Only check ice-form for ice (#2940) Co-authored-by: NotMyFault <mc.cache@web.de> * Use hasPermissionRange to check for trust and add limits * Update permission range declaration * Replace toggle permission with plots.toggle * Update licenses to 2021 Happy new year 🎆 * Remove redundant legacy version check "api-version" backs us up here. * Add leaf-decay flag Stop leaves from decaying. * Invert leaf-decay message * Use WE Expressions instead of js evaluation (#2941) * Implement thread-safe expression evaluation * Update `{args}` to `plot` automatically * Stringify more money/balance/price occurrences with EconHandler#format * Implement CaptionLoader API to be used by third party plugins/addons This allows to load resources from other classloaders than the P2 one. Therefore, we can use this in addons too to manage messages the same way. * code style * Should be code, not link Co-authored-by: Alexander Söderberg <4096670+Citymonstret@users.noreply.github.com> * Allow over/undersizes schematics to be saved and pasted (#2944) Co-authored-by: NotMyFault <mc.cache@web.de> * handle cancellation properly in DefaultProgressSubscriber * Actually place the debugroadregen blocks * Bring v5 entity spawn changes to v6 * fix two <> errors in lang * Disable destructive operations for plot world plots * Move creation date up in plot header * Fixes IntellectualSites/PlotSquaredSuggestions#129 * Fix improper missing permission message on /plot list world * Fix sync tasks not being sync * Fix singleworlds * fix teleport to "*" * Address comments * Initial annotation usage cleanup + EditorConfig * More annotation work * Move to ServerLib * Update bStats to 2.1.0 * Update ServerLib * Fixes https://issues.intellectualsites.com/issue/PS-186 * Remove duplicated translation strings * Enhance continue message * Fixes https://issues.intellectualsites.com/issue/PS-23 * Switch to vanity url * Don't fail to load when moving components file * Fix several issues with debug command * Remove eol config entries * Add new metrics pies * Remove scripting-related stuff (#2947) * Remove scripting-related stuff * Cleanup Co-authored-by: NotMyFault <mc.cache@web.de> * Add crop-grow flag * Use javax for Nullable + guice, hope I didn't miss anything * Restrict a few more commands from plot world plots And add missing tab completion for debug commands * Strip Java 15 note * Cover a couple of NPEs * Don't invert the debug status message * Strip lesser used debug commands * Fix a few issues with debugexec * Don't fail on Java 17 (and higher) * Fixes PS-229 Closes #2948 Co-Authored-By: Benjamin Govaerts <17101059+BenjaminGoGurts@users.noreply.github.com> * Addressing more issues * Fix exporting all plots * Sort plots for /plot home the same as for /plot visit, fixes PS-188 * Fix backup captions and add placeholders to copy/move/swap * Strip commands from translation files * Add flag placeholders to flag commands * Add tab completion for gamemode flag * Fixes IntellectualSites/PlotSquaredSuggestions#23 * Re add per-world-teleport * Make use of `because` args * Update a few dependencies * Suggest flag name instead of value * Update to gradle 7 * Take building min height also into consideration * Fixes https://issues.intellectualsites.com/issue/PS-237 * Fix keep-inventory flag & adjust disallowed-blocks translation * Merge branch 'v5' into v6 * Update ServerLib * Lazy merge v5/v6 * Opt in future proof gradle features 🚀 (#2950) * Opt in future proof gradle features * Resolve merge conflicts * Don't double color the inbox * Fixup inbox javadocs * Address a few deprecations * Fix empty default flag message * Fix invalid backup messages & component prefix & update minimessage * Fix flag exception coloring * Fix `/plot cluster sethome` triggering usage message Enhance cluster messages a bit * Fix `/plot sethome` returning usage message & working on unclaimed plots * Fix empty templates when vault not found * Beautify empty `/plot caps` output Also strip prefix from empty plot description * Exchange EssentialsX maven repo * Clarify native dependency versions * Fixed feedback recipient for notify flags (Owner instead of entering / leaving player) (#3011) * Un-stringify plot id calls - PlotId#toString() already stringifies IDs, no need to call String.valueOf() - Add tab completion to `/plot debugroadregen` - Add `plots.flag.notify-leave.bypass` permission separating from notify-enter - Add message notifying the player if the attempt to enter a plot they are denied from * Fix a few typos * Update gradle and shadow * Replaced economy supported (Vault) check within cost condition with a pre-eliminating if-guard (#3014) * Make `/plot setup` header translatable - Document a couple of permission nodes * Make the plot jukebox gui translatable Fixes https://github.com/IntellectualSites/PlotSquared-Translations/issues/2 * Fix typo * Jump to Java 16 * Update licenser * Add `no-portals` and `deny-portal-travel` flag * Add `lectern-read-book` flag Fixes #2980 * Minor cleanup in favor of Java 16 - Addressing a few command deprecations during the major release superseded by toggles - Don't swallow SQL warnings in loggers behind debug, as it's often set to false - Deleted JavaVersionCheck, it's part of ServerLib. * Fix plot list coloring * Fix licenser issues * Log plot chat to console - Fix plot music removal template - Fix debug args * Always initialize PermissionHandler (fixes #3019) * Added event handler for cauldron water level modification to prevent untrusted players interacting with a plot (#3035) * Added check for burning players using non-trusted plots cauldrons to extinguish themselves, causing the cauldron level to decrease * Cancelling burning of players without downscaling water instead of ignoring their burn status * Using Java 14 JEP 305 enhanced instanceOf Co-authored-by: NotMyFault <mc.cache@web.de> * Players without permissions may not wash banners or armor now either. Rain modification is now permitted. * Extinguishing is now explicitly handled so that event handling for other plugins has the actual information of the new cauldron water level * Un-nestified the if-condition :) * Properly cancelled the event (since it is semantically cancelled) * (Actually) properly cancelled the event (since it is semantically cancelled) Co-authored-by: NotMyFault <mc.cache@web.de> * Fix infinite loop on multi auto (fixes #3022) * Update gradle to 7.0.2 * Bug through last Economy PR - Withdrawn money for non-affordable plots (#3036) * Replaced economy supported (Vault) check within cost condition with a pre-eliminating if-guard * Negate mob-place flag debug message * Actually prevent purchase of plots if they can't afford it (whoops) Co-authored-by: NotMyFault <mc.cache@web.de> * Rephrase message if user has no access to sub-command help pages * Provide instruction about the .editorconfig * Enhance flag tutorial message * Fixes #3058 - Anonymize meta data keys * Notify the kicked person over the actor * Fixes #3057 Actually execute a kick from server if ordered * Do not rely on a static file path Doing so will cause issues with the `--plugins` flag. E.g. `java -jar server.jar --plugins /path/to/plugins/` * Make `/plot rate` GUI items customizable Bye bye legacy items :) * Add administrative override for `/plot components` * Fixes #3064 * Remove dead imports * Implemented tab completion for `/plot help` (#3053) Co-authored-by: NotMyFault <mc.cache@web.de> * Add option for legacy sign material Follow up to cde2789 * Remove chat.interactive option Whether the chat is interactive or not can be declared in the strings.json by using MMs <click:_action_:_value_> type. * Don't send teleport message before the teleportation is initiated * Component-ify plot setup wizard Touches #3068 * Implemented the ability to change titles to actionbar on plot entry (#3060) * Implemented the ability to change titles to actionbar on plot entry * Fixed typo in action * Updated explanation in Javadoc * Implemented suggestions * Remove excess import * Implemented PR suggestions Co-authored-by: NotMyFault <mc.cache@web.de> * Add actionbar message for notification flags - Move title_as_actionbar boolean into enabled_components * Move `notification-as-actionbar` into the `Chat` config block - Move titles alongside all its new options into its own config block - Move `titles-as-actionbar` into the new titles block - Enhance notification about removed config entries * Use same creation message for templates like for setup * Remove scripting from javadocs * Fixes #3073 - Also add new caption if attempting to clear an empty alias * Prevent dragon eggs from leaving or entering plot bounds (#3075) * Negate mob-place flag debug message * fixed a little typo :) * Added check for dragon egg teleportation event #3074 * Basic dragon egg interact bugfix (Left-click interaction) Co-authored-by: NotMyFault <mc.cache@web.de> * Make /plot pardon an alias of Plot Remove (#3071) * Make /plot pardon an alias of /plot undeny * Make Remove state more clearly what it does * Lazily target v6 * Enhance alias message with placeholders * Enhance `/plot target` & expiry confirm message * Fixes #3032 * Fixes #3063 * Fix if-condition limited to roads for animal attack cancelling on plots (#3079) * Negate mob-place flag debug message * fixed a little typo :) * Added check for dragon egg teleportation event #3074 * Basic dragon egg interact bugfix (Left-click interaction) * Lifted admin if-condition out of roads (out-of-plot) only block (for animals) Co-authored-by: NotMyFault <mc.cache@web.de> * feat: re-add aggregated javadocs task (#3077) * feat: re-add aggregated javadocs task This was removed by #2922. Closes #3037. Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com> * feat: aggregate javadocs on root build task Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com> * Address changes requested Co-authored-by: NotMyFault <mc.cache@web.de> * Bump gh action tasks prevent failing of gradle wrapper validation * Fixes #3027 - Ditch slf4j in favor of log4j. slf4j is (unfortunately) very much unmaintained at this time and future versions of MC (1.17+) will use log4j version 2.14.1 onwards over some ancient sfl4j version. - Using log4j reduces our jar size as well, because we don't need to bridge it as the game provides it natively. * Fix typo introduced in f4552e3 * Enqueue on unlink * Check merge status from correct plot * Move enqueue to the actual end of the code * Adjust improper origin -> target message of plot moving * Update wiki links * Make `/plot rate` categories translatable * Fix some inbox issues * Make world settings reloadable * 👀 * Remove "ORE" from setup steps Touches #3068 Generating a world with just ore is used nowhere and needs to be reimplemented properly at some time. * Fixes #3018 * Make CaptionLoader namespace-aware * Correctly handle coordinates in swapping Fixes #3030 * begin integration with fawe * Fix licences * Move FAWE detection before guice injection/configuration * Add whenDone task to setCuboids and ensure whenDone tasks are added to the queue before FAWE might do something * Make "NaN" in placeholders translatable * Implement "off" to PlotWeather flag and make it default - Players with "player weather" will no longer have their weather reset on plots that do not set the PlotWeather flag * Add note about PlayerPlotAutoEvent return null plot * Fix place flag message * Update licenser & gradle * Fixes #3066 * Fix #3095 * 1.17 (#3088) * Minor work for 1.17 * Address TODOs Introduce `entity-change-block` flag covering blocks affected by `onPeskyMobsChangeTheWorldLikeWTFEvent`. Previously this was covered by the mob-place flag, however, changing the tilt state of big drip leafs and a series of other blocks call `EntityChangeBlockEvent` so this shouldn't be covered by mob flags only. * Address other TODOs * Compile against paper 1.17 This will only work if you built paper locally and deployed it to your local maven repo. * Updated linked javadoc links * Handle sculk sensor events in a more controllable way * Update issue forms for 1.17 * We don't need "no-nashorn" config option in v6 * Fix arkitektonika backend url * Don't fail loading on versions prior to 1.17 * Back to snapshot for development * Bump PlotAPI version Co-authored-by: N0tMyFaultOG <mc.cache@web.de> Co-authored-by: Hannes Greule <hannesgreule@outlook.de> Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com> Co-authored-by: dordsor21 <dordsor21@gmail.com> Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Benjamin Govaerts <17101059+BenjaminGoGurts@users.noreply.github.com> Co-authored-by: Patrick "IPat" Hein <ThisIsIPat@users.noreply.github.com> Co-authored-by: Aurélien <43724816+Aurelien30000@users.noreply.github.com> Co-authored-by: Glare <admin@glaremasters.me> Co-authored-by: Orlaando <38089755+Orlaando-dev@users.noreply.github.com> Co-authored-by: Mariell Hoversholm <proximyst@proximy.st>
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Overview
Fixes #2993
Description
This PR implements a config option to send the "titles" of plot entry to a player as an ActionBar instead of a Title.
Checklist