Minimal TWW updates to not error immediately

Author: mbattersby

BankFrame.lua

@@ -16,12 +16,15 @@ LiteBagBankMixin = {}
 function LiteBagBankMixin:ShowPanel(n)
     LiteBagFrameMixin.ShowPanel(self, n)
 
-    -- The itembuttons use BankFrame.selectedTab to know where
-    -- to put something that's clicked.
+    -- The itembuttons use these to know where to put something that's clicked.
+    -- C_Container.UseContainerItem(
+    --      self:GetBagID(),
+    --      self:GetID(),
+    --      nil,
+    --      BankFrame:GetActiveBankType(),
+    --      BankFrame:IsShown() and BankFrame.selectedTab == 2
+    -- )
     BankFrame.selectedTab = n
-
-    -- The AutoSortButton uses activeTabIndex to know which tooltip to
-    -- show (and what to sort, but we override that).
     BankFrame.activeTabIndex = n
 end
 
@@ -41,6 +44,9 @@ function LiteBagBankMixin:OnLoad()
     -- Attach in the reagent bank wrapper.
     self:AddPanel(LiteBagReagentBank)
 
+    -- Attach in the account bank wrapper.
+    self:AddPanel(LiteBagAccountBank)
+
     -- Bank frame specific events
     self:RegisterEvent('PLAYER_INTERACTION_MANAGER_FRAME_SHOW')
     self:RegisterEvent('PLAYER_INTERACTION_MANAGER_FRAME_HIDE')
@@ -108,7 +114,7 @@ function LiteBagBankMixin:OnHide()
 
     -- Call this so the server knows we closed and it needs to send us a
     -- new open event if we interact with the NPC again.
-    CloseBankFrame()
+    C_Bank.CloseBankFrame()
 end
 
 function LiteBagBankMixin:ResizeToPanel()

ContainerPanel.lua

@@ -61,7 +61,7 @@ function LiteBagContainerPanelMixin:OnLoad()
         -- The Blizzard token tracker is hard coded to be a single tracker which is updated
         -- by direct call from the TokenFrame UI, Also the event handling for it is done
         -- in MainMenuBar. It's a mess.
-        hooksecurefunc('TokenFrame_Update',
+        hooksecurefunc(BackpackTokenFrame, 'Update',
             function ()
                 self.TokenTracker:Update()
             end)

Core.lua

@@ -282,6 +282,11 @@ function LB.Manager:OnEvent(event, ...)
     elseif event == 'PLAYER_LOGIN' then
         LB.InitializeOptions()
         LB.InitializeGUIOptions()
+        local tocVersion = select(4, GetBuildInfo())
+        if tocVersion < 110000 then
+            LB.Print('Error, TWW beta version installed onto live, aborting.')
+            return
+        end
         self:CallInitializeHooks()
         self:ReplaceBlizzard()
         self:ManageBlizzardBagButtons()

FilterDropDown.lua

@@ -108,7 +108,7 @@ do
         LibDD:UIDropDownMenu_AddButton(info, level)
 
         info = LibDD:UIDropDownMenu_CreateInfo()
-        local activeBagFilter = ContainerFrameSettingsManager:GetFilterFlag(bagID)
+        local activeBagFilter = ContainerFrameSettingsManager:GetFilterFlags(bagID)
 
         for i, flag in ContainerFrameUtil_EnumerateBagGearFilters() do
             info.text = BAG_FILTER_LABELS[flag]

Frame.xml

@@ -67,6 +67,12 @@
             </Scripts>
         </Button>
 
+        <Button name="$parentTab3" inherits="PanelTabButtonTemplate" id="3" hidden="true">
+            <Scripts>
+                <OnClick> self:GetParent():ShowPanel(self:GetID()) </OnClick>
+            </Scripts>
+        </Button>
+
         <Button name="$parentResizeBottomRight" parentKey="ResizeBottomRight" hidden="true">
             <Size x="16" y="16" />
             <Anchors>

LiteBag.toc

@@ -25,7 +25,7 @@ BagButton.xml
 ItemButton.xml
 FilterDropDown.xml
 ContainerPanel.xml
-ReagentBankPanel.xml
+WrappedBankPanel.xml
 Frame.xml
 BankFrame.xml
 BackpackFrame.xml

ReagentBankPanel.lua renamed to WrappedBankPanel.lua

@@ -1,6 +1,6 @@
 --[[----------------------------------------------------------------------------
 
-  LiteBag/ReagentBankFrame.lua
+  LiteBag/WrappedBankPanel.lua
 
   Copyright 2022 Mike Battersby
 
@@ -11,23 +11,25 @@
 
 local addonName, LB = ...
 
-LiteBagReagentBankMixin = {}
+LiteBagWrappedBankMixin = {}
 
-function LiteBagReagentBankMixin:OnLoad()
-    local data = BANK_PANELS[2]
+function LiteBagWrappedBankMixin:OnLoad()
+    local id = self:GetID()
+    local data = BANK_PANELS[id]
+    self.wrappedPanel = _G[data.name]
 
-    ReagentBankFrame:SetParent(self)
-    ReagentBankFrame:ClearAllPoints()
-    ReagentBankFrame:SetPoint("TOPLEFT")
+    self.wrappedPanel:SetParent(self)
+    self.wrappedPanel:ClearAllPoints()
+    self.wrappedPanel:SetPoint("TOPLEFT")
 
-    ReagentBankFrame:SetWidth(data.size.x)
-    ReagentBankFrame:SetHeight(data.size.y)
-    ReagentBankFrame:Hide()
+    self.wrappedPanel:SetWidth(data.size.x)
+    self.wrappedPanel:SetHeight(data.size.y)
+    self.wrappedPanel:Hide()
 
-    self:SetSize(ReagentBankFrame:GetSize())
+    self:SetSize(self.wrappedPanel:GetSize())
 end
 
-function LiteBagReagentBankMixin:OnShow()
+function LiteBagWrappedBankMixin:OnShow()
     LB.FrameDebug(self, "OnShow")
     BankItemAutoSortButton.anchorBag = self
     BankItemAutoSortButton:SetParent(self)
@@ -41,23 +43,23 @@ function LiteBagReagentBankMixin:OnShow()
     BankItemSearchBox:SetWidth(256)
     BankItemSearchBox:Show()
 
-    ReagentBankFrame:Show()
+    self.wrappedPanel:Show()
 
     self:RegisterEvent('INVENTORY_SEARCH_UPDATE')
     self:RegisterEvent('ITEM_LOCK_CHANGED')
     self:RegisterEvent('PLAYERREAGENTBANKSLOTS_CHANGED')
 end
 
-function LiteBagReagentBankMixin:OnHide()
+function LiteBagWrappedBankMixin:OnHide()
     LB.FrameDebug(self, "OnHide")
-    ReagentBankFrame:Hide()
+    self.wrappedPanel:Hide()
     self:UnregisterAllEvents()
 end
 
-function LiteBagReagentBankMixin:OnEvent(event, ...)
+function LiteBagWrappedBankMixin:OnEvent(event, ...)
     LB.EventDebug(self, event, ...)
     if event == 'INVENTORY_SEARCH_UPDATE' then
-        ContainerFrameMixin.UpdateSearchResults(ReagentBankFrame)
+        ContainerFrameMixin.UpdateSearchResults(self.wrappedPanel)
     elseif event == 'ITEM_LOCK_CHANGED' then
         local bag, slot = ...
         if bag == Enum.BagIndex.ReagentBank then

ReagentBankPanel.xml renamed to WrappedBankPanel.xml

@@ -7,12 +7,9 @@
      get the search and sort buttons attached, store the title, etc.
 -->
 
-<Script file="ReagentBankPanel.lua" />
+<Script file="WrappedBankPanel.lua" />
 
-<Frame name="LiteBagReagentBank" hidden="true" mixin="LiteBagReagentBankMixin">
-    <KeyValues>
-        <KeyValue key="Title" value="REAGENT_BANK" type="global" />
-    </KeyValues>
+<Frame name="LiteBagWrappedBankTemplate" hidden="true" mixin="LiteBagWrappedBankMixin" virtual="true">
     <Scripts>
         <OnLoad method="OnLoad" />
         <OnEvent method="OnEvent" />
@@ -21,4 +18,16 @@
     </Scripts>
 </Frame>
 
+<Frame name="LiteBagReagentBank" hidden="true" inherits="LiteBagWrappedBankTemplate" id="2">
+    <KeyValues>
+        <KeyValue key="Title" value="REAGENT_BANK" type="global" />
+    </KeyValues>
+</Frame>
+
+<Frame name="LiteBagAccountBank" hidden="true" inherits="LiteBagWrappedBankTemplate" id="3">
+    <KeyValues>
+        <KeyValue key="Title" value="ACCOUNT_BANK_PANEL_TITLE" type="global" />
+    </KeyValues>
+</Frame>
+
 </Ui>