Skip to content

Commit 3185411

Browse files
authored
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
1 parent 59c8789 commit 3185411

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1540
-189
lines changed

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
# SkyHanni - Change Log
22

3+
## Version 0.7 - Dungeon and Colored Highlight
4+
5+
## New Dungeon Features
6+
- Added highlight deathmites in dungeon in red color
7+
- Added hide Superboom TNT laying around in dungeon
8+
- Added hide Blessings laying around in dungeon
9+
- Added hide Revive Stones laying around in dungeon
10+
- Added hide Premium Flesh laying around in dungeon
11+
- Added Dungeon Copilot (Suggests to you what to do next in dungeon)
12+
- Added separate option to hide dungeon key pickup and door open messages
13+
- Added hide Journal Entry pages laying around in dungeon.
14+
- Added hide Skeleton Skulls laying around in dungeon.
15+
- Added highlight Skeleton Skulls in dungeon when combining into a skeleton in orange color (not useful combined with feature Hide Skeleton Skull)
16+
17+
18+
### Other Misc Features
19+
- Added option to hide the Skyblock Level from the chat messages (alpha only atm)
20+
- 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)
21+
- Added highlight the voidling extremist in pink color
22+
- Added highlight corrupted mobs in purple color
23+
- Added command /shmarkplayer (marking a player with yellow color)
24+
- Added highlight slayer miniboss in blue color
25+
- 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.
26+
- Added highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)
27+
28+
### Fixes
29+
- Fixed message filter for small bazaar messages
30+
331
## Version 0.6 - Ashfang and Summoning Mobs
432

533
### New Features

FEATURES.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# SkyHanni - List of all Features
22

33
## Commands
4+
- /skyhanni or /sh (opening the SkyHanni config in game)
45
- /wiki (using hypixel-skyblock.fandom.com instead of Hypixel wiki)
6+
- /shmarkplayer (marking a player with yellow color)
57

68
## Chat Filter
79
- 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 @@
1214

1315
## Chat
1416
+ Using a clean chat format for player messages (removing the rank prefix, every player writes in the same color)
15-
+ Dungeon Filter (Removing annoying messages from inside dungeon)
17+
+ Dungeon Filter (Removing annoying messages from in the dungeon)
1618
+ Dungeon Boss Message hider (includes The Watcher as well)
19+
- Option to hide the Skyblock Level from the chat messages,
20+
- 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)
21+
- 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.
1722

1823
## Dungeon
1924
- Clicked Blocks (Showing the block behind walls AFTER clicked on a chest, wither essence or a lever)
@@ -22,6 +27,16 @@
2227
- Clean End (Hiding all entities and particles from displaying after the last dungeon boss dies, showing dungeon chests, still)
2328
- Option to exclude guardians in F3 and M3 from the clean end feature (only when sneaking)
2429
- Hiding damage splashes while inside the boss room (replacing a broken feature from Skytils)
30+
- Highlight deathmites in red color
31+
- Hide Superboom TNT laying around in dungeon
32+
- Hide Blessings laying around in dungeon
33+
- Hide Revive Stones laying around in dungeon
34+
- Hide Premium Flesh laying around in dungeon
35+
- Hide Journal Entry pages laying around in dungeon.
36+
- Dungeon Copilot (Suggests to you what to do next in dungeon)
37+
- Option to hide key pickup and door open messages in dungeon.
38+
- Hide Skeleton Skulls laying around in dungeon.
39+
- Highlight Skeleton Skulls in dungeon when combining into a skeleton in orange color (not useful combined with feature Hide Skeleton Skull)
2540

2641
## Inventory
2742
- 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 @@
87102
- Summon Soul Display (show the name of a dropped soul, not working in dungeon when Skytils' "Hide Non-Starred Mobs Nametags" is enabled)
88103
- Fixing Skytils custom Damage Splash
89104
- Gui element showing the real time
105+
- Highlight the voidling extremist in pink color
106+
- Highlight corrupted mobs in purple color
107+
- Highlight slayer miniboss in blue color
108+
- Highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
}
1111

1212
group = "at.hannibal2.skyhanni"
13-
version = "0.6"
13+
version = "0.7"
1414

1515
// Toolchains:
1616
java {

src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,18 @@
33
import at.hannibal2.skyhanni.config.ConfigManager;
44
import at.hannibal2.skyhanni.config.Features;
55
import at.hannibal2.skyhanni.config.gui.commands.Commands;
6-
import at.hannibal2.skyhanni.data.ApiKeyGrabber;
7-
import at.hannibal2.skyhanni.data.HypixelData;
8-
import at.hannibal2.skyhanni.data.ItemRenderBackground;
9-
import at.hannibal2.skyhanni.data.ScoreboardData;
6+
import at.hannibal2.skyhanni.data.*;
107
import at.hannibal2.skyhanni.data.repo.RepoManager;
118
import at.hannibal2.skyhanni.features.*;
129
import at.hannibal2.skyhanni.features.anvil.AnvilCombineHelper;
1310
import at.hannibal2.skyhanni.features.bazaar.BazaarApi;
1411
import at.hannibal2.skyhanni.features.bazaar.BazaarBestSellMethod;
1512
import at.hannibal2.skyhanni.features.bazaar.BazaarOrderHelper;
16-
import at.hannibal2.skyhanni.features.chat.ChatFilter;
17-
import at.hannibal2.skyhanni.features.chat.ChatManager;
18-
import at.hannibal2.skyhanni.features.chat.PlayerChatFilter;
13+
import at.hannibal2.skyhanni.features.chat.*;
1914
import at.hannibal2.skyhanni.features.commands.WikiCommand;
2015
import at.hannibal2.skyhanni.features.damageindicator.DamageIndicatorManager;
2116
import at.hannibal2.skyhanni.features.dungeon.*;
17+
import at.hannibal2.skyhanni.features.end.VoidlingExtremistColor;
2218
import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager;
2319
import at.hannibal2.skyhanni.features.fishing.SeaCreatureMessageShortener;
2420
import at.hannibal2.skyhanni.features.fishing.TrophyFishMessages;
@@ -29,6 +25,8 @@
2925
import at.hannibal2.skyhanni.features.items.abilitycooldown.ItemAbilityCooldown;
3026
import at.hannibal2.skyhanni.features.minion.MinionFeatures;
3127
import at.hannibal2.skyhanni.features.nether.ashfang.*;
28+
import at.hannibal2.skyhanni.features.slayer.EndermanSlayerBeacon;
29+
import at.hannibal2.skyhanni.features.slayer.HighlightSlayerMiniboss;
3230
import at.hannibal2.skyhanni.test.LorenzTest;
3331
import net.minecraft.client.Minecraft;
3432
import net.minecraft.client.gui.GuiScreen;
@@ -43,7 +41,7 @@
4341
public class SkyHanniMod {
4442

4543
public static final String MODID = "skyhanni";
46-
public static final String VERSION = "0.6";
44+
public static final String VERSION = "0.7";
4745

4846
public static Features feature;
4947

@@ -61,10 +59,13 @@ public void preInit(FMLPreInitializationEvent event) {
6159
registerEvent(new ApiKeyGrabber());
6260
registerEvent(new SeaCreatureManager());
6361
registerEvent(new ItemRenderBackground());
62+
registerEvent(new EntityData());
63+
registerEvent(new EntityMovementHelper());
6464

6565
registerEvent(new BazaarOrderHelper());
6666
registerEvent(new ChatFilter());
6767
registerEvent(new PlayerChatFilter());
68+
registerEvent(new SkyBlockLevelChatMessage());
6869
registerEvent(new DungeonChatFilter());
6970
registerEvent(new HideNotClickableItems());
7071
registerEvent(new ItemDisplayOverlayFeatures());
@@ -97,6 +98,15 @@ public void preInit(FMLPreInitializationEvent event) {
9798
registerEvent(new RngMeterInventory());
9899
registerEvent(new WikiCommand());
99100
registerEvent(new SummoningMobManager());
101+
registerEvent(new VoidlingExtremistColor());
102+
registerEvent(new CorruptedMobHighlight());
103+
registerEvent(new PlayerMarker());
104+
registerEvent(new HighlightSlayerMiniboss());
105+
registerEvent(new HideFarDeathMessages());
106+
registerEvent(new HighlightDungeonDeathmite());
107+
registerEvent(new DungeonHideItems());
108+
registerEvent(new DungeonCopilot());
109+
registerEvent(new EndermanSlayerBeacon());
100110

101111
Commands.init();
102112

src/main/java/at/hannibal2/skyhanni/config/Features.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ public void executeRunnable(String runnableId) {
7676
editOverlay(activeConfigCategory, 200, 16, abilities.summoningMobDisplayPos);
7777
return;
7878
}
79+
80+
if (runnableId.equals("dungeonCopilot")) {
81+
editOverlay(activeConfigCategory, 200, 16, dungeon.copilotPos);
82+
return;
83+
}
7984
}
8085

8186
@Expose

src/main/java/at/hannibal2/skyhanni/config/features/Chat.java

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package at.hannibal2.skyhanni.config.features;
22

3-
import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigAccordionId;
4-
import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorAccordion;
5-
import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
6-
import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
3+
import at.hannibal2.skyhanni.config.gui.core.config.annotations.*;
74
import com.google.gson.annotations.Expose;
85

96
public class Chat {
@@ -45,17 +42,49 @@ public class Chat {
4542
public boolean others = false;
4643

4744
@Expose
48-
@ConfigOption(name = "Player Messages", desc = "Add a fancy new chat format for player messages.")
49-
@ConfigEditorBoolean
45+
@ConfigOption(name = "Player Messages", desc = "")
46+
@ConfigEditorAccordion(id = 1)
5047
public boolean playerMessages = false;
5148

5249
@Expose
53-
@ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages inside dungeon.")
50+
@ConfigOption(name = "Player Messages Format", desc = "Add a fancy new chat format for player messages.")
51+
@ConfigEditorBoolean
52+
@ConfigAccordionId(id = 1)
53+
public boolean playerMessagesFormat = false;
54+
55+
@Expose
56+
@ConfigOption(name = "Hide SkyBlock Level", desc = "Hiding the Skyblock Level from the chat messages")
57+
@ConfigEditorBoolean
58+
@ConfigAccordionId(id = 1)
59+
public boolean hideSkyblockLevel = false;
60+
61+
@Expose
62+
@ConfigOption(
63+
name = "SkyBlock Level Design",
64+
desc = "Change the way the Skyblock Level gets displayed in the chat\n" +
65+
"§cRequires SkyBlock Level and player messages format both enabled"
66+
)
67+
@ConfigEditorDropdown(
68+
values = {"§8[§6123§8] §bname §fmsg",
69+
"§6§l123 §bname §fmsg",
70+
"§bname §8[§6123§8]§f: msg"}
71+
)
72+
@ConfigAccordionId(id = 1)
73+
public int skyblockLevelDesign = 0;
74+
75+
@Expose
76+
@ConfigOption(name = "Dungeon Filter", desc = "Hide annoying messages in the dungeon.")
5477
@ConfigEditorBoolean
5578
public boolean dungeonMessages = false;
5679

5780
@Expose
58-
@ConfigOption(name = "Dungeon Boss Messages", desc = "Hide messages from watcher and bosses inside dungeon.")
81+
@ConfigOption(name = "Dungeon Boss Messages", desc = "Hide messages from watcher and bosses in the dungeon.")
5982
@ConfigEditorBoolean
6083
public boolean dungeonBossMessages = false;
84+
85+
@Expose
86+
@ConfigOption(name = "Hide Far Deaths", desc = "Hide the death messages of other players, " +
87+
"except for players who are close to the player, inside dungeon or doing a Kuudra fight.")
88+
@ConfigEditorBoolean
89+
public boolean hideFarDeathMessages = false;
6190
}

src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java

Lines changed: 79 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class Dungeon {
1616
public boolean showMilestone = false;
1717

1818
@Expose
19-
@ConfigOption(name = "Milestones Display", desc = "Show the current milestone inside Dungeons.")
19+
@ConfigOption(name = "Milestones Display", desc = "Show the current milestone in the Dungeon.")
2020
@ConfigEditorBoolean
2121
@ConfigAccordionId(id = 0)
2222
public boolean showMilestonesDisplay = false;
@@ -61,7 +61,84 @@ public class Dungeon {
6161
public boolean cleanEndF3IgnoreGuardians = false;
6262

6363
@Expose
64-
@ConfigOption(name = "Boss Damage Splash", desc = "Hiding damage splashes while inside the boss room (fixing Skytils feature)")
64+
@ConfigOption(name = "Boss Damage Splash", desc = "Hiding damage splashes while inside the boss room. (fixing Skytils feature)")
6565
@ConfigEditorBoolean
6666
public boolean damageSplashBoss = false;
67+
68+
@Expose
69+
@ConfigOption(name = "Highlight Deathmites", desc = "Highlight deathmites in dungeon in red color.")
70+
@ConfigEditorBoolean
71+
public boolean highlightDeathmites = false;
72+
73+
@ConfigOption(name = "Item Hider", desc = "")
74+
@ConfigEditorAccordion(id = 3)
75+
public boolean itemHider = false;
76+
77+
@Expose
78+
@ConfigOption(name = "Hide Superboom TNT", desc = "Hide Superboom TNT laying around in dungeon.")
79+
@ConfigEditorBoolean
80+
@ConfigAccordionId(id = 3)
81+
public boolean hideSuperboomTNT = false;
82+
83+
@Expose
84+
@ConfigOption(name = "Hide Blessings", desc = "Hide Blessings laying around in dungeon.")
85+
@ConfigEditorBoolean
86+
@ConfigAccordionId(id = 3)
87+
public boolean hideBlessing = false;
88+
89+
@Expose
90+
@ConfigOption(name = "Hide Revive Stones", desc = "Hide Revive Stones laying around in dungeon.")
91+
@ConfigEditorBoolean
92+
@ConfigAccordionId(id = 3)
93+
public boolean hideReviveStone = false;
94+
95+
@Expose
96+
@ConfigOption(name = "Hide Premium Flesh", desc = "Hide Premium Flesh laying around in dungeon.")
97+
@ConfigEditorBoolean
98+
@ConfigAccordionId(id = 3)
99+
public boolean hidePremiumFlesh = false;
100+
101+
@Expose
102+
@ConfigOption(name = "Hide Journal Entry", desc = "Hide Journal Entry pages laying around in dungeon.")
103+
@ConfigEditorBoolean
104+
@ConfigAccordionId(id = 3)
105+
public boolean hideJournalEntry = false;
106+
107+
@Expose
108+
@ConfigOption(name = "Hide Skeleton Skull", desc = "Hide Skeleton Skulls laying around in dungeon.")
109+
@ConfigEditorBoolean
110+
@ConfigAccordionId(id = 3)
111+
public boolean hideSkeletonSkull = false;
112+
113+
@ConfigOption(name = "Message Filter", desc = "")
114+
@ConfigEditorAccordion(id = 4)
115+
public boolean messageFilter = false;
116+
117+
@Expose
118+
@ConfigOption(name = "Keys and Doors", desc = "Hides the chat message when picking up keys or opening doors in dungeon.")
119+
@ConfigEditorBoolean
120+
@ConfigAccordionId(id = 4)
121+
public boolean messageFilterKeysAndDoors = false;
122+
123+
@ConfigOption(name = "Dungeon Copilot", desc = "")
124+
@ConfigEditorAccordion(id = 5)
125+
public boolean dungeonCopilot = false;
126+
127+
@Expose
128+
@ConfigOption(name = "Copilot Enabled", desc = "Suggests what to do next in dungeon.")
129+
@ConfigEditorBoolean
130+
@ConfigAccordionId(id = 5)
131+
public boolean copilotEnabled = false;
132+
133+
@Expose
134+
@ConfigOption(name = "Copilot Pos", desc = "")
135+
@ConfigEditorButton(runnableId = "dungeonCopilot", buttonText = "Edit")
136+
@ConfigAccordionId(id = 5)
137+
public Position copilotPos = new Position(10, 10, false, true);
138+
139+
@Expose
140+
@ConfigOption(name = "Moving Skeleton Skulls", desc = "Highlight Skeleton Skulls when combining into a " +
141+
"Skeletor in orange color (not useful combined with feature Hide Skeleton Skull)")
142+
@ConfigEditorBoolean
143+
public boolean highlightSkeletonSkull = false;
67144
}

src/main/java/at/hannibal2/skyhanni/config/features/Misc.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,24 @@ public class Misc {
4848
@ConfigOption(name = "Real Time Position", desc = "")
4949
@ConfigEditorButton(runnableId = "realTime", buttonText = "Edit")
5050
public Position realTimePos = new Position(10, 10, false, true);
51+
52+
@Expose
53+
@ConfigOption(name = "Voidling Extremist Color", desc = "Highlight the voidling extremist in pink color")
54+
@ConfigEditorBoolean
55+
public boolean voidlingExtremistColor = false;
56+
57+
@Expose
58+
@ConfigOption(name = "Corrupted Mob Highlight", desc = "Highlight corrupted mobs in purple color")
59+
@ConfigEditorBoolean
60+
public boolean corruptedMobHighlight = false;
61+
62+
@Expose
63+
@ConfigOption(name = "Slayer Miniboss Highlight", desc = "Highlight slayer miniboss in blue color")
64+
@ConfigEditorBoolean
65+
public boolean slayerMinibossHighlight = false;
66+
67+
@Expose
68+
@ConfigOption(name = "Slayer Enderman Beacon", desc = "Highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)")
69+
@ConfigEditorBoolean
70+
public boolean slayerEndermanBeacon = false;
5171
}

src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import at.hannibal2.skyhanni.SkyHanniMod;
44
import at.hannibal2.skyhanni.config.gui.config.ConfigEditor;
55
import at.hannibal2.skyhanni.config.gui.core.GuiScreenElementWrapper;
6+
import at.hannibal2.skyhanni.features.PlayerMarker;
67
import at.hannibal2.skyhanni.test.LorenzTest;
78
import at.hannibal2.skyhanni.test.command.CopyItemCommand;
89
import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand;
@@ -87,5 +88,25 @@ public void processCommand(ICommandSender sender, String[] args) {
8788
}
8889
)
8990
);
91+
ClientCommandHandler.instance.registerCommand(
92+
new SimpleCommand(
93+
"shmarkplayer",
94+
new SimpleCommand.ProcessCommandRunnable() {
95+
public void processCommand(ICommandSender sender, String[] args) {
96+
PlayerMarker.Companion.command(args);
97+
}
98+
}
99+
)
100+
);
101+
ClientCommandHandler.instance.registerCommand(
102+
new SimpleCommand(
103+
"togglepacketlog",
104+
new SimpleCommand.ProcessCommandRunnable() {
105+
public void processCommand(ICommandSender sender, String[] args) {
106+
LorenzTest.Companion.togglePacketLog();
107+
}
108+
}
109+
)
110+
);
90111
}
91112
}

0 commit comments

Comments
 (0)