Backend: Base Stats

src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java

@@ -65,6 +65,11 @@ public class DebugConfig {
     @ConfigEditorBoolean
     public boolean showNpcPrice = false;
 
+    @Expose
+    @ConfigOption(name = "Show Base Values", desc = "Show item base values in item lore.")
+    @ConfigEditorBoolean
+    public boolean showBaseValues = false;
+
     @Expose
     @ConfigOption(name = "Show Craft Price", desc = "Show craft price in item lore.")
     @ConfigEditorBoolean

src/main/java/at/hannibal2/skyhanni/data/jsonobjects/other/SkyblockItemsDataJson.kt

@@ -11,4 +11,5 @@ data class SkyblockItemData(
     @Expose val id: String?,
     @Expose @SerializedName("npc_sell_price") val npcPrice: Double?,
     @Expose @SerializedName("motes_sell_price") val motesPrice: Double?,
+    @Expose @SerializedName("stats") val stats: Map<String, Int>?,
 )

src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarApi.kt

@@ -43,7 +43,7 @@ object BazaarApi {
 
     private var loadedNpcPriceData = false
 
-    val holder = BazaarDataHolder()
+    val holder = HypixelItemAPI()
     var inBazaarInventory = false
     private var currentSearchedItem = ""
 

src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarDataHolder.kt → src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/HypixelItemAPI.kt

@@ -6,12 +6,13 @@ import at.hannibal2.skyhanni.data.jsonobjects.other.SkyblockItemsDataJson
 import at.hannibal2.skyhanni.features.rift.RiftAPI
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.APIUtils
+import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUItems
 import at.hannibal2.skyhanni.utils.json.fromJson
 import kotlinx.coroutines.launch
 
-class BazaarDataHolder {
+class HypixelItemAPI {
 
     companion object {
 
@@ -27,11 +28,14 @@ class BazaarDataHolder {
             val itemsData = ConfigManager.gson.fromJson<SkyblockItemsDataJson>(apiResponse)
 
             val motesPrice = mutableMapOf<NEUInternalName, Double>()
+            val allStats = mutableMapOf<NEUInternalName, Map<String, Int>>()
             for (item in itemsData.items) {
                 val neuItemId = NEUItems.transHypixelNameToInternalName(item.id ?: continue)
                 item.npcPrice?.let { list[neuItemId] = it }
                 item.motesPrice?.let { motesPrice[neuItemId] = it }
+                item.stats?.let { stats -> allStats[neuItemId] = stats.mapKeys { it.key.lowercase() } }
             }
+            ItemUtils.itemBaseStats = allStats
             RiftAPI.motesPrice = motesPrice
         } catch (e: Throwable) {
             ErrorManager.logErrorWithData(

src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt

@@ -29,6 +29,7 @@ import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemPriceUtils.getNpcPriceOrNull
 import at.hannibal2.skyhanni.utils.ItemPriceUtils.getPriceOrNull
 import at.hannibal2.skyhanni.utils.ItemPriceUtils.getRawCraftCostOrNull
+import at.hannibal2.skyhanni.utils.ItemUtils.getBaseStats
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemCategoryOrNull
@@ -452,6 +453,22 @@ object SkyHanniDebugsAndTests {
         event.toolTip.add("§7NPC price: ${npcPrice.addSeparators()}")
     }
 
+    @SubscribeEvent
+    fun onShowBaseStats(event: LorenzToolTipEvent) {
+        if (!LorenzUtils.inSkyBlock) return
+        if (!debugConfig.showBaseValues) return
+        val internalName = event.itemStack.getInternalNameOrNull() ?: return
+
+        val stats = internalName.getBaseStats()
+        if (stats.isEmpty()) return
+
+        event.toolTip.add("§7Base stats:")
+        for ((name, value) in stats) {
+
+            event.toolTip.add("§7$name: $value")
+        }
+    }
+
     @SubscribeEvent
     fun onShowCraftPrice(event: LorenzToolTipEvent) {
         if (!LorenzUtils.inSkyBlock) return

src/main/java/at/hannibal2/skyhanni/utils/ItemPriceUtils.kt

@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.utils
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.SecondPassedEvent
 import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.getBazaarData
-import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarDataHolder
+import at.hannibal2.skyhanni.features.inventory.bazaar.HypixelItemAPI
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getRecipePrice
@@ -92,7 +92,7 @@ object ItemPriceUtils {
         if (this == NEUInternalName.WISP_POTION) {
             return 20_000.0
         }
-        return BazaarDataHolder.getNpcPrice(this)
+        return HypixelItemAPI.getNpcPrice(this)
     }
 
     fun debugItemPrice(args: Array<String>) {

src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt

@@ -45,10 +45,13 @@ import kotlin.time.Duration.Companion.seconds
 object ItemUtils {
 
     private val itemNameCache = mutableMapOf<NEUInternalName, String>() // internal name -> item name
+    var itemBaseStats = mapOf<NEUInternalName, Map<String, Int>>()
 
     private val missingRepoItems = mutableSetOf<String>()
     private var lastRepoWarning = SimpleTimeMark.farPast()
 
+    fun NEUInternalName.getBaseStats(): Map<String, Int> = itemBaseStats[this].orEmpty()
+
     @HandleEvent
     fun onConfigLoad(event: ConfigLoadEvent) {
         ConditionalUtils.onToggle(SkyHanniMod.feature.misc.replaceRomanNumerals) {