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

fix: Fire fabric tooltip events for REI item stacks

Browse Source
This commit is contained in:
Linnea Gräf
2024-11-17 19:46:42 +01:00
parent 86cbf9d422
commit 3478861ee3
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer
import me.shedaniel.rei.api.client.gui.widgets.Tooltip import me.shedaniel.rei.api.client.gui.widgets.Tooltip
import me.shedaniel.rei.api.client.gui.widgets.TooltipContext import me.shedaniel.rei.api.client.gui.widgets.TooltipContext
import me.shedaniel.rei.api.common.entry.EntryStack 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.MinecraftClient
import net.minecraft.client.gui.DrawContext import net.minecraft.client.gui.DrawContext
import net.minecraft.client.render.DiffuseLighting import net.minecraft.client.render.DiffuseLighting
@@ -31,6 +32,7 @@ import net.minecraft.item.tooltip.TooltipType
import moe.nea.firmament.compat.rei.FirmamentReiPlugin.Companion.asItemEntry import moe.nea.firmament.compat.rei.FirmamentReiPlugin.Companion.asItemEntry
import moe.nea.firmament.events.ItemTooltipEvent import moe.nea.firmament.events.ItemTooltipEvent
import moe.nea.firmament.repo.SBItemStack import moe.nea.firmament.repo.SBItemStack
import moe.nea.firmament.util.ErrorUtil
import moe.nea.firmament.util.MC import moe.nea.firmament.util.MC
import moe.nea.firmament.util.mc.displayNameAccordingToNbt import moe.nea.firmament.util.mc.displayNameAccordingToNbt
import moe.nea.firmament.util.mc.loreAccordingToNbt import moe.nea.firmament.util.mc.loreAccordingToNbt
@@ -48,18 +50,29 @@ object NEUItemEntryRenderer : EntryRenderer<SBItemStack>, BatchedEntryRenderer<S
} }
val minecraft = MinecraftClient.getInstance() val minecraft = MinecraftClient.getInstance()
var canUseVanillaTooltipEvents = false
override fun getTooltip(entry: EntryStack<SBItemStack>, tooltipContext: TooltipContext): Tooltip? { override fun getTooltip(entry: EntryStack<SBItemStack>, tooltipContext: TooltipContext): Tooltip? {
val stack = entry.value.asImmutableItemStack() val stack = entry.value.asImmutableItemStack()
val lore = mutableListOf(stack.displayNameAccordingToNbt) val lore = mutableListOf(stack.displayNameAccordingToNbt)
lore.addAll(stack.loreAccordingToNbt) lore.addAll(stack.loreAccordingToNbt)
if (canUseVanillaTooltipEvents) {
try {
ItemTooltipCallback.EVENT.invoker().getTooltip(
stack, tooltipContext.vanillaContext(), TooltipType.BASIC, lore
)
} catch (ex: Exception) {
ErrorUtil.softError("Failed to use vanilla tooltips", ex)
}
} else {
ItemTooltipEvent.publish(ItemTooltipEvent( ItemTooltipEvent.publish(ItemTooltipEvent(
stack, stack,
tooltipContext.vanillaContext(), tooltipContext.vanillaContext(),
TooltipType.BASIC, TooltipType.BASIC,
lore lore
)) ))
}
// TODO: tags aren't sent as early now so some tooltip components that use tags will crash the game // TODO: tags aren't sent as early now so some tooltip components that use tags will crash the game
// stack.getTooltip( // stack.getTooltip(
// Item.TooltipContext.create( // Item.TooltipContext.create(