From a020e63f39b57bb0be042117c1c4adf6316a8ada Mon Sep 17 00:00:00 2001 From: alexbegt Date: Sat, 17 Aug 2019 14:06:38 -0400 Subject: [PATCH] Bring back the effects tooltips on the edible items, this is controllable like how it was in 1.12.2. --- .../slimeknights/mantle/item/EdibleItem.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/main/java/slimeknights/mantle/item/EdibleItem.java b/src/main/java/slimeknights/mantle/item/EdibleItem.java index 343efc5..2133d62 100644 --- a/src/main/java/slimeknights/mantle/item/EdibleItem.java +++ b/src/main/java/slimeknights/mantle/item/EdibleItem.java @@ -1,15 +1,36 @@ package slimeknights.mantle.item; import com.google.gson.JsonObject; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Food; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.EffectInstance; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import org.apache.commons.lang3.tuple.Pair; import slimeknights.mantle.common.IGeneratedJson; +import javax.annotation.Nullable; +import java.util.List; + public class EdibleItem extends Item implements IGeneratedJson { + private boolean displayEffectsTooltip; // set to false to not display effects of food in tooltip + public EdibleItem(Food foodIn, ItemGroup itemGroup) { + this(foodIn, itemGroup, true); + } + + public EdibleItem(Food foodIn, ItemGroup itemGroup, boolean displayEffectsTooltip) { super(new Properties().food(foodIn).group(itemGroup)); + this.displayEffectsTooltip = displayEffectsTooltip; } @Override @@ -25,4 +46,20 @@ public class EdibleItem extends Item implements IGeneratedJson { return textures; } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + TooltipItem.addOptionalTooltip(stack, tooltip); + + if (this.displayEffectsTooltip) { + for (Pair pair : stack.getItem().getFood().getEffects()) { + if (pair.getLeft() != null) { + tooltip.add(new StringTextComponent(TextFormatting.GRAY.toString() + I18n.format(pair.getLeft().getEffectName()).trim())); + } + } + } + + super.addInformation(stack, worldIn, tooltip, flagIn); + } }