Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: improve REI load times during search caching once more

Browse Source
This commit is contained in:
Linnea Gräf
2025-07-07 14:43:17 +02:00
parent 8e4e349963
commit d7b3f89032
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt
View File

@@ -45,7 +45,7 @@ object NEUItemEntryRenderer : EntryRenderer<SBItemStack> {
delta: Float delta: Float
) { ) {
val neuItem = entry.value.neuItem val neuItem = entry.value.neuItem
val itemToRender = if(RepoManager.Config.perfectRenders < RepoManager.PerfectRender.RENDER && !entry.value.isWarm() && neuItem != null) { val itemToRender = if(!RepoManager.Config.perfectRenders.rendersPerfectVisuals() && !entry.value.isWarm() && neuItem != null) {
ItemCache.recacheSoon(neuItem) ItemCache.recacheSoon(neuItem)
ItemStack(Items.PAINTING) ItemStack(Items.PAINTING)
} else { } else {
@@ -72,7 +72,7 @@ object NEUItemEntryRenderer : EntryRenderer<SBItemStack> {
@OptIn(ExpensiveItemCacheApi::class) @OptIn(ExpensiveItemCacheApi::class)
override fun getTooltip(entry: EntryStack<SBItemStack>, tooltipContext: TooltipContext): Tooltip? { override fun getTooltip(entry: EntryStack<SBItemStack>, tooltipContext: TooltipContext): Tooltip? {
if (!entry.value.isWarm() && RepoManager.Config.perfectRenders < RepoManager.PerfectRender.RENDER_AND_TEXT) { if (!entry.value.isWarm() && !RepoManager.Config.perfectRenders.rendersPerfectText()) {
val neuItem = entry.value.neuItem val neuItem = entry.value.neuItem
if (neuItem != null) { if (neuItem != null) {
val lore = mutableListOf<Text>() val lore = mutableListOf<Text>()

2
src/compat/rei/java/moe/nea/firmament/compat/rei/SBItemEntryDefinition.kt
View File

@@ -46,7 +46,7 @@ object SBItemEntryDefinition : EntryDefinition<SBItemStack> {
@OptIn(ExpensiveItemCacheApi::class) @OptIn(ExpensiveItemCacheApi::class)
override fun asFormattedText(entry: EntryStack<SBItemStack>, value: SBItemStack): Text { override fun asFormattedText(entry: EntryStack<SBItemStack>, value: SBItemStack): Text {
val neuItem = entry.value.neuItem val neuItem = entry.value.neuItem
return if (RepoManager.Config.perfectRenders < RepoManager.PerfectRender.RENDER_AND_TEXT || entry.value.isWarm() || neuItem == null) { return if (!RepoManager.Config.perfectRenders.rendersPerfectText() || entry.value.isWarm() || neuItem == null) {
VanillaEntryTypes.ITEM.definition.asFormattedText(entry.asItemEntry(), value.asImmutableItemStack()) VanillaEntryTypes.ITEM.definition.asFormattedText(entry.asItemEntry(), value.asImmutableItemStack())
} else { } else {
Text.literal(neuItem.displayName) Text.literal(neuItem.displayName)

3
src/main/kotlin/repo/RepoManager.kt
View File

@@ -61,6 +61,9 @@ object RepoManager {
RENDER_AND_TEXT("text"), RENDER_AND_TEXT("text"),
; ;
fun rendersPerfectText() = this == RENDER_AND_TEXT
fun rendersPerfectVisuals() = this == RENDER || this == RENDER_AND_TEXT
override fun asString(): String? = label override fun asString(): String? = label
} }