diff options
6 files changed, 49 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 326c10292..d8fc9b60c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ + Added area mini bosses spawn timer. + Added Corleone highlighter. + Added **Tps Display** - Show the Tps of the current server. ++ Added Kuudra Key Number overlay. ++ Added colored highlight support for zealots, bruisers and special zealots. ## 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 cb684d95e..ffdd815c0 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -46,7 +46,7 @@ ## Inventory - Not Clickable Items: Mark items gray in your inventory when they are not supposed to be moved in certain GUIs, and make green lines around items that meet that requirement. (in NPC sell inventories, ender chests and backpacks, salvaging in the dungeon hub, player trade, bazaar, action house, accessory bag, sack of sacks, fishing bag, potion bag, chests on the private island, attribute fusion and equipment GUI) - Option to change the gray-out opacity for 'Not Clickable Items'. -- Set stack number for specific items (stars for crimson armor, minion tier, pet level, new year cake, for golden and diamond dungeon heads the floor number and the tier of master skull and master star) +- Set stack number for specific items (stars for crimson armor, minion tier, pet level, new year cake, for golden and diamond dungeon heads the floor number, the tier of master skull and master star, kuudra keys) - Sack name (show short name of sacks) - Anvil Combine Helper (When putting an enchanted book into the first slot of the anvil, all items with the same enchantment are highlighted in the inventory) - Added compact star counter on all items (not only on items with dungeon stars and master stars but also on crimson armors, cloaks and fishing rods) @@ -154,6 +154,8 @@ + Area mini boss highlighter. + Area mini boss spawn timer. + Corleone highlighter. ++ Zealots, Bruisers and Special Zealot highlighter. +- Highlight corrupted mobs. ## Commands - /wiki (using hypixel-skyblock.fandom.com instead of Hypixel wiki) @@ -167,7 +169,6 @@ - Fixing Skytils custom Damage Splash. - Gui element showing the real time. - Highlight the voidling extremist in pink color. -- Highlight corrupted mobs in purple color. - Highlight millenia aged blaze color in red - Option to hide all damage splashes, from anywhere in Skyblock. - Hide armor or just helmet of other player or yourself 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 |