aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-02-11 06:08:45 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-02-11 06:08:45 +0100
commitc618fb4e335a3d03b04ba8840f7e3e6fb8832eaf (patch)
tree4fb522caf51e4d85fce8bea15888eaa450174b52
parentded258748604449fa3582af59549bfe07f203b42 (diff)
downloadskyhanni-c618fb4e335a3d03b04ba8840f7e3e6fb8832eaf.tar.gz
skyhanni-c618fb4e335a3d03b04ba8840f7e3e6fb8832eaf.tar.bz2
skyhanni-c618fb4e335a3d03b04ba8840f7e3e6fb8832eaf.zip
Added Corleone highlighter.
-rw-r--r--CHANGELOG.md1
-rw-r--r--FEATURES.md1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt19
4 files changed, 20 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d6c96831..1029c1d35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
+ Added colors for the missing slayer area bosses (Golden Ghoul, Old Wolf and Spider Keeper)
+ Added Arachne keeper highlighter.
+ Added area mini bosses spawn timer.
++ Added Corleone highlighter.
## Removals
- Removed Blaze slayer Pillar warning + timer (The Feature caused lags and Soopy's approach is better)
diff --git a/FEATURES.md b/FEATURES.md
index 48ad166f3..7150a623e 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -153,6 +153,7 @@
+ Arachne keeper highlighter.
+ Area mini boss highlighter.
+ Area mini boss spawn timer.
++ Corleone highlighter.
## Commands
- /wiki (using hypixel-skyblock.fandom.com instead of Hypixel wiki)
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java b/src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java
index 91ea4c492..feda60b5b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java
@@ -38,4 +38,9 @@ public class Mobs {
@ConfigOption(name = "Arachne Keeper Highlight", desc = "Highlight corrupted mobs in purple color")
@ConfigEditorBoolean
public boolean arachneKeeperHighlight = true;
+
+ @Expose
+ @ConfigOption(name = "Corleone Highlighter", desc = "Highlight Boss Corleone in the Crystal Hollows")
+ @ConfigEditorBoolean
+ public boolean corleoneHighlighter = true;
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
index 5338a6563..8d5d84940 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
import at.hannibal2.skyhanni.utils.LorenzColor
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
+import net.minecraft.client.entity.EntityOtherPlayerMP
import net.minecraft.entity.monster.EntitySpider
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -35,12 +36,18 @@ class MobHighlight {
val entity = event.entity
val maxHealth = event.maxHealth
if (SkyHanniMod.feature.mobs.arachneKeeperHighlight) {
- if (entity is EntitySpider) {
- if (maxHealth == 3_000) {
- RenderLivingEntityHelper.setEntityColor(entity, LorenzColor.DARK_BLUE.toColor().withAlpha(127))
- { SkyHanniMod.feature.mobs.arachneKeeperHighlight }
- RenderLivingEntityHelper.setNoHurtTime(entity) { SkyHanniMod.feature.mobs.arachneKeeperHighlight }
- }
+ if (maxHealth == 3_000 && entity is EntitySpider) {
+ RenderLivingEntityHelper.setEntityColor(entity, LorenzColor.DARK_BLUE.toColor().withAlpha(127))
+ { SkyHanniMod.feature.mobs.arachneKeeperHighlight }
+ RenderLivingEntityHelper.setNoHurtTime(entity) { SkyHanniMod.feature.mobs.arachneKeeperHighlight }
+ }
+ }
+
+ if (SkyHanniMod.feature.mobs.corleoneHighlighter) {
+ if (maxHealth == 1_000_000 && entity is EntityOtherPlayerMP && entity.name == "Team Treasurite") {
+ RenderLivingEntityHelper.setEntityColor(entity, LorenzColor.DARK_PURPLE.toColor().withAlpha(127))
+ { SkyHanniMod.feature.mobs.corleoneHighlighter }
+ RenderLivingEntityHelper.setNoHurtTime(entity) { SkyHanniMod.feature.mobs.corleoneHighlighter }
}
}
}