diff --git a/mods/CORE/Enum/init.lua b/mods/CORE/Enum/init.lua deleted file mode 100644 index 741e784..0000000 --- a/mods/CORE/Enum/init.lua +++ /dev/null @@ -1,5 +0,0 @@ -local modInfo = Mod.getInfo('smc__core__enum') -local require = modInfo.require - -return require('Enum') - diff --git a/mods/CORE/Enum/mod.conf b/mods/CORE/Enum/mod.conf deleted file mode 100644 index 27baa72..0000000 --- a/mods/CORE/Enum/mod.conf +++ /dev/null @@ -1,2 +0,0 @@ -name = smc__core__enum -depends = smc__api__api_loader diff --git a/mods/CORE/Enum/src/Enum.lua b/mods/CORE/Enum/src/Enum.lua deleted file mode 100644 index 3979bae..0000000 --- a/mods/CORE/Enum/src/Enum.lua +++ /dev/null @@ -1,30 +0,0 @@ ----Abstract class implementing enumeration. It is a table. Read-only table! ----@abstract ----@class Enum -local Enum = {} - ----@param enum string[] ----@return Enum -function Enum:new(enum) - local metaEnum = {} - - -- Create table - for _, v in ipairs(enum) do - metaEnum[v] = v - end - - ---@type Enum - local instance = setmetatable({}, { - __index = metaEnum, - __newindex = function() - error('The Enum table is read only!') - end, - __metatable = false - }) - - return instance -end - ----@alias Enum.EnumKey string Key from enumeration - -return Enum \ No newline at end of file diff --git a/mods/CORE/Item/src/Item.lua b/mods/CORE/Item/src/Item.lua index 70c95a6..5d9ea9b 100644 --- a/mods/CORE/Item/src/Item.lua +++ b/mods/CORE/Item/src/Item.lua @@ -1,8 +1,6 @@ local modInfo = Mod.getInfo('smc__core__item') local require = modInfo.require -local VisualEnum = require('Item.VisualEnum') - local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory') ---@class Item @@ -76,15 +74,15 @@ function Item:new(itemDef) local visual = itemDef.settings.visual if visual == nil then - visual = VisualEnum.ITEM_2D + visual = 'item_2d' end itemDef.settings.visual = nil - if visual == VisualEnum.ITEM_3D then + if visual == 'item_3d' then register3dItem(luantiDef) else - visual = VisualEnum.ITEM_2D + visual = 'item_2d' registerFlatItem(luantiDef) end diff --git a/mods/CORE/Item/src/Item/Settings.lua b/mods/CORE/Item/src/Item/Settings.lua index fb3dabe..b435721 100644 --- a/mods/CORE/Item/src/Item/Settings.lua +++ b/mods/CORE/Item/src/Item/Settings.lua @@ -13,10 +13,13 @@ Settings.title = nil ---@type string? Settings.description = nil +---@alias Item.Visual +---'item_2d'| +---'item_3d' + ---Visual node type. ----Values ​​are specified via an enumeration `Item.VisualEnum`. ----@type Enum.EnumKey? -Settings.visual = "" +---@type Item.Visual? +Settings.visual = nil diff --git a/mods/CORE/Item/src/Item/VisualEnum.lua b/mods/CORE/Item/src/Item/VisualEnum.lua deleted file mode 100644 index 6640378..0000000 --- a/mods/CORE/Item/src/Item/VisualEnum.lua +++ /dev/null @@ -1,12 +0,0 @@ ----@type Enum -local Enum = Mod.getInfo('smc__core__enum').require('Enum') - ----@class Item.VisualEnum : Enum ----@field ITEM_2D Enum.EnumKey ----@field ITEM_3D Enum.EnumKey -local VisualEnum = Enum:new({ - 'ITEM_2D', - 'ITEM_3D', -}) - -return VisualEnum \ No newline at end of file diff --git a/mods/CORE/Node/src/Node.lua b/mods/CORE/Node/src/Node.lua index c7ee164..54174fe 100644 --- a/mods/CORE/Node/src/Node.lua +++ b/mods/CORE/Node/src/Node.lua @@ -3,9 +3,6 @@ local itemRequire = Mod.getInfo('smc__core__item').require ---@type Item local Item = itemRequire('Item') ----@type Item.VisualEnum -local VisualEnum = itemRequire('Item.VisualEnum') - ---@type ItemFactory local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory') @@ -16,7 +13,7 @@ local Node = Class.extend(Item, {}) ---@param nodeDef Node.NodeDefinition ---@return Node function Node:new(nodeDef) - nodeDef.settings.visual = VisualEnum.ITEM_3D + nodeDef.settings.visual = 'item_3d' ---@type Node local instance = Item:new(nodeDef)