aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md17
-rw-r--r--FEATURES.md9
-rw-r--r--build.gradle.kts2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java183
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/Features.java13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/core/GuiElementTextField.java6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Bingo.java14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Chat.java7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Hidden.java5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Minions.java15
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Misc.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt (renamed from src/main/java/at/hannibal2/skyhanni/data/ApiKeyGrabber.kt)37
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt (renamed from src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt)100
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/IslandType.kt22
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/ItemRenderBackground.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/SendTitleHelper.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt17
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataGrabber.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusUnopenedChestTracker.kt11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/end/VoidlingExtremistColor.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/TrophyFishMessages.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/RngMeterInventory.kt17
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/StatsTuning.kt22
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/minion/MinionData.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt123
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/BrewingStandOverlay.kt44
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/ButtonOnPause.kt)6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CollectionCounter.kt194
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CompactBingoChat.kt112
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CompactSplashPotionMessage.kt36
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CorruptedMobHighlight.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/CorruptedMobHighlight.kt)9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/CurrentPetDisplay.kt)8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ExpBottleOnGroundHider.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/ExpBottleOnGroundHider.kt)4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/HideArmor.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/HideArmor.kt)6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/HideDamageSplash.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/HideDamageSplash.kt)4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/MarkedPlayerManager.kt)8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/NonGodPotEffectDisplay.kt)18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/RealTime.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/RealTime.kt)6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ThunderSparksHighlight.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/ThunderSparksHighlight.kt)4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/MilleniaAgedBlazeColor.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideDamageIndicator.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/EndermanSlayerBeacon.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/HideMobNames.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/HighlightSlayerMiniboss.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerFirePitsWarning.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerPillar.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/HellionShieldHelper.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/inventory/GuiEditSignMixin.java8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt22
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt20
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt44
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt16
94 files changed, 1042 insertions, 436 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ff538037..51270877e 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/FEATURES.md b/FEATURES.md
index 552552f9c..0788dd7c8 100644
--- a/FEATURES.md
+++ b/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. \ No newline at end of file
+- Wishing compass uses amount display.
+- Brewing Stand Overlay. \ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index ad8158481..9f6014f26 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
}
group = "at.hannibal2.skyhanni"
-version = "0.13"
+version = "0.14"
// Toolchains:
java {
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
index eccfc78c9..f6190fb10 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -5,7 +5,6 @@ import at.hannibal2.skyhanni.config.Features;
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.inventory.*;
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,7 +62,7 @@ import java.util.List;
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;
@@ -70,7 +70,7 @@ public class SkyHanniMod {
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 class SkyHanniMod {
//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());