-
-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #906 from KyoriPowered/allow-custom-colors-legacy
feat: allow custom colors in LegacyComponentSerializer
- Loading branch information
Showing
10 changed files
with
546 additions
and
97 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
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
225 changes: 225 additions & 0 deletions
225
...r-legacy/src/main/java/net/kyori/adventure/text/serializer/legacy/CharacterAndFormat.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,225 @@ | ||
| /* | ||
| * This file is part of adventure, licensed under the MIT License. | ||
| * | ||
| * Copyright (c) 2017-2023 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.serializer.legacy; | ||
|
|
||
| import java.util.List; | ||
| import java.util.stream.Stream; | ||
| import net.kyori.adventure.text.format.NamedTextColor; | ||
| import net.kyori.adventure.text.format.TextDecoration; | ||
| import net.kyori.adventure.text.format.TextFormat; | ||
| import net.kyori.examination.Examinable; | ||
| import net.kyori.examination.ExaminableProperty; | ||
| import org.jetbrains.annotations.ApiStatus; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Unmodifiable; | ||
|
|
||
| /** | ||
| * A combination of a {@code character} and a {@link TextFormat}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| @ApiStatus.NonExtendable | ||
| public interface CharacterAndFormat extends Examinable { | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#BLACK}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat BLACK = characterAndFormat('0', NamedTextColor.BLACK); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#DARK_BLUE}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat DARK_BLUE = characterAndFormat('1', NamedTextColor.DARK_BLUE); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#DARK_GREEN}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat DARK_GREEN = characterAndFormat('2', NamedTextColor.DARK_GREEN); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#DARK_AQUA}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat DARK_AQUA = characterAndFormat('3', NamedTextColor.DARK_AQUA); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#DARK_RED}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat DARK_RED = characterAndFormat('4', NamedTextColor.DARK_RED); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#DARK_PURPLE}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat DARK_PURPLE = characterAndFormat('5', NamedTextColor.DARK_PURPLE); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#GOLD}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat GOLD = characterAndFormat('6', NamedTextColor.GOLD); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#GRAY}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat GRAY = characterAndFormat('7', NamedTextColor.GRAY); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#DARK_GRAY}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat DARK_GRAY = characterAndFormat('8', NamedTextColor.DARK_GRAY); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#BLUE}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat BLUE = characterAndFormat('9', NamedTextColor.BLUE); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#GREEN}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat GREEN = characterAndFormat('a', NamedTextColor.GREEN); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#AQUA}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat AQUA = characterAndFormat('b', NamedTextColor.AQUA); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#RED}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat RED = characterAndFormat('c', NamedTextColor.RED); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#LIGHT_PURPLE}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat LIGHT_PURPLE = characterAndFormat('d', NamedTextColor.LIGHT_PURPLE); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#YELLOW}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat YELLOW = characterAndFormat('e', NamedTextColor.YELLOW); | ||
| /** | ||
| * Character and format pair representing {@link NamedTextColor#WHITE}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat WHITE = characterAndFormat('f', NamedTextColor.WHITE); | ||
|
|
||
| /** | ||
| * Character and format pair representing {@link TextDecoration#OBFUSCATED}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat OBFUSCATED = characterAndFormat('k', TextDecoration.OBFUSCATED); | ||
| /** | ||
| * Character and format pair representing {@link TextDecoration#BOLD}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat BOLD = characterAndFormat('l', TextDecoration.BOLD); | ||
| /** | ||
| * Character and format pair representing {@link TextDecoration#STRIKETHROUGH}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat STRIKETHROUGH = characterAndFormat('m', TextDecoration.STRIKETHROUGH); | ||
| /** | ||
| * Character and format pair representing {@link TextDecoration#UNDERLINED}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat UNDERLINED = characterAndFormat('n', TextDecoration.UNDERLINED); | ||
| /** | ||
| * Character and format pair representing {@link TextDecoration#ITALIC}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat ITALIC = characterAndFormat('o', TextDecoration.ITALIC); | ||
|
|
||
| /** | ||
| * Character and format pair representing {@link Reset#INSTANCE}. | ||
| * | ||
| * @since 4.14.0 | ||
| */ | ||
| CharacterAndFormat RESET = characterAndFormat('r', Reset.INSTANCE); | ||
|
|
||
| /** | ||
| * Creates a new combination of a {@code character} and a {@link TextFormat}. | ||
| * | ||
| * @param character the character | ||
| * @param format the format | ||
| * @return a new character and format pair. | ||
| * @since 4.14.0 | ||
| */ | ||
| static @NotNull CharacterAndFormat characterAndFormat(final char character, final @NotNull TextFormat format) { | ||
| return new CharacterAndFormatImpl(character, format); | ||
| } | ||
|
|
||
| /** | ||
| * Gets an unmodifiable list of character and format pairs containing all default vanilla formats. | ||
| * | ||
| * @return am unmodifiable list of character and format pairs containing all default vanilla formats | ||
| * @since 4.14.0 | ||
| */ | ||
| @Unmodifiable | ||
| static @NotNull List<CharacterAndFormat> defaults() { | ||
| return CharacterAndFormatImpl.Defaults.DEFAULTS; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the character. | ||
| * | ||
| * @return the character | ||
| * @since 4.14.0 | ||
| */ | ||
| char character(); | ||
|
|
||
| /** | ||
| * Gets the format. | ||
| * | ||
| * @return the format | ||
| * @since 4.14.0 | ||
| */ | ||
| @NotNull TextFormat format(); | ||
|
|
||
| @Override | ||
| default @NotNull Stream<? extends ExaminableProperty> examinableProperties() { | ||
| return Stream.of( | ||
| ExaminableProperty.of("character", this.character()), | ||
| ExaminableProperty.of("format", this.format()) | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.