Add "Decorative only" tooltips to wooden pillars

TeamTotemic · Aug 13, 2018 · 5938b8a · 5938b8a
1 parent 44537c8
commit 5938b8a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/src/main/java/pokefenn/totemic/block/BlockDecoPillar.java b/src/main/java/pokefenn/totemic/block/BlockDecoPillar.java
@@ -1,5 +1,7 @@
 package pokefenn.totemic.block;
 
+import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.BlockPlanks;
@@ -13,6 +15,8 @@
 import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -95,6 +99,12 @@ public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World wo
         return new ItemStack(this, 1, tile.getDropMetadata());
     }
 
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag)
+    {
+        tooltip.add(I18n.format("tile.totemic:wooden_pillar.tooltip"));
+    }
+
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items)
     {

diff --git a/src/main/java/pokefenn/totemic/block/BlockDecoPillarBase.java b/src/main/java/pokefenn/totemic/block/BlockDecoPillarBase.java
@@ -14,6 +14,8 @@
 import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -108,6 +110,12 @@ public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World wo
         return new ItemStack(this, 1, tile.getDropMetadata());
     }
 
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag)
+    {
+        tooltip.add(I18n.format("tile.totemic:wooden_pillar.tooltip"));
+    }
+
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items)
     {

diff --git a/src/main/java/pokefenn/totemic/totempedia/page/PageRecipe.java b/src/main/java/pokefenn/totemic/totempedia/page/PageRecipe.java
@@ -176,7 +176,7 @@ public void renderItem(IGuiLexiconEntry gui, int xPos, int yPos, ItemStack stack
             if(accountForContainer)
             {
                 ItemStack containerStack = stack.getItem().getContainerItem(stack);
-                if(!containerStack.isEmpty())
+                if(!containerStack.isEmpty() && !containerStack.isItemEqualIgnoreDurability(stack))
                     tooltipContainerStack = containerStack;
             }
         }

diff --git a/src/main/resources/assets/totemic/lang/de_de.lang b/src/main/resources/assets/totemic/lang/de_de.lang
@@ -93,6 +93,7 @@ tile.totemic:wooden_pillar_base.stripped_jungle.name=Entrindete Tropenholzpfahlb
 tile.totemic:wooden_pillar_base.stripped_acacia.name=Entrindete Akazienholzpfahlbasis
 tile.totemic:wooden_pillar_base.stripped_dark_oak.name=Entrindete Schwarzeichenholzpfahlbasis
 tile.totemic:wooden_pillar_base.stripped_cedar.name=Entrindete Zedernholzpfahlbasis
+tile.totemic:wooden_pillar.tooltip=Nur dekorativ
 
 #Entity localizations
 entity.totemic:buffalo.name=Büffel
@@ -195,6 +196,7 @@ totemicmisc.clickToIndex=Umschalt+Klick zum Inhaltsverzeichnis
 totemicmisc.clickToRecipe=Umschalt+Klick zum Rezept
 totemicmisc.shapeless=Formlos
 totemicmisc.oredict=Ore Dictionary
+totemicmisc.craftingContainer=Gibt den Behälter zurück
 totemic.gui.lexicon.recipeNotAvailable=(Handwerksrezept siehe Rezeptbuch)
 totemic.gui.lexicon.wip=In Arbeit
 

diff --git a/src/main/resources/assets/totemic/lang/en_us.lang b/src/main/resources/assets/totemic/lang/en_us.lang
@@ -93,6 +93,7 @@ tile.totemic:wooden_pillar_base.stripped_jungle.name=Stripped Jungle Wood Pillar
 tile.totemic:wooden_pillar_base.stripped_acacia.name=Stripped Acacia Wood Pillar Base
 tile.totemic:wooden_pillar_base.stripped_dark_oak.name=Stripped Dark Oak Wood Pillar Base
 tile.totemic:wooden_pillar_base.stripped_cedar.name=Stripped Red Cedar Pillar Base
+tile.totemic:wooden_pillar.tooltip=Decorative only
 
 #Entity localizations
 entity.totemic:buffalo.name=Buffalo
@@ -201,6 +202,7 @@ totemicmisc.clickToIndex=Shift+Click to return to index
 totemicmisc.clickToRecipe=Shift+Click to see recipe
 totemicmisc.shapeless=Shapeless
 totemicmisc.oredict=Ore Dictionary
+totemicmisc.craftingContainer=Returns the container
 totemic.gui.lexicon.recipeNotAvailable=(Check recipe book for crafting recipe)
 totemic.gui.lexicon.wip=Work In Progress