From ccd26dd73637652a48731f0b37326ff6b767abb0 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sun, 10 Dec 2023 00:47:39 +0100 Subject: Added Marked Entity Color as separate option --- .../skyhanni/config/features/markedplayer/MarkedPlayerConfig.java | 7 ++++++- .../at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/main/java/at/hannibal2') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/markedplayer/MarkedPlayerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/markedplayer/MarkedPlayerConfig.java index 38b5b1981..3c02437e3 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/markedplayer/MarkedPlayerConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/markedplayer/MarkedPlayerConfig.java @@ -24,9 +24,14 @@ public class MarkedPlayerConfig { @ConfigEditorBoolean() public Property markOwnName = Property.of(false); - @ConfigOption(name = "Marked Chat Color", desc = "Marked Chat Color. §eIf Chroma is gray, enable Chroma in Chroma settings") + @ConfigOption(name = "Marked Chat Color", desc = "Marked Chat Color. §eIf Chroma is gray, enable Chroma in Chroma settings.") @Expose @ConfigEditorDropdown public LorenzColor chatColor = LorenzColor.YELLOW; + @ConfigOption(name = "Marked Entity Color", desc = "The color of the marked player in the world. §cDoes not yet support chroma.") + @Expose + @ConfigEditorDropdown + public LorenzColor entityColor = LorenzColor.YELLOW; + } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt index 5409d956a..0ce1a8fd8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt @@ -8,7 +8,6 @@ import at.hannibal2.skyhanni.events.RenderMobColoredEvent import at.hannibal2.skyhanni.events.ResetEntityHurtEvent import at.hannibal2.skyhanni.events.withAlpha import at.hannibal2.skyhanni.utils.EntityUtils -import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraft.client.Minecraft import net.minecraft.client.entity.EntityOtherPlayerMP @@ -93,7 +92,7 @@ class MarkedPlayerManager { val entity = event.entity if (entity in markedPlayers.values) { - event.color = LorenzColor.YELLOW.toColor().withAlpha(127) + event.color = config.entityColor.toColor().withAlpha(127) } } -- cgit