-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve adventure support and fix colorizing method, use setDurabilit…
…y method instead of unsupported damageable class
- Loading branch information
Showing
15 changed files
with
220 additions
and
263 deletions.
There are no files selected for viewing
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
71 changes: 0 additions & 71 deletions
71
...kkit-adventure/src/main/java/cc/dreamcode/utilities/bukkit/adventure/AdventureLegacy.java
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
...adventure/src/main/java/cc/dreamcode/utilities/bukkit/adventure/AdventureLegacyColor.java
This file was deleted.
Oops, something went wrong.
95 changes: 95 additions & 0 deletions
95
...bukkit-adventure/src/main/java/cc/dreamcode/utilities/bukkit/adventure/AdventureUtil.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package cc.dreamcode.utilities.bukkit.adventure; | ||
|
|
||
| import cc.dreamcode.utilities.StringUtil; | ||
| import eu.okaeri.placeholders.context.PlaceholderContext; | ||
| import eu.okaeri.placeholders.message.CompiledMessage; | ||
| import lombok.NonNull; | ||
| import net.kyori.adventure.text.Component; | ||
| import net.kyori.adventure.text.TextReplacementConfig; | ||
| import net.kyori.adventure.text.minimessage.MiniMessage; | ||
| import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; | ||
| import net.kyori.adventure.text.minimessage.tag.standard.StandardTags; | ||
| import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; | ||
|
|
||
| import java.util.Locale; | ||
| import java.util.Map; | ||
| import java.util.regex.Pattern; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public final class AdventureUtil { | ||
|
|
||
| private static final char COLOR_CHAR = '&'; | ||
|
|
||
| private static final Pattern FIELD_PATTERN = Pattern.compile("\\{(?<content>[^}]+)}"); | ||
| private static final Pattern SECTION_COLOR_PATTERN = Pattern.compile("(?i)§([0-9A-FK-OR])"); | ||
|
|
||
| private static final LegacyComponentSerializer AMPERSAND_SERIALIZER = LegacyComponentSerializer.builder() | ||
| .character(COLOR_CHAR) | ||
| .hexColors() | ||
| .build(); | ||
|
|
||
| private static final MiniMessage MINI_MESSAGE = MiniMessage.builder() | ||
| .preProcessor(text -> SECTION_COLOR_PATTERN.matcher(text).replaceAll("&$1")) | ||
| .build(); | ||
| private static final MiniMessage PLACEHOLDER_MINI_MESSAGE = MiniMessage.builder() | ||
| .preProcessor(text -> SECTION_COLOR_PATTERN.matcher(text).replaceAll("&$1")) | ||
| .tags(TagResolver.builder() | ||
| .resolver(StandardTags.color()) | ||
| .resolver(StandardTags.decorations()) | ||
| .resolver(StandardTags.rainbow()) | ||
| .resolver(StandardTags.gradient()) | ||
| .resolver(StandardTags.transition()) | ||
| .build()) | ||
| .build(); | ||
|
|
||
| public static String format(@NonNull String text) { | ||
| final Component component = MINI_MESSAGE.deserialize(text); | ||
| return AMPERSAND_SERIALIZER.serialize(component); | ||
| } | ||
|
|
||
| public static String format(@NonNull String text, @NonNull Map<String, Object> placeholders) { | ||
| return format(text, Locale.forLanguageTag("pl"), placeholders); | ||
| } | ||
|
|
||
| public static String format(@NonNull String text, @NonNull Locale locale, @NonNull Map<String, Object> placeholders) { | ||
| final CompiledMessage compiledMessage = CompiledMessage.of(locale, text); | ||
| final PlaceholderContext placeholderContext = StringUtil.getPlaceholders().contextOf(compiledMessage) | ||
| .with(placeholders); | ||
|
|
||
| return format(text, placeholderContext); | ||
| } | ||
|
|
||
| public static String format(@NonNull String text, @NonNull PlaceholderContext placeholderContext) { | ||
|
|
||
| Component component = MINI_MESSAGE.deserialize(text); | ||
|
|
||
| final Map<String, String> fields = renderFields(placeholderContext); | ||
| final TextReplacementConfig replacementConfig = replacementConfig(fields); | ||
| component = component.replaceText(replacementConfig); | ||
|
|
||
| return AMPERSAND_SERIALIZER.serialize(component); | ||
| } | ||
|
|
||
| private static Map<String, String> renderFields(@NonNull PlaceholderContext placeholderContext) { | ||
| return placeholderContext.renderFields() | ||
| .entrySet() | ||
| .stream() | ||
| .collect(Collectors.toMap( | ||
| entry -> entry.getKey().getRaw(), | ||
| entry -> { | ||
| final Component component = PLACEHOLDER_MINI_MESSAGE.deserialize(entry.getValue()); | ||
| return AMPERSAND_SERIALIZER.serialize(component); | ||
| } | ||
| )); | ||
| } | ||
|
|
||
| private static TextReplacementConfig replacementConfig(@NonNull Map<String, String> replaceMap) { | ||
| return TextReplacementConfig.builder() | ||
| .match(FIELD_PATTERN) | ||
| .replacement((result, input) -> { | ||
| final String value = replaceMap.get(result.group(1)); | ||
| return AMPERSAND_SERIALIZER.deserialize(value); | ||
| }) | ||
| .build(); | ||
| } | ||
| } |
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
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
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
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
Oops, something went wrong.