aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/Features.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java (renamed from src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java)7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt7
4 files changed, 15 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java
index 02c4f9a80..8adf851ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Features.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java
@@ -85,7 +85,7 @@ public class Features extends Config {
@Expose
@Category(name = "Damage Indicator", desc = "Better damage overview in combat with bosses of all sorts.")
- public DamageIndicator damageIndicator = new DamageIndicator();
+ public DamageIndicatorConfig damageIndicator = new DamageIndicatorConfig();
@Expose
@Category(name = "Slayer", desc = "Slayer features.")
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
index f558b638d..141b5e5ed 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
@@ -10,7 +10,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-public class DamageIndicator {
+public class DamageIndicatorConfig {
@Expose
@ConfigOption(name = "Damage Indicator Enabled", desc = "Show the boss' remaining health.")
@@ -57,11 +57,12 @@ public class DamageIndicator {
"§bDiana Mobs",
"§bSea Creatures",
"Dummy",
- "§bArachne"
+ "§bArachne",
+ "§bThe Rift Bosses"
}
)
//TODO only show currently working and tested features
- public List<Integer> bossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 7, 8, 9, 18, 19, 21));
+ public List<Integer> bossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 7, 8, 9, 18, 19, 21, 22));
@Expose
@ConfigOption(name = "Hide Damage Splash", desc = "Hiding damage splashes near the damage indicator.")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
index 0b8563937..9abed088a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
@@ -74,6 +74,9 @@ enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName
ARACHNE_SMALL("§cSmall Arachne", 21),
ARACHNE_BIG("§4Big Arachne", 21),
+ // The Rift
+ LEECH_SUPREME("§cLeech Supreme", 22),
+
//TODO arachne
//TODO corelone
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
index 373d20c22..4316c895c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.damageindicator
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.withAlpha
import at.hannibal2.skyhanni.features.dungeon.DungeonData
+import at.hannibal2.skyhanni.features.rift.RiftAPI
import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
import at.hannibal2.skyhanni.utils.EntityUtils.hasBossHealth
import at.hannibal2.skyhanni.utils.EntityUtils.hasMaxHealth
@@ -192,6 +193,12 @@ class MobFinder {
}
}
}
+ } else if (RiftAPI.inRift()) {
+ if (entity is EntityOtherPlayerMP) {
+ if (entity.name == "Leech Supreme") {
+ return EntityResult(bossType = BossType.LEECH_SUPREME)
+ }
+ }
} else {
if (entity is EntityBlaze) {
if (entity.name != "Dinnerbone") {