Merge branch 'beta' into non-textured-chroma-shader

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt

CHANGELOG.md

@@ -57,6 +57,8 @@
 + Show pet items XP Share and Tier Boost as small icons next to the pet in an inventory. - Thunderblade73
 + Added Shift Click Brewing. - Thunderblade73
     + Makes normal clicks to shift clicks in Brewing Stand inventory.
++ Low Quiver Notification. - CarsCupcake
+    + This will notify you via title if your quiver is low on arrows according to chat message.
 
 #### Item Features
 
@@ -111,6 +113,8 @@
 + Updating the Garden Optimal Speed Display and Warning immediately when changing the setting. - hannibal2
 + Added auto mouse-unlocking on plot teleport in garden. - martimavocado
 + Improve items in sacks display in Visitor Shopping List wording and color. - alexia
++ Hide Garden Composter reminder while participating in a Farming Contest. - hannibal2
++ Improve Exportable Carrots/Expired Pumpkin tooltip in /ff. - alexia
 
 #### Rift Changes
 
@@ -220,6 +224,7 @@
 + Fixed Sensitivity Reducer still working when switching from the garden to the hub. - martimavocado
 + Fixed a rare farming weight API error. - CalMWolfs
 + Fixed mouse rotation unlocks after doing /warp garden with Sensitivity Reducer on. - martimavocado
++ Fixed wording of composter fuel warning. - alexia
 
 #### Combat Fixes
 
@@ -270,6 +275,8 @@
 + Fixed Reindrake mob, Frosty NPC and frosty the snow blaster shop counting as sea creatures in the barn fishing
   timer. - hannibal2
 + Fixed trophy fish chat message detection. - Empa
++ Fixed Sheep pet triggering Geyser Box and fixed particles being permanently hidden after throwing bobber at it once. - Empa
++ Fixed fishing profit tracker stops working when trophy fishing for 10 minutes. - hannibal2
 
 #### Invenory Fixes
 
@@ -285,6 +292,9 @@
 + Fixed shift-click NPC sell not working for menus with different sizes and full inventories. - Thunderblade73
 + Fixed an error with the shift-click NPC sell feature. - Thunderblade73
 + Ignore Shift-Click NPC Sell when right-clicking a sack. - Thunderblade73
++ Fixed pet level stack size - Thunderblade73
++ Fixed enchantment names and pet names in the chest value feature. - hannibal2
++ Fixed pet names in item profit trackers. - hannibal2
 
 #### Bingo Fixes
 
@@ -304,6 +314,7 @@
 + Fixed render overlapping problem with chat, SkyHanni GUIs and title. - Thunderblade73
 + Fixed GUI positions moving into the bottom-right corner when leaving the GUI position editor while pressing the mouse
   button on next reopen. - hannibal2
++ Fixed parts of Compact Tab List being uncoloured. - CalMWolfs
 
 #### Winter Fixes
 
@@ -388,6 +399,17 @@
 + Fixed an NPE in ReflectionUtils.shPackageName. - Thunderblade73
 + Cleaned up string pluralization methods. - alexia
 + Moved many regex patterns in the repo and code cleanup. - CalMWolfs
++ Improved purse pattern. - j10a1n15
++ Added cache to item stack → neu internal name. - hannibal2
++ Added cache to internal name → item name. - hannibal2
++ Added debug option to show SkyHanni item name in item lore. - hannibal2
++ Created ActionBarUpdateEvent and used it. - CalMWolfs
++ Added Rounded Rectangles Renderable. - VixidDev
++ Added progress Bar Renderable. - Thunderblade73
++ Added Horizontal Container Renderable. - Thunderblade73
++ Added GetFromSackAPI. - Thunderblade73
++ Improved Packet Test. - Thunderblade73
++ Increases the feature set of the packet test and improves usability.
 
 ## Version 0.22
 

DISCORD_FAQ.md

@@ -1,7 +1,7 @@
 _Frequently Asked Questions_
 
 > **1: How do I open the SkyHanni Menu?**
-> Use the command `/sh`
+> Use the command `/sh`.
 
 > **2: Why does SkyHanni tell me to update NotEnoughUpdates (NEU) even if I already have the latest version?**
 > To make the mod work, you need to use the latest version from <#1123201092193366027>.
@@ -11,46 +11,49 @@ _Frequently Asked Questions_
 > Do `/sh scale` to change the global GUI scale of all elements at once.
 
 > **4: My Garden Crop Milestones are not accurate. What should I do?**
-> To sync your Crop Milestones with SkyHanni, open /cropmilestones once.
+> To sync your Crop Milestones with SkyHanni, open `/cropmilestones` once.
 
 > **5: How can I move GUIs like Coins/Copper in SkyMart?**
 > Use the command `/sh open hotkey` to set a hotkey, and press it inside the GUI you want to move.
 
-> **6: Will SkyHanni support Minecraft versions 1.19 or 1.20? (Foraging Update)**
+> **6: Will SkyHanni support Minecraft versions 1.20? (Foraging Update)**
 > The Foraging update isn't expected to release for several months.
-> Thus, we'll wait for other mods in the community to update for Minecraft versions 1.19 or 1.20.
-> Switching from 1.8.9 to 1.19 will take some time, and we plan to discontinue support for 1.8.9 afterward since we won't support multiple versions at once.
+> Thus, we'll wait for other mods in the community to update for Minecraft version 1.20.
+> Switching from 1.8.9 to 1.20 will take some time, and we plan to discontinue support for 1.8.9 afterward since we won't support multiple versions at once.
 
 > **7: My Jacob Contest Display crops are wrong, how do I fix this?**
-> Run the command `/shclearcontestdata` to clear the Jacob contenst data.
+> Run the command `/shclearcontestdata` to clear the Jacob contest data.
 
 > **8: How can I get bigger crop hit boxes?**
-> Use [Patcher](<https://sk1er.club/mods/patcher>) to have 1.12 hit boxes in 1.8.9.
+> Use [Patcher](<https://sk1er.club/mods/patcher>) to have 1.12 hitboxes in 1.8.9.
 
 > **9: Why does my Item Tracker feature not track this item?**
 > 1. Check if the item goes directly into your sacks. 
 > 2. If it does, enable the sack pickup chat message from Hypixel:
-> 3. Go to `hypixel settings --> personal -> chat feedback` and enable `sack notifications`
-> 4. If you want the [Sacks] messages to be hidden, do `/sh sacks hider` and enable that
+>  - Go to `Hypixel Settings --> Personal -> Chat Feedback` and enable `Sack Notifications`.
+> 3. If you want the [Sacks] messages to be hidden, do `/sh sacks hider` and enable that.
 
 > **10: How do I remove SkyHanni GUI elements?**
-> 1. Type `/sh gui`
-> 2. Hover over the UI element
-> 3. See the element name in the top center of screen
-> 4. Search for that element with /sh name
-> 5. Disable this feature
+> 1. Type `/sh gui`.
+> 2. Hover over the UI element.
+> 3. See the element name in the top center of screen.
+> 4. Search for that element with `/sh <name>`.
+> 5. Disable this feature.
   
 > **11: How do I reset a SkyHanni tracker?**
 > 1. Do you want to **view only the current session**? 
-> 2. Open the inventory (Press E) and hover over the display. 
-> 3. Then click on [session].
-> 1. Do you want to **remove one specific item** from the tracker?
-> 2. Open the inventory (Press E) and hover over the display.
-> 3. Then shift-click on an item in the list to remove it.
-> 1. Do you want to reset the total stats of a tracker?
-> 2. To reset a tracker, use the in-game command /shcommands <tracker type>.
-> 3. Execute the obtained command to reset the tracker.
-
-
-*This FAQ was last updated on February 5th, 2024.
+>  - Open the inventory (Press E) and hover over the display. 
+>  - Then click on `[This Session]`.
+> 2. Do you want to **reset the current session**?
+>  - Open the inventory (Press E) and hover over the display.
+>  - Then click on `Reset Session!`.
+> 3. Do you want to **remove one specific item** from the tracker?
+>  - Open the inventory (Press E) and hover over the display.
+>  - Then shift-click on an item in the list to remove it.
+> 4. Do you want to reset the total stats of a tracker?
+>  - To reset a tracker, use the in-game command `/shcommands <tracker type>`.
+>  - Execute the obtained command to reset the tracker.
+
+
+*This FAQ was last updated on February 20th, 2024.
 If you believe there's something that should be added to this list, please tell us, so we can add it.*

FEATURES.md

@@ -147,6 +147,8 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
 + Show pet items XP Share and Tier Boost as small icons next to the pet in an inventory. - Thunderblade73
 + Shift Click Brewing. - Thunderblade73
     + Makes normal clicks to shift clicks in Brewing Stand inventory.
++ Low Quiver Notification. - CarsCupcake
+    + This will notify you via title if your quiver is low on arrows according to chat message.
 
 </details>
 <details open><summary>

build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 }
 
 group = "at.hannibal2.skyhanni"
-version = "0.23.Beta.20"
+version = "0.23.Beta.21"
 
 val gitHash by lazy {
     val baos = ByteArrayOutputStream()

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

@@ -389,7 +389,7 @@ import org.apache.logging.log4j.Logger
     clientSideOnly = true,
     useMetadata = true,
     guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
-    version = "0.23.Beta.20",
+    version = "0.23.Beta.21",
 )
 class SkyHanniMod {
 
@@ -756,7 +756,7 @@ class SkyHanniMod {
         loadModule(FixGhostEntities)
         loadModule(CopyNearbyParticlesCommand)
         loadModule(ButtonOnPause())
-        loadModule(PacketTest())
+        loadModule(PacketTest)
         loadModule(TestBingo)
         loadModule(TestCopyRngMeterValues)
         loadModule(TestCopyBestiaryValues)

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

@@ -392,7 +392,7 @@ object Commands {
             "shcopyparticles",
             "Copied information about the particles that spawn in the next 50ms to the clipboard"
         ) { CopyNearbyParticlesCommand.command(it) }
-        registerCommand("shtestpacket", "Logs incoming and outgoing packets to the console") { PacketTest.toggle() }
+        registerCommand("shtestpacket", "Logs incoming and outgoing packets to the console") { PacketTest.command(it) }
         registerCommand(
             "shtestmessage",
             "Sends a custom chat message client side in the chat"

src/main/java/at/hannibal2/skyhanni/config/features/inventory/GetFromSackConfig.java

@@ -8,7 +8,7 @@
 public class GetFromSackConfig {
 
     @Expose
-    @ConfigOption(name = "Queued GfS", desc = "If §e/gfs §for §e/getfromsacks §fis used it queues up the commands so all items are guarantied to be received.")
+    @ConfigOption(name = "Queued GfS", desc = "If §e/gfs §7or §e/getfromsacks §7is used it queues up the commands so all items are guarantied to be received.")
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean queuedGFS = true;

src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt

@@ -1,14 +1,9 @@
 package at.hannibal2.skyhanni.features.fishing
 
 import at.hannibal2.skyhanni.events.FishingBobberCastEvent
-import at.hannibal2.skyhanni.events.IslandChangeEvent
-import at.hannibal2.skyhanni.events.ItemInHandChangeEvent
-import at.hannibal2.skyhanni.events.SkillExpGainEvent
-import at.hannibal2.skyhanni.features.fishing.tracker.FishingProfitTracker
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishManager
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishManager.getFilletValue
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity
-import at.hannibal2.skyhanni.utils.DelayedRun
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name
@@ -25,15 +20,13 @@ import net.minecraft.init.Blocks
 import net.minecraft.item.ItemStack
 import net.minecraftforge.event.entity.EntityJoinWorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import kotlin.time.Duration.Companion.seconds
 
 object FishingAPI {
 
     val lavaBlocks = listOf(Blocks.lava, Blocks.flowing_lava)
     private val waterBlocks = listOf(Blocks.water, Blocks.flowing_water)
 
     var lastCastTime = SimpleTimeMark.farPast()
-    var lastActiveFishingTime = SimpleTimeMark.farPast()
 
     @SubscribeEvent
     fun onJoinWorld(event: EntityJoinWorldEvent) {
@@ -46,33 +39,6 @@ object FishingAPI {
         FishingBobberCastEvent(entity).postAndCatch()
     }
 
-    @SubscribeEvent
-    fun onItemInHandChange(event: ItemInHandChangeEvent) {
-        if (event.oldItem.isFishingRod()) {
-            lastActiveFishingTime = SimpleTimeMark.now()
-        }
-        if (event.newItem.isFishingRod()) {
-            DelayedRun.runDelayed(1.seconds) {
-                lastActiveFishingTime = SimpleTimeMark.now()
-            }
-        }
-    }
-
-    @SubscribeEvent
-    fun onSkillExpGain(event: SkillExpGainEvent) {
-        val skill = event.skill
-        if (FishingProfitTracker.isEnabled()) {
-            if (skill != "fishing") {
-                lastActiveFishingTime = SimpleTimeMark.farPast()
-            }
-        }
-    }
-
-    @SubscribeEvent
-    fun onIslandChange(event: IslandChangeEvent) {
-        lastActiveFishingTime = SimpleTimeMark.farPast()
-    }
-
     fun hasFishingRodInHand() = InventoryUtils.itemInHandId.isFishingRod()
 
     fun NEUInternalName.isFishingRod() = contains("ROD")

src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingProfitTracker.kt

@@ -27,7 +27,6 @@ import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import com.google.gson.annotations.Expose
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
 typealias CategoryName = String
@@ -181,11 +180,9 @@ object FishingProfitTracker {
         if (!isEnabled()) return
 
         val recentPickup = config.showWhenPickup && lastCatchTime.passedSince() < 3.seconds
-        if (!recentPickup) {
-            if (!FishingAPI.isFishing()) return
+        if (recentPickup || FishingAPI.isFishing()) {
+            tracker.renderDisplay(config.position)
         }
-
-        tracker.renderDisplay(config.position)
     }
 
     @SubscribeEvent
@@ -194,8 +191,6 @@ object FishingProfitTracker {
     }
 
     private fun maybeAddItem(internalName: NEUInternalName, amount: Int) {
-        if (FishingAPI.lastActiveFishingTime.passedSince() > 10.minutes) return
-
         if (!isAllowedItem(internalName)) {
             ChatUtils.debug("Ignored non-fishing item pickup: $internalName'")
             return