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

fix: Re-add extra item tooltips to the item list

Browse Source
This commit is contained in:
Linnea Gräf
2024-11-12 22:14:49 +01:00
parent 3308bb6df3
commit 3ac5c34273
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,9 @@ import net.minecraft.client.render.VertexConsumerProvider
import net.minecraft.client.render.model.BakedModel import net.minecraft.client.render.model.BakedModel
import net.minecraft.client.texture.SpriteAtlasTexture import net.minecraft.client.texture.SpriteAtlasTexture
import net.minecraft.item.ModelTransformationMode import net.minecraft.item.ModelTransformationMode
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.repo.SBItemStack import moe.nea.firmament.repo.SBItemStack
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
@@ -52,7 +54,12 @@ object NEUItemEntryRenderer : EntryRenderer<SBItemStack>, BatchedEntryRenderer<S
val lore = mutableListOf(stack.displayNameAccordingToNbt) val lore = mutableListOf(stack.displayNameAccordingToNbt)
lore.addAll(stack.loreAccordingToNbt) lore.addAll(stack.loreAccordingToNbt)
ItemTooltipEvent.publish(ItemTooltipEvent(
stack,
tooltipContext.vanillaContext(),
TooltipType.BASIC,
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(

17
src/main/kotlin/events/TooltipEvent.kt
View File

@@ -1,17 +0,0 @@
package moe.nea.firmament.events
import net.minecraft.client.gui.tooltip.Tooltip
import net.minecraft.entity.player.PlayerEntity
import net.minecraft.item.Item
import net.minecraft.item.ItemStack
data class TooltipEvent(
val itemStack: ItemStack,
val tooltip: Tooltip,
val tooltipContext: Item.TooltipContext,
val player: PlayerEntity?
) : FirmamentEvent() {
companion object : FirmamentEventBus<TooltipEvent>()
}