0.7 (#2)

* code cleanup * Option to hide the Skyblock Level from the chat messages, Option to change the way the Skyblock Level gets displayed in the chat * change version to 0.6.1 * add highlight the voidling extremist in pink color * add highlight corrupted mobs in purple color * fixed highlight corrupted mobs in purple color in the private island * another minor fix for highlight corrupted mobs in purple color * created EntityHealthUpdateEvent and fixing CorruptedMobHighlight * using EntityHealthUpdateEvent everywhere * added marking a player with yellow color * highlight slayer miniboss in blue color * /copyentities now shows health correctly for every entity * infer fix * fixing bazaar message filter * changelog * hides the death messages of other players, except for players who are close to the player. * hiding tip messages * highlight deathmites in dungeon in red color * code cleanup * code cleanup * hide tnt laying around in dungeon * fix infer * remove debug * Added hide Blessings laying around in dungeon. Added hide Revive Stones laying around in dungeon. * Hide Premium Flesh laying around in dungeon. * edited LorenzTest * Added dungeon copilot and separate filter for hiding dungeon key and door messages. * Added hide Journal Entry pages laying around in dungeon. * Added hide Skeleton Skulls laying around in dungeon. * credits * Added highlight Skeleton Skulls when combining into a skeleton in orange color (not useful combined with feature Hide Skeleton Skull) * Added highlight Skeleton Skulls when combining into a skeleton in orange color (not useful combined with feature Hide Skeleton Skull) * fix wording * clarification * small fixes * Highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying) * better/more readability for CopyNearbyEntitiesCommand * make version 0.7
hannibal002 · Sep 7, 2022 · 3185411 · 3185411
1 parent 59c8789
commit 3185411
Show file tree

Hide file tree

Showing 50 changed files with 1,540 additions and 189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # SkyHanni - Change Log
 
+## Version 0.7 - Dungeon and Colored Highlight
+
+## New Dungeon Features
+- Added highlight deathmites in dungeon in red color
+- Added hide Superboom TNT laying around in dungeon
+- Added hide Blessings laying around in dungeon
+- Added hide Revive Stones laying around in dungeon
+- Added hide Premium Flesh laying around in dungeon
+- Added Dungeon Copilot (Suggests to you what to do next in dungeon)
+- Added separate option to hide dungeon key pickup and door open messages
+- Added hide Journal Entry pages laying around in dungeon.
+- Added hide Skeleton Skulls laying around in dungeon.
+- Added highlight Skeleton Skulls in dungeon when combining into a skeleton in orange color (not useful combined with feature Hide Skeleton Skull)
+
+
+### Other Misc Features
+- Added option to hide the Skyblock Level from the chat messages (alpha only atm)
+- Added option to change the way the Skyblock Level gets displayed in the chat (only working when skyblock level and fancy player message format are enabled)
+- Added highlight the voidling extremist in pink color
+- Added highlight corrupted mobs in purple color
+- Added command /shmarkplayer (marking a player with yellow color)
+- Added highlight slayer miniboss in blue color
+- Added option to hide the death messages of other players, except for players who are close to the player, inside dungeon or doing a Kuudra fight.
+- Added highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)
+
+### Fixes
+- Fixed message filter for small bazaar messages
+
 ## Version 0.6 - Ashfang and Summoning Mobs
 
 ### New Features

diff --git a/FEATURES.md b/FEATURES.md
@@ -1,7 +1,9 @@
 # SkyHanni - List of all Features
 
 ## Commands
+- /skyhanni or /sh (opening the SkyHanni config in game)
 - /wiki (using hypixel-skyblock.fandom.com instead of Hypixel wiki)
+- /shmarkplayer (marking a player with yellow color)
 
 ## Chat Filter
 - Hiding annoying messages in the Hub of Hypixel (MVP player joins, other player loot boxes, prototype message, radiating generosity, HyPixel tournaments)
@@ -12,8 +14,11 @@
 
 ## Chat
 + Using a clean chat format for player messages (removing the rank prefix, every player writes in the same color)
-+ Dungeon Filter (Removing annoying messages from inside dungeon)
++ Dungeon Filter (Removing annoying messages from in the dungeon)
 + Dungeon Boss Message hider (includes The Watcher as well)
+- Option to hide the Skyblock Level from the chat messages,
+- Option to change the way the Skyblock Level gets displayed in the chat (only working when skyblock level and fancy player message format are enabled)
+- Option to hide the death messages of other players, except for players who are close to the player, inside dungeon or doing a Kuudra fight.
 
 ## Dungeon
 - Clicked Blocks (Showing the block behind walls AFTER clicked on a chest, wither essence or a lever)
@@ -22,6 +27,16 @@
 - Clean End (Hiding all entities and particles from displaying after the last dungeon boss dies, showing dungeon chests, still)
 - Option to exclude guardians in F3 and M3 from the clean end feature (only when sneaking)
 - Hiding damage splashes while inside the boss room (replacing a broken feature from Skytils)
+- Highlight deathmites in red color
+- Hide Superboom TNT laying around in dungeon
+- Hide Blessings laying around in dungeon
+- Hide Revive Stones laying around in dungeon
+- Hide Premium Flesh laying around in dungeon
+- Hide Journal Entry pages laying around in dungeon.
+- Dungeon Copilot (Suggests to you what to do next in dungeon)
+- Option to hide key pickup and door open messages in dungeon.
+- Hide Skeleton Skulls laying around in dungeon.
+- Highlight Skeleton Skulls in dungeon when combining into a skeleton in orange color (not useful combined with feature Hide Skeleton Skull)
 
 ## Inventory
 - Not Clickable Items: Mark items gray in your inventory when they are not supposed to be moved in certain GUIs (in NPC sell inventories, ender chests and backpacks, salvaging in 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)
@@ -87,3 +102,7 @@
 - Summon Soul Display (show the name of a dropped soul, not working in dungeon when Skytils' "Hide Non-Starred Mobs Nametags" is enabled)
 - 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 slayer miniboss in blue color
+- Highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.6"
+version = "0.7"
 
 // Toolchains:
 java {

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -3,22 +3,18 @@
 import at.hannibal2.skyhanni.config.ConfigManager;
 import at.hannibal2.skyhanni.config.Features;
 import at.hannibal2.skyhanni.config.gui.commands.Commands;
-import at.hannibal2.skyhanni.data.ApiKeyGrabber;
-import at.hannibal2.skyhanni.data.HypixelData;
-import at.hannibal2.skyhanni.data.ItemRenderBackground;
-import at.hannibal2.skyhanni.data.ScoreboardData;
+import at.hannibal2.skyhanni.data.*;
 import at.hannibal2.skyhanni.data.repo.RepoManager;
 import at.hannibal2.skyhanni.features.*;
 import at.hannibal2.skyhanni.features.anvil.AnvilCombineHelper;
 import at.hannibal2.skyhanni.features.bazaar.BazaarApi;
 import at.hannibal2.skyhanni.features.bazaar.BazaarBestSellMethod;
 import at.hannibal2.skyhanni.features.bazaar.BazaarOrderHelper;
-import at.hannibal2.skyhanni.features.chat.ChatFilter;
-import at.hannibal2.skyhanni.features.chat.ChatManager;
-import at.hannibal2.skyhanni.features.chat.PlayerChatFilter;
+import at.hannibal2.skyhanni.features.chat.*;
 import at.hannibal2.skyhanni.features.commands.WikiCommand;
 import at.hannibal2.skyhanni.features.damageindicator.DamageIndicatorManager;
 import at.hannibal2.skyhanni.features.dungeon.*;
+import at.hannibal2.skyhanni.features.end.VoidlingExtremistColor;
 import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager;
 import at.hannibal2.skyhanni.features.fishing.SeaCreatureMessageShortener;
 import at.hannibal2.skyhanni.features.fishing.TrophyFishMessages;
@@ -29,6 +25,8 @@
 import at.hannibal2.skyhanni.features.items.abilitycooldown.ItemAbilityCooldown;
 import at.hannibal2.skyhanni.features.minion.MinionFeatures;
 import at.hannibal2.skyhanni.features.nether.ashfang.*;
+import at.hannibal2.skyhanni.features.slayer.EndermanSlayerBeacon;
+import at.hannibal2.skyhanni.features.slayer.HighlightSlayerMiniboss;
 import at.hannibal2.skyhanni.test.LorenzTest;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
@@ -43,7 +41,7 @@
 public class SkyHanniMod {
 
     public static final String MODID = "skyhanni";
-    public static final String VERSION = "0.6";
+    public static final String VERSION = "0.7";
 
     public static Features feature;
 
@@ -61,10 +59,13 @@ public void preInit(FMLPreInitializationEvent event) {
         registerEvent(new ApiKeyGrabber());
         registerEvent(new SeaCreatureManager());
         registerEvent(new ItemRenderBackground());
+        registerEvent(new EntityData());
+        registerEvent(new EntityMovementHelper());
 
         registerEvent(new BazaarOrderHelper());
         registerEvent(new ChatFilter());
         registerEvent(new PlayerChatFilter());
+        registerEvent(new SkyBlockLevelChatMessage());
         registerEvent(new DungeonChatFilter());
         registerEvent(new HideNotClickableItems());
         registerEvent(new ItemDisplayOverlayFeatures());
@@ -97,6 +98,15 @@ public void preInit(FMLPreInitializationEvent event) {
         registerEvent(new RngMeterInventory());
         registerEvent(new WikiCommand());
         registerEvent(new SummoningMobManager());
+        registerEvent(new VoidlingExtremistColor());
+        registerEvent(new CorruptedMobHighlight());
+        registerEvent(new PlayerMarker());
+        registerEvent(new HighlightSlayerMiniboss());
+        registerEvent(new HideFarDeathMessages());
+        registerEvent(new HighlightDungeonDeathmite());
+        registerEvent(new DungeonHideItems());
+        registerEvent(new DungeonCopilot());
+        registerEvent(new EndermanSlayerBeacon());
 
         Commands.init();
 

diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java
@@ -76,6 +76,11 @@ public void executeRunnable(String runnableId) {
             editOverlay(activeConfigCategory, 200, 16, abilities.summoningMobDisplayPos);
             return;
         }
+
+        if (runnableId.equals("dungeonCopilot")) {
+            editOverlay(activeConfigCategory, 200, 16, dungeon.copilotPos);
+            return;
+        }
     }
 
     @Expose

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
@@ -1,9 +1,6 @@
 package at.hannibal2.skyhanni.config.features;
 
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigAccordionId;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorAccordion;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.*;
 import com.google.gson.annotations.Expose;
 
 public class Chat {
@@ -45,17 +42,49 @@ public class Chat {
     public boolean others = false;
 
     @Expose
-    @ConfigOption(name = "Player Messages", desc = "Add a fancy new chat format for player messages.")
-    @ConfigEditorBoolean
+    @ConfigOption(name = "Player Messages", desc = "")
+    @ConfigEditorAccordion(id = 1)
     public boolean playerMessages = false;
 
     @Expose
-    @ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages inside dungeon.")
+    @ConfigOption(name = "Player Messages Format", desc = "Add a fancy new chat format for player messages.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 1)
+    public boolean playerMessagesFormat = false;
+
+    @Expose
+    @ConfigOption(name = "Hide SkyBlock Level", desc = "Hiding the Skyblock Level from the chat messages")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 1)
+    public boolean hideSkyblockLevel = false;
+
+    @Expose
+    @ConfigOption(
+            name = "SkyBlock Level Design",
+            desc = "Change the way the Skyblock Level gets displayed in the chat\n" +
+                    "§cRequires SkyBlock Level and player messages format both enabled"
+    )
+    @ConfigEditorDropdown(
+            values = {"§8[§6123§8] §bname §fmsg",
+                    "§6§l123 §bname §fmsg",
+                    "§bname §8[§6123§8]§f: msg"}
+    )
+    @ConfigAccordionId(id = 1)
+    public int skyblockLevelDesign = 0;
+
+    @Expose
+    @ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages in the dungeon.")
     @ConfigEditorBoolean
     public boolean dungeonMessages = false;
 
     @Expose
-    @ConfigOption(name = "Dungeon Boss Messages", desc = "Hide messages from watcher and bosses inside dungeon.")
+    @ConfigOption(name = "Dungeon Boss Messages", desc = "Hide messages from watcher and bosses in the dungeon.")
     @ConfigEditorBoolean
     public boolean dungeonBossMessages = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Far Deaths", desc = "Hide the death messages of other players, " +
+            "except for players who are close to the player, inside dungeon or doing a Kuudra fight.")
+    @ConfigEditorBoolean
+    public boolean hideFarDeathMessages = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
@@ -16,7 +16,7 @@ public class Dungeon {
     public boolean showMilestone = false;
 
     @Expose
-    @ConfigOption(name = "Milestones Display", desc = "Show the current milestone inside Dungeons.")
+    @ConfigOption(name = "Milestones Display", desc = "Show the current milestone in the Dungeon.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean showMilestonesDisplay = false;
@@ -61,7 +61,84 @@ public class Dungeon {
     public boolean cleanEndF3IgnoreGuardians = false;
 
     @Expose
-    @ConfigOption(name = "Boss Damage Splash", desc = "Hiding damage splashes while inside the boss room (fixing Skytils feature)")
+    @ConfigOption(name = "Boss Damage Splash", desc = "Hiding damage splashes while inside the boss room. (fixing Skytils feature)")
     @ConfigEditorBoolean
     public boolean damageSplashBoss = false;
+
+    @Expose
+    @ConfigOption(name = "Highlight Deathmites", desc = "Highlight deathmites in dungeon in red color.")
+    @ConfigEditorBoolean
+    public boolean highlightDeathmites = false;
+
+    @ConfigOption(name = "Item Hider", desc = "")
+    @ConfigEditorAccordion(id = 3)
+    public boolean itemHider = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Superboom TNT", desc = "Hide Superboom TNT laying around in dungeon.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 3)
+    public boolean hideSuperboomTNT = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Blessings", desc = "Hide Blessings laying around in dungeon.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 3)
+    public boolean hideBlessing = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Revive Stones", desc = "Hide Revive Stones laying around in dungeon.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 3)
+    public boolean hideReviveStone = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Premium Flesh", desc = "Hide Premium Flesh laying around in dungeon.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 3)
+    public boolean hidePremiumFlesh = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Journal Entry", desc = "Hide Journal Entry pages laying around in dungeon.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 3)
+    public boolean hideJournalEntry = false;
+
+    @Expose
+    @ConfigOption(name = "Hide Skeleton Skull", desc = "Hide Skeleton Skulls laying around in dungeon.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 3)
+    public boolean hideSkeletonSkull = false;
+
+    @ConfigOption(name = "Message Filter", desc = "")
+    @ConfigEditorAccordion(id = 4)
+    public boolean messageFilter = false;
+
+    @Expose
+    @ConfigOption(name = "Keys and Doors", desc = "Hides the chat message when picking up keys or opening doors in dungeon.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 4)
+    public boolean messageFilterKeysAndDoors = false;
+
+    @ConfigOption(name = "Dungeon Copilot", desc = "")
+    @ConfigEditorAccordion(id = 5)
+    public boolean dungeonCopilot = false;
+
+    @Expose
+    @ConfigOption(name = "Copilot Enabled", desc = "Suggests what to do next in dungeon.")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 5)
+    public boolean copilotEnabled = false;
+
+    @Expose
+    @ConfigOption(name = "Copilot Pos", desc = "")
+    @ConfigEditorButton(runnableId = "dungeonCopilot", buttonText = "Edit")
+    @ConfigAccordionId(id = 5)
+    public Position copilotPos = new Position(10, 10, false, true);
+
+    @Expose
+    @ConfigOption(name = "Moving Skeleton Skulls", desc = "Highlight Skeleton Skulls when combining into a " +
+            "Skeletor in orange color (not useful combined with feature Hide Skeleton Skull)")
+    @ConfigEditorBoolean
+    public boolean highlightSkeletonSkull = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -48,4 +48,24 @@ public class Misc {
     @ConfigOption(name = "Real Time Position", desc = "")
     @ConfigEditorButton(runnableId = "realTime", buttonText = "Edit")
     public Position realTimePos = new Position(10, 10, false, true);
+
+    @Expose
+    @ConfigOption(name = "Voidling Extremist Color", desc = "Highlight the voidling extremist in pink color")
+    @ConfigEditorBoolean
+    public boolean voidlingExtremistColor = false;
+
+    @Expose
+    @ConfigOption(name = "Corrupted Mob Highlight", desc = "Highlight corrupted mobs in purple color")
+    @ConfigEditorBoolean
+    public boolean corruptedMobHighlight = false;
+
+    @Expose
+    @ConfigOption(name = "Slayer Miniboss Highlight", desc = "Highlight slayer miniboss in blue color")
+    @ConfigEditorBoolean
+    public boolean slayerMinibossHighlight = false;
+
+    @Expose
+    @ConfigOption(name = "Slayer Enderman Beacon", desc = "Highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)")
+    @ConfigEditorBoolean
+    public boolean slayerEndermanBeacon = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
@@ -3,6 +3,7 @@
 import at.hannibal2.skyhanni.SkyHanniMod;
 import at.hannibal2.skyhanni.config.gui.config.ConfigEditor;
 import at.hannibal2.skyhanni.config.gui.core.GuiScreenElementWrapper;
+import at.hannibal2.skyhanni.features.PlayerMarker;
 import at.hannibal2.skyhanni.test.LorenzTest;
 import at.hannibal2.skyhanni.test.command.CopyItemCommand;
 import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand;
@@ -87,5 +88,25 @@ public void processCommand(ICommandSender sender, String[] args) {
                         }
                 )
         );
+        ClientCommandHandler.instance.registerCommand(
+                new SimpleCommand(
+                        "shmarkplayer",
+                        new SimpleCommand.ProcessCommandRunnable() {
+                            public void processCommand(ICommandSender sender, String[] args) {
+                                PlayerMarker.Companion.command(args);
+                            }
+                        }
+                )
+        );
+        ClientCommandHandler.instance.registerCommand(
+                new SimpleCommand(
+                        "togglepacketlog",
+                        new SimpleCommand.ProcessCommandRunnable() {
+                            public void processCommand(ICommandSender sender, String[] args) {
+                                LorenzTest.Companion.togglePacketLog();
+                            }
+                        }
+                )
+        );
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,11 @@ public void executeRunnable(String runnableId) { @@
                 editOverlay(activeConfigCategory, 200, 16, abilities.summoningMobDisplayPos);
                 return;
             }
+            if (runnableId.equals("dungeonCopilot")) {
+                editOverlay(activeConfigCategory, 200, 16, dungeon.copilotPos);
+                return;
+            }
         }
         @Expose
@@ Expand Down @@