Merge pull request #19 from SLNE-Development/fix/fix-colors

Keviro · web-flow · commit 1b6112c89fb3 · 2026-02-20T17:04:33.000+01:00
Fix/fix colors
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.daemon=true
 kapt.use.k2=true
 kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
-version=1.21.11-1.4.0
+version=1.21.11-1.4.1
diff --git a/surf-clan-api/src/main/kotlin/dev/slne/clan/api/clan/Clan.kt b/surf-clan-api/src/main/kotlin/dev/slne/clan/api/clan/Clan.kt
@@ -6,7 +6,6 @@ import dev.slne.clan.api.invite.ClanInviteResult
 import dev.slne.clan.api.member.ClanMember
 import dev.slne.clan.api.member.ClanMemberAddResult
 import dev.slne.clan.api.member.ClanMemberRole
-import dev.slne.surf.surfapi.core.api.messages.Colors
 import net.kyori.adventure.text.format.ShadowColor
 import net.kyori.adventure.text.format.TextColor
 import org.jetbrains.annotations.ApiStatus
@@ -127,11 +126,12 @@ interface Clan : ClanView {
         /**
          * The default color for clan tags when no custom color is set.
          */
-        val DEFAULT_CLAN_TAG_BACKGROUND_COLOR: TextColor = Colors.WHITE
-
-        val DEFAULT_CLAN_TAG_FOREGROUND_COLOR: TextColor = Colors.WHITE
-
-        val DEFAULT_CLAN_TAG_SHADOW_COLOR: ShadowColor = ShadowColor.none()
+        val DEFAULT_CLAN_TAG_BACKGROUND_COLOR: TextColor = TextColor.fromHexString("#39434f")
+            ?: error("Failed to parse default clan tag background color")
+        val DEFAULT_CLAN_TAG_FOREGROUND_COLOR: TextColor = TextColor.fromHexString("#f0f4f7")
+            ?: error("Failed to parse default clan tag foreground color")
+        val DEFAULT_CLAN_TAG_SHADOW_COLOR: ShadowColor = ShadowColor.fromHexString("#899098FF")
+            ?: error("Failed to parse default clan tag shadow color")
 
         val DEFAULT_CLAN_TAG_COLORS = ClanTagColor(
             DEFAULT_CLAN_TAG_FOREGROUND_COLOR,
@@ -170,15 +170,17 @@ interface Clan : ClanView {
          * @param listener the listener to register
          * @see ClanListener
          */
-        fun registerListener(listener: ClanListener) = ClanService.instance.registerListener(listener)
+        fun registerListener(listener: ClanListener) =
+            ClanService.instance.registerListener(listener)
 
         /**
          * Unregisters a previously registered clan listener.
          *
          * @param listener the listener to unregister
          * @see ClanListener
          */
-        fun unregisterListener(listener: ClanListener) = ClanService.instance.unregisterListener(listener)
+        fun unregisterListener(listener: ClanListener) =
+            ClanService.instance.unregisterListener(listener)
 
         /**
          * Retrieves the clan that a player is a member of.
@@ -257,6 +259,7 @@ interface Clan : ClanView {
     }
 }
 
-suspend inline fun Clan.changeClanTagColor(update: ClanTagColor.Update.Builder.() -> Unit) = changeClanTagColor(
-    ClanTagColor.update(update)
-)
+suspend inline fun Clan.changeClanTagColor(update: ClanTagColor.Update.Builder.() -> Unit) =
+    changeClanTagColor(
+        ClanTagColor.update(update)
+    )
diff --git a/surf-clan-api/src/main/kotlin/dev/slne/clan/api/clan/ClanTagColor.kt b/surf-clan-api/src/main/kotlin/dev/slne/clan/api/clan/ClanTagColor.kt
@@ -69,6 +69,20 @@ data class ClanTagColor(
                 shadowColor = shadow ?: Clan.DEFAULT_CLAN_TAG_SHADOW_COLOR
             )
         }
+
+        fun clanTagColorOrNull(
+            foreground: TextColor?,
+            background: TextColor?,
+            shadow: ShadowColor?
+        ): ClanTagColor? {
+            if (foreground == null || background == null || shadow == null) return null
+
+            return ClanTagColor(
+                foregroundColor = foreground,
+                backgroundColor = background,
+                shadowColor = shadow
+            )
+        }
     }
 
     internal sealed interface Field<out T> {
@@ -77,7 +91,7 @@ data class ClanTagColor(
         data class Set<T>(val value: T) : Field<T>
     }
 
-    fun applyUpdate(update: Update, defaults: ClanTagColor): ClanTagColor {
+    fun applyUpdate(update: Update): ClanTagColor {
         fun <T> Field<T>.resolve(current: T, default: T): T =
             when (this) {
                 Field.Unset -> current
@@ -86,9 +100,21 @@ data class ClanTagColor(
             }
 
         return copy(
-            foregroundColor = update.foreground.resolve(foregroundColor, defaults.foregroundColor),
-            backgroundColor = update.background.resolve(backgroundColor, defaults.backgroundColor),
-            shadowColor = update.shadow.resolve(shadowColor, defaults.shadowColor),
+            foregroundColor = update.foreground.resolve(foregroundColor, foregroundColor),
+            backgroundColor = update.background.resolve(backgroundColor, backgroundColor),
+            shadowColor = update.shadow.resolve(shadowColor, shadowColor),
         )
     }
+}
+
+fun ClanTagColor?.update(update: ClanTagColor.Update): ClanTagColor {
+    return this?.applyUpdate(update) ?: ClanTagColor().applyUpdate(update)
+}
+
+fun ClanTagColor?.update(block: ClanTagColor.Update.Builder.() -> Unit): ClanTagColor {
+    val builder = ClanTagColor.Update.Builder()
+    block(builder)
+    return builder.build().let { update ->
+        this?.applyUpdate(update) ?: ClanTagColor().applyUpdate(update)
+    }
 }
diff --git a/surf-clan-api/src/main/kotlin/dev/slne/clan/api/clan/ClanView.kt b/surf-clan-api/src/main/kotlin/dev/slne/clan/api/clan/ClanView.kt
@@ -4,8 +4,6 @@ import dev.slne.clan.api.invite.ClanInviteView
 import dev.slne.clan.api.member.ClanMemberView
 import dev.slne.clan.api.permission.ClanPermission
 import net.kyori.adventure.text.Component
-import net.kyori.adventure.text.format.ShadowColor
-import net.kyori.adventure.text.format.TextColor
 import org.jetbrains.annotations.ApiStatus
 import java.time.OffsetDateTime
 import java.util.*
@@ -54,7 +52,7 @@ interface ClanView {
      */
     val discordInvite: String?
 
-    val clanTagColor: ClanTagColor
+    val clanTagColor: ClanTagColor?
 
     /**
      * An immutable set of all members in this clan.
@@ -129,4 +127,5 @@ interface ClanView {
     fun renderClanTag(minSize: Int = 0): Component
 
     fun broadcast(message: Component)
+    fun getClanTagColorOrDefault() = clanTagColor ?: Clan.DEFAULT_CLAN_TAG_COLORS
 }
diff --git a/surf-clan-core/src/main/kotlin/dev/slne/clan/core/clan/AbstractClanView.kt b/surf-clan-core/src/main/kotlin/dev/slne/clan/core/clan/AbstractClanView.kt
@@ -22,14 +22,12 @@ abstract class AbstractClanView : ClanView {
         return getMember(uuid)?.hasPermission(permission) ?: false
     }
 
-    override fun getRichClanTag(): Component {
-        return BitmapProvider.translateToComponent(
-            tag,
-            clanTagColor.foregroundColor,
-            clanTagColor.backgroundColor,
-            clanTagColor.shadowColor
-        )
-    }
+    override fun getRichClanTag(): Component = BitmapProvider.translateToComponent(
+        tag,
+        getClanTagColorOrDefault().foregroundColor,
+        getClanTagColorOrDefault().backgroundColor,
+        getClanTagColorOrDefault().shadowColor
+    )
 
     override fun renderClanTag(minSize: Int): Component {
         if (tag.isBlank()) return Component.empty()
diff --git a/surf-clan-core/src/main/kotlin/dev/slne/clan/core/clan/ClanImpl.kt b/surf-clan-core/src/main/kotlin/dev/slne/clan/core/clan/ClanImpl.kt
@@ -21,7 +21,7 @@ data class ClanImpl(
     override val name: String,
     override val tag: String,
     override val createdByUuid: SerializableStringUUID,
-    override var clanTagColor: ClanTagColor,
+    override var clanTagColor: ClanTagColor?,
     override var description: String?,
     override var discordInvite: String?,
     override var members: Set<ClanMemberImpl>,
diff --git a/surf-clan-core/src/main/kotlin/dev/slne/clan/core/clan/ClanViewImpl.kt b/surf-clan-core/src/main/kotlin/dev/slne/clan/core/clan/ClanViewImpl.kt
@@ -15,7 +15,7 @@ data class ClanViewImpl(
     override val createdByUuid: UUID,
     override val description: String?,
     override val discordInvite: String?,
-    override val clanTagColor: ClanTagColor,
+    override val clanTagColor: ClanTagColor?,
     override val members: Set<ClanMemberView>,
     override val updatedAt: OffsetDateTime,
     override val createdAt: OffsetDateTime,
diff --git a/surf-clan-paper/src/main/kotlin/dev/slne/clan/paper/commands/subcommands/options/ClanTagOptionTagColorCommand.kt b/surf-clan-paper/src/main/kotlin/dev/slne/clan/paper/commands/subcommands/options/ClanTagOptionTagColorCommand.kt
@@ -49,13 +49,15 @@ fun CommandAPICommand.clanTagColorCommand() = subcommand("tagcolor") {
 }
 
 private suspend fun changeColor(sender: Player, update: ClanTagColor.Update) {
-    val clan = Clan.byPlayer(sender.uniqueId) ?: throw CommandAPI.failWithString("Du bist in keinem Clan.")
+    val clan =
+        Clan.byPlayer(sender.uniqueId) ?: throw CommandAPI.failWithString("Du bist in keinem Clan.")
 
     if (!clan.hasMemberPermission(sender.uniqueId, ClanPermission.OPTIONS_TAG_COLOR)) {
         throw CommandAPI.failWithString("Du hast keine Berechtigung, die Farbe des Clan-Tags zu ändern.")
     }
 
     clan.changeClanTagColor(update)
+
     sender.sendText {
         appendSuccessPrefix()
         success("Die Farbe des Clan-Tags wurde erfolgreich geändert.")
diff --git a/surf-clan-runtime/src/main/kotlin/dev/slne/surf/clan/runtime/db/repository/impl/ClanRepositoryImpl.kt b/surf-clan-runtime/src/main/kotlin/dev/slne/surf/clan/runtime/db/repository/impl/ClanRepositoryImpl.kt
@@ -65,31 +65,34 @@ class ClanRepositoryImpl : ClanRepository {
             .let(::createClanDAOOrNull)
     }
 
-    override suspend fun fetchAllClansWithoutMembersSortByMemberCount(): Collection<ClanImpl> = suspendTransaction {
-        val memberCount = ClanMembersTable.id.count()
-
-        ClansTable
-            .leftJoin(ClanMembersTable, { ClansTable.id }, { ClanMembersTable.clanId })
-            .select(ClansTable.columns + memberCount)
-            .groupBy(ClansTable.id)
-            .orderBy(memberCount, SortOrder.DESC)
-            .map { row ->
-                createClanDAO(row, emptySet())
-            }
-            .toList()
-    }
+    override suspend fun fetchAllClansWithoutMembersSortByMemberCount(): Collection<ClanImpl> =
+        suspendTransaction {
+            val memberCount = ClanMembersTable.id.count()
 
-    override suspend fun updateDescription(clanID: ULong, description: String?): Boolean = suspendTransaction {
-        ClansTable.update({ ClansTable.id eq clanID }) {
-            it[ClansTable.description] = description
-        } > 0
-    }
+            ClansTable
+                .leftJoin(ClanMembersTable, { ClansTable.id }, { ClanMembersTable.clanId })
+                .select(ClansTable.columns + memberCount)
+                .groupBy(ClansTable.id)
+                .orderBy(memberCount, SortOrder.DESC)
+                .map { row ->
+                    createClanDAO(row, emptySet())
+                }
+                .toList()
+        }
 
-    override suspend fun updateDiscordInvite(clanID: ULong, discordInvite: String?): Boolean = suspendTransaction {
-        ClansTable.update({ ClansTable.id eq clanID }) {
-            it[ClansTable.discordInvite] = discordInvite
-        } > 0
-    }
+    override suspend fun updateDescription(clanID: ULong, description: String?): Boolean =
+        suspendTransaction {
+            ClansTable.update({ ClansTable.id eq clanID }) {
+                it[ClansTable.description] = description
+            } > 0
+        }
+
+    override suspend fun updateDiscordInvite(clanID: ULong, discordInvite: String?): Boolean =
+        suspendTransaction {
+            ClansTable.update({ ClansTable.id eq clanID }) {
+                it[ClansTable.discordInvite] = discordInvite
+            } > 0
+        }
 
     override suspend fun updateTagColor(
         clanID: ULong,
@@ -193,7 +196,6 @@ class ClanRepositoryImpl : ClanRepository {
             }
             .toSet()
 
-        ShadowColor.none()
         return createClanDAO(clanRow, members)
     }
 
@@ -205,7 +207,7 @@ class ClanRepositoryImpl : ClanRepository {
         createdByUuid = row[ClansTable.createdBy],
         description = row[ClansTable.description],
         discordInvite = row[ClansTable.discordInvite],
-        clanTagColor = ClanTagColor.withDefaultsAsFallback(
+        clanTagColor = ClanTagColor.clanTagColorOrNull(
             foreground = row[ClansTable.tagForegroundColor],
             background = row[ClansTable.tagBackgroundColor],
             shadow = row[ClansTable.tagShadowColor]
diff --git a/surf-clan-runtime/src/main/kotlin/dev/slne/surf/clan/runtime/services/ClanServiceImpl.kt b/surf-clan-runtime/src/main/kotlin/dev/slne/surf/clan/runtime/services/ClanServiceImpl.kt
@@ -101,7 +101,13 @@ class ClanServiceImpl : CoreClanService {
     }
 
     fun callClanMemberUpdatedListeners(clan: Clan, memberUuid: UUID, added: Boolean) {
-        callClanListeners<ClanUpdateMemberListener> { it.onClanMemberUpdated(clan, memberUuid, added) }
+        callClanListeners<ClanUpdateMemberListener> {
+            it.onClanMemberUpdated(
+                clan,
+                memberUuid,
+                added
+            )
+        }
     }
 
     override suspend fun findClanByPlayer(playerUuid: UUID): Clan? {
@@ -203,7 +209,7 @@ class ClanServiceImpl : CoreClanService {
     }
 
     override suspend fun updateTagColor(clan: ClanImpl, update: ClanTagColor.Update): Boolean {
-        val updatedTagColor = clan.clanTagColor.applyUpdate(update, Clan.DEFAULT_CLAN_TAG_COLORS)
+        val updatedTagColor = clan.clanTagColor.update(update)
 
         val updated = ClanRepository.updateTagColor(
             clan.id,
@@ -225,7 +231,11 @@ class ClanServiceImpl : CoreClanService {
         return ClanInviteServiceImpl.get().fetchPendingInvites(clan.id)
     }
 
-    override suspend fun invitePlayer(clan: ClanImpl, invitee: UUID, invitedBy: UUID): ClanInviteResult {
+    override suspend fun invitePlayer(
+        clan: ClanImpl,
+        invitee: UUID,
+        invitedBy: UUID
+    ): ClanInviteResult {
         return ClanInviteServiceImpl.get().createInvite(clan.id, invitee, invitedBy)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,15 @@ fun CommandAPICommand.clanTagColorCommand() = subcommand("tagcolor") {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`private suspend fun changeColor(sender: Player, update: ClanTagColor.Update) {`
`52`		`- val clan = Clan.byPlayer(sender.uniqueId) ?: throw CommandAPI.failWithString("Du bist in keinem Clan.")`
	`52`	`+ val clan =`
	`53`	`+ Clan.byPlayer(sender.uniqueId) ?: throw CommandAPI.failWithString("Du bist in keinem Clan.")`
`53`	`54`
`54`	`55`	`if (!clan.hasMemberPermission(sender.uniqueId, ClanPermission.OPTIONS_TAG_COLOR)) {`
`55`	`56`	`throw CommandAPI.failWithString("Du hast keine Berechtigung, die Farbe des Clan-Tags zu ändern.")`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`clan.changeClanTagColor(update)`
	`60`	`+`
`59`	`61`	`sender.sendText {`
`60`	`62`	`appendSuccessPrefix()`
`61`	`63`	`success("Die Farbe des Clan-Tags wurde erfolgreich geändert.")`