Krealle · Krealle · Jul 4, 2025 · Jul 4, 2025 · Jul 4, 2025 · Jul 4, 2025
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -49,6 +49,7 @@
     "RegisterAttributeDriver",
     "FAILED",
     "INTERRUPTED",
-    "CellParent"
+    "CellParent",
+    "WOW_PROJECT_MISTS_CLASSIC"
   ]
 }
diff --git a/Cell_UnitFrames.toc b/Cell_UnitFrames.toc
@@ -9,6 +9,7 @@
 ## X-License: MIT
 ## X-Curse-Project-ID: 1085605
 ## X-Wago-ID: ZKxqRdGk
+## X-Flavor: Mainline
 
 ## Dependencies: Cell
 
@@ -50,39 +51,8 @@ Menu/AppearanceTab.lua
 Menu/ColorTab.lua
 Menu/VisibilityTab.lua
 
-Widgets/Common.lua
-
-Widgets/Texts/BaseTextWidget.lua
-Widgets/Texts/CustomFormats.lua
-Widgets/Texts/NameText.lua
-Widgets/Texts/HealthText.lua
-Widgets/Texts/PowerText.lua
-Widgets/Texts/LevelText.lua
-Widgets/Texts/CustomText.lua
-
-Widgets/Bars/HealthBar.lua
-Widgets/Bars/PowerBar.lua
-Widgets/Bars/AltPowerBar.lua
-Widgets/Bars/ShieldBar.lua
-Widgets/Bars/CastBar.lua
-Widgets/Bars/ClassBar.lua
-Widgets/Bars/HealAbsorb.lua
-Widgets/Bars/HealPrediction.lua
-
-Widgets/Icons/RaidIcon.lua
-Widgets/Icons/RoleIcon.lua
-Widgets/Icons/LeaderIcon.lua
-Widgets/Icons/CombatIcon.lua
-Widgets/Icons/ReadyCheckIcon.lua
-Widgets/Icons/RestingIcon.lua
-
-Widgets/Auras/Auras.lua
-Widgets/Auras/Updater.lua
-Widgets/Auras/Dispels.lua
-Widgets/Auras/Totems.lua
-
-Widgets/Misc/Fader.lua
-Widgets/Misc/Highlight.lua
+Widgets/LoadWidgets_Common.xml
+Widgets/LoadWidgets_Retail.xml
 
 UnitFrames/UnitButton.xml
 UnitFrames/UnitButton.lua

diff --git a/Cell_UnitFrames_Mists.toc b/Cell_UnitFrames_Mists.toc
@@ -0,0 +1,66 @@
+## Interface: 50500
+## SavedVariables: CUF_DB
+## IconTexture: Interface\ICONS\spell_progenitor_buff
+
+## Title: Cell - Unit Frames
+## Author: Vollmer
+## Version: @project-version@
+## X-Date: @project-date-iso@
+## X-License: MIT
+## X-Curse-Project-ID: 1085605
+## X-Wago-ID: ZKxqRdGk
+## X-Flavor: Mists
+
+## Dependencies: Cell
+
+## Notes: Unitframes for our beloved Cell!
+
+Locales/LoadLocales.xml
+Core/Init.lua
+Core/Events.lua
+
+Data/Constants.lua
+Util/Utils.lua
+Util/PixelPerfect.lua
+Data/Defaults.lua
+Data/Database.lua
+Data/DBUtil.lua
+Data/Revise.lua
+
+Util/Handler.lua
+Util/HideBlizzard.lua
+Util/HelpTips.lua
+Util/Compat.lua
+
+Debug/DebugWindow.lua
+Debug/Debug.lua
+
+Core/SlashCommands.lua
+
+Menu/Builder.lua
+Menu/AuraFilterList.lua
+Menu/Menu.lua
+Menu/ImportExport.lua
+Menu/GeneralTab.lua
+Menu/UnitFramesTab.lua
+Menu/WidgetsTab.lua
+Menu/FaderTab.lua
+Menu/AppearanceTab.lua
+Menu/ColorTab.lua
+Menu/VisibilityTab.lua
+
+Widgets/LoadWidgets_Common.xml
+Widgets/LoadWidgets_Mist.xml
+
+UnitFrames/UnitButton.xml
+UnitFrames/UnitButton.lua
+UnitFrames/OnLoad.lua
+UnitFrames/MenuOptions.lua
+UnitFrames/EditMode.lua
+UnitFrames/EventMixin.lua
+UnitFrames/AurasMixin.lua
+
+API/Common.lua
+API/CustomAnchors.lua
+
+Core/OnLoad.lua
diff --git a/Cell_UnitFrames_Vanilla.toc b/Cell_UnitFrames_Vanilla.toc
@@ -0,0 +1,65 @@
+## Interface: 11507
+## SavedVariables: CUF_DB
+## IconTexture: Interface\ICONS\spell_progenitor_buff
+
+## Title: Cell - Unit Frames
+## Author: Vollmer
+## Version: @project-version@
+## X-Date: @project-date-iso@
+## X-License: MIT
+## X-Curse-Project-ID: 1085605
+## X-Wago-ID: ZKxqRdGk
+## X-Flavor: Vanilla
+
+## Dependencies: Cell
+
+## Notes: Unitframes for our beloved Cell!
+
+Locales/LoadLocales.xml
+Core/Init.lua
+Core/Events.lua
+
+Data/Constants.lua
+Util/Utils.lua
+Util/PixelPerfect.lua
+Data/Defaults.lua
+Data/Database.lua
+Data/DBUtil.lua
+Data/Revise.lua
+
+Util/Handler.lua
+Util/HideBlizzard.lua
+Util/HelpTips.lua
+Util/Compat.lua
+
+Debug/DebugWindow.lua
+Debug/Debug.lua
+
+Core/SlashCommands.lua
+
+Menu/Builder.lua
+Menu/AuraFilterList.lua
+Menu/Menu.lua
+Menu/ImportExport.lua
+Menu/GeneralTab.lua
+Menu/UnitFramesTab.lua
+Menu/WidgetsTab.lua
+Menu/FaderTab.lua
+Menu/AppearanceTab.lua
+Menu/ColorTab.lua
+Menu/VisibilityTab.lua
+
+Widgets/LoadWidgets_Common.xml
+
+UnitFrames/UnitButton.xml
+UnitFrames/UnitButton.lua
+UnitFrames/OnLoad.lua
+UnitFrames/MenuOptions.lua
+UnitFrames/EditMode.lua
+UnitFrames/EventMixin.lua
+UnitFrames/AurasMixin.lua
+
+API/Common.lua
+API/CustomAnchors.lua
+
+Core/OnLoad.lua
diff --git a/Core/Init.lua b/Core/Init.lua
@@ -49,3 +49,12 @@ CUF.vars = {}
 ---@field [Unit] CUFUnitButton
 ---@field boss table<string, CUFUnitButton>
 CUF.unitButtons = {}
+
+-- Borrowed from DBM: https://github.com/DeadlyBossMods/DeadlyBossMods/blob/171258b10cd053a3fbb34f5f9fe93a238f4cfaad/DBM-Core/modules/objects/GameVersion.lua
+CUF.vars.wowTOC = (select(4, GetBuildInfo()))
+CUF.vars.isRetail = WOW_PROJECT_ID == (WOW_PROJECT_MAINLINE or 1)
+CUF.vars.isVanilla = WOW_PROJECT_ID == (WOW_PROJECT_CLASSIC or 2)
+CUF.vars.isBCC = WOW_PROJECT_ID == (WOW_PROJECT_BURNING_CRUSADE_CLASSIC or 5)
+CUF.vars.isWrath = WOW_PROJECT_ID == (WOW_PROJECT_WRATH_CLASSIC or 11)
+CUF.vars.isCata = WOW_PROJECT_ID == (WOW_PROJECT_CATACLYSM_CLASSIC or 14)
+CUF.vars.isMop = WOW_PROJECT_ID == (WOW_PROJECT_MISTS_CLASSIC or 19)
diff --git a/Core/OnLoad.lua b/Core/OnLoad.lua
@@ -29,12 +29,14 @@ local function OnCellInitialUpdateLayout(_layout)
     -- TODO: This is kinda non-ideal and should be looked into
     -- Mixin in some extra bleeds/enrages
     -- These values can be overwritten by the user via snippets
-    local LibDispel = LibStub("LibDispel")
-    if Cell.vars.bleedList then
-        Mixin(LibDispel.bleed, Cell.vars.bleedList)
+    local LibDispel = LibStub("LibDispel", true)
+    if LibDispel then
+        if Cell.vars.bleedList then
+            Mixin(LibDispel.bleed, Cell.vars.bleedList)
+        end
+        Mixin(LibDispel.bleed, CUF.Defaults.Values.extraBleeds)
+        Mixin(LibDispel.enrage, CUF.Defaults.Values.extraEnrages)
     end
-    Mixin(LibDispel.bleed, CUF.Defaults.Values.extraBleeds)
-    Mixin(LibDispel.enrage, CUF.Defaults.Values.extraEnrages)
 
     -- Init Unit Buttons
     CUF.uFuncs:InitUnitButtons()

diff --git a/Data/Constants.lua b/Data/Constants.lua
@@ -25,6 +25,13 @@ const.UNIT = {
     BOSS = "boss",
 }
 
+if CUF.vars.isVanilla then
+    const.UNIT.FOCUS = nil
+end
+if CUF.vars.isVanilla or CUF.vars.isBCC then
+    const.UNIT.BOSS = nil
+end
+
 ---@enum TitleCasedUnits
 -- Used for frame titles
 const.TITLE_CASED_UNITS = {
@@ -87,6 +94,14 @@ const.HealthTextFormat = {
     CUSTOM = "custom",
 }
 
+---@type table<HealthTextFormat, boolean>
+const.ValidHealthTextFormats = {}
+for _, format in pairs(const.HealthTextFormat) do
+    -- There is no absorbs API in Vanilla
+    local isValidFormat = (not CUF.vars.isVanilla) or (not string.match(format, "absorbs"))
+    const.ValidHealthTextFormats[format] = isValidFormat
+end
+
 ---@enum WIDGET_KIND
 const.WIDGET_KIND = {
     NAME_TEXT = "nameText",

diff --git a/Data/DBUtil.lua b/Data/DBUtil.lua
@@ -223,6 +223,10 @@ function DB.VerifyDB()
                 layoutTable.CUFUnits[unit] = Util:CopyDeep(unitLayout)
             else
                 Util:AddMissingProps(layoutTable.CUFUnits[unit], unitLayout, DB.PropsToOnlyInit)
+
+                if not CUF.constants.ValidHealthTextFormats[layoutTable.CUFUnits[unit].widgets.healthText.format] then
+                    layoutTable.CUFUnits[unit].widgets.healthText.format = CUF.constants.HealthTextFormat.PERCENTAGE
+                end
             end
         end
     end