From 22de7c9d69ab0deb96d5dfec4408fd524252f62f Mon Sep 17 00:00:00 2001 From: TheBjoRedCraft <143264463+TheBjoRedCraft@users.noreply.github.com> Date: Sun, 28 Dec 2025 12:59:26 +0100 Subject: [PATCH 1/5] Document NOTE color constant in Colors.kt Added documentation for the NOTE color constant. --- .../dev/slne/surf/surfapi/core/api/messages/Colors.kt | 8 ++++++++ 1 file changed, 8 insertions(+) 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..0fb64470 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 @@ -44,6 +44,14 @@ interface Colors { @JvmField val INFO: TextColor = color(0x97B3F7) + /** + * The note color (#6EA6D9). + * Used to display a note or other which is not + * an info or primary text + */ + @JvmField + val NOTE: TextColor = color(0x6EA6D9) + /** * The success color (#65ff64). * Indicates a positive outcome of a user action and is always From 17ec451f51fc2b591ff02af4999b85cb729f3bd3 Mon Sep 17 00:00:00 2001 From: TheBjoRedCraft <143264463+TheBjoRedCraft@users.noreply.github.com> Date: Sun, 28 Dec 2025 13:01:39 +0100 Subject: [PATCH 2/5] Add note function to SurfComponentBuilder --- .../core/api/messages/builder/SurfComponentBuilder.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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..608a7eaa 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 @@ -3,6 +3,7 @@ package dev.slne.surf.surfapi.core.api.messages.builder 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 +import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.NOTE import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.PREFIX import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.PRIMARY import dev.slne.surf.surfapi.core.api.messages.Colors.Companion.SECONDARY @@ -124,6 +125,8 @@ interface SurfComponentBuilder : TextComponent.Builder { fun info(int: Int, vararg decoration: TextDecoration) = text(int, INFO, *decoration) fun info(long: Long, vararg decoration: TextDecoration) = text(long, INFO, *decoration) + fun note(any: Any, vararg decoration: TextDecoration) = text(any.toString(), NOTE, *decoration) + fun success(text: String, vararg decoration: TextDecoration) = text(text, SUCCESS, *decoration) fun success(boolean: Boolean, vararg decoration: TextDecoration) = text(boolean, SUCCESS, *decoration) @@ -339,4 +342,4 @@ interface SurfComponentBuilder : TextComponent.Builder { override fun style(style: Style): SurfComponentBuilder override fun shadowColor(argb: ARGBLike?): SurfComponentBuilder override fun shadowColorIfAbsent(argb: ARGBLike?): SurfComponentBuilder -} \ No newline at end of file +} From 2e4a0d923bedef1f5197733d4439e3fecae6a2c3 Mon Sep 17 00:00:00 2001 From: TheBjoRedCraft <143264463+TheBjoRedCraft@users.noreply.github.com> Date: Sun, 28 Dec 2025 13:01:59 +0100 Subject: [PATCH 3/5] 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> --- .../dev/slne/surf/surfapi/core/api/messages/Colors.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 0fb64470..42a29806 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 @@ -46,8 +46,11 @@ interface Colors { /** * The note color (#6EA6D9). - * Used to display a note or other which is not - * an info or primary text + * Used for supplemental or side-note information that adds context, + * tips, or clarifications to a primary message. + * Prefer this for ancillary guidance rather than main content: + * use [INFO] for neutral system messages or status updates, and [PRIMARY] + * for branded elements such as titles or key headings. */ @JvmField val NOTE: TextColor = color(0x6EA6D9) From 4211b8df09ab89857f51e6bd74e6d2300e16e5f8 Mon Sep 17 00:00:00 2001 From: TheBjoRedCraft Date: Sun, 28 Dec 2025 13:14:13 +0100 Subject: [PATCH 4/5] feat: add `note` function and `NOTE` field to support styled text decorations across API modules; bump version to 2.48.1 --- gradle.properties | 2 +- .../surf-api-bukkit-api/api/surf-api-bukkit-api.api | 3 +++ surf-api-core/surf-api-core-api/api/surf-api-core-api.api | 3 +++ .../surf-api-velocity-api/api/surf-api-velocity-api.api | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d48c02e7..26821785 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled javaVersion=21 mcVersion=1.21.11 group=dev.slne.surf -version=1.21.11-2.48.0 +version=1.21.11-2.48.1 relocationPrefix=dev.slne.surf.surfapi.libs snapshot=false diff --git a/surf-api-bukkit/surf-api-bukkit-api/api/surf-api-bukkit-api.api b/surf-api-bukkit/surf-api-bukkit-api/api/surf-api-bukkit-api.api index f4cb4ad3..97b856e1 100644 --- a/surf-api-bukkit/surf-api-bukkit-api/api/surf-api-bukkit-api.api +++ b/surf-api-bukkit/surf-api-bukkit-api/api/surf-api-bukkit-api.api @@ -12345,6 +12345,7 @@ public abstract interface class dev/slne/surf/surfapi/core/api/messages/Colors { public static final field GREEN Lnet/kyori/adventure/text/format/NamedTextColor; public static final field INFO Lnet/kyori/adventure/text/format/TextColor; public static final field LIGHT_PURPLE Lnet/kyori/adventure/text/format/NamedTextColor; + public static final field NOTE Lnet/kyori/adventure/text/format/TextColor; public static final field PREFIX Lnet/kyori/adventure/text/Component; public static final field PREFIX_COLOR Lnet/kyori/adventure/text/format/TextColor; public static final field PRIMARY Lnet/kyori/adventure/text/format/TextColor; @@ -12773,6 +12774,7 @@ public abstract interface class dev/slne/surf/surfapi/core/api/messages/builder/ public abstract fun mergeStyle (Lnet/kyori/adventure/text/Component;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public abstract fun mergeStyle (Lnet/kyori/adventure/text/Component;Ljava/util/Set;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public abstract fun mergeStyle (Lnet/kyori/adventure/text/Component;[Lnet/kyori/adventure/text/format/Style$Merge;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; + public fun note (Ljava/lang/Object;[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public fun primary (C[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public fun primary (D[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public fun primary (F[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; @@ -12895,6 +12897,7 @@ public final class dev/slne/surf/surfapi/core/api/messages/builder/SurfComponent public static fun info (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;J[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun info (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;Ljava/lang/String;[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun info (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;Z[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; + public static fun note (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;Ljava/lang/Object;[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun primary (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;C[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun primary (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;D[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun primary (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;F[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; diff --git a/surf-api-core/surf-api-core-api/api/surf-api-core-api.api b/surf-api-core/surf-api-core-api/api/surf-api-core-api.api index de6b98d9..eb3aa70e 100644 --- a/surf-api-core/surf-api-core-api/api/surf-api-core-api.api +++ b/surf-api-core/surf-api-core-api/api/surf-api-core-api.api @@ -6935,6 +6935,7 @@ public abstract interface class dev/slne/surf/surfapi/core/api/messages/Colors { public static final field GREEN Lnet/kyori/adventure/text/format/NamedTextColor; public static final field INFO Lnet/kyori/adventure/text/format/TextColor; public static final field LIGHT_PURPLE Lnet/kyori/adventure/text/format/NamedTextColor; + public static final field NOTE Lnet/kyori/adventure/text/format/TextColor; public static final field PREFIX Lnet/kyori/adventure/text/Component; public static final field PREFIX_COLOR Lnet/kyori/adventure/text/format/TextColor; public static final field PRIMARY Lnet/kyori/adventure/text/format/TextColor; @@ -7363,6 +7364,7 @@ public abstract interface class dev/slne/surf/surfapi/core/api/messages/builder/ public abstract fun mergeStyle (Lnet/kyori/adventure/text/Component;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public abstract fun mergeStyle (Lnet/kyori/adventure/text/Component;Ljava/util/Set;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public abstract fun mergeStyle (Lnet/kyori/adventure/text/Component;[Lnet/kyori/adventure/text/format/Style$Merge;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; + public fun note (Ljava/lang/Object;[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public fun primary (C[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public fun primary (D[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public fun primary (F[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; @@ -7485,6 +7487,7 @@ public final class dev/slne/surf/surfapi/core/api/messages/builder/SurfComponent public static fun info (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;J[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun info (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;Ljava/lang/String;[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun info (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;Z[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; + public static fun note (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;Ljava/lang/Object;[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun primary (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;C[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun primary (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;D[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun primary (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;F[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; diff --git a/surf-api-velocity/surf-api-velocity-api/api/surf-api-velocity-api.api b/surf-api-velocity/surf-api-velocity-api/api/surf-api-velocity-api.api index e64dc370..446b8e58 100644 --- a/surf-api-velocity/surf-api-velocity-api/api/surf-api-velocity-api.api +++ b/surf-api-velocity/surf-api-velocity-api/api/surf-api-velocity-api.api @@ -10241,6 +10241,7 @@ public abstract interface class dev/slne/surf/surfapi/core/api/messages/Colors { public static final field GREEN Lnet/kyori/adventure/text/format/NamedTextColor; public static final field INFO Lnet/kyori/adventure/text/format/TextColor; public static final field LIGHT_PURPLE Lnet/kyori/adventure/text/format/NamedTextColor; + public static final field NOTE Lnet/kyori/adventure/text/format/TextColor; public static final field PREFIX Lnet/kyori/adventure/text/Component; public static final field PREFIX_COLOR Lnet/kyori/adventure/text/format/TextColor; public static final field PRIMARY Lnet/kyori/adventure/text/format/TextColor; @@ -10669,6 +10670,7 @@ public abstract interface class dev/slne/surf/surfapi/core/api/messages/builder/ public abstract fun mergeStyle (Lnet/kyori/adventure/text/Component;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public abstract fun mergeStyle (Lnet/kyori/adventure/text/Component;Ljava/util/Set;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public abstract fun mergeStyle (Lnet/kyori/adventure/text/Component;[Lnet/kyori/adventure/text/format/Style$Merge;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; + public fun note (Ljava/lang/Object;[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public fun primary (C[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public fun primary (D[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public fun primary (F[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; @@ -10791,6 +10793,7 @@ public final class dev/slne/surf/surfapi/core/api/messages/builder/SurfComponent public static fun info (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;J[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun info (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;Ljava/lang/String;[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun info (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;Z[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; + public static fun note (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;Ljava/lang/Object;[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun primary (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;C[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun primary (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;D[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; public static fun primary (Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder;F[Lnet/kyori/adventure/text/format/TextDecoration;)Ldev/slne/surf/surfapi/core/api/messages/builder/SurfComponentBuilder; From a9fc24cb2e6fdc74100aa17293d19218bc3f6b90 Mon Sep 17 00:00:00 2001 From: twisti <76837088+twisti-dev@users.noreply.github.com> Date: Sun, 28 Dec 2025 14:17:16 +0100 Subject: [PATCH 5/5] Update version to 1.21.11-2.49.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 26821785..c952a78f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled javaVersion=21 mcVersion=1.21.11 group=dev.slne.surf -version=1.21.11-2.48.1 +version=1.21.11-2.49.0 relocationPrefix=dev.slne.surf.surfapi.libs snapshot=false