diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index e5ca7ae34..886da84b9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -99,9 +99,6 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @SideOnly(Side.CLIENT) public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { - BaubleType type = getBaubleType(par1ItemStack); - addStringToTooltip(I18n.format("botania.baubletype." + type.name().toLowerCase()), stacks); - String key = vazkii.botania.client.core.helper.RenderHelper.getKeyDisplayString("Baubles Inventory"); if(key != null) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 28a366aa5..3d5a581f0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -100,7 +100,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override public BaubleType getBaubleType(ItemStack arg0) { - return BaubleType.AMULET; + return BaubleType.TRINKET; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 9e594ff8a..e93fb2ea7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -87,7 +87,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @Override public BaubleType getBaubleType(ItemStack arg0) { - return BaubleType.AMULET; + return BaubleType.CHARM; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index d40545712..cd7aae0d4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -96,7 +96,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override public BaubleType getBaubleType(ItemStack arg0) { - return BaubleType.AMULET; + return BaubleType.HEAD; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index 40dad732a..a43edf251 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -59,7 +59,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { @Override public BaubleType getBaubleType(ItemStack itemstack) { - return BaubleType.AMULET; + return BaubleType.HEAD; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 0e06899e9..09e83b08b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -104,7 +104,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { @Override public BaubleType getBaubleType(ItemStack arg0) { - return BaubleType.BELT; + return BaubleType.BODY; } public static int getCooldown(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 6188fad3b..452d3a1fe 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -218,7 +218,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { @Override public BaubleType getBaubleType(ItemStack arg0) { - return BaubleType.AMULET; + return BaubleType.HEAD; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index 91eb0b39c..c19a5eee2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -45,7 +45,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm @Override public BaubleType getBaubleType(ItemStack arg0) { - return BaubleType.AMULET; + return BaubleType.CHARM; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 44962b8c2..22897f38d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -44,7 +44,7 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { @Override public BaubleType getBaubleType(ItemStack itemstack) { - return BaubleType.AMULET; + return BaubleType.CHARM; } @Override