-
-
Notifications
You must be signed in to change notification settings - Fork 122
feat(mini-message): #791 add mini-message audience #848
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
AV3RG
wants to merge
2
commits into
KyoriPowered:main/4
Choose a base branch
from
AV3RG:feat/mini-audience
base: main/4
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
236 changes: 236 additions & 0 deletions
236
...sage/src/main/java/net/kyori/adventure/text/minimessage/audience/MiniMessageAudience.java
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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,236 @@ | ||||||
/* | ||||||
* This file is part of adventure, licensed under the MIT License. | ||||||
* | ||||||
* Copyright (c) 2017-2022 KyoriPowered | ||||||
* | ||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||||||
* of this software and associated documentation files (the "Software"), to deal | ||||||
* in the Software without restriction, including without limitation the rights | ||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||||
* copies of the Software, and to permit persons to whom the Software is | ||||||
* furnished to do so, subject to the following conditions: | ||||||
* | ||||||
* The above copyright notice and this permission notice shall be included in all | ||||||
* copies or substantial portions of the Software. | ||||||
* | ||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||||
* SOFTWARE. | ||||||
*/ | ||||||
package net.kyori.adventure.text.minimessage.audience; | ||||||
|
||||||
import net.kyori.adventure.audience.Audience; | ||||||
import net.kyori.adventure.chat.ChatType; | ||||||
import net.kyori.adventure.text.Component; | ||||||
import net.kyori.adventure.text.minimessage.MiniMessage; | ||||||
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; | ||||||
import net.kyori.adventure.title.TitlePart; | ||||||
import org.jetbrains.annotations.NotNull; | ||||||
|
||||||
/** | ||||||
* Implementation of {@link Audience} that provides additional methods for sending MiniMessage strings. | ||||||
* | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
public interface MiniMessageAudience extends Audience { | ||||||
|
||||||
/** | ||||||
* Creates a new {@link MiniMessageAudience} that forwards to the provided {@link Audience}. | ||||||
* Uses the {@link MiniMessage} instance provided by {@link MiniMessage#miniMessage()}. | ||||||
* | ||||||
* @param audience the audience to forward to | ||||||
* @return a new MiniMessageAudience | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
static @NotNull MiniMessageAudience audience(final @NotNull Audience audience) { | ||||||
return audience(audience, MiniMessage.miniMessage()); | ||||||
} | ||||||
|
||||||
/** | ||||||
* Creates a new {@link MiniMessageAudience} that forwards to the provided {@link Audience}. | ||||||
* | ||||||
* @param audience the audience to forward to | ||||||
* @param mini the MiniMessage instance to use | ||||||
* @return a new MiniMessageAudience | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
static @NotNull MiniMessageAudience audience(final @NotNull Audience audience, final @NotNull MiniMessage mini) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
return new MiniMessageAudienceImpl(audience, mini); | ||||||
} | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience. | ||||||
* | ||||||
* @param message the message with MiniMessage strings to send | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendMessage(final @NotNull String message); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience. | ||||||
* | ||||||
* @param message the message with MiniMessage strings to send | ||||||
* @param tagResolver the tag resolver to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendMessage(final @NotNull String message, final @NotNull TagResolver tagResolver); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience. | ||||||
* | ||||||
* @param message the message with MiniMessage strings to send | ||||||
* @param tagResolvers the tag resolvers to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendMessage(final @NotNull String message, final @NotNull TagResolver @NotNull ... tagResolvers); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience. | ||||||
* | ||||||
* @param message the message with MiniMessage strings to send | ||||||
* @param bound the bound chat type | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendMessage(final @NotNull String message, ChatType.@NotNull Bound bound); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as action bar. | ||||||
* | ||||||
* @param message the action bar with MiniMessage strings to send | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendActionBar(final @NotNull String message); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as action bar. | ||||||
* | ||||||
* @param message the action bar with MiniMessage strings to send | ||||||
* @param tagResolver the tag resolver to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendActionBar(final @NotNull String message, final @NotNull TagResolver tagResolver); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as action bar. | ||||||
* | ||||||
* @param message the action bar with MiniMessage strings to send | ||||||
* @param tagResolvers the tag resolvers to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendActionBar(final @NotNull String message, final @NotNull TagResolver @NotNull ... tagResolvers); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as player list header. | ||||||
* | ||||||
* @param header the title header with MiniMessage strings to send | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendPlayerListHeader(final @NotNull String header); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as player list header. | ||||||
* | ||||||
* @param header the title header with MiniMessage strings to send | ||||||
* @param tagResolver the tag resolver to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendPlayerListHeader(final @NotNull String header, final @NotNull TagResolver tagResolver); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as player list header. | ||||||
* | ||||||
* @param header the title header with MiniMessage strings to send | ||||||
* @param tagResolvers the tag resolvers to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendPlayerListHeader(final @NotNull String header, final @NotNull TagResolver @NotNull ... tagResolvers); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as player list footer. | ||||||
* | ||||||
* @param footer the title footer with MiniMessage strings to send | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendPlayerListFooter(final @NotNull String footer); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as player list footer. | ||||||
* | ||||||
* @param footer the title footer with MiniMessage strings to send | ||||||
* @param tagResolver the tag resolver to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendPlayerListFooter(final @NotNull String footer, final @NotNull TagResolver tagResolver); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as player list footer. | ||||||
* | ||||||
* @param footer the title footer with MiniMessage strings to send | ||||||
* @param tagResolvers the tag resolvers to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendPlayerListFooter(final @NotNull String footer, final @NotNull TagResolver @NotNull ... tagResolvers); | ||||||
|
||||||
/** | ||||||
* Sends two MiniMessage strings to this audience as player list header and footer respectively. | ||||||
* | ||||||
* @param header the title header with MiniMessage strings to send | ||||||
* @param footer the title footer with MiniMessage strings to send | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendPlayerListHeaderAndFooter(final @NotNull String header, final @NotNull String footer); | ||||||
|
||||||
/** | ||||||
* Sends two MiniMessage strings to this audience as player list header and footer respectively. | ||||||
* | ||||||
* @param header the title header with MiniMessage strings to send | ||||||
* @param footer the title footer with MiniMessage strings to send | ||||||
* @param tagResolver the tag resolver to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendPlayerListHeaderAndFooter(final @NotNull String header, final @NotNull String footer, final @NotNull TagResolver tagResolver); | ||||||
|
||||||
/** | ||||||
* Sends two MiniMessage strings to this audience as player list header and footer respectively. | ||||||
* | ||||||
* @param header the title header with MiniMessage strings to send | ||||||
* @param footer the title footer with MiniMessage strings to send | ||||||
* @param tagResolvers the tag resolvers to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendPlayerListHeaderAndFooter(final @NotNull String header, final @NotNull String footer, final @NotNull TagResolver @NotNull ... tagResolvers); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as title part. | ||||||
* | ||||||
* @param part the part of the title to send | ||||||
* @param message the content of the title part with MiniMessage strings to send | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendTitlePart(final @NotNull TitlePart<Component> part, final @NotNull String message); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as title part. | ||||||
* | ||||||
* @param part the part of the title to send | ||||||
* @param message the content of the title part with MiniMessage strings to send | ||||||
* @param tagResolver the tag resolver to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendTitlePart(final @NotNull TitlePart<Component> part, final @NotNull String message, final @NotNull TagResolver tagResolver); | ||||||
|
||||||
/** | ||||||
* Sends a MiniMessage string to this audience as title part. | ||||||
* | ||||||
* @param part the part of the title to send | ||||||
* @param message the content of the title part with MiniMessage strings to send | ||||||
* @param tagResolvers the tag resolvers to parse additional tags | ||||||
* @since 4.13.0 | ||||||
*/ | ||||||
void sendTitlePart(final @NotNull TitlePart<Component> part, final @NotNull String message, final @NotNull TagResolver @NotNull ... tagResolvers); | ||||||
|
||||||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be
miniMessageAudience
so it's nice for static imports