aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-02-11 07:46:01 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-02-11 07:46:01 +0100
commit1f64f15f8cd4a53b5d970248972a138c5db95655 (patch)
treefec54890953fbec619c1d9a137617bcf2c683686 /src
parentd542bad4e83d86bca7a307f7c32f16864789c30c (diff)
downloadskyhanni-1f64f15f8cd4a53b5d970248972a138c5db95655.tar.gz
skyhanni-1f64f15f8cd4a53b5d970248972a138c5db95655.tar.bz2
skyhanni-1f64f15f8cd4a53b5d970248972a138c5db95655.zip
Added Kuudra Key Number overlay. Added colored highlight support for zealots, bruisers and special zealots.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt17
4 files changed, 44 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
index 6c4496af3..d1a42c252 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
@@ -102,7 +102,8 @@ public class Inventory {
"§bPet Level",
"§bMinion Tier",
"§bCrimson Armor",
- "§bWishing Compass"
+ "§bWishing Compass",
+ "§bKuudra Key"
}
)
public List<Integer> itemNumberAsStackSize = new ArrayList<>(Collections.singletonList(3));
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 feda60b5b..9becb348e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Mobs.java
@@ -30,17 +30,27 @@ public class Mobs {
public boolean areaMinisBossesRespawnTimer = false;
@Expose
- @ConfigOption(name = "Corrupted Mob Highlight", desc = "Highlight corrupted mobs in purple color")
+ @ConfigOption(name = "Corrupted Mob Highlight", desc = "Highlight corrupted mobs in purple color.")
@ConfigEditorBoolean
public boolean corruptedMobHighlight = false;
@Expose
- @ConfigOption(name = "Arachne Keeper Highlight", desc = "Highlight corrupted mobs in purple color")
+ @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")
+ @ConfigOption(name = "Corleone Highlighter", desc = "Highlight Boss Corleone in the Crystal Hollows.")
@ConfigEditorBoolean
public boolean corleoneHighlighter = true;
+
+ @Expose
+ @ConfigOption(name = "Zealots Highlighter", desc = "Highlight Zealots and Bruisers in The End.")
+ @ConfigEditorBoolean
+ public boolean zealotBruiserHighlighter = false;
+
+ @Expose
+ @ConfigOption(name = "Special Zealots Highlighter", desc = "Highlight Special Zealots in The End. (The one that drops Summoning Eyes)")
+ @ConfigEditorBoolean
+ public boolean specialZealotHighlighter = true;
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
index 2071c1311..a8825354b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt
@@ -104,6 +104,18 @@ class ItemDisplayOverlayFeatures {
}
}
+ if (SkyHanniMod.feature.inventory.itemNumberAsStackSize.contains(7)) {
+ if (name.contains("Kuudra Key")) {
+ return when (name) {
+ "Kuudra Key" -> "§a1"
+ "Hot Kuudra Key" -> "§22"
+ "Burning Kuudra Key" -> "§e3"
+ "Fiery Kuudra Key" -> "§64"
+ "Infernal Kuudra Key" -> "§c5"
+ else -> "§4?"
+ }
+ }
+ }
return ""
}
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 8d5d84940..8c58c70a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt
@@ -9,6 +9,7 @@ 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.EntityEnderman
import net.minecraft.entity.monster.EntitySpider
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -50,5 +51,21 @@ class MobHighlight {
RenderLivingEntityHelper.setNoHurtTime(entity) { SkyHanniMod.feature.mobs.corleoneHighlighter }
}
}
+
+ if (SkyHanniMod.feature.mobs.zealotBruiserHighlighter) {
+ if ((maxHealth == 65_000 || maxHealth == 13_000) && entity is EntityEnderman) {
+ RenderLivingEntityHelper.setEntityColor(entity, LorenzColor.DARK_AQUA.toColor().withAlpha(127))
+ { SkyHanniMod.feature.mobs.zealotBruiserHighlighter }
+ RenderLivingEntityHelper.setNoHurtTime(entity) { SkyHanniMod.feature.mobs.zealotBruiserHighlighter }
+ }
+ }
+
+ if (SkyHanniMod.feature.mobs.specialZealotHighlighter) {
+ if (maxHealth == 2_000 && entity is EntityEnderman) {
+ RenderLivingEntityHelper.setEntityColor(entity, LorenzColor.DARK_RED.toColor().withAlpha(50))
+ { SkyHanniMod.feature.mobs.specialZealotHighlighter }
+ RenderLivingEntityHelper.setNoHurtTime(entity) { SkyHanniMod.feature.mobs.specialZealotHighlighter }
+ }
+ }
}
} \ No newline at end of file