From 2bcc7d4fb1e300d7cd41589de6026ef6ab0b64d0 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Sun, 26 Feb 2023 18:13:25 +0100 Subject: [PATCH] deprecate TextComponent::formatting --- .../de/bixilon/minosoft/data/text/LegacyComponentReader.kt | 2 -- src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt | 1 + .../java/de/bixilon/minosoft/data/text/formatting/ChatCode.kt | 3 ++- .../minosoft/data/text/formatting/ChatFormattingCode.kt | 3 ++- .../minosoft/data/text/formatting/ChatFormattingCodes.kt | 3 ++- .../minosoft/data/text/formatting/PostChatFormattingCodes.kt | 3 ++- .../minosoft/data/text/formatting/PreChatFormattingCodes.kt | 3 ++- .../de/bixilon/minosoft/data/text/formatting/TextStyle.kt | 4 +++- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/data/text/LegacyComponentReader.kt b/src/main/java/de/bixilon/minosoft/data/text/LegacyComponentReader.kt index a2995b3ea..3d63c7419 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/LegacyComponentReader.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/LegacyComponentReader.kt @@ -114,8 +114,6 @@ object LegacyComponentReader { } continue } - - // ignore the next char, it is not valid formatting and should be hidden } parts.push(sequence, restricted) diff --git a/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt b/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt index 390ae3887..f7a682a88 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt @@ -33,6 +33,7 @@ import javafx.util.Duration open class TextComponent( message: Any? = "", override var color: RGBColor? = null, + @Deprecated("bitfield") override val formatting: MutableSet = mutableSetOf(), var clickEvent: ClickEvent? = null, var hoverEvent: HoverEvent? = null, diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatCode.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatCode.kt index dc4bcd273..47331954a 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatCode.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatCode.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -18,6 +18,7 @@ import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asColor +@Deprecated("bitfield") interface ChatCode { companion object { val FORMATTING_CODES: Map = ChatColors.NAME_MAP.extend( diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCode.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCode.kt index 12a506f5a..db2c89c1d 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCode.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCode.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,6 +12,7 @@ */ package de.bixilon.minosoft.data.text.formatting +@Deprecated("bitfield") interface ChatFormattingCode : ChatCode { val char: Char val ansi: String diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCodes.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCodes.kt index b6c243a34..f1de2cf36 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCodes.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCodes.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -14,6 +14,7 @@ package de.bixilon.minosoft.data.text.formatting import com.google.common.collect.HashBiMap +@Deprecated("bitfield") object ChatFormattingCodes { private val FORMATTING_CODES = HashBiMap.create() diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/PostChatFormattingCodes.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/PostChatFormattingCodes.kt index 5d046442d..4f5ce8007 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/PostChatFormattingCodes.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/PostChatFormattingCodes.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,6 +12,7 @@ */ package de.bixilon.minosoft.data.text.formatting +@Deprecated("bitfield") enum class PostChatFormattingCodes( override val char: Char, override val ansi: String, diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/PreChatFormattingCodes.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/PreChatFormattingCodes.kt index 069a08d93..5a752d166 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/PreChatFormattingCodes.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/PreChatFormattingCodes.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -12,6 +12,7 @@ */ package de.bixilon.minosoft.data.text.formatting +@Deprecated("bitfield") enum class PreChatFormattingCodes( override val char: Char, override val ansi: String, diff --git a/src/main/java/de/bixilon/minosoft/data/text/formatting/TextStyle.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/TextStyle.kt index 10ae2478b..b9ee557dc 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/formatting/TextStyle.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/TextStyle.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -17,5 +17,7 @@ import de.bixilon.minosoft.data.text.formatting.color.RGBColor interface TextStyle { var color: RGBColor? + + @Deprecated("bitfield") val formatting: MutableCollection }