Fix nations chat

HorizonsEndMC · Jan 30, 2025 · edf6698 · edf6698
1 parent 7debb9d
commit edf6698
Show file tree

Hide file tree

Showing 10 changed files with 381 additions and 299 deletions.
diff --git a/common/src/main/kotlin/net/horizonsend/ion/common/database/cache/nations/PlayerCache.kt b/common/src/main/kotlin/net/horizonsend/ion/common/database/cache/nations/PlayerCache.kt
@@ -94,6 +94,7 @@ abstract class AbstractPlayerCache : ManualCache() {
 		var hitmarkerOnHull: Boolean = true,
 
 		var shortenChatChannels: Boolean = false,
+
 		var hideUserPrefixes: Boolean = false,
 		var hideGlobalPrefixes: Boolean = false,
 

diff --git a/common/src/main/kotlin/net/horizonsend/ion/common/database/schema/misc/SLPlayer.kt b/common/src/main/kotlin/net/horizonsend/ion/common/database/schema/misc/SLPlayer.kt
@@ -116,6 +116,7 @@ data class SLPlayer(
 	var hitmarkerOnHull: Boolean = true,
 
 	var shortenChatChannels: Boolean = false,
+
 	var hideUserPrefixes: Boolean = false,
 	var hideGlobalPrefixes: Boolean = false,
 

diff --git a/common/src/main/kotlin/net/horizonsend/ion/common/utils/text/Formatting.kt b/common/src/main/kotlin/net/horizonsend/ion/common/utils/text/Formatting.kt
@@ -2,7 +2,9 @@ package net.horizonsend.ion.common.utils.text
 
 import net.horizonsend.ion.common.database.Oid
 import net.horizonsend.ion.common.database.cache.nations.NationCache
+import net.horizonsend.ion.common.database.cache.nations.SettlementCache
 import net.horizonsend.ion.common.database.schema.nations.Nation
+import net.horizonsend.ion.common.database.schema.nations.Settlement
 import net.horizonsend.ion.common.utils.text.colors.HEColorScheme
 import net.horizonsend.ion.common.utils.text.colors.HEColorScheme.Companion.HE_DARK_GRAY
 import net.horizonsend.ion.common.utils.text.colors.HEColorScheme.Companion.HE_LIGHT_GRAY
@@ -290,6 +292,11 @@ fun formatNationName(id: Oid<Nation>): Component {
 	return text(cached.name, TextColor.color(cached.color))
 }
 
+fun formatSettlementName(id: Oid<Settlement>): Component {
+	val cached = SettlementCache[id]
+	return text(cached.name, NamedTextColor.AQUA)
+}
+
 fun formatException(throwable: Throwable): Component {
 	val stackTrace = "$throwable\n" + throwable.stackTrace.joinToString(separator = "\n")
 

diff --git a/server/src/main/kotlin/net/horizonsend/ion/server/command/misc/ChatCommand.kt b/server/src/main/kotlin/net/horizonsend/ion/server/command/misc/ChatCommand.kt
@@ -21,4 +21,4 @@ object ChatCommand : SLCommand() {
 
         ChannelSelections.switchChannel(ChannelSelections[sender], chatChannel, sender)
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,4 @@ object ChatCommand : SLCommand() { @@
             ChannelSelections.switchChannel(ChannelSelections[sender], chatChannel, sender)
         }
-    }
+    }