Merge branch 'dev'

Author: hannibal002

CHANGELOG.md

@@ -1,5 +1,22 @@
 # SkyHanni - Change Log
 
+## Version 0.14
+
+### Features
++ Added /shtrackcollection <item> - This tracks the number of items you collect, but it does not work with sacks.
++ Added Compact Bingo Chat Messages.
++ Added Compact Potion Effect Chat Messages.
++ Added Brewing Stand Overlay.
++ Added minion name display with minion tier.
+
+### Changes
++ Don't render overlays when tab list key is pressed.
++ Do no longer prevent the selling of bazaar items to NPC when on ironman, stranded or bingo mode.
+
+### Fixes
++ Fixed wrong dungeon level colors. (in Party Finder)
++ Fixed error in Sea Creature Guide inventory.
+
 ## Version 0.13
 
 ### Features

FEATURES.md

@@ -19,6 +19,7 @@
 - Option to hide the death messages of other players, except for players who are close to the player, inside the dungeon or during a Kuudra fight.
 - Scan messages sent by players in all-chat for blacklisted words and greys out the message.
 - Chat peeking (holding key to display chat without opening the chat gui)
+- Compact Potion Effect Messages
 
 ## Dungeon
 - Clicked Blocks (Showing the block behind walls AFTER clicked on a chest, wither essence or a lever)
@@ -85,6 +86,7 @@
 - A marker to the last opened minion for a couple of seconds (seen through walls)
 - Option to hide mob nametags close to minions.
 - Minion hopper coins per day display (Using the held coins in the hopper and the last time the hopper was collected to calculate the coins a hopper collects in a day)
+- Minion name display with minion tier.
 
 ## Bazaar
 - Showing colors in the order inventory for outbid or fully bought/sold items.
@@ -137,9 +139,13 @@
 + Highlight marked player names in chat.
 + Mark the own player name.
 
+## Bingo
++ Shortens chat messages about skill level ups, collection gains, new area discoveries, and bestiarity upgrades while on bingo.
+
 ## Commands
 - /wiki (using hypixel-skyblock.fandom.com instead of Hypixel wiki)
 - /shmarkplayer <player> (marking a player with yellow color)
+- /shtrackcollection <item> - This tracks the number of items you collect, but it does not work with sacks.
 - 
 ## Misc
 - Allow to copy, paste, and mark selected text in signs (not visual, but it's working still)
@@ -154,4 +160,5 @@
 - Hide armor or just helmet of other player or yourself
 - Display the active non-god potion effects.
 - Option to hide blaze particles.
-- Wishing compass uses amount display.
+- Wishing compass uses amount display.
+- Brewing Stand Overlay.

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.13"
+version = "0.14"
 
 // Toolchains:
 java {

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

@@ -5,7 +5,6 @@
 import at.hannibal2.skyhanni.config.commands.Commands;
 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;
@@ -30,6 +29,7 @@
 import at.hannibal2.skyhanni.features.itemabilities.FireVeilWandParticles;
 import at.hannibal2.skyhanni.features.itemabilities.abilitycooldown.ItemAbilityCooldown;
 import at.hannibal2.skyhanni.features.minion.MinionFeatures;
+import at.hannibal2.skyhanni.features.misc.*;
 import at.hannibal2.skyhanni.features.nether.MilleniaAgedBlazeColor;
 import at.hannibal2.skyhanni.features.nether.ashfang.*;
 import at.hannibal2.skyhanni.features.slayer.EndermanSlayerBeacon;
@@ -62,15 +62,15 @@
 public class SkyHanniMod {
 
     public static final String MODID = "skyhanni";
-    public static final String VERSION = "0.13";
+    public static final String VERSION = "0.14";
 
     public static Features feature;
 
     public static RepoManager repo;
     public static ConfigManager configManager;
     private static Logger logger;
 
-    public static List<Object> listenerClasses = new ArrayList<>();
+    public static List<Object> modules = new ArrayList<>();
     public static Job globalJob = JobKt.Job(null);
     public static CoroutineScope coroutineScope =
             CoroutineScopeKt.CoroutineScope(
@@ -84,94 +84,98 @@ public void preInit(FMLPreInitializationEvent event) {
 
         //API and utils
         new BazaarApi();
-        registerEvent(this);
-        registerEvent(new ChatManager());
-        registerEvent(new HypixelData());
-        registerEvent(new DungeonData());
-        registerEvent(new ScoreboardData());
-        registerEvent(new ApiKeyGrabber());
-        registerEvent(new SeaCreatureManager());
-        registerEvent(new ItemRenderBackground());
-        registerEvent(new EntityData());
-        registerEvent(new EntityMovementData());
-        registerEvent(new ItemClickData());
-        registerEvent(new MinecraftData());
-        registerEvent(new SendTitleHelper());
-        registerEvent(new ItemTipHelper());
+        loadModule(this);
+        loadModule(new ChatManager());
+        loadModule(new HyPixelData());
+        loadModule(new DungeonData());
+        loadModule(new ScoreboardData());
+        loadModule(new ApiDataLoader());
+        loadModule(new SeaCreatureManager());
+        loadModule(new ItemRenderBackground());
+        loadModule(new EntityData());
+        loadModule(new EntityMovementData());
+        loadModule(new ItemClickData());
+        loadModule(new MinecraftData());
+        loadModule(new SendTitleHelper());
+        loadModule(new ItemTipHelper());
 
         //features
-        registerEvent(new BazaarOrderHelper());
-        registerEvent(new ChatFilter());
-        registerEvent(new PlayerChatModifier());
-        registerEvent(new DungeonChatFilter());
-        registerEvent(new HideNotClickableItems());
-        registerEvent(new ItemDisplayOverlayFeatures());
-        registerEvent(new CurrentPetDisplay());
-        registerEvent(new ExpBottleOnGroundHider());
-        registerEvent(new DamageIndicatorManager());
-        registerEvent(new ItemAbilityCooldown());
-        registerEvent(new DungeonHighlightClickedBlocks());
-        registerEvent(new DungeonMilestonesDisplay());
-        registerEvent(new DungeonDeathCounter());
-        registerEvent(new DungeonCleanEnd());
-        registerEvent(new DungeonBossMessages());
-        registerEvent(new DungeonBossHideDamageSplash());
-        registerEvent(new TrophyFishMessages());
-        registerEvent(new BazaarBestSellMethod());
-        registerEvent(new AnvilCombineHelper());
-        registerEvent(new SeaCreatureMessageShortener());
+        loadModule(new BazaarOrderHelper());
+        loadModule(new ChatFilter());
+        loadModule(new PlayerChatModifier());
+        loadModule(new DungeonChatFilter());
+        loadModule(new HideNotClickableItems());
+        loadModule(new ItemDisplayOverlayFeatures());
+        loadModule(new CurrentPetDisplay());
+        loadModule(new ExpBottleOnGroundHider());
+        loadModule(new DamageIndicatorManager());
+        loadModule(new ItemAbilityCooldown());
+        loadModule(new DungeonHighlightClickedBlocks());
+        loadModule(new DungeonMilestonesDisplay());
+        loadModule(new DungeonDeathCounter());
+        loadModule(new DungeonCleanEnd());
+        loadModule(new DungeonBossMessages());
+        loadModule(new DungeonBossHideDamageSplash());
+        loadModule(new TrophyFishMessages());
+        loadModule(new BazaarBestSellMethod());
+        loadModule(new AnvilCombineHelper());
+        loadModule(new SeaCreatureMessageShortener());
 //        registerEvent(new GriffinBurrowFinder());
-        registerEvent(new AshfangFreezeCooldown());
-        registerEvent(new AshfangNextResetCooldown());
-        registerEvent(new SummoningSoulsName());
-        registerEvent(new AshfangGravityOrbs());
-        registerEvent(new AshfangBlazingSouls());
-        registerEvent(new AshfangBlazes());
-        registerEvent(new AshfangHideParticles());
-        registerEvent(new AshfangHideDamageIndicator());
-        registerEvent(new ItemStars());
-        registerEvent(new MinionFeatures());
-        registerEvent(new RealTime());
-        registerEvent(new RngMeterInventory());
-        registerEvent(new WikiCommand());
-        registerEvent(new SummoningMobManager());
-        registerEvent(new VoidlingExtremistColor());
-        registerEvent(new MilleniaAgedBlazeColor());
-        registerEvent(new CorruptedMobHighlight());
-        registerEvent(new MarkedPlayerManager());
-        registerEvent(new HighlightSlayerMiniboss());
-        registerEvent(new PlayerDeathMessages());
-        registerEvent(new HighlightDungeonDeathmite());
-        registerEvent(new DungeonHideItems());
-        registerEvent(new DungeonCopilot());
-        registerEvent(new EndermanSlayerBeacon());
-        registerEvent(new FireVeilWandParticles());
-        registerEvent(new HideMobNames());
-        registerEvent(new HideDamageSplash());
-        registerEvent(new ThunderSparksHighlight());
-        registerEvent(new BlazeSlayerPillar());
-        registerEvent(new BlazeSlayerDaggerHelper());
-        registerEvent(new HellionShieldHelper());
-        registerEvent(new BlazeSlayerFirePitsWarning());
-        registerEvent(new BlazeSlayerClearView());
-        registerEvent(new PlayerChatFilter());
-        registerEvent(new HideArmor());
-        registerEvent(new SlayerQuestWarning());
-        registerEvent(new StatsTuning());
-        registerEvent(new NonGodPotEffectDisplay());
-        registerEvent(new SoopyGuessBurrow());
-        registerEvent(new GriffinBurrowHelper());
-        registerEvent(new GriffinBurrowParticleFinder());
-        registerEvent(new BurrowWarpHelper());
-        registerEvent(new HighlightBonzoMasks());
-        registerEvent(new DungeonLevelColor());
-        registerEvent(new BazaarCancelledBuyOrderClipboard());
-        registerEvent(new CroesusUnopenedChestTracker());
+        loadModule(new AshfangFreezeCooldown());
+        loadModule(new AshfangNextResetCooldown());
+        loadModule(new SummoningSoulsName());
+        loadModule(new AshfangGravityOrbs());
+        loadModule(new AshfangBlazingSouls());
+        loadModule(new AshfangBlazes());
+        loadModule(new AshfangHideParticles());
+        loadModule(new AshfangHideDamageIndicator());
+        loadModule(new ItemStars());
+        loadModule(new MinionFeatures());
+        loadModule(new RealTime());
+        loadModule(new RngMeterInventory());
+        loadModule(new WikiCommand());
+        loadModule(new SummoningMobManager());
+        loadModule(new VoidlingExtremistColor());
+        loadModule(new MilleniaAgedBlazeColor());
+        loadModule(new CorruptedMobHighlight());
+        loadModule(new MarkedPlayerManager());
+        loadModule(new HighlightSlayerMiniboss());
+        loadModule(new PlayerDeathMessages());
+        loadModule(new HighlightDungeonDeathmite());
+        loadModule(new DungeonHideItems());
+        loadModule(new DungeonCopilot());
+        loadModule(new EndermanSlayerBeacon());
+        loadModule(new FireVeilWandParticles());
+        loadModule(new HideMobNames());
+        loadModule(new HideDamageSplash());
+        loadModule(new ThunderSparksHighlight());
+        loadModule(new BlazeSlayerPillar());
+        loadModule(new BlazeSlayerDaggerHelper());
+        loadModule(new HellionShieldHelper());
+        loadModule(new BlazeSlayerFirePitsWarning());
+        loadModule(new BlazeSlayerClearView());
+        loadModule(new PlayerChatFilter());
+        loadModule(new HideArmor());
+        loadModule(new SlayerQuestWarning());
+        loadModule(new StatsTuning());
+        loadModule(new NonGodPotEffectDisplay());
+        loadModule(new SoopyGuessBurrow());
+        loadModule(new GriffinBurrowHelper());
+        loadModule(new GriffinBurrowParticleFinder());
+        loadModule(new BurrowWarpHelper());
+        loadModule(new CollectionCounter());
+        loadModule(new HighlightBonzoMasks());
+        loadModule(new DungeonLevelColor());
+        loadModule(new BazaarCancelledBuyOrderClipboard());
+        loadModule(new CompactSplashPotionMessage());
+        loadModule(new CroesusUnopenedChestTracker());
+        loadModule(new CompactBingoChat());
+        loadModule(new BrewingStandOverlay());
 
         Commands.INSTANCE.init();
 
-        registerEvent(new LorenzTest());
-        registerEvent(new ButtonOnPause());
+        loadModule(new LorenzTest());
+        loadModule(new ButtonOnPause());
 
         configManager = new ConfigManager();
         configManager.firstLoad();
@@ -183,14 +187,9 @@ public void preInit(FMLPreInitializationEvent event) {
         repo.loadRepoInformation();
     }
 
-    private void registerEvent(Object object) {
-        listenerClasses.add(object);
-        String simpleName = object.getClass().getSimpleName();
-        consoleLog("SkyHanni registering '" + simpleName + "'");
-        long start = System.currentTimeMillis();
+    private void loadModule(Object object) {
+        modules.add(object);
         MinecraftForge.EVENT_BUS.register(object);
-        long duration = System.currentTimeMillis() - start;
-        consoleLog("Done after " + duration + " ms!");
     }
 
     public static GuiScreen screenToOpen = null;

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

@@ -8,8 +8,8 @@
 import at.hannibal2.skyhanni.config.core.config.annotations.Category;
 import at.hannibal2.skyhanni.config.core.config.gui.GuiPositionEditor;
 import at.hannibal2.skyhanni.config.features.*;
-import at.hannibal2.skyhanni.features.HideArmor;
-import at.hannibal2.skyhanni.features.MarkedPlayerManager;
+import at.hannibal2.skyhanni.features.misc.HideArmor;
+import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager;
 import com.google.gson.annotations.Expose;
 import net.minecraft.client.Minecraft;
 
@@ -37,6 +37,11 @@ public void executeRunnable(String runnableId) {
             return;
         }
 
+        if (runnableId.equals("collectionCounter")) {
+            editOverlay(activeConfigCategory, 200, 16, misc.collectionCounterPos);
+            return;
+        }
+
         if (runnableId.equals("debugPos")) {
             editOverlay(activeConfigCategory, 200, 16, dev.debugPos);
             return;
@@ -159,6 +164,10 @@ public void executeRunnable(String runnableId) {
     @Category(name = "Marked Players", desc = "Players that got marked with /shmarkplayer")
     public MarkedPlayers markedPlayers = new MarkedPlayers();
 
+    @Expose
+    @Category(name = "Bingo", desc = "Features for the Bingo mode.")
+    public Bingo bingo = new Bingo();
+
     @Expose
     @Category(name = "Misc", desc = "Settings without a category.")
     public Misc misc = new Misc();

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

@@ -4,8 +4,9 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigEditor
 import at.hannibal2.skyhanni.config.commands.SimpleCommand.ProcessCommandRunnable
 import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper
-import at.hannibal2.skyhanni.features.MarkedPlayerManager
 import at.hannibal2.skyhanni.features.event.diana.BurrowWarpHelper
+import at.hannibal2.skyhanni.features.misc.CollectionCounter
+import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
 import at.hannibal2.skyhanni.test.LorenzTest
 import at.hannibal2.skyhanni.test.command.CopyItemCommand
 import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand
@@ -37,6 +38,7 @@ object Commands {
         registerCommand("togglepacketlog") { LorenzTest.togglePacketLog() }
         registerCommand("shreloadlisteners") { LorenzTest.reloadListeners() }
         registerCommand("shresetburrowwarps") { BurrowWarpHelper.resetDisabledWarps() }
+        registerCommand("shtrackcollection") { CollectionCounter.command(it) }
     }
 
     private fun registerCommand(name: String, function: (Array<String>) -> Unit) {

src/main/java/at/hannibal2/skyhanni/config/core/GuiElementTextField.java

@@ -566,9 +566,9 @@ private void drawTextbox(
 					);
 					GlScissorStack.pop(scaledresolution);
 				} else {
-//					String toRender = Minecraft.getMinecraft().fontRendererObj.trimStringToWidth(ChromaUtils.INSTANCE.chromaStringByColourCode(
-					String toRender = Minecraft.getMinecraft().fontRendererObj.trimStringToWidth(texts[yOffI], searchBarXSize - 10);
-					Minecraft.getMinecraft().fontRendererObj.drawString(toRender, x + 5,
+//					String display = Minecraft.getMinecraft().fontRendererObj.trimStringToWidth(ChromaUtils.INSTANCE.chromaStringByColourCode(
+					String display = Minecraft.getMinecraft().fontRendererObj.trimStringToWidth(texts[yOffI], searchBarXSize - 10);
+					Minecraft.getMinecraft().fontRendererObj.drawString(display, x + 5,
 						y + (searchBarYSize - 8) / 2 + yOff, customTextColour
 					);
 				}

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

@@ -0,0 +1,14 @@
+package at.hannibal2.skyhanni.config.features;
+
+import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean;
+import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption;
+import com.google.gson.annotations.Expose;
+
+public class Bingo {
+
+    @Expose
+    @ConfigOption(name = "Compact Chat Messages", desc = "Shortens chat messages about skill level ups, collection gains, " +
+            "new area discoveries, and bestiarity upgrades while on bingo.")
+    @ConfigEditorBoolean
+    public boolean compactChatMessages = true;
+}