From e40438ce2a7340ff2e1e45e9de2bc73b91cf0fb3 Mon Sep 17 00:00:00 2001 From: Vanic Date: Wed, 3 Sep 2025 19:08:31 +0000 Subject: [PATCH] Item: Add VisualEnum to item definition. Create Settings & Callbacks classes for ItemDefinition --- mods/CORE/Item/src/Item.lua | 9 +++++++-- mods/CORE/Item/src/ItemDefinition.lua | 14 ++------------ mods/CORE/Item/src/ItemDefinition/Callbacks.lua | 4 ++++ mods/CORE/Item/src/ItemDefinition/Settings.lua | 8 ++++++++ mods/CORE/Item/src/VisualEnum.lua | 9 +++++++++ 5 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 mods/CORE/Item/src/ItemDefinition/Callbacks.lua create mode 100644 mods/CORE/Item/src/ItemDefinition/Settings.lua create mode 100644 mods/CORE/Item/src/VisualEnum.lua diff --git a/mods/CORE/Item/src/Item.lua b/mods/CORE/Item/src/Item.lua index 8c82577..0ccaa85 100644 --- a/mods/CORE/Item/src/Item.lua +++ b/mods/CORE/Item/src/Item.lua @@ -1,3 +1,8 @@ +local modInfo = Mod.getInfo() +local require = modInfo.require + +local VisualEnum = require('Item.VisualEnum') + ---@class Item ---@field itemDef Item.ItemDefinition ---@field luantiDef table @@ -43,10 +48,10 @@ function Item:new(itemDef) local visual = itemDef.settings.visual itemDef.settings.visual = nil - if visual == '3d' then + if visual == VisualEnum.ITEM_3D then register3dItem(luantiDef) else - visual = 'flat' + visual = VisualEnum.ITEM_2D registerFlatItem(luantiDef) end diff --git a/mods/CORE/Item/src/ItemDefinition.lua b/mods/CORE/Item/src/ItemDefinition.lua index 066dfb0..2b23f35 100644 --- a/mods/CORE/Item/src/ItemDefinition.lua +++ b/mods/CORE/Item/src/ItemDefinition.lua @@ -1,16 +1,6 @@ ---@class Item.ItemDefinition ----@field settings table +---@field settings Item.ItemDefinition.Settings ---@field callbacks table -local ItemDefinition = { - settings = { - name = '', - title = '', -- 1st line of item description - description = '', -- the rest of item description - visual = '', -- '3d' | 'flat' - ... - }, - callbacks = { - }, -} +local ItemDefinition = {} return ItemDefinition diff --git a/mods/CORE/Item/src/ItemDefinition/Callbacks.lua b/mods/CORE/Item/src/ItemDefinition/Callbacks.lua new file mode 100644 index 0000000..0f93559 --- /dev/null +++ b/mods/CORE/Item/src/ItemDefinition/Callbacks.lua @@ -0,0 +1,4 @@ +---@class Item.ItemDefinition.Callbacks +local Callbacks = {} + +return Callbacks \ No newline at end of file diff --git a/mods/CORE/Item/src/ItemDefinition/Settings.lua b/mods/CORE/Item/src/ItemDefinition/Settings.lua new file mode 100644 index 0000000..9a6094f --- /dev/null +++ b/mods/CORE/Item/src/ItemDefinition/Settings.lua @@ -0,0 +1,8 @@ +---@class Item.ItemDefinition.Settings +---@field name string +---@field title string 1st line of item description +---@field description string the rest of item description +---@field visual Enum.EnumKey from ENUM `Item.ItemDefinition.Settings.VisualEnum` +local Settings = {} + +return Settings \ No newline at end of file diff --git a/mods/CORE/Item/src/VisualEnum.lua b/mods/CORE/Item/src/VisualEnum.lua new file mode 100644 index 0000000..23e6b05 --- /dev/null +++ b/mods/CORE/Item/src/VisualEnum.lua @@ -0,0 +1,9 @@ +---@class Item.VisualEnum : Enum +---@field ITEM_2D Enum.EnumKey +---@field ITEM_3D Enum.EnumKey +local VisualEnum = Core.Enum:getModClassInstance({ + 'ITEM_2D', + 'ITEM_3D', +}) + +return VisualEnum \ No newline at end of file