Add support for the effects on food to be Blue for good, and Red for …

…bad. (#276)
progwml6 · Sep 27, 2016 · 7f515d4 · 7f515d4
1 parent c81479d
commit 7f515d4
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 5 deletions.
diff --git a/src/main/java/com/progwml6/natura/shared/NaturaCommons.java b/src/main/java/com/progwml6/natura/shared/NaturaCommons.java
@@ -9,6 +9,7 @@
 import com.progwml6.natura.library.Util;
 import com.progwml6.natura.shared.block.hopper.BlockBlazeHopper;
 import com.progwml6.natura.shared.item.ItemEdibleSoup;
+import com.progwml6.natura.shared.item.ItemNaturaEdible;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -22,7 +23,6 @@
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
-import slimeknights.mantle.item.ItemEdible;
 import slimeknights.mantle.item.ItemMetaDynamic;
 import slimeknights.mantle.pulsar.pulse.Pulse;
 
@@ -46,7 +46,7 @@ public class NaturaCommons extends NaturaPulse
     // Items
     public static ItemMetaDynamic materials;
     public static ItemMetaDynamic empty_bowls;
-    public static ItemEdible edibles;
+    public static ItemNaturaEdible edibles;
     public static ItemEdibleSoup soups;
 
     // Material Itemstacks
@@ -106,7 +106,7 @@ public void preInit(FMLPreInitializationEvent event)
         // Items
         materials = registerItem(new ItemMetaDynamic(), "materials");
         empty_bowls = registerItem(new ItemMetaDynamic(), "empty_bowls");
-        edibles = registerItem(new ItemEdible(), "edibles");
+        edibles = registerItem(new ItemNaturaEdible(), "edibles");
         soups = registerItem(new ItemEdibleSoup(), "soups");
 
         materials.setCreativeTab(NaturaRegistry.tabGeneral);

diff --git a/src/main/java/com/progwml6/natura/shared/item/ItemEdibleSoup.java b/src/main/java/com/progwml6/natura/shared/item/ItemEdibleSoup.java
@@ -7,9 +7,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.World;
-import slimeknights.mantle.item.ItemEdible;
 
-public class ItemEdibleSoup extends ItemEdible
+public class ItemEdibleSoup extends ItemNaturaEdible
 {
     protected TIntObjectHashMap<ItemStack> bowlsList;
 

diff --git a/src/main/java/com/progwml6/natura/shared/item/ItemNaturaEdible.java b/src/main/java/com/progwml6/natura/shared/item/ItemNaturaEdible.java
@@ -0,0 +1,44 @@
+package com.progwml6.natura.shared.item;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.text.translation.I18n;
+import slimeknights.mantle.item.ItemEdible;
+
+public class ItemNaturaEdible extends ItemEdible
+{
+    public boolean displayCustomEffectsTooltip; // set to false to not display effects of food in tooltip
+
+    public ItemNaturaEdible()
+    {
+        super();
+        this.displayEffectsTooltip = false;
+        this.displayCustomEffectsTooltip = true;
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced)
+    {
+        super.addInformation(stack, playerIn, tooltip, advanced);
+
+        // effect info
+        if (displayCustomEffectsTooltip)
+        {
+            for (PotionEffect potionEffect : potionEffects.get(stack.getMetadata()))
+            {
+                if (potionEffect.getPotion().isBadEffect())
+                {
+                    tooltip.add("§4" + I18n.translateToLocal(potionEffect.getEffectName()).trim());
+                }
+                else
+                {
+                    tooltip.add("§9" + I18n.translateToLocal(potionEffect.getEffectName()).trim());
+                }
+            }
+        }
+    }
+}