diff options
author | Empa <42304516+ItsEmpa@users.noreply.github.com> | 2024-04-01 21:17:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-01 21:17:21 +0200 |
commit | 9d0f4deee109a05ebed657e1c578c78d7c19f863 (patch) | |
tree | 78c243fe7ef3e48fb4093b0c1147c16b26587dcd /src/main/java/at/hannibal2/skyhanni | |
parent | 6ac1fba772a35fb55cd639f8b592968adfbf153b (diff) | |
download | skyhanni-9d0f4deee109a05ebed657e1c578c78d7c19f863.tar.gz skyhanni-9d0f4deee109a05ebed657e1c578c78d7c19f863.tar.bz2 skyhanni-9d0f4deee109a05ebed657e1c578c78d7c19f863.zip |
Feature: Custom Inquisitor Highlight Color (#1323)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java | 6 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java index fb992ab5f..9c46400f5 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java @@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.annotations.Accordion; import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigEditorColour; import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; import io.github.moulberry.moulconfig.annotations.ConfigOption; import org.lwjgl.input.Keyboard; @@ -17,6 +18,11 @@ public class DianaConfig { public boolean highlightInquisitors = true; @Expose + @ConfigOption(name = "Inquisitor Highlight", desc = "Color in which Inquisitors will be highlighted.") + @ConfigEditorColour + public String color = "0:127:85:255:255"; + + @Expose @ConfigOption(name = "Guess Next Burrow", desc = "Uses math from §eSoopy's Guess Logic §7to find the next burrow. Does not require SoopyV2 or ChatTriggers to be installed.") @ConfigEditorBoolean @FeatureToggle diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt index 8ee9a1756..a56554af9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt @@ -2,9 +2,8 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper -import at.hannibal2.skyhanni.utils.ColorUtils.withAlpha -import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.SpecialColour import net.minecraft.entity.player.EntityPlayer import net.minecraftforge.event.entity.EntityJoinWorldEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -21,7 +20,7 @@ class HighlightInquisitors { val entity = event.entity if (entity is EntityPlayer && entity.name == "Minos Inquisitor") { - val color = LorenzColor.AQUA.toColor().withAlpha(127) + val color = SpecialColour.specialToChromaRGB(config.color) RenderLivingEntityHelper.setEntityColorWithNoHurtTime(entity, color) { config.highlightInquisitors } } } |