feat: Allow breaking itemstacks even further for faster repo reloads

5 files changed, 29 insertions, 9 deletions

diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt
index ab45e7c..10bff1b 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt
@@ -13,18 +13,17 @@ import snownee.jade.api.ui.IElementHelper
 import snownee.jade.impl.ui.ItemStackElement
 import snownee.jade.impl.ui.TextElement
 import kotlin.jvm.optionals.getOrDefault
-import net.minecraft.item.ItemStack
-import net.minecraft.item.Items
 import net.minecraft.text.Text
 import net.minecraft.util.Identifier
 import net.minecraft.util.math.Vec2f
 import moe.nea.firmament.Firmament
-import moe.nea.firmament.repo.ItemCache.asItemStack
+import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.repo.SBItemStack
 import moe.nea.firmament.util.MC
 
 class DrillToolProvider : IBlockComponentProvider {
+	@OptIn(ExpensiveItemCacheApi::class)
 	override fun appendTooltip(
 		tooltip: ITooltip,
 		accessor: BlockAccessor,
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/FirmamentReiPlugin.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/FirmamentReiPlugin.kt
index b5c9a6d..89c3e19 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/FirmamentReiPlugin.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/FirmamentReiPlugin.kt
@@ -29,6 +29,7 @@ import moe.nea.firmament.compat.rei.recipes.SBShopRecipe
 import moe.nea.firmament.events.HandledScreenPushREIEvent
 import moe.nea.firmament.features.inventory.CraftingOverlay
 import moe.nea.firmament.features.inventory.storageoverlay.StorageOverlayScreen
+import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.repo.SBItemStack
 import moe.nea.firmament.repo.recipes.SBCraftingRecipeRenderer
@@ -44,6 +45,7 @@ import moe.nea.firmament.util.unformattedString
 class FirmamentReiPlugin : REIClientPlugin {
 
 	companion object {
+		@ExpensiveItemCacheApi
 		fun EntryStack<SBItemStack>.asItemEntry(): EntryStack<ItemStack> {
 			return EntryStack.of(VanillaEntryTypes.ITEM, value.asImmutableItemStack())
 		}
@@ -51,6 +53,7 @@ class FirmamentReiPlugin : REIClientPlugin {
 		val SKYBLOCK_ITEM_TYPE_ID = Identifier.of("firmament", "skyblockitems")
 	}
 
+	@OptIn(ExpensiveItemCacheApi::class)
 	override fun registerTransferHandlers(registry: TransferHandlerRegistry) {
 		registry.register(TransferHandler { context ->
 			val screen = context.containerScreen
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt
index 2803980..d73500a 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt
@@ -17,10 +17,13 @@ import me.shedaniel.rei.api.common.entry.EntryStack
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.DrawContext
+import net.minecraft.item.ItemStack
+import net.minecraft.item.Items
 import net.minecraft.item.tooltip.TooltipType
 import net.minecraft.text.Text
-import moe.nea.firmament.compat.rei.FirmamentReiPlugin.Companion.asItemEntry
 import moe.nea.firmament.events.ItemTooltipEvent
+import moe.nea.firmament.repo.ExpensiveItemCacheApi
+import moe.nea.firmament.repo.ItemCache
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.repo.SBItemStack
 import moe.nea.firmament.util.ErrorUtil
@@ -32,6 +35,7 @@ import moe.nea.firmament.util.mc.loreAccordingToNbt
 // TODO: make this re implement BatchedEntryRenderer, if possible (likely not, due to no-alloc rendering)
 // Also it is probably not even that much faster now, with render layers.
 object NEUItemEntryRenderer : EntryRenderer<SBItemStack> {
+	@OptIn(ExpensiveItemCacheApi::class)
 	override fun render(
 		entry: EntryStack<SBItemStack>,
 		context: DrawContext,
@@ -40,13 +44,20 @@ object NEUItemEntryRenderer : EntryRenderer<SBItemStack> {
 		mouseY: Int,
 		delta: Float
 	) {
+		val neuItem = entry.value.neuItem
+		val itemToRender = if(RepoManager.Config.perfectRenders < RepoManager.PerfectRender.RENDER && !entry.value.isWarm() && neuItem != null) {
+			ItemCache.recacheSoon(neuItem)
+			ItemStack(Items.PAINTING)
+		} else {
+			entry.value.asImmutableItemStack()
+		}
+
 		context.matrices.push()
 		context.matrices.translate(bounds.centerX.toFloat(), bounds.centerY.toFloat(), 0F)
 		context.matrices.scale(bounds.width.toFloat() / 16F, bounds.height.toFloat() / 16F, 1f)
-		val item = entry.asItemEntry().value
-		context.drawItemWithoutEntity(item, -8, -8)
+		context.drawItemWithoutEntity(itemToRender, -8, -8)
 		context.drawStackOverlay(
-			minecraft.textRenderer, item, -8, -8,
+			minecraft.textRenderer, itemToRender, -8, -8,
 			if (entry.value.getStackSize() > 1000) FirmFormatters.shortFormat(
 				entry.value.getStackSize()
 					.toDouble()
@@ -59,8 +70,9 @@ object NEUItemEntryRenderer : EntryRenderer<SBItemStack> {
 	val minecraft = MinecraftClient.getInstance()
 	var canUseVanillaTooltipEvents = true
 
+	@OptIn(ExpensiveItemCacheApi::class)
 	override fun getTooltip(entry: EntryStack<SBItemStack>, tooltipContext: TooltipContext): Tooltip? {
-		if (!entry.value.isWarm() && !RepoManager.Config.perfectTooltips) {
+		if (!entry.value.isWarm() && RepoManager.Config.perfectRenders < RepoManager.PerfectRender.RENDER_AND_TEXT) {
 			val neuItem = entry.value.neuItem
 			if (neuItem != null) {
 				val lore = mutableListOf<Text>()
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/SBItemEntryDefinition.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/SBItemEntryDefinition.kt
index e932edf..1d0a611 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/SBItemEntryDefinition.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/SBItemEntryDefinition.kt
@@ -15,6 +15,7 @@ import net.minecraft.registry.tag.TagKey
 import net.minecraft.text.Text
 import net.minecraft.util.Identifier
 import moe.nea.firmament.compat.rei.FirmamentReiPlugin.Companion.asItemEntry
+import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.repo.SBItemStack
 import moe.nea.firmament.util.SkyblockId
@@ -24,6 +25,7 @@ object SBItemEntryDefinition : EntryDefinition<SBItemStack> {
 		return o1.skyblockId == o2.skyblockId && o1.getStackSize() == o2.getStackSize()
 	}
 
+	@OptIn(ExpensiveItemCacheApi::class)
 	override fun cheatsAs(entry: EntryStack<SBItemStack>?, value: SBItemStack): ItemStack {
 		return value.asCopiedItemStack()
 	}
@@ -41,9 +43,10 @@ object SBItemEntryDefinition : EntryDefinition<SBItemStack> {
 		return Stream.empty()
 	}
 
+	@OptIn(ExpensiveItemCacheApi::class)
 	override fun asFormattedText(entry: EntryStack<SBItemStack>, value: SBItemStack): Text {
 		val neuItem = entry.value.neuItem
-		return if (RepoManager.Config.perfectTooltips || entry.value.isWarm() || neuItem == null) {
+		return if (RepoManager.Config.perfectRenders < RepoManager.PerfectRender.RENDER_AND_TEXT || entry.value.isWarm() || neuItem == null) {
 			VanillaEntryTypes.ITEM.definition.asFormattedText(entry.asItemEntry(), value.asImmutableItemStack())
 		} else {
 			Text.literal(neuItem.displayName)
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt
index c5b4fb6..fca3edf 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBReforgeRecipe.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExpensiveItemCacheApi::class)
+
 package moe.nea.firmament.compat.rei.recipes
 
 import java.util.Optional
@@ -27,6 +29,7 @@ import moe.nea.firmament.Firmament
 import moe.nea.firmament.compat.rei.EntityWidget
 import moe.nea.firmament.compat.rei.SBItemEntryDefinition
 import moe.nea.firmament.gui.entity.EntityRenderer
+import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.Reforge
 import moe.nea.firmament.repo.ReforgeStore
 import moe.nea.firmament.repo.RepoItemTypeCache