HomeStorageTracker.lua

local addonName = "HomeStorageTracker"
local addon = {}
addon.name = addonName
local addonVersion = "13.3"
addon.version = addonVersion

-- Default storage capacities (fallback values)
local DEFAULT_HOME_STORAGE_SLOTS = 360
local DEFAULT_BANK_SLOTS = 240
local DEFAULT_BACKPACK_SLOTS = 60
local DEFAULT_FURNITURE_VAULT_SLOTS = 600

-- Forward declarations for functions used in slash commands
local ToggleGoldDisplay, ToggleFurnitureVaultDisplay

-- Dynamic storage capacity calculation
local function GetHomeStorageMax()
    local totalSlots = 0
    for i = BAG_HOUSE_BANK_ONE, BAG_HOUSE_BANK_TEN do
        local bagSize = GetBagSize(i)
        if bagSize and bagSize > 0 then
            totalSlots = totalSlots + bagSize
        end
    end
    return totalSlots > 0 and totalSlots or DEFAULT_HOME_STORAGE_SLOTS
end

local function GetBankStorageMax()
    local bankSize = GetBagSize(BAG_BANK)
    return (bankSize and bankSize > 0) and bankSize or DEFAULT_BANK_SLOTS
end

local function GetBackpackStorageMax()
    local backpackSize = GetBagSize(BAG_BACKPACK)
    return (backpackSize and backpackSize > 0) and backpackSize or DEFAULT_BACKPACK_SLOTS
end

-- UPDATED: Correct API function for furniture vault
local function GetFurnitureVaultMax()
    -- Use the correct API function for furniture vault
    if GetHousingFurnitureVaultInfo then
        local _, vaultMax = GetHousingFurnitureVaultInfo()
        return (vaultMax and vaultMax > 0) and vaultMax or DEFAULT_FURNITURE_VAULT_SLOTS
    end
    return DEFAULT_FURNITURE_VAULT_SLOTS
end

-- NEW: Check vault availability
local function IsFurnitureVaultAvailable()
    if IsHousingFurnitureVaultAvailable then
        return IsHousingFurnitureVaultAvailable()
    end
    return false
end

-- SavedVariables setup
local savedVarsName = addonName.."SavedVars"
local defaultSavedVars = {
    accountWide = {
        lastHomeUsed = 0,
        lastBankUsed = 0,
        lastBankMax = DEFAULT_BANK_SLOTS,
        lastBackpackUsed = 0,
        lastBackpackMax = DEFAULT_BACKPACK_SLOTS,
        lastCharacterGold = 0,
        lastBankGold = 0,
        lastFurnitureVaultUsed = 0,
        lastFurnitureVaultMax = DEFAULT_FURNITURE_VAULT_SLOTS,
        lastUpdate = 0
    },
    perCharacter = {
        posX = nil,
        posY = nil,
        isVisible = true,
        showBank = true,
        showBackpack = true,
        showGold = true, -- New option for gold tracking
        showFurnitureVault = true, -- New option for furniture vault tracking
        lockWindow = false,
        horizontalLayout = true -- New option for layout
    }
}

-- Get character-specific settings
local function GetCharacterSettings()
    local charKey = GetUnitName("player").."@"..GetWorldName()
    if not addon.savedVars.perCharacter[charKey] then
        addon.savedVars.perCharacter[charKey] = ZO_DeepTableCopy(defaultSavedVars.perCharacter)
    end
    return addon.savedVars.perCharacter[charKey]
end

-- Create or update UI elements
local function CreateUI()
    local charSettings = GetCharacterSettings()
    
    -- Create main window if it doesn't exist
    if not addon.window then
        addon.window = WINDOW_MANAGER:CreateTopLevelWindow(addonName.."Window")
        addon.window:SetMouseEnabled(not charSettings.lockWindow)
        addon.window:SetMovable(not charSettings.lockWindow)
        addon.window:SetClampedToScreen(true)
        addon.window:SetDrawLayer(DL_OVERLAY)
        
        -- Background
        addon.backdrop = WINDOW_MANAGER:CreateControl(addonName.."Backdrop", addon.window, CT_BACKDROP)
        addon.backdrop:SetAnchorFill()
        addon.backdrop:SetCenterColor(0.1, 0.1, 0.1, 0.8)
        addon.backdrop:SetEdgeColor(0.4, 0.4, 0.4, 0.5)
        
        -- Set initial position
        if charSettings.posX and charSettings.posY then
            addon.window:SetAnchor(TOPLEFT, GuiRoot, TOPLEFT, charSettings.posX, charSettings.posY)
        else
            addon.window:SetAnchor(CENTER, GuiRoot, CENTER, 0, 0)
        end
        
        -- Save position when moved
        addon.window:SetHandler("OnMoveStop", function(self)
            if not charSettings.lockWindow then
                charSettings.posX = self:GetLeft()
                charSettings.posY = self:GetTop()
            end
        end)
    end
    
    -- Hide existing controls
    if addon.homeIcon then addon.homeIcon:SetHidden(true) end
    if addon.homeText then addon.homeText:SetHidden(true) end
    if addon.bankIcon then addon.bankIcon:SetHidden(true) end
    if addon.bankText then addon.bankText:SetHidden(true) end
    if addon.backpackIcon then addon.backpackIcon:SetHidden(true) end
    if addon.backpackText then addon.backpackText:SetHidden(true) end
    if addon.goldIcon then addon.goldIcon:SetHidden(true) end
    if addon.goldText then addon.goldText:SetHidden(true) end
    if addon.bankGoldIcon then addon.bankGoldIcon:SetHidden(true) end
    if addon.bankGoldText then addon.bankGoldText:SetHidden(true) end
    if addon.vaultIcon then addon.vaultIcon:SetHidden(true) end
    if addon.vaultText then addon.vaultText:SetHidden(true) end
    
    -- Calculate window dimensions based on layout
    local visibleElements = 1 -- Always show home
    if charSettings.showFurnitureVault then visibleElements = visibleElements + 1 end
    if charSettings.showBank then visibleElements = visibleElements + 1 end
    if charSettings.showBackpack then visibleElements = visibleElements + 1 end
    if charSettings.showGold then visibleElements = visibleElements + 2 end -- Bank gold + Player gold
    
    local windowWidth, windowHeight
    if charSettings.horizontalLayout then
        -- Horizontal bar layout
        windowWidth = visibleElements * 120 + (visibleElements - 1) * 10 + 10 -- Each element is ~120px wide
        windowHeight = 42 -- Single row height
    else
        -- Vertical layout (original)
        windowWidth = 180
        windowHeight = visibleElements * 32 + (visibleElements - 1) * 5 + 10
    end
    
    addon.window:SetDimensions(windowWidth, windowHeight)
    
    -- Create controls based on layout
    local previousControl = nil
    
    -- ORDER: 1. House (always visible)
    if not addon.homeIcon then
        addon.homeIcon = WINDOW_MANAGER:CreateControl(addonName.."HomeIcon", addon.window, CT_TEXTURE)
        addon.homeIcon:SetDimensions(32, 30)
        addon.homeIcon:SetTexture("HomeStorageTracker/house.dds")
    end
    
    if not addon.homeText then
        addon.homeText = WINDOW_MANAGER:CreateControl(addonName.."HomeText", addon.window, CT_LABEL)
        addon.homeText:SetFont("ZoFontGame")
        addon.homeText:SetColor(1, 1, 1, 1)
        addon.homeText:SetHorizontalAlignment(TEXT_ALIGN_LEFT)
        addon.homeText:SetVerticalAlignment(TEXT_ALIGN_CENTER)
    end
    
    addon.homeIcon:ClearAnchors()
    addon.homeText:ClearAnchors()
    
    if charSettings.horizontalLayout then
        addon.homeIcon:SetAnchor(TOPLEFT, addon.window, TOPLEFT, 5, 6)
        addon.homeText:SetDimensions(80, 30)
        addon.homeText:SetAnchor(LEFT, addon.homeIcon, RIGHT, 3, 0)
    else
        addon.homeIcon:SetAnchor(TOPLEFT, addon.window, TOPLEFT, 5, 5)
        addon.homeText:SetDimensions(120, 30)
        addon.homeText:SetAnchor(LEFT, addon.homeIcon, RIGHT, 8, 0)
    end
    
    addon.homeIcon:SetHidden(false)
    addon.homeText:SetText("Loading...")
    addon.homeText:SetHidden(false)
    previousControl = charSettings.horizontalLayout and addon.homeText or addon.homeIcon

    -- ORDER: 2. Vault
    if charSettings.showFurnitureVault then
        if not addon.vaultIcon then
            addon.vaultIcon = WINDOW_MANAGER:CreateControl(addonName.."VaultIcon", addon.window, CT_TEXTURE)
            addon.vaultIcon:SetDimensions(32, 32)
            addon.vaultIcon:SetTexture("HomeStorageTracker/vault.dds")
        end
        
        if not addon.vaultText then
            addon.vaultText = WINDOW_MANAGER:CreateControl(addonName.."VaultText", addon.window, CT_LABEL)
            addon.vaultText:SetFont("ZoFontGame")
            addon.vaultText:SetColor(1, 1, 1, 1)
            addon.vaultText:SetHorizontalAlignment(TEXT_ALIGN_LEFT)
            addon.vaultText:SetVerticalAlignment(TEXT_ALIGN_CENTER)
        end
        
        addon.vaultIcon:ClearAnchors()
        addon.vaultText:ClearAnchors()
        
        if charSettings.horizontalLayout then
            addon.vaultIcon:SetAnchor(LEFT, previousControl, RIGHT, 10, 0)
            addon.vaultText:SetDimensions(80, 30)
            addon.vaultText:SetAnchor(LEFT, addon.vaultIcon, RIGHT, 3, 0)
        else
            addon.vaultIcon:SetAnchor(TOPLEFT, previousControl, BOTTOMLEFT, 0, 5)
            addon.vaultText:SetDimensions(120, 30)
            addon.vaultText:SetAnchor(LEFT, addon.vaultIcon, RIGHT, 8, 0)
        end
        
        addon.vaultIcon:SetHidden(false)
        addon.vaultText:SetText("Loading...")
        addon.vaultText:SetHidden(false)
        previousControl = charSettings.horizontalLayout and addon.vaultText or addon.vaultIcon
    else
        if addon.vaultIcon then addon.vaultIcon:SetHidden(true) end
        if addon.vaultText then addon.vaultText:SetHidden(true) end
    end

    -- ORDER: 3. Bank
    if charSettings.showBank then
        if not addon.bankIcon then
            addon.bankIcon = WINDOW_MANAGER:CreateControl(addonName.."BankIcon", addon.window, CT_TEXTURE)
            addon.bankIcon:SetDimensions(32, 30)
            addon.bankIcon:SetTexture("HomeStorageTracker/bank.dds")
        end
        
        if not addon.bankText then
            addon.bankText = WINDOW_MANAGER:CreateControl(addonName.."BankText", addon.window, CT_LABEL)
            addon.bankText:SetFont("ZoFontGame")
            addon.bankText:SetColor(1, 1, 1, 1)
            addon.bankText:SetHorizontalAlignment(TEXT_ALIGN_LEFT)
            addon.bankText:SetVerticalAlignment(TEXT_ALIGN_CENTER)
        end
        
        addon.bankIcon:ClearAnchors()
        addon.bankText:ClearAnchors()
        
        if charSettings.horizontalLayout then
            addon.bankIcon:SetAnchor(LEFT, previousControl, RIGHT, 10, 0)
            addon.bankText:SetDimensions(80, 30)
            addon.bankText:SetAnchor(LEFT, addon.bankIcon, RIGHT, 3, 0)
        else
            addon.bankIcon:SetAnchor(TOPLEFT, previousControl, BOTTOMLEFT, 0, 5)
            addon.bankText:SetDimensions(120, 30)
            addon.bankText:SetAnchor(LEFT, addon.bankIcon, RIGHT, 8, 0)
        end
        
        addon.bankIcon:SetHidden(false)
        addon.bankText:SetText("Loading...")
        addon.bankText:SetHidden(false)
        previousControl = charSettings.horizontalLayout and addon.bankText or addon.bankIcon
    else
        if addon.bankIcon then addon.bankIcon:SetHidden(true) end
        if addon.bankText then addon.bankText:SetHidden(true) end
    end

    -- ORDER: 4. Backpack
    if charSettings.showBackpack then
        if not addon.backpackIcon then
            addon.backpackIcon = WINDOW_MANAGER:CreateControl(addonName.."BackpackIcon", addon.window, CT_TEXTURE)
            addon.backpackIcon:SetDimensions(32, 30)
            addon.backpackIcon:SetTexture("HomeStorageTracker/bag.dds")
        end
        
        if not addon.backpackText then
            addon.backpackText = WINDOW_MANAGER:CreateControl(addonName.."BackpackText", addon.window, CT_LABEL)
            addon.backpackText:SetFont("ZoFontGame")
            addon.backpackText:SetColor(1, 1, 1, 1)
            addon.backpackText:SetHorizontalAlignment(TEXT_ALIGN_LEFT)
            addon.backpackText:SetVerticalAlignment(TEXT_ALIGN_CENTER)
        end
        
        addon.backpackIcon:ClearAnchors()
        addon.backpackText:ClearAnchors()
        
        if charSettings.horizontalLayout then
            addon.backpackIcon:SetAnchor(LEFT, previousControl, RIGHT, 10, 0)
            addon.backpackText:SetDimensions(80, 30)
            addon.backpackText:SetAnchor(LEFT, addon.backpackIcon, RIGHT, 3, 0)
        else
            addon.backpackIcon:SetAnchor(TOPLEFT, previousControl, BOTTOMLEFT, 0, 5)
            addon.backpackText:SetDimensions(120, 30)
            addon.backpackText:SetAnchor(LEFT, addon.backpackIcon, RIGHT, 8, 0)
        end
        
        addon.backpackIcon:SetHidden(false)
        addon.backpackText:SetText("Loading...")
        addon.backpackText:SetHidden(false)
        previousControl = charSettings.horizontalLayout and addon.backpackText or addon.backpackIcon
    else
        if addon.backpackIcon then addon.backpackIcon:SetHidden(true) end
        if addon.backpackText then addon.backpackText:SetHidden(true) end
    end

    -- ORDER: 5. Bank Gold, 6. Player Gold
    if charSettings.showGold then
        -- Bank Gold FIRST
        if not addon.bankGoldIcon then
            addon.bankGoldIcon = WINDOW_MANAGER:CreateControl(addonName.."BankGoldIcon", addon.window, CT_TEXTURE)
            addon.bankGoldIcon:SetDimensions(32, 32)
            addon.bankGoldIcon:SetTexture("HomeStorageTracker/bcoins.dds")
        end
        
        if not addon.bankGoldText then
            addon.bankGoldText = WINDOW_MANAGER:CreateControl(addonName.."BankGoldText", addon.window, CT_LABEL)
            addon.bankGoldText:SetFont("ZoFontGame")
            addon.bankGoldText:SetColor(1, 1, 1, 1)
            addon.bankGoldText:SetHorizontalAlignment(TEXT_ALIGN_LEFT)
            addon.bankGoldText:SetVerticalAlignment(TEXT_ALIGN_CENTER)
        end
        
        addon.bankGoldIcon:ClearAnchors()
        addon.bankGoldText:ClearAnchors()
        
        if charSettings.horizontalLayout then
            addon.bankGoldIcon:SetAnchor(LEFT, previousControl, RIGHT, 10, 0)
            addon.bankGoldText:SetDimensions(80, 30)
            addon.bankGoldText:SetAnchor(LEFT, addon.bankGoldIcon, RIGHT, 3, 0)
        else
            addon.bankGoldIcon:SetAnchor(TOPLEFT, previousControl, BOTTOMLEFT, 0, 5)
            addon.bankGoldText:SetDimensions(120, 30)
            addon.bankGoldText:SetAnchor(LEFT, addon.bankGoldIcon, RIGHT, 8, 0)
        end
        
        addon.bankGoldIcon:SetHidden(false)
        addon.bankGoldText:SetText("Loading...")
        addon.bankGoldText:SetHidden(false)
        previousControl = charSettings.horizontalLayout and addon.bankGoldText or addon.bankGoldIcon

        -- Player Gold SECOND
        if not addon.goldIcon then
            addon.goldIcon = WINDOW_MANAGER:CreateControl(addonName.."GoldIcon", addon.window, CT_TEXTURE)
            addon.goldIcon:SetDimensions(32, 32)
            addon.goldIcon:SetTexture("HomeStorageTracker/pcoins.dds")
        end
        
        if not addon.goldText then
            addon.goldText = WINDOW_MANAGER:CreateControl(addonName.."GoldText", addon.window, CT_LABEL)
            addon.goldText:SetFont("ZoFontGame")
            addon.goldText:SetColor(1, 1, 1, 1)
            addon.goldText:SetHorizontalAlignment(TEXT_ALIGN_LEFT)
            addon.goldText:SetVerticalAlignment(TEXT_ALIGN_CENTER)
        end
        
        addon.goldIcon:ClearAnchors()
        addon.goldText:ClearAnchors()
        
        if charSettings.horizontalLayout then
            addon.goldIcon:SetAnchor(LEFT, previousControl, RIGHT, 10, 0)
            addon.goldText:SetDimensions(80, 30)
            addon.goldText:SetAnchor(LEFT, addon.goldIcon, RIGHT, 3, 0)
        else
            addon.goldIcon:SetAnchor(TOPLEFT, previousControl, BOTTOMLEFT, 0, 5)
            addon.goldText:SetDimensions(120, 30)
            addon.goldText:SetAnchor(LEFT, addon.goldIcon, RIGHT, 8, 0)
        end
        
        addon.goldIcon:SetHidden(false)
        addon.goldText:SetText("Loading...")
        addon.goldText:SetHidden(false)
        previousControl = charSettings.horizontalLayout and addon.goldText or addon.goldIcon
    else
        if addon.goldIcon then addon.goldIcon:SetHidden(true) end
        if addon.goldText then addon.goldText:SetHidden(true) end
        if addon.bankGoldIcon then addon.bankGoldIcon:SetHidden(true) end
        if addon.bankGoldText then addon.bankGoldText:SetHidden(true) end
    end

    -- Update visibility
    addon.window:SetHidden(not charSettings.isVisible)
    
    UpdateDisplay()
end

-- Update storage display
function UpdateDisplay()
    if not addon.window or not addon.homeText then return end
    
    local charSettings = GetCharacterSettings()
    local anyCurrent = false
    
    -- Home storage
    local homeUsed = 0
    local homeMax = GetHomeStorageMax()
    for i = BAG_HOUSE_BANK_ONE, BAG_HOUSE_BANK_TEN do
        local bagUsed = GetNumBagUsedSlots(i)
        if bagUsed and bagUsed > 0 then
            homeUsed = homeUsed + bagUsed
        end
    end
    if homeUsed > 0 then
        addon.savedVars.accountWide.lastHomeUsed = homeUsed
        anyCurrent = true
    else
        homeUsed = addon.savedVars.accountWide.lastHomeUsed or 0
    end
    
    local homePercent = math.floor((homeUsed/homeMax)*100 + 0.5)
    local homeColor = homePercent >= 90 and "|cFF0000" or homePercent >= 70 and "|cFFFF00" or "|c00FF00"
    
    -- Format text based on layout
    if charSettings.horizontalLayout then
        addon.homeText:SetText(string.format("%s%d|r/%d", homeColor, homeUsed, homeMax))
    else
        addon.homeText:SetText(string.format("%s%d|r/|cFFFFFF%d|r (%d%%)", homeColor, homeUsed, homeMax, homePercent))
    end

    -- Bank storage
    if charSettings.showBank and addon.bankText and not addon.bankText:IsHidden() then
        local bankUsed, bankMax = 0, 0
        local bankCurrent = false
        
        if IsBankOpen() then
            bankUsed = GetNumBagUsedSlots(BAG_BANK) or 0
            bankMax = GetBankStorageMax()
            bankCurrent = true
        end
        
        if bankCurrent then
            addon.savedVars.accountWide.lastBankUsed = bankUsed
            addon.savedVars.accountWide.lastBankMax = bankMax
            anyCurrent = true
        else
            bankUsed = addon.savedVars.accountWide.lastBankUsed or 0
            bankMax = addon.savedVars.accountWide.lastBankMax or GetBankStorageMax()
        end
        
        local bankPercent = math.floor((bankUsed/bankMax)*100 + 0.5)
        local bankColor = bankPercent >= 90 and "|cFF0000" or bankPercent >= 70 and "|cFFFF00" or "|c00FF00"
        
        if charSettings.horizontalLayout then
            addon.bankText:SetText(string.format("%s%d|r/%d", bankColor, bankUsed, bankMax))
        else
            addon.bankText:SetText(string.format("%s%d|r/|cFFFFFF%d|r (%d%%)", bankColor, bankUsed, bankMax, bankPercent))
        end
    end

    -- Backpack storage
    if charSettings.showBackpack and addon.backpackText and not addon.backpackText:IsHidden() then
        local backpackUsed = GetNumBagUsedSlots(BAG_BACKPACK) or 0
        local backpackMax = GetBackpackStorageMax()
        addon.savedVars.accountWide.lastBackpackUsed = backpackUsed
        addon.savedVars.accountWide.lastBackpackMax = backpackMax
        anyCurrent = true
        
        local backpackPercent = math.floor((backpackUsed/backpackMax)*100 + 0.5)
        local backpackColor = backpackPercent >= 90 and "|cFF0000" or backpackPercent >= 70 and "|cFFFF00" or "|c00FF00"
        
        if charSettings.horizontalLayout then
            addon.backpackText:SetText(string.format("%s%d|r/%d", backpackColor, backpackUsed, backpackMax))
        else
            addon.backpackText:SetText(string.format("%s%d|r/|cFFFFFF%d|r (%d%%)", backpackColor, backpackUsed, backpackMax, backpackPercent))
        end
    end

    if anyCurrent then
        addon.savedVars.accountWide.lastUpdate = GetTimeStamp()
    end

    -- Gold tracking
    if charSettings.showGold and addon.goldText and not addon.goldText:IsHidden() then
        local characterGold = GetCurrentMoney()
        local bankGold = 0
        
        if IsBankOpen() then
            bankGold = GetBankedMoney()
            addon.savedVars.accountWide.lastBankGold = bankGold
        else
            bankGold = addon.savedVars.accountWide.lastBankGold or 0
        end
        
        addon.savedVars.accountWide.lastCharacterGold = characterGold
        
        -- Format gold amounts with commas for readability
        local function FormatGold(amount)
            local formatted = tostring(amount)
            local k = 1
            while k < string.len(formatted) do
                if (string.len(formatted) - k + 1) % 3 == 0 and k ~= 1 then
                    formatted = string.sub(formatted, 1, k - 1) .. "," .. string.sub(formatted, k)
                    k = k + 1
                end
                k = k + 1
            end
            return formatted
        end
        
        if charSettings.horizontalLayout then
            addon.goldText:SetText("|cFFD700"..FormatGold(characterGold).."|r")
            if addon.bankGoldText then
                addon.bankGoldText:SetText("|cFFD700"..FormatGold(bankGold).."|r")
            end
        else
            addon.goldText:SetText("|cFFD700"..FormatGold(characterGold).."|r")
            if addon.bankGoldText then
                addon.bankGoldText:SetText("|cFFD700"..FormatGold(bankGold).."|r")
            end
        end
    end

    -- UPDATED: Furniture Vault tracking with correct API
    if charSettings.showFurnitureVault and addon.vaultText and not addon.vaultText:IsHidden() then
        local vaultUsed = 0
        local vaultMax = DEFAULT_FURNITURE_VAULT_SLOTS
        
        -- Check if vault is available (ESO Plus required)
        if IsFurnitureVaultAvailable() then
            -- Use the correct API function for furniture vault info
            if GetHousingFurnitureVaultInfo then
                vaultUsed, vaultMax = GetHousingFurnitureVaultInfo()
                vaultUsed = vaultUsed or 0
                vaultMax = vaultMax or DEFAULT_FURNITURE_VAULT_SLOTS
            end
            
            addon.savedVars.accountWide.lastFurnitureVaultUsed = vaultUsed
            addon.savedVars.accountWide.lastFurnitureVaultMax = vaultMax
        else
            -- Use saved values if vault is not available
            vaultUsed = addon.savedVars.accountWide.lastFurnitureVaultUsed or 0
            vaultMax = addon.savedVars.accountWide.lastFurnitureVaultMax or DEFAULT_FURNITURE_VAULT_SLOTS
        end
        
        local vaultPercent = math.floor((vaultUsed/vaultMax)*100 + 0.5)
        local vaultColor = vaultPercent >= 90 and "|cFF0000" or vaultPercent >= 70 and "|cFFFF00" or "|c00FF00"
        
        if charSettings.horizontalLayout then
            addon.vaultText:SetText(string.format("%s%d|r/%d", vaultColor, vaultUsed, vaultMax))
        else
            addon.vaultText:SetText(string.format("%s%d|r/|cFFFFFF%d|r (%d%%)", vaultColor, vaultUsed, vaultMax, vaultPercent))
        end
    end
end

-- Toggle functions (now defined after the functions they depend on)
ToggleGoldDisplay = function()
    local charSettings = GetCharacterSettings()
    charSettings.showGold = not charSettings.showGold
    CreateUI()
    d("Gold display "..(charSettings.showGold and "shown" or "hidden"))
end

ToggleFurnitureVaultDisplay = function()
    local charSettings = GetCharacterSettings()
    charSettings.showFurnitureVault = not charSettings.showFurnitureVault
    CreateUI()
    d("Furniture Vault display "..(charSettings.showFurnitureVault and "shown" or "hidden"))
end

-- Other toggle functions
local function ToggleVisibility()
    local charSettings = GetCharacterSettings()
    charSettings.isVisible = not charSettings.isVisible
    if addon.window then
        addon.window:SetHidden(not charSettings.isVisible)
    else
        CreateUI()
    end
    d(addonName.." "..(charSettings.isVisible and "shown" or "hidden"))
end

local function ToggleBankDisplay()
    local charSettings = GetCharacterSettings()
    charSettings.showBank = not charSettings.showBank
    CreateUI()
    d("Bank display "..(charSettings.showBank and "shown" or "hidden"))
end

local function ToggleBackpackDisplay()
    local charSettings = GetCharacterSettings()
    charSettings.showBackpack = not charSettings.showBackpack
    CreateUI()
    d("Backpack display "..(charSettings.showBackpack and "shown" or "hidden"))
end

local function ToggleWindowLock()
    local charSettings = GetCharacterSettings()
    charSettings.lockWindow = not charSettings.lockWindow
    if addon.window then
        addon.window:SetMouseEnabled(not charSettings.lockWindow)
        addon.window:SetMovable(not charSettings.lockWindow)
    end
    d("Window position "..(charSettings.lockWindow and "locked" or "unlocked"))
end

local function ToggleLayout()
    local charSettings = GetCharacterSettings()
    charSettings.horizontalLayout = not charSettings.horizontalLayout
    CreateUI()
    d("Layout switched to "..(charSettings.horizontalLayout and "horizontal bar" or "vertical list"))
end

local function ResetPosition()
    local charSettings = GetCharacterSettings()
    charSettings.posX = nil
    charSettings.posY = nil
    if addon.window then
        addon.window:ClearAnchors()
        addon.window:SetAnchor(CENTER, GuiRoot, CENTER, 0, 0)
    end
    d("Position reset to center")
end

local function ShowHelp()
    d("HomeStorageTracker v"..addonVersion.." Commands:")
    d("/hst - Update display")
    d("/hst toggle - Show/hide window")
    d("/hst bank - Toggle bank display")
    d("/hst backpack (or bp) - Toggle backpack display")
    d("/hst gold - Toggle gold display")
    d("/hst vault - Toggle furniture vault display")
    d("/hst layout - Toggle horizontal/vertical layout")
    d("/hst lock - Lock/unlock window position")
    d("/hst reset - Reset window position")
    d("/hst debug - Show debug information")
    d("/hst help - Show this help")
end

-- Slash command handler
local function HandleSlashCommand(args)
    args = args and string.lower(string.match(args, "^%s*(.-)%s*$")) or ""
    
    if args == "toggle" then
        ToggleVisibility()
    elseif args == "bank" then
        ToggleBankDisplay()
    elseif args == "backpack" or args == "bp" then
        ToggleBackpackDisplay()
    elseif args == "gold" then
        ToggleGoldDisplay()
    elseif args == "vault" then
        ToggleFurnitureVaultDisplay()
    elseif args == "layout" then
        ToggleLayout()
    elseif args == "lock" then
        ToggleWindowLock()
    elseif args == "reset" then
        ResetPosition()
    elseif args == "help" then
        ShowHelp()
    elseif args == "debug" then
        d(string.format("Debug Info (v%s):", addonVersion))
        d(string.format("Home: %d/%d", addon.savedVars.accountWide.lastHomeUsed or 0, GetHomeStorageMax()))
        d(string.format("Bank: %d/%d", addon.savedVars.accountWide.lastBankUsed or 0, addon.savedVars.accountWide.lastBankMax or GetBankStorageMax()))
        d(string.format("Backpack: %d/%d", addon.savedVars.accountWide.lastBackpackUsed or 0, addon.savedVars.accountWide.lastBackpackMax or GetBackpackStorageMax()))
        d(string.format("Character Gold: %d", addon.savedVars.accountWide.lastCharacterGold or 0))
        d(string.format("Bank Gold: %d", addon.savedVars.accountWide.lastBankGold or 0))
        d(string.format("Furniture Vault: %d/%d", addon.savedVars.accountWide.lastFurnitureVaultUsed or 0, addon.savedVars.accountWide.lastFurnitureVaultMax or GetFurnitureVaultMax()))
        d(string.format("Vault Available: %s", IsFurnitureVaultAvailable() and "Yes" or "No"))
        local lastUpdate = addon.savedVars.accountWide.lastUpdate or 0
        if lastUpdate > 0 then
            d(string.format("Last update: %s", os.date("%c", lastUpdate)))
        else
            d("Last update: Never")
        end
        local charSettings = GetCharacterSettings()
        d(string.format("Settings: Bank=%s, Backpack=%s, Gold=%s, Vault=%s, Visible=%s, Locked=%s, Layout=%s", 
            tostring(charSettings.showBank), 
            tostring(charSettings.showBackpack), 
            tostring(charSettings.showGold),
            tostring(charSettings.showFurnitureVault),
            tostring(charSettings.isVisible), 
            tostring(charSettings.lockWindow),
            charSettings.horizontalLayout and "Horizontal" or "Vertical"))
    else
        -- Default action when no argument or unrecognized argument
        if args ~= "" then
            d("Unknown command: "..args..". Use '/hst help' for available commands.")
        end
        UpdateDisplay()
        d("Storage updated")
    end
end

-- Initialize addon with error handling
local function Initialize(event, name)
    if name ~= addonName then return end
    EVENT_MANAGER:UnregisterForEvent(addonName, EVENT_ADD_ON_LOADED)

    -- Wrap initialization in pcall for error handling
    local success, errorMsg = pcall(function()
        -- Initialize SavedVariables
        addon.savedVars = ZO_SavedVars:NewAccountWide(savedVarsName, 1, nil, defaultSavedVars)
        
        -- Ensure the saved vars structure is correct
        if not addon.savedVars.accountWide then
            addon.savedVars.accountWide = ZO_DeepTableCopy(defaultSavedVars.accountWide)
        end
        if not addon.savedVars.perCharacter then
            addon.savedVars.perCharacter = {}
        end
        
        -- Register slash command
        SLASH_COMMANDS["/hst"] = HandleSlashCommand

        -- Register events with error handling
        EVENT_MANAGER:RegisterForEvent(addonName, EVENT_INVENTORY_SINGLE_SLOT_UPDATE, function(_, bagId)
            pcall(function()
                if (bagId >= BAG_HOUSE_BANK_ONE and bagId <= BAG_HOUSE_BANK_TEN) or 
                   (bagId == BAG_BANK) or 
                   (bagId == BAG_BACKPACK) then
                    zo_callLater(UpdateDisplay, 100)
                end
            end)
        end)

        EVENT_MANAGER:RegisterForEvent(addonName, EVENT_OPEN_BANK, function()
            pcall(UpdateDisplay)
        end)
        
        EVENT_MANAGER:RegisterForEvent(addonName, EVENT_CLOSE_BANK, function()
            pcall(UpdateDisplay)
        end)
        
        -- Register money change events
        EVENT_MANAGER:RegisterForEvent(addonName, EVENT_MONEY_UPDATE, function()
            pcall(UpdateDisplay)
        end)
        
        EVENT_MANAGER:RegisterForEvent(addonName, EVENT_BANKED_MONEY_UPDATE, function()
            pcall(UpdateDisplay)
        end)
        
        -- NEW: Register for housing editor events (vault is accessed through housing)
        EVENT_MANAGER:RegisterForEvent(addonName, EVENT_HOUSING_EDITOR_MODE_CHANGED, function(_, oldMode, newMode)
            if newMode then
                zo_callLater(UpdateDisplay, 500)
            end
        end)
        
        -- NEW: Register for collectible updates (vault is a collectible)
        EVENT_MANAGER:RegisterForEvent(addonName, EVENT_COLLECTIBLE_USE_RESULT, function(_, result, collectibleId)
            zo_callLater(UpdateDisplay, 500)
        end)

        -- Create UI and do initial update with delay
        zo_callLater(function()
            pcall(function()
                CreateUI()
                UpdateDisplay()
            end)
        end, 1000)
        
        d(addonName.." v"..addonVersion.." loaded. Type '/hst help' for commands.")
    end)
    
    if not success then
        d(addonName.." failed to initialize: "..tostring(errorMsg))
    end
end

EVENT_MANAGER:RegisterForEvent(addonName, EVENT_ADD_ON_LOADED, Initialize)