diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 90757153c..3c897d55e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -16,6 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; @@ -28,6 +29,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemManaCookie extends ItemFood { + private IIcon totalBiscuitIcon; + public ItemManaCookie() { super(0, 0.1F, false); setPotionEffect(Potion.field_76443_y.id, 1, 0, 1F); @@ -51,11 +54,22 @@ public class ItemManaCookie extends ItemFood { public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } + + @Override + public IIcon getIcon(ItemStack stack, int pass) { + return getIconIndex(stack); + } + @Override + public IIcon getIconIndex(ItemStack stack) { + return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack); + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { itemIcon = IconHelper.forItem(par1IconRegister, this); + totalBiscuitIcon = IconHelper.forName(par1IconRegister, "totalBiscuit"); } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 14e61c1bb..0903401f5 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -429,7 +429,7 @@ achievement.botania:sparkCraft.desc=Make a Spark to help transfer Mana around achievement.botania:baubleWear=Inner Arts achievement.botania:baubleWear.desc=Craft any variety of Bauble and wear it achievement.botania:manaCookieEat=Rotten Heresy and Chocolate -achievement.botania:manaCookieEat.desc=Infuse and eat a delicious Mana Cookie +achievement.botania:manaCookieEat.desc=Infuse and eat a delicious Biscuit of Totality achievement.botania:runePickup=Lilium Doll achievement.botania:runePickup.desc=Use a Runic Altar to create a Rune achievement.botania:manaBlasterShoot=M'aider Stranded Girl @@ -1374,7 +1374,7 @@ item.botania:signalFlare.name=Signal Flare item.botania:manaTablet.name=Mana Tablet item.botania:manaGun.name=Mana Blaster item.botania:compositeLens.name=Composite Mana Lens: %s %s -item.botania:manaCookie.name=Mana Cookie +item.botania:manaCookie.name=Biscuit of Totality item.botania:fertilizer.name=Floral Fertilizer item.botania:grassSeeds0.name=Pasture Seeds item.botania:grassSeeds1.name=Boreal Seeds @@ -2065,7 +2065,7 @@ botania.page.pool6=Infusing &1Mana Petals&0 botania.page.pool11=Infusing &1Managlass&0, clear seamless glass. botania.page.pool12=Infusing &1String&0 botania.page.pool13=Used &1Mana Infused String&0 to make &1Cobwebs&0 -botania.page.pool7=Infusing &1Mana Cookies&0, pretty good food. +botania.page.pool7=A total space biscuit # -- SPARKS botania.entry.sparks=Sparks diff --git a/src/main/resources/assets/botania/textures/items/totalBiscuit.png b/src/main/resources/assets/botania/textures/items/totalBiscuit.png new file mode 100644 index 000000000..787c8c690 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/totalBiscuit.png differ