Skip to content

Feat: Class color and class name on map #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kemmisch wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Feat: Class color and class name on map #553

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c44a09f
Update apiTools.kt
Kemmisch May 29, 2025
62f87d3
Update RenderUtils.kt
Kemmisch May 29, 2025
99194d3
meaningful default colors
Kemmisch May 29, 2025
0ca1032
new config options
Kemmisch May 29, 2025
6709bb6
changed name rendering
Kemmisch May 29, 2025
89713dd
fix commas
Kemmisch May 29, 2025
49106bf
Update RenderUtils.kt
Kemmisch Jun 2, 2025
6238a2c
Apply suggestions from code review
My-Name-Is-Jeff Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/core/CatlasConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,30 @@ object CatlasConfig : Vigilant(
)
var mapVanillaMarker = false

@Property(
name = "Show Class Name Instead of Player Names",
type = PropertyType.SWITCH,
description = "Show the class name under player heads instead of the player name",
category = "Map",
subcategory = "Toggle",
i18nName = "catlas.config.map.toggle.player_class_name",
i18nCategory = "catlas.config.map",
i18nSubcategory = "catlas.config.map.toggle"
)
var useClassForPlayerNames = false

@Property(
name = "Color Player Names By Class",
type = PropertyType.SWITCH,
description = "Colors player names according to their class",
category = "Map",
subcategory = "Toggle",
i18nName = "catlas.config.map.toggle.name_class_color",
i18nCategory = "catlas.config.map",
i18nSubcategory = "catlas.config.map.toggle"
)
var colorPlayerNames = false

@Property(
name = "Map Text Scale",
type = PropertyType.DECIMAL_SLIDER,
Expand Down Expand Up @@ -413,7 +437,7 @@ object CatlasConfig : Vigilant(
i18nCategory = "catlas.config.colors",
i18nSubcategory = "catlas.config.colors.players"
)
var colorPlayerArcher = Color(0, 0, 0, 255)
var colorPlayerArcher = Color(247 ,156 ,165 , 255)

@Property(
name = "Player Border Color (Berserk)",
Expand All @@ -425,7 +449,7 @@ object CatlasConfig : Vigilant(
i18nCategory = "catlas.config.colors",
i18nSubcategory = "catlas.config.colors.players"
)
var colorPlayerBerserk = Color(0, 0, 0, 255)
var colorPlayerBerserk = Color(245, 184, 127, 255)

@Property(
name = "Player Border Color (Healer)",
Expand All @@ -437,7 +461,7 @@ object CatlasConfig : Vigilant(
i18nCategory = "catlas.config.colors",
i18nSubcategory = "catlas.config.colors.players"
)
var colorPlayerHealer = Color(0, 0, 0, 255)
var colorPlayerHealer = Color(207, 158, 240, 255)

@Property(
name = "Player Border Color (Mage)",
Expand All @@ -449,7 +473,7 @@ object CatlasConfig : Vigilant(
i18nCategory = "catlas.config.colors",
i18nSubcategory = "catlas.config.colors.players"
)
var colorPlayerMage = Color(0, 0, 0, 255)
var colorPlayerMage = Color(148, 193, 242, 255)

@Property(
name = "Player Border Color (Tank)",
Expand All @@ -461,7 +485,7 @@ object CatlasConfig : Vigilant(
i18nCategory = "catlas.config.colors",
i18nSubcategory = "catlas.config.colors.players"
)
var colorPlayerTank = Color(0, 0, 0, 255)
var colorPlayerTank = Color(148, 242, 151, 255)

@Property(
name = "Blood Room",
Expand Down
15 changes: 6 additions & 9 deletions src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/catlas/utils/RenderUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,7 @@ object RenderUtils {
GlStateManager.rotate(-180f, 0f, 0f, 1f)
} else {
// Render box behind the player head
val borderColor = when (player.teammate.dungeonClass) {
DungeonClass.ARCHER -> CatlasConfig.colorPlayerArcher
DungeonClass.BERSERK -> CatlasConfig.colorPlayerBerserk
DungeonClass.HEALER -> CatlasConfig.colorPlayerHealer
DungeonClass.MAGE -> CatlasConfig.colorPlayerMage
DungeonClass.TANK -> CatlasConfig.colorPlayerTank
else -> Color.BLACK
}
val borderColor = player.teammate.dungeonClass.color

renderRect(-6.0, -6.0, 12.0, 12.0, borderColor)
GlStateManager.translate(0f, 0f, 0.1f)
Expand Down Expand Up @@ -217,7 +210,11 @@ object RenderUtils {
GlStateManager.translate(0f, 10f, 0f)
GlStateManager.scale(CatlasConfig.playerNameScale, CatlasConfig.playerNameScale, 1f)
mc.fontRendererObj.drawString(
name, -mc.fontRendererObj.getStringWidth(name) / 2f, 0f, 0xffffff, true
if (!CatlasConfig.useClassForPlayerNames) name else player.teammate.dungeonClass.className,
-mc.fontRendererObj.getStringWidth(if (!CatlasConfig.useClassForPlayerNames) name else player.teammate.dungeonClass.className) / 2f,
0f,
if (CatlasConfig.colorPlayerNames) player.teammate.dungeonClass.color.rgb else 0xffffff,
true
)
}
GlStateManager.popMatrix()
Expand Down
10 changes: 10 additions & 0 deletions src/main/kotlin/gg/skytils/skytilsmod/utils/apiTools.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ package gg.skytils.skytilsmod.utils
import gg.skytils.hypixel.types.player.Player
import gg.skytils.hypixel.types.skyblock.Profile
import gg.skytils.hypixel.types.util.Inventory
import gg.skytils.skytilsmod.features.impl.dungeons.catlas.core.CatlasConfig
import kotlinx.serialization.KSerializer
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down Expand Up @@ -61,6 +62,15 @@ enum class DungeonClass {

val className = name.toTitleCase()
val apiName = name.lowercase()
val color: Color
Copy link
Member

@My-Name-Is-Jeff My-Name-Is-Jeff Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't really like this change here

get() = when (this) {
ARCHER -> CatlasConfig.colorPlayerArcher
BERSERK -> CatlasConfig.colorPlayerBerserk
HEALER -> CatlasConfig.colorPlayerHealer
MAGE -> CatlasConfig.colorPlayerMage
TANK -> CatlasConfig.colorPlayerTank
else -> Color.BLACK
}

override fun toString(): String {
return this.className
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/catlas/lang/en_US.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ catlas.config.map.toggle.hide_in_boss=Hide In Boss
catlas.config.map.toggle.show_before_start=Show Before Start
catlas.config.map.toggle.show_player_names=Show Player Names
catlas.config.map.toggle.vanilla_head_marker=Vanilla Head Marker
catlas.config.map.toggle.player_class_name=Show Class Name Instead of Player Names
catlas.config.map.toggle.name_class_color=Color Player Names By Class
catlas.config.map.size.map_text_scale=Map Text Scale
catlas.config.map.size.player_heads_scale=Player Heads Scale
catlas.config.map.size.head_border_scale=Head Border Scale
Expand Down