Delete Enum & VisualEnum classes

This commit is contained in:
Van
2025-12-28 20:27:16 +03:00
parent 27004ebf45
commit 13391b085e
7 changed files with 10 additions and 61 deletions

View File

@@ -1,5 +0,0 @@
local modInfo = Mod.getInfo('smc__core__enum')
local require = modInfo.require
return require('Enum')

View File

@@ -1,2 +0,0 @@
name = smc__core__enum
depends = smc__api__api_loader

View File

@@ -1,30 +0,0 @@
---Abstract class implementing enumeration. It is a table<ENUM_KEY, ENUM_KEY>. Read-only table!
---@abstract
---@class Enum
local Enum = {}
---@param enum string[]
---@return Enum
function Enum:new(enum)
local metaEnum = {}
-- Create table<ENUM_KEY, ENUM_KEY>
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

View File

@@ -1,8 +1,6 @@
local modInfo = Mod.getInfo('smc__core__item') local modInfo = Mod.getInfo('smc__core__item')
local require = modInfo.require local require = modInfo.require
local VisualEnum = require('Item.VisualEnum')
local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory') local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
---@class Item ---@class Item
@@ -76,15 +74,15 @@ function Item:new(itemDef)
local visual = itemDef.settings.visual local visual = itemDef.settings.visual
if visual == nil then if visual == nil then
visual = VisualEnum.ITEM_2D visual = 'item_2d'
end end
itemDef.settings.visual = nil itemDef.settings.visual = nil
if visual == VisualEnum.ITEM_3D then if visual == 'item_3d' then
register3dItem(luantiDef) register3dItem(luantiDef)
else else
visual = VisualEnum.ITEM_2D visual = 'item_2d'
registerFlatItem(luantiDef) registerFlatItem(luantiDef)
end end

View File

@@ -13,10 +13,13 @@ Settings.title = nil
---@type string? ---@type string?
Settings.description = nil Settings.description = nil
---@alias Item.Visual
---'item_2d'|
---'item_3d'
---Visual node type. ---Visual node type.
---Values ​​are specified via an enumeration `Item.VisualEnum`. ---@type Item.Visual?
---@type Enum.EnumKey? Settings.visual = nil
Settings.visual = ""

View File

@@ -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

View File

@@ -3,9 +3,6 @@ local itemRequire = Mod.getInfo('smc__core__item').require
---@type Item ---@type Item
local Item = itemRequire('Item') local Item = itemRequire('Item')
---@type Item.VisualEnum
local VisualEnum = itemRequire('Item.VisualEnum')
---@type ItemFactory ---@type ItemFactory
local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory') local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
@@ -16,7 +13,7 @@ local Node = Class.extend(Item, {})
---@param nodeDef Node.NodeDefinition ---@param nodeDef Node.NodeDefinition
---@return Node ---@return Node
function Node:new(nodeDef) function Node:new(nodeDef)
nodeDef.settings.visual = VisualEnum.ITEM_3D nodeDef.settings.visual = 'item_3d'
---@type Node ---@type Node
local instance = Item:new(nodeDef) local instance = Item:new(nodeDef)