feat: Allow breaking itemstacks even further for faster repo reloads

5 files changed, 11 insertions, 1 deletions

diff --git a/src/main/kotlin/features/debug/itemeditor/LegacyItemData.kt b/src/main/kotlin/features/debug/itemeditor/LegacyItemData.kt
index 2332e2d..c0f48ca 100644
--- a/src/main/kotlin/features/debug/itemeditor/LegacyItemData.kt
+++ b/src/main/kotlin/features/debug/itemeditor/LegacyItemData.kt
@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.util.Identifier
 import moe.nea.firmament.Firmament
+import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.ItemCache
 import moe.nea.firmament.util.MC
 
@@ -57,6 +58,7 @@ object LegacyItemData {
 	val enchantmentLut = enchantmentData.associateBy { Identifier.ofVanilla(it.name) }
 
 	val itemDat = getLegacyData<List<ItemData>>("items")
+	@OptIn(ExpensiveItemCacheApi::class) // This is fine, we get loaded in a thread.
 	val itemLut = itemDat.flatMap { item ->
 		item.allVariants().map { legacyItemType ->
 			val nbt = ItemCache.convert189ToModern(NbtCompound().apply {
diff --git a/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt b/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt
index 5151862..0cfaeba 100644
--- a/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt
+++ b/src/main/kotlin/features/events/anniversity/AnniversaryFeatures.kt
@@ -15,6 +15,7 @@ import moe.nea.firmament.events.WorldReadyEvent
 import moe.nea.firmament.features.FirmamentFeature
 import moe.nea.firmament.gui.config.ManagedConfig
 import moe.nea.firmament.gui.hud.MoulConfigHud
+import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.ItemNameLookup
 import moe.nea.firmament.repo.SBItemStack
 import moe.nea.firmament.util.MC
@@ -202,7 +203,8 @@ object AnniversaryFeatures : FirmamentFeature {
 	            SBItemStack(SkyblockId.NULL)
             }
 
-            @Bind
+            @OptIn(ExpensiveItemCacheApi::class)
+			@Bind
             fun name(): String {
                 return when (backedBy) {
                     is Reward.Coins -> "Coins"
diff --git a/src/main/kotlin/features/inventory/CraftingOverlay.kt b/src/main/kotlin/features/inventory/CraftingOverlay.kt
index d2c79fd..f823086 100644
--- a/src/main/kotlin/features/inventory/CraftingOverlay.kt
+++ b/src/main/kotlin/features/inventory/CraftingOverlay.kt
@@ -8,6 +8,7 @@ import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.ScreenChangeEvent
 import moe.nea.firmament.events.SlotRenderEvents
 import moe.nea.firmament.features.FirmamentFeature
+import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.SBItemStack
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.skyblockId
@@ -45,6 +46,7 @@ object CraftingOverlay : FirmamentFeature {
 	override val identifier: String
 		get() = "crafting-overlay"
 
+	@OptIn(ExpensiveItemCacheApi::class)
 	@Subscribe
 	fun onSlotRender(event: SlotRenderEvents.After) {
 		val slot = event.slot
diff --git a/src/main/kotlin/features/inventory/ItemHotkeys.kt b/src/main/kotlin/features/inventory/ItemHotkeys.kt
index 4aa8202..0dc8a2a 100644
--- a/src/main/kotlin/features/inventory/ItemHotkeys.kt
+++ b/src/main/kotlin/features/inventory/ItemHotkeys.kt
@@ -3,6 +3,7 @@ package moe.nea.firmament.features.inventory
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.HandledScreenKeyPressedEvent
 import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.HypixelStaticData
 import moe.nea.firmament.repo.ItemCache
 import moe.nea.firmament.repo.ItemCache.asItemStack
@@ -18,6 +19,7 @@ object ItemHotkeys {
 		val openGlobalTradeInterface by keyBindingWithDefaultUnbound("global-trade-interface")
 	}
 
+	@OptIn(ExpensiveItemCacheApi::class)
 	@Subscribe
 	fun onHandledInventoryPress(event: HandledScreenKeyPressedEvent) {
 		if (!event.matches(TConfig.openGlobalTradeInterface)) {
diff --git a/src/main/kotlin/features/inventory/buttons/InventoryButton.kt b/src/main/kotlin/features/inventory/buttons/InventoryButton.kt
index 39feecf..955ae88 100644
--- a/src/main/kotlin/features/inventory/buttons/InventoryButton.kt
+++ b/src/main/kotlin/features/inventory/buttons/InventoryButton.kt
@@ -11,6 +11,7 @@ import net.minecraft.command.argument.ItemStackArgumentType
 import net.minecraft.item.ItemStack
 import net.minecraft.resource.featuretoggle.FeatureFlags
 import net.minecraft.util.Identifier
+import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.ItemCache.asItemStack
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.util.MC
@@ -40,6 +41,7 @@ data class InventoryButton(
 		}
 		val dimensions = Dimension(18, 18)
 		val getItemForName = ::getItemForName0.memoize(1024)
+		@OptIn(ExpensiveItemCacheApi::class)
 		fun getItemForName0(icon: String): ItemStack {
 			val repoItem = RepoManager.getNEUItem(SkyblockId(icon))
 			var itemStack = repoItem.asItemStack(idHint = SkyblockId(icon))