aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2022-09-25 10:13:38 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2022-09-25 10:13:38 +0200
commit292fb024c4cb3ad55b3ae872d17049739343e500 (patch)
treeaba7f717dae33d8f91b7cdcb5ab908c9f2ce037c /src/main/java
parent48812f4af2b7f2f5c6e45801802fa8bc7a5c8705 (diff)
downloadskyhanni-292fb024c4cb3ad55b3ae872d17049739343e500.tar.gz
skyhanni-292fb024c4cb3ad55b3ae872d17049739343e500.tar.bz2
skyhanni-292fb024c4cb3ad55b3ae872d17049739343e500.zip
set dev to 0.10.1 and added Lord Jawbus to damage indicator
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java4
-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, 11 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
index bc5045b7e..2005fe4bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -59,7 +59,7 @@ import java.util.List;
public class SkyHanniMod {
public static final String MODID = "skyhanni";
- public static final String VERSION = "0.10";
+ public static final String VERSION = "0.10.1";
public static Features feature;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java
index b14caba94..9a3bcdc87 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java
@@ -55,12 +55,12 @@ public class DamageIndicator {
"\u00a7bDungeon Floor 6",
"\u00a7bDungeon Floor 7",
"\u00a7bDiana Mobs",
- "\u00a7bThunder",
+ "\u00a7bSea Creatures",
"Dummy"
}
)
//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));
+ public List<Integer> bossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 7, 8, 9, 18, 19));
@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 39784df01..2f7e09184 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
@@ -68,8 +68,9 @@ enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName
MINOTAUR("§2Minotaur", 18),
THUNDER("§cThunder", 19),
+ LORD_JAWBUS("§cLord Jawbus", 19),
- DUMMY("Dummy", 20),
+ DUMMY("Dummy", 21),
//TODO arachne
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 af363b647..4ce145b96 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
@@ -187,7 +187,6 @@ class MobFinder {
}
}
} else {
-
if (entity is EntityBlaze) {
if (entity.name != "Dinnerbone") {
if (entity.hasNameTagWith(2, "§e﴾ §8[§7Lv200§8] §l§8§lAshfang§r ")) {
@@ -326,6 +325,12 @@ class MobFinder {
return EntityResult(bossType = BossType.THUNDER)
}
}
+
+ if (entity is EntityIronGolem) {
+ if (entity.hasMaxHealth(100_000_000)) {
+ return EntityResult(bossType = BossType.LORD_JAWBUS)
+ }
+ }
}
return null