From 5977a13b6de6c3d7d76870cad046c589340d8f4c Mon Sep 17 00:00:00 2001 From: TheBjoRedCraft Date: Wed, 19 Nov 2025 16:02:35 +0100 Subject: [PATCH 1/3] feat: enhance message prefixes for consistency and clarity --- gradle.properties | 2 +- .../surf/surfapi/core/api/messages/Colors.kt | 31 +++++++++++++++++-- .../messages/builder/SurfComponentBuilder.kt | 11 ++++--- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index f72716a5..acfa0f5b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled javaVersion=21 mcVersion=1.21.10 group=dev.slne.surf -version=1.21.10-2.42.3 +version=1.21.10-2.42.4 relocationPrefix=dev.slne.surf.surfapi.libs snapshot=false \ No newline at end of file diff --git a/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/Colors.kt b/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/Colors.kt index 2496a9c0..9805a75a 100644 --- a/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/Colors.kt +++ b/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/Colors.kt @@ -1,9 +1,11 @@ package dev.slne.surf.surfapi.core.api.messages +import dev.slne.surf.surfapi.core.api.messages.adventure.buildText import net.kyori.adventure.text.Component import net.kyori.adventure.text.format.NamedTextColor import net.kyori.adventure.text.format.TextColor import net.kyori.adventure.text.format.TextColor.color +import net.kyori.adventure.text.format.TextDecoration /** * A class that defines all the colors used in the Surf system, ensuring a consistent visual style @@ -108,11 +110,36 @@ interface Colors { // -------------------- Default Colors -------------------- // /** - * The default prefix used across all Surf plugins, ensuring a recognizable and uniform + * The default prefix used across all Surf plugins + */ + @JvmField + val PREFIX: Component = buildText { + spacer("»") + appendSpace() + } + + @JvmField + val WARNING_PREFIX: Component = buildText { + spacer("[") + error("!", TextDecoration.BOLD) + spacer("]") + appendSpace() + } + + @JvmField + val ERROR_PREFIX: Component = buildText { + spacer("[") + error("✘", TextDecoration.BOLD) + spacer("]") + appendSpace() + } + + /** + * The surf used across all Surf plugins, ensuring a recognizable and uniform * identifier in messages. */ @JvmField - val PREFIX: Component = Component.text(">> ", DARK_SPACER) + val SURF_PREFIX: Component = Component.text(">> ", DARK_SPACER) .append(Component.text("Surf", PREFIX_COLOR)) .append(Component.text(" | ", DARK_SPACER)) diff --git a/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder.kt b/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder.kt index a375740c..e12fd470 100644 --- a/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder.kt +++ b/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder.kt @@ -1,5 +1,6 @@ package dev.slne.surf.surfapi.core.api.messages.builder +import dev.slne.surf.surfapi.core.api.messages.* import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.DARK_SPACER import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.ERROR import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.INFO @@ -11,14 +12,10 @@ import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.SUCCESS import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.VARIABLE_KEY import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.VARIABLE_VALUE import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.WARNING -import dev.slne.surf.surfapi.core.api.messages.CommonComponents import dev.slne.surf.surfapi.core.api.messages.CommonComponents.DISCONNECT_HEADER import dev.slne.surf.surfapi.core.api.messages.CommonComponents.DISCORD_LINK import dev.slne.surf.surfapi.core.api.messages.CommonComponents.MAP_SEPERATOR import dev.slne.surf.surfapi.core.api.messages.CommonComponents.TIME_SEPARATOR -import dev.slne.surf.surfapi.core.api.messages.NoLowercase -import dev.slne.surf.surfapi.core.api.messages.joinToComponent -import dev.slne.surf.surfapi.core.api.messages.joinToComponentNewLine import net.kyori.adventure.key.Key import net.kyori.adventure.text.* import net.kyori.adventure.text.event.ClickEvent @@ -44,6 +41,9 @@ interface SurfComponentBuilder : TextComponent.Builder { } fun appendPrefix() = append(PREFIX) + fun appendSurfPrefix() = append(Colors.SURF_PREFIX) + fun appendErrorPrefix() = append(Colors.ERROR_PREFIX) + fun appendWarningPrefix() = append(Colors.WARNING_PREFIX) fun appendNewPrefixedLine() = appendNewline().appendPrefix() fun append(block: SurfComponentBuilder.() -> Unit): SurfComponentBuilder = @@ -234,6 +234,9 @@ interface SurfComponentBuilder : TextComponent.Builder { fun darkSpacer(long: Long, vararg decoration: TextDecoration) = text(long, DARK_SPACER, *decoration) + fun white(any: Any, vararg decoration: TextDecoration) = + text(any.toString(), Colors.WHITE, *decoration) + fun ellipsis(color: TextColor? = SPACER) = append(CommonComponents.ELLIPSIS.color(color)) fun appendDiscordLink() = append(DISCORD_LINK) From e721143dd6c6947ae37d80954b7d708275a7255c Mon Sep 17 00:00:00 2001 From: TheBjoRedCraft Date: Wed, 19 Nov 2025 16:25:55 +0100 Subject: [PATCH 2/3] feat: bump version to 1.6.2 --- surf-api-gradle-plugin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/surf-api-gradle-plugin/build.gradle.kts b/surf-api-gradle-plugin/build.gradle.kts index 1b3bcf57..0b676baf 100644 --- a/surf-api-gradle-plugin/build.gradle.kts +++ b/surf-api-gradle-plugin/build.gradle.kts @@ -20,7 +20,7 @@ plugins { group = groupId version = buildString { append(mcVersion) - append("-1.6.1") + append("-1.6.2") if (snapshot) append("-SNAPSHOT") } From a32452f966d48f888ba0656526c8d6bdac4586e7 Mon Sep 17 00:00:00 2001 From: TheBjoRedCraft <143264463+TheBjoRedCraft@users.noreply.github.com> Date: Wed, 19 Nov 2025 16:39:21 +0100 Subject: [PATCH 3/3] Update surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/Colors.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../kotlin/dev/slne/surf/surfapi/core/api/messages/Colors.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/Colors.kt b/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/Colors.kt index 9805a75a..753663a1 100644 --- a/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/Colors.kt +++ b/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/Colors.kt @@ -135,7 +135,7 @@ interface Colors { } /** - * The surf used across all Surf plugins, ensuring a recognizable and uniform + * The Surf prefix used across all Surf plugins, ensuring a recognizable and uniform * identifier in messages. */ @JvmField