diff --git a/build.gradle.kts b/build.gradle.kts index 423182c63dff..7a8827a1d84f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ plugins { } group = "at.hannibal2.skyhanni" -version = "0.25" +version = "0.26.Beta.1" val gitHash by lazy { val baos = ByteArrayOutputStream() diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 511d56d15082..b53e9b1fedb7 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,61 @@ # SkyHanni - Change Log +## Version 0.26 (In Beta) + +### New Features + +#### Combat Features + ++ SOS/Alert/Warning Flare Display. - HiZe + hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1803) + + Warn when the flare is about to despawn (chat, title or both). + + Change the display type (as a GUI element, in the world, or both). + + Show effective area (as a wireframe, filled or circle). + + Show mana regeneration buff next to the GUI element. + + Option to hide flare particles. + +#### Misc Features + ++ Click on breakdown display in /playtimedetailed to copy the stats into the clipboard. - seraid (https://github.com/hannibal002/SkyHanni/pull/1807) + +### Improvements + +#### Farming Island Improvements + ++ Trevor Mob Detection now works with Oasis mobs. - Awes (https://github.com/hannibal002/SkyHanni/pull/1812) + +#### Garden Improvements + ++ Added `/shtpinfested` command to teleport to nearest infested plot. - Empa (https://github.com/hannibal002/SkyHanni/pull/1763) + +#### Hoppity Event Improvements + ++ Renamed "Unfound Eggs" to "Unclaimed Eggs" for the Hoppity event. - Luna (https://github.com/hannibal002/SkyHanni/pull/1876) ++ Added Compact Hoppity Chat option. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1748) + +#### Mining Improvements + ++ Highlight Treasure Hoarders during Treasure Hoarder Puncher commissions. - Luna (https://github.com/hannibal002/SkyHanni/pull/1852) + +#### Misc Improvements + ++ Added a toggle for 24-hour time. - seraid (https://github.com/hannibal002/SkyHanni/pull/1804) ++ Improved the NEU missing/outdated warning. - Luna (https://github.com/hannibal002/SkyHanni/pull/1847) + + Link to the latest GitHub release instead of 2.2.0. + + Also link to Modrinth. ++ Improved performance with Slayer Items on Ground and Fished Item Names. - Empa (https://github.com/hannibal002/SkyHanni/pull/1875) + +### Fixes + +#### Mining Fixes + ++ Fixed Tunnel Maps GUI position not saving. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1882) ++ Fixed Glacite Walkers not being highlighted during commissions. - Luna (https://github.com/hannibal002/SkyHanni/pull/1850) + +#### Garden Fixes + ++ Fixed farming contests showing in the election GUI. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1871) ++ Fixed wrong icon for the rat crop type in Stereo Harmony display. - raven (https://github.com/hannibal002/SkyHanni/pull/1849) + ## Version 0.25 ### New Features diff --git a/docs/FEATURES.md b/docs/FEATURES.md index 595709575e87..95d1d781afc1 100644 --- a/docs/FEATURES.md +++ b/docs/FEATURES.md @@ -392,6 +392,12 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Warns when right-clicking with a Wither Impact weapon (e.g. Hyperion) no longer gains combat exp + Kill a mob with melee-hits to fix this hypixel bug + Only works while doing slayer ++ SOS/Alert/Warning Flare Display. - HiZe + hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1803) + + Warn when the flare is about to despawn (chat, title or both). + + Change the display type (as a GUI element, in the world, or both). + + Show effective area (as a wireframe, filled or circle). + + Show mana regeneration buff next to the GUI element. + + Option to hide flare particles. + Title warning when picking up an expensive slayer item + **RNG Meter Display** + Display amount of bosses needed until the next RNG Meter item drops @@ -1134,6 +1140,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. martimavocado (https://github.com/hannibal002/SkyHanni/pull/848) + Support for `/playtime` and `/pt` while in Limbo. + Added your playtime to Hypixel's `/playtimedetailed`. ++ Click on breakdown display in /playtimedetailed to copy the stats into the clipboard. - seraid (https://github.com/hannibal002/SkyHanni/pull/1807) + Custom Scoreboard - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/893) + Customizable; New, never seen before lines like the current mayor with perks, your party, and more! + Custom Title and Footer, align them on different sides of the scoreboard. diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index e3aace908537..9cacf0f10eec 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -493,7 +493,7 @@ import org.apache.logging.log4j.Logger clientSideOnly = true, useMetadata = true, guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop", - version = "0.25", + version = "0.26.Beta.1", ) class SkyHanniMod { @@ -697,6 +697,7 @@ class SkyHanniMod { loadModule(HideMobNames()) loadModule(HideDamageSplash()) loadModule(FerocityDisplay()) + loadModule(FlareDisplay) loadModule(InGameDateDisplay()) loadModule(ThunderSparksHighlight()) loadModule(BlazeSlayerDaggerHelper()) diff --git a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt index 5ef2b76b4259..5cc007370c36 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt @@ -35,18 +35,41 @@ object ProfileStorageData { fun onProfileJoin(event: ProfileJoinEvent) { val playerSpecific = playerSpecific val sackPlayers = sackPlayers + val profileName = event.name if (playerSpecific == null) { + workaroundIn10Seconds(profileName) ErrorManager.skyHanniError("playerSpecific is null in ProfileJoinEvent!") } if (sackPlayers == null) { ErrorManager.skyHanniError("sackPlayers is null in ProfileJoinEvent!") } - val profileName = event.name loadProfileSpecific(playerSpecific, sackPlayers, profileName) ConfigLoadEvent().postAndCatch() } + private fun workaroundIn10Seconds(profileName: String) { + val playerSpecific = playerSpecific + val sackPlayers = sackPlayers + + if (playerSpecific == null) { + ErrorManager.logErrorStateWithData( + "failed to load your profile data a second time", + "workaround in 10 seconds did not work" + ) + ErrorManager.skyHanniError("playerSpecific is null in ProfileJoinEvent!") + } + if (sackPlayers == null) { + ErrorManager.skyHanniError("sackPlayers is null in ProfileJoinEvent!") + } + loadProfileSpecific(playerSpecific, sackPlayers, profileName) + ConfigLoadEvent().postAndCatch() + } + + private fun runWorkaround() { + + } + @SubscribeEvent fun onTabListUpdate(event: TabListUpdateEvent) { if (!LorenzUtils.inSkyBlock) return diff --git a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt index e5ea5ab83049..59a2529a0aa6 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt @@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.test import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.HypixelData import at.hannibal2.skyhanni.data.IslandType +import at.hannibal2.skyhanni.data.ProfileStorageData import at.hannibal2.skyhanni.data.repo.RepoManager import at.hannibal2.skyhanni.events.DebugDataCollectEvent import at.hannibal2.skyhanni.utils.ChatUtils @@ -64,6 +65,11 @@ object DebugCommand { return } + if (ProfileStorageData.playerSpecific == null) { + event.addData("playerSpecific is null!") + return + } + val classic = !LorenzUtils.noTradeMode if (classic) { event.addIrrelevant("on classic")