Merge branch 'master' into Slayers

Author: 7azeemm

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -35,6 +35,7 @@ body:
       label: Minecraft Version
       description: What version of Minecraft are you running? If you do not know what version you are using, look in the bottom left corner of the main menu in game.
       options:
+        - "1.21.11"
         - "1.21.9/1.21.10"
         - "1.21.6-1.21.8"
         - "1.21.5"
@@ -45,7 +46,7 @@ body:
     attributes:
       label: Skyblocker Version
       description: What version of Skyblocker are you running? Every part is important! If you do not know what version you are using, look at the file name in your "mods" folder.
-      placeholder: ex. skyblocker-5.0.0+1.21.10.jar
+      placeholder: ex. skyblocker-5.0.0+1.21.11.jar
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/crash_report.yml

@@ -16,6 +16,7 @@ body:
       label: Minecraft Version
       description: What version of Minecraft are you running? If you do not know what version you are using, look in the bottom left corner of the main menu in game.
       options:
+        - "1.21.11"
         - "1.21.9/1.21.10"
         - "1.21.6-1.21.8"
         - "1.21.5"
@@ -26,7 +27,7 @@ body:
     attributes:
       label: Skyblocker Version
       description: What version of Skyblocker are you running? Every part is important! If you do not know what version you are using, look at the file name in your "mods" folder.
-      placeholder: ex. skyblocker-5.0.0+1.21.10.jar
+      placeholder: ex. skyblocker-5.0.0+1.21.11.jar
     validations:
       required: true
   - type: textarea

CHANGELOG.md

@@ -1,3 +1,56 @@
+# Release 5.10.0
+
+## Highlight
+* Add Room and Secret Syncing
+  * Rooms opened and secrets found by other players will sync to everybody in the run with Skyblocker.
+* Add Item Value Breakdown Popup
+  * Press I while hovering over an item to view a breakdown of its value.
+* Add Anvil Helper
+* Add Pickobulus Helper
+* Add support for Greenhouse crops
+* Improve Etherwarp Teleport Overlay
+* Update Enchant Abbreviations
+* Fix Inventory Search bugs
+* Fix Redstone Key Secrets
+* Fix Trap Room names
+* Fix Slayer XP Buff perk not stacking with Aura's Work Smarter perk
+* Fix Moby Duck not being a protected consumable
+* Fix rarely saving original item names as custom names
+* Fix Null Pointer Exception with PlainTextComponents
+* Fix Builder's Wand Block Preview Bug
+
+## What's Changed
+* Avoid Star Imports .editorconfig by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1902
+* Minor Config Description Changes by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1908
+* Fix builder wand block preview bug by @TheTerrariaGuy in https://github.com/SkyblockerMod/Skyblocker/pull/1897
+* More Mayor Fixes by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1903
+* do not save original item name as a custom name by @viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/1909
+* Cache lore strings by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/1893
+* Account for Slayer XP Buff Minister Perk by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1913
+* value breakdown popup by @viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/1793
+* Add anvil helper by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/1916
+* Redstone Key Secret Fix by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1891
+* Translations update from hysky translate by @Weblate-LifeIsAParadox in https://github.com/SkyblockerMod/Skyblocker/pull/1898
+* rename keybind translation keys by @viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/1905
+* Add greenhouse crops by @IllagerCaptain in https://github.com/SkyblockerMod/Skyblocker/pull/1921
+* Inventory Search Fixes by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1918
+* Update enchantment abbreviations by @Bedrock-Armor in https://github.com/SkyblockerMod/Skyblocker/pull/1917
+* Use Chest Animation For Chest Secret Detection by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1873
+* Slightly Improve Etherwarp Teleport Overlay by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1662
+* Structure Template <-> Skeleton File Converter by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1675
+* Add Dungeon Secret Sync over WS by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1874
+* Add Pickobulus Helper by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/1894
+* Rename Trap Rooms by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1928
+* Fix some Null warnings in Dungeon package by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/1911
+* Fix null pointer exception when PlainTextComponent constructors are called with null text. by @Nengyi-Jonathan-Jiang in https://github.com/SkyblockerMod/Skyblocker/pull/1929
+
+## New Contributors
+* @TheTerrariaGuy made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/1897
+* @Nengyi-Jonathan-Jiang made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/1929
+
+**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v5.9.1+1.21.10...v5.10.0+1.21.10
+___
+
 # Release 5.9.1
 
 ## Highlight

FEATURES.md

@@ -1,6 +1,7 @@
 ### Dungeon Features:
 - **Fancy Party Finder GUI**
 - **Secrets Waypoint Highlight:** Fully customizable
+- **Room and Secret Syncing**
 - **Fancy Minimap & Score**
     - Support for showing player heads
     - Integration with Spirit Leap Overlay
@@ -162,6 +163,7 @@
 - **Powder HUD**
 - **Ordered Waypoints**
     - Basic ordered waypoint commands
+- **Pickobulus Helper**
 
 ### Rift Features:
 - **Mirrorverse Waypoints**
@@ -312,6 +314,7 @@
 - **Sack Message Prices**
 - **Bazaar order tracker**
 - **Builder's wand preview**
+- **Item Value Breakdown Popup**
 
 ### Barn Features:
 - **Barn Solver:**
@@ -361,6 +364,7 @@
 - **Disable All Command**
 - **Abiphone Call Prompts**
     - Adds clickable messages in chat to quickly call Trevor the Trapper, Maddox, and Queen Mismyla
+- **Anvil Helper**
 
 ### Miscellaneous Features:
 - **[Roughly Enough Items (REI)](https://modrinth.com/mod/rei), [EMI](https://modrinth.com/mod/emi) and [JEI](https://modrinth.com/mod/jei/) Support**

README.md

@@ -8,7 +8,7 @@
  \
 [![Discord](https://img.shields.io/discord/879732108745125969?logo=discord&labelColor=cecece&color=7289DA&label=)](https://discord.com/invite/aNNJHQykck)
 
-Hypixel Skyblock Mod for Minecraft 1.21.10
+Hypixel Skyblock Mod for Minecraft 1.21.11
 
 Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/installation) or use our [Modpack](https://modrinth.com/modpack/skyblocker-modpack)
 ## Features
@@ -19,6 +19,7 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
 ### Dungeon Features:
 - **Fancy Party Finder GUI**
 - **Secrets Waypoint Highlight:** Fully customizable
+- **Room and Secret Syncing**
 - **Fancy Minimap & Score**
     - Support for showing player heads
     - Integration with Spirit Leap Overlay
@@ -180,6 +181,7 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
 - **Powder HUD**
 - **Ordered Waypoints**
     - Basic ordered waypoint commands
+- **Pickobulus Helper**
 
 ### Rift Features:
 - **Mirrorverse Waypoints**
@@ -314,7 +316,7 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
     - *Skyblock ID*
     - *Bazaar Reorder Helper*
 - **Quick Navigation:** Fully customizable fast navigation between pets, armor, storage, skill, collection, crafting, enchant, anvil, warp dungeon, and warp hub.
-    - Item Selector
+    - Item Selector 
 - **Recipe Book:** Lists all Skyblock items in the vanilla recipe book, allowing you to see the recipe of the item.
     - Crafting
     - Forge
@@ -330,6 +332,7 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
 - **Sack Message Prices**
 - **Bazaar order tracker**
 - **Builder's wand preview**
+- **Item Value Breakdown Popup**
 
 ### Barn Features:
 - **Barn Solver:**
@@ -379,6 +382,7 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in
 - **Disable All Command**
 - **Abiphone Call Prompts**
     - Adds clickable messages in chat to quickly call Trevor the Trapper, Maddox, and Queen Mismyla
+- **Anvil Helper**
 
 ### Miscellaneous Features:
 - **[Roughly Enough Items (REI)](https://modrinth.com/mod/rei), [EMI](https://modrinth.com/mod/emi) and [JEI](https://modrinth.com/mod/jei/) Support**

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	// Building
-	id 'fabric-loom' version "${loom_version}"
+	id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
 	id "de.hysky.skyblocker.annotation-processor"
 	id "com.diffplug.spotless" version "${spotless_version}"
 	id "checkstyle"
@@ -206,9 +206,6 @@ dependencies {
 	// Apache Commons Text
 	include implementation("org.apache.commons:commons-text:${project.commons_text_version}")
 
-	// JSpecify Annotations
-	include implementation("org.jspecify:jspecify:1.0.0")
-
 	// Fabric Language Kotlin for using MoulConfig - we are still a Java-exclusive mod
 	modImplementation("net.fabricmc:fabric-language-kotlin:${project.flk_version}")
 }

checkstyle.xml

@@ -39,6 +39,13 @@
         <module name="IllegalImport"/>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
+        <module name="IllegalImport">
+            <property name="illegalClasses" value="org.jetbrains.annotations.Nullable"/>
+            <property name="illegalClasses" value="org.jetbrains.annotations.NotNull"/>
+            <property name="illegalClasses" value="org.jetbrains.annotations.NotNullByDefault"/>
+            <!-- Since everything is @NullMarked this should not be used, prefer Objects#requireNonNull -->
+            <property name="illegalClasses" value="org.jspecify.annotations.NonNull"/>
+        </module>
 
         <module name="SeparatorWrap">
             <property name="tokens" value="DOT,ELLIPSIS,AT"/>

gradle.properties

@@ -3,26 +3,26 @@ org.gradle.parallel=true
 org.gradle.configuration-cache=false
 
 # Fabric Properties (https://fabricmc.net/versions.html)
-minecraft_version=1.21.10
-yarn_mappings=1.21.10+build.2
-loader_version=0.17.3
-loom_version=1.13-SNAPSHOT
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.2
+loader_version=0.18.2
+loom_version=1.14-SNAPSHOT
 
 # Fabric API
-fabric_api_version=0.137.0+1.21.10
+fabric_api_version=0.139.4+1.21.11
 
 # Minecraft Mods
 ## Dandelion
 dandelion_version=1.0.0-alpha.10+1.21.10
 ## YACL (https://github.com/isXander/YetAnotherConfigLib)
-yacl_version=3.8.0+1.21.9
+yacl_version=3.8.1+1.21.11
 ## MoulConfig (https://github.com/NotEnoughUpdates/MoulConfig)
 moulconfig_flavour=modern-1.21.7
 moulconfig_version=4.0.1-beta
 ## HM API (https://github.com/AzureAaron/hm-api)
 hm_api_version=1.0.1+1.21.2
 ## Mod Menu (https://modrinth.com/mod/modmenu/versions)
-mod_menu_version = 16.0.0-rc.1
+mod_menu_version = 17.0.0-alpha.1
 ## REI (https://modrinth.com/mod/rei/versions?l=fabric)
 rei_version = 19.0.806
 ## EMI (https://modrinth.com/mod/emi/versions)
@@ -48,18 +48,18 @@ jgit_version = 7.4.0.202509020913-r
 ## Apache Commons Math (https://mvnrepository.com/artifact/org.apache.commons/commons-math3)
 commons_math_version = 3.6.1
 ## Apache Commons Text (https://mvnrepository.com/artifact/org.apache.commons/commons-text)
-commons_text_version = 1.14.0
+commons_text_version = 1.15.0
 
 # Miscellaneous Gradle Plugins
 ## Spotless (https://github.com/diffplug/spotless)
-spotless_version=8.0.0
+spotless_version=8.1.0
 ## Checkstyle (https://checkstyle.sourceforge.io)
-checkstyle_version=12.1.1
+checkstyle_version=12.2.0
 ## Mod Publish Plugin (https://github.com/modmuss50/mod-publish-plugin)
 mod_publish_plugin_version=1.1.0
 
 # Mod Properties
-mod_version = 5.9.1
+mod_version = 5.10.0
 maven_group = de.hysky
 archives_base_name = skyblocker
 modrinth_id=y6DuFGwJ

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME