Skip to content

Commit fd1e202

Browse files
authored
Merge pull request #125 from hlam9/1.7-port desc/tooltip fix for generation items
desc/tooltip fix for generation items
2 parents 53a79fe + eb700d5 commit fd1e202

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/BlockItemWithLang.kt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ package generations.gg.generations.core.generationscore.common.world.item
22

33
import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsBlockItem
44
import net.minecraft.core.Holder
5+
import net.minecraft.network.chat.Component
6+
import net.minecraft.world.item.Item.TooltipContext
7+
import net.minecraft.world.item.ItemStack
8+
import net.minecraft.world.item.TooltipFlag
59
import net.minecraft.world.level.block.Block
610

7-
open class BlockItemWithLang(block: Holder<Block>, properties: Properties) : GenerationsBlockItem(block, properties), LangTooltip
11+
open class BlockItemWithLang(block: Holder<Block>, properties: Properties) : GenerationsBlockItem(block, properties), LangTooltip {
12+
override fun appendHoverText(stack: ItemStack, context: TooltipContext, tooltipComponents: MutableList<Component>, isAdvanced: TooltipFlag) {
13+
super.appendHoverText(stack, context, tooltipComponents, isAdvanced)
14+
addText(stack, context, tooltipComponents, isAdvanced)
15+
}
16+
}

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/LangTooltip.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface LangTooltip {
1515
isAdvanced: TooltipFlag
1616
) {
1717
val tooltipId = tooltipId(stack)
18-
if (Language.getInstance().has(self().getDescriptionId(stack))) tooltipComponents.add(
18+
if (Language.getInstance().has(tooltipId)) tooltipComponents.add(
1919
Component.translatable(
2020
tooltipId
2121
)

0 commit comments

Comments
 (0)