aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-10 00:47:39 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-10 00:47:39 +0100
commitccd26dd73637652a48731f0b37326ff6b767abb0 (patch)
treee64ed1963fa91fa8d034141ac696a1462cb5c214 /src/main/java
parent684a34bfc579f729e01fc6005377ba9315463bf3 (diff)
downloadskyhanni-ccd26dd73637652a48731f0b37326ff6b767abb0.tar.gz
skyhanni-ccd26dd73637652a48731f0b37326ff6b767abb0.tar.bz2
skyhanni-ccd26dd73637652a48731f0b37326ff6b767abb0.zip
Added Marked Entity Color as separate option
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/markedplayer/MarkedPlayerConfig.java7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt3
2 files changed, 7 insertions, 3 deletions
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<Boolean> 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)
}
}