AAAAAAAAAAAA

Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <[email protected]>

CHANGELOG.md

@@ -24,6 +24,7 @@
     + Highlight missing power stones, show their total bazaar price, and allows to open the bazaar when clicking on the
       items in the Power Stone Guide.
 + Option to make normal clicks to shift clicks in equipment inventory. - Thunderblade73
++ Show pet items XP Share and Tier Boost as small icons next to the pet in an inventory. - Thunderblade73
 
 #### Item Features
 
@@ -33,6 +34,17 @@
 
 + Add tab list fire sale advertisement hider. - nea
 
+#### Command Features
+
++ Party Kick with reason. - nea
+    + Added support for the Hypixel command /p kick /pk to add a reason. The reason will be sent in party chat before
+      kicking the player.
+
+#### Misc Features
+
++ Fixes Ghost Entities. - hannibal2 & nea & Thunderblade73
+    + Removes ghost entities caused by a Hypixel bug. This included Diana, Dungeon and Crimson Isle mobs and nametags.
+
 ### Changes
 
 #### Garden Changes
@@ -47,6 +59,7 @@
 + Jacob Contest feature now has clickable calendar open command when Elite API is not ready yet. - alexia
 + Mark carrot/pumpkin fortune as completed when giving to Carrolyn after already done. - alexia
 + Added ability to get unique visitors served without Green Thumb. - alexia
++ Check if you are sneaking for optimal speed in the Garden and show current speed when wrong. - alexia
 
 #### Rift Changes
 
@@ -81,13 +94,18 @@
 + Changed the description of the Dungeon Chat Filter feature to be more descriptive. - Wambo
 + Added options to change exactly what part of the Dungeon Chat Filter should be used. - Wambo
 
+#### Diana Changes
+
++ Changed the Griffin Burrow Guess text to a centered title instead of an odd line that goes down. - hannibal2
+
 #### Chat Changes
 
 + Hide new Fire Sale message format. - Thunderblade73
 + Added Hypixel Lobby chat messages "SMP" and "Snow Particles" to the Spam Filter. - walker
 + Added more messages to Hypixel Lobby spam hider.
     + SMP and Snow Particles. - walker
     + Earned mystery dust. - alexia
++ Added the fire sale ended message to the Fire Sale Chat Hider. - hannibal2
 
 #### Misc Changes
 
@@ -116,12 +134,14 @@
 + Fixed wrong calculation when zero bosses killed in slayer profit trackers. - hannibal2
 + Hide No Fishing Bait warning during Kuudra fight. - hannibal2
 + Fixed Dungeon and Kuudra party finder join message not detecting in party member tab complete. - CalMWolfs
++ Fixed Fire Veil Wand circle shows on left-clicking. - hannibal2
 
 #### Mining Fixes
 
 + Fixed an error when showing all elements in Powder Tracker. - hannibal2
 + Fixed powder tracker detecting gemstone chat messages. - CalMWolfs
 + Fixed Mining Chat Filter not hiding gemstone messages. - CalMWolfs
++ Fixed names for the Crystal Hollows Mining Areas feature. - alexia
 
 #### Rift Fixes
 
@@ -165,6 +185,7 @@
 + Maybe fixed Tia Relay Helper. - Thunderblade73
 + Fixed wording in trackers when the item is newly obtained. - hannibal2
 + Fixed titles not showing above other SkyHanni GUI elements all the time. - Thunderblade73
++ Fixed Daily City Project Reminder is still working on already-released projects. - alexia
 
 ### Technical Changes
 
@@ -191,6 +212,18 @@
 + Don't allow uppercase Repo Pattern keys and added a more descriptive error. - CalMWolfs
 + Moved party API chat messages to Repo Pattern. - CalMWolfs
 + Allowing nullable parameters for regex functions matches() and find(). - hannibal2
++ Cleanup calculate() in Estimated Item Value. - walker
++ Added DebugDataCollectEvent. - hannibal2
++ Added Diana Burrow Nearest Warp to /shdebugdata - hannibal2
++ Changed debug commands: - hannibal2
+    + /shdebugwaypoint -> /shtestwaypoint
+    + /shdebugtablist -> /shtesttablist
+    + /shdebugdata -> /shdebug
++ Moving dungeons and slayer related debug data into DebugDataCollectEvent. - hannibal2
+    + Allowing to hide/search for specific debug data with /shdebug <search> - hannibal2
++ Per default only active/relevant data is shown.
++ Added visitor status to /shdebug - hannibal2
++ Added hotswap detection and reloading all listeners on hotswap. - nea
 
 ## Version 0.22
 

FEATURES.md

@@ -137,6 +137,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
     + Highlight missing power stones, show their total bazaar price, and allows to open the bazaar when clicking on the
       items in the Power Stone Guide.
 + Option to make normal clicks to shift clicks in equipment inventory. - Thunderblade73
++ Show pet items XP Share and Tier Boost as small icons next to the pet in an inventory. - Thunderblade73
 
 </details>
 <details open><summary>
@@ -917,6 +918,11 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Added AFK time to Discord RPC. - NetheriteMiner
 + Added the option to change Hypixel Wiki to the fandom Wiki in more areas than just the /wiki command. - Erymanthus
     + E.g. inside the SkyBlock leveling guide.
++ Fixes Ghost Entities. - hannibal2 & nea & Thunderblade73
+    + Removes ghost entities caused by a Hypixel bug. This included Diana, Dungeon and Crimson Isle mobs and nametags.
++ Party Kick with reason. - nea
+    + Added support for the Hypixel command /p kick /pk to add a reason. The reason will be sent in party chat before
+      kicking the player.
 
 </details>
 <details open><summary>

build.gradle.kts

@@ -10,10 +10,11 @@ plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
     kotlin("jvm") version "1.9.0"
     id("com.bnorm.power.kotlin-power-assert") version "0.13.0"
+    id("moe.nea.shot") version "1.0.0"
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.23.Beta.8"
+version = "0.23.Beta.9"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()
@@ -68,6 +69,8 @@ val headlessLwjgl by configurations.creating {
     isVisible = false
 }
 
+val shot = shots.shot("minecraft", project.file("shots.txt"))
+
 dependencies {
     minecraft("com.mojang:minecraft:1.8.9")
     mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
@@ -108,6 +111,7 @@ dependencies {
     shadowModImpl(libs.moulconfig)
     shadowImpl(libs.libautoupdate)
     shadowImpl("org.jetbrains.kotlin:kotlin-reflect:1.9.0")
+    implementation(libs.hotswapagentforge)
 
 //    testImplementation(kotlin("test"))
     testImplementation("com.github.NotEnoughUpdates:NotEnoughUpdates:v2.1.1-pre4:all") {
@@ -117,6 +121,9 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
     testImplementation("io.mockk:mockk:1.12.5")
 }
+configurations.getByName("minecraftNamed").dependencies.forEach {
+    shot.applyTo(it as HasConfigurableAttributes<*>)
+}
 
 tasks.withType(Test::class) {
     useJUnitPlatform()

gradle/libs.versions.toml

@@ -9,3 +9,4 @@ moulconfig = { module = "org.notenoughupdates.moulconfig:legacy", version.ref =
 libautoupdate = { module = "moe.nea:libautoupdate", version.ref = "libautoupdate" }
 headlessLwjgl = { module = "com.github.3arthqu4ke.HeadlessMc:headlessmc-lwjgl", version.ref = "headlessLwjgl" }
 jbAnnotations = { module = "org.jetbrains:annotations", version.ref = "jbAnnotations" }
+hotswapagentforge = { module = "moe.nea:hotswapagent-forge", version = "1.0.1" }

settings.gradle.kts

@@ -7,6 +7,7 @@ pluginManagement {
         maven("https://maven.fabricmc.net")
         maven("https://maven.minecraftforge.net/")
         maven("https://repo.spongepowered.org/maven/")
+        maven("https://repo.nea.moe/releases")
         maven("https://repo.sk1er.club/repository/maven-releases/")
     }
     resolutionStrategy {

shots.txt

@@ -0,0 +1,56 @@
+net.minecraft.client.entity.EntityPlayerSP:
+    sendQueue:
+        annotate org.jetbrains.annotations.NotNull
+net.minecraft.client.Minecraft:
+    renderEngine:
+        annotate org.jetbrains.annotations.NotNull
+    renderGlobal:
+        annotate org.jetbrains.annotations.NotNull
+    thePlayer:
+        annotate org.jetbrains.annotations.Nullable
+    pointedEntity:
+        annotate org.jetbrains.annotations.Nullable
+    effectRenderer:
+        annotate org.jetbrains.annotations.NotNull
+    fontRendererObj:
+        annotate org.jetbrains.annotations.NotNull
+    standardGalacticFontRenderer:
+        annotate org.jetbrains.annotations.NotNull
+    currentScreen:
+        annotate org.jetbrains.annotations.Nullable
+    entityRenderer:
+        annotate org.jetbrains.annotations.NotNull
+    guiAchievement:
+        annotate org.jetbrains.annotations.NotNull
+    ingameGUI:
+        annotate org.jetbrains.annotations.NotNull
+    objectMouseOver:
+        annotate org.jetbrains.annotations.Nullable
+    gameSettings:
+        annotate org.jetbrains.annotations.NotNull
+    mouseHelper:
+        annotate org.jetbrains.annotations.NotNull
+    mcDataDir:
+        annotate org.jetbrains.annotations.NotNull
+    frameTimer:
+        annotate org.jetbrains.annotations.NotNull
+    mcProfiler:
+        annotate org.jetbrains.annotations.NotNull
+    mcDefaultResourcePack:
+        annotate org.jetbrains.annotations.NotNull
+    theWorld:
+        annotate org.jetbrains.annotations.Nullable
+    <init>(net.minecraft.client.main.GameConfiguration):
+        annotateParameter 0 org.jetbrains.annotations.NotNull
+    getFrameBuffer():
+        annotate org.jetbrains.annotations.NotNull
+    getVersion():
+        annotate org.jetbrains.annotations.NotNull
+    drawSplashScreen(net.minecraft.client.renderer.texture.TextureManager):
+        annotate org.jetbrains.annotations.NotNull
+    getSaveLoader():
+        annotate org.jetbrains.annotations.NotNull
+    displayGuiScreen(net.minecraft.client.gui.GuiScreen):
+        annotateParameter 0 org.jetbrains.annotations.Nullable
+    getMusicTicker():
+        annotate org.jetbrains.annotations.NotNull

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

@@ -66,6 +66,7 @@ import at.hannibal2.skyhanni.features.chat.ChatFilter
 import at.hannibal2.skyhanni.features.chat.CompactBestiaryChatMessage
 import at.hannibal2.skyhanni.features.chat.CompactSplashPotionMessage
 import at.hannibal2.skyhanni.features.chat.PlayerDeathMessages
+import at.hannibal2.skyhanni.features.chat.SkyblockXPInChat
 import at.hannibal2.skyhanni.features.chat.Translator
 import at.hannibal2.skyhanni.features.chat.WatchdogHider
 import at.hannibal2.skyhanni.features.chat.playerchat.PlayerChatFilter
@@ -207,6 +208,7 @@ import at.hannibal2.skyhanni.features.inventory.PowerStoneGuideFeatures
 import at.hannibal2.skyhanni.features.inventory.QuickCraftFeatures
 import at.hannibal2.skyhanni.features.inventory.RngMeterInventory
 import at.hannibal2.skyhanni.features.inventory.SackDisplay
+import at.hannibal2.skyhanni.features.inventory.ShiftClickBrewing
 import at.hannibal2.skyhanni.features.inventory.ShiftClickEquipment
 import at.hannibal2.skyhanni.features.inventory.ShiftClickNPCSell
 import at.hannibal2.skyhanni.features.inventory.SkyBlockLevelGuideHelper
@@ -233,6 +235,7 @@ import at.hannibal2.skyhanni.features.misc.CurrentPetDisplay
 import at.hannibal2.skyhanni.features.misc.CustomTextBox
 import at.hannibal2.skyhanni.features.misc.ExpOrbsOnGroundHider
 import at.hannibal2.skyhanni.features.misc.FandomWikiFromMenus
+import at.hannibal2.skyhanni.features.misc.FixGhostEntities
 import at.hannibal2.skyhanni.features.misc.FixNEUHeavyPearls
 import at.hannibal2.skyhanni.features.misc.HideArmor
 import at.hannibal2.skyhanni.features.misc.InGameDateDisplay
@@ -249,6 +252,7 @@ import at.hannibal2.skyhanni.features.misc.PartyMemberOutlines
 import at.hannibal2.skyhanni.features.misc.PatcherSendCoordinates
 import at.hannibal2.skyhanni.features.misc.PetCandyUsedDisplay
 import at.hannibal2.skyhanni.features.misc.PetExpTooltip
+import at.hannibal2.skyhanni.features.misc.PetItemDisplay
 import at.hannibal2.skyhanni.features.misc.PlayerChatSymbols
 import at.hannibal2.skyhanni.features.misc.PocketSackInASackDisplay
 import at.hannibal2.skyhanni.features.misc.QuickModMenuSwitch
@@ -328,7 +332,6 @@ import at.hannibal2.skyhanni.features.summonings.SummoningMobManager
 import at.hannibal2.skyhanni.features.summonings.SummoningSoulsName
 import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
 import at.hannibal2.skyhanni.test.HighlightMissingRepoItems
-import at.hannibal2.skyhanni.test.HotSwapDetection
 import at.hannibal2.skyhanni.test.PacketTest
 import at.hannibal2.skyhanni.test.ParkourWaypointSaver
 import at.hannibal2.skyhanni.test.ShowItemUuid
@@ -340,12 +343,15 @@ import at.hannibal2.skyhanni.test.TestExportTools
 import at.hannibal2.skyhanni.test.TestShowSlotNumber
 import at.hannibal2.skyhanni.test.WorldEdit
 import at.hannibal2.skyhanni.test.command.CopyNearbyParticlesCommand
+import at.hannibal2.skyhanni.test.hotswap.HotswapSupport
 import at.hannibal2.skyhanni.utils.EntityOutlineRenderer
 import at.hannibal2.skyhanni.utils.KeyboardManager
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.MinecraftConsoleFilter.Companion.initLogging
 import at.hannibal2.skyhanni.utils.NEUVersionCheck.checkIfNeuIsLoaded
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils
 import at.hannibal2.skyhanni.utils.TabListData
+import at.hannibal2.skyhanni.utils.UtilsPatterns
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPatternManager
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
@@ -368,13 +374,16 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.23.Beta.8",
+    version = "0.23.Beta.9",
 )
 class SkyHanniMod {
+
     @Mod.EventHandler
     fun preInit(event: FMLPreInitializationEvent?) {
         checkIfNeuIsLoaded()
 
+        HotswapSupport.load()
+
         // data
         loadModule(this)
         loadModule(ChatManager)
@@ -426,6 +435,7 @@ class SkyHanniMod {
         loadModule(GardenBestCropTime())
         loadModule(TrackerManager)
         loadModule(SkyBlockItemModifierUtils)
+        loadModule(UtilsPatterns)
 
         // APIs
         loadModule(BazaarApi())
@@ -443,6 +453,7 @@ class SkyHanniMod {
         loadModule(SackAPI)
         loadModule(BingoAPI)
         loadModule(FishingAPI)
+        loadModule(LorenzUtils)
 
         // features
         loadModule(BazaarOrderHelper())
@@ -470,6 +481,7 @@ class SkyHanniMod {
         loadModule(TrophyFishFillet())
         loadModule(TrophyFishMessages())
         loadModule(BazaarBestSellMethod())
+        loadModule(ShiftClickBrewing())
         loadModule(BazaarOpenPriceWebsite())
         loadModule(AuctionHouseCopyUnderbidPrice())
         loadModule(AnvilCombineHelper())
@@ -492,6 +504,7 @@ class SkyHanniMod {
         loadModule(ViewRecipeCommand)
         loadModule(PartyCommands)
         loadModule(SummoningMobManager())
+        loadModule(SkyblockXPInChat())
         loadModule(AreaMiniBossFeatures())
         loadModule(MobHighlight())
         loadModule(SpawnTimers())
@@ -580,6 +593,7 @@ class SkyHanniMod {
         loadModule(MinionCollectLogic())
         loadModule(BetterSignEditing())
         loadModule(PatcherSendCoordinates())
+        loadModule(PetItemDisplay())
         loadModule(EstimatedItemValue)
         loadModule(EstimatedWardrobePrice())
         loadModule(ComposterInventoryNumbers())
@@ -709,6 +723,7 @@ class SkyHanniMod {
 
         // test stuff
         loadModule(SkyHanniDebugsAndTests())
+        loadModule(FixGhostEntities)
         loadModule(CopyNearbyParticlesCommand)
         loadModule(ButtonOnPause())
         loadModule(PacketTest())
@@ -720,7 +735,6 @@ class SkyHanniMod {
         loadModule(TestShowSlotNumber())
         loadModule(SkyHanniDebugsAndTests)
         loadModule(WorldEdit)
-        loadModule(HotSwapDetection)
         PreInitFinishedEvent().postAndCatch()
     }
 
@@ -733,6 +747,7 @@ class SkyHanniMod {
             configManager.saveConfig(ConfigFileType.FEATURES, "shutdown-hook")
         })
         repo = RepoManager(ConfigManager.configDirectory)
+        loadModule(repo)
         try {
             repo.loadRepoInformation()
         } catch (e: Exception) {
@@ -759,6 +774,7 @@ class SkyHanniMod {
     }
 
     companion object {
+
         const val MODID = "skyhanni"
 
         @JvmStatic