From 51e67634571abf5515d2cae65b2c4fc7d3bcdcee Mon Sep 17 00:00:00 2001 From: Vanic Date: Fri, 27 Feb 2026 20:34:37 +0300 Subject: [PATCH] `HelperLib`: add require methods --- mods/CORE/Item/src/Item.lua | 5 +-- mods/CORE/Node/src/Node.lua | 8 +---- mods/CORE/Plant/src/Plant.lua | 10 ++---- mods/CORE/WorkStation/src/WorkStation.lua | 3 +- mods/GAME/ITEMS/essences/init.lua | 7 +--- mods/GAME/ITEMS/liquids/init.lua | 3 +- mods/GAME/ITEMS/plants/init.lua | 8 +---- mods/GAME/ITEMS/rocks/init.lua | 6 +--- mods/GAME/ITEMS/soils/init.lua | 6 +--- mods/GAME/ITEMS/wood/init.lua | 6 +--- mods/SYSTEM/HelperLib/src/Lib.lua | 3 +- mods/SYSTEM/HelperLib/src/Lib/requires.lua | 41 ++++++++++++++++++++++ 12 files changed, 54 insertions(+), 52 deletions(-) create mode 100644 mods/SYSTEM/HelperLib/src/Lib/requires.lua diff --git a/mods/CORE/Item/src/Item.lua b/mods/CORE/Item/src/Item.lua index 2a2866b..b1afa66 100644 --- a/mods/CORE/Item/src/Item.lua +++ b/mods/CORE/Item/src/Item.lua @@ -2,10 +2,7 @@ local getInstance, extend = Class.getInstance, Class.extend local tableCopy, tableMerge, colorize = table.copy, table.merge, core.colorize -local modInfo = Mod.getInfo('smc__core__item') -local require = modInfo.require - -local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory') +local ItemFactory = Smc.requireItemFactory() ---Determines whether common rarity will be shown in item descriptions or not. local SHOW_COMMON_RARITY = true diff --git a/mods/CORE/Node/src/Node.lua b/mods/CORE/Node/src/Node.lua index 8ff8a20..22ca625 100644 --- a/mods/CORE/Node/src/Node.lua +++ b/mods/CORE/Node/src/Node.lua @@ -1,10 +1,4 @@ -local itemRequire = Mod.getInfo('smc__core__item').require - ----@type Item -local Item = itemRequire('Item') - ----@type ItemFactory -local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory') +local Item, ItemFactory = Smc.requireItem(), Smc.requireItemFactory() ---@class Node : Item ---@field defaultDef Node.NodeDefinition diff --git a/mods/CORE/Plant/src/Plant.lua b/mods/CORE/Plant/src/Plant.lua index 4d40b4a..35c29ed 100644 --- a/mods/CORE/Plant/src/Plant.lua +++ b/mods/CORE/Plant/src/Plant.lua @@ -1,10 +1,4 @@ -local nodeRequire = Mod.getInfo('smc__core__node').require - ----@type Node -local Node = nodeRequire('Node') - --- -@type ItemFactory ----local ItemFactory = Mod.getInfo('smc__core__item_factory').require('ItemFactory') +local Node = Smc.requireNode() ---@class Plant : Node local Plant = Node:getExtended({ @@ -24,4 +18,4 @@ local Plant = Node:getExtended({ } }) -return Plant \ No newline at end of file +return Plant diff --git a/mods/CORE/WorkStation/src/WorkStation.lua b/mods/CORE/WorkStation/src/WorkStation.lua index 4447262..22dcb7e 100644 --- a/mods/CORE/WorkStation/src/WorkStation.lua +++ b/mods/CORE/WorkStation/src/WorkStation.lua @@ -6,8 +6,7 @@ local ImmersiveCraftHandler = Mod.getInfo('smc__core__craft_system').require('Cr ---@type WorkStationUI local WorkStationUI = Mod.getInfo('smc__ui__work_station').require('WorkStationUI') ----@type Node -local Node = Mod.getInfo('smc__core__node').require('Node') +local Node = Smc.requireNode() -- Default settings that a work station node should have. local WorkStationNode = Node:getExtended({ diff --git a/mods/GAME/ITEMS/essences/init.lua b/mods/GAME/ITEMS/essences/init.lua index e57c4cc..0b00c53 100644 --- a/mods/GAME/ITEMS/essences/init.lua +++ b/mods/GAME/ITEMS/essences/init.lua @@ -1,8 +1,4 @@ ----@type TileSheet -local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet') - ----@type Item -local Item = Mod.getInfo('smc__core__item').require('Item') +local Item, TileSheet = Smc.requireItem(), Smc.requireTileSheet() ---@type Item.ItemDefinition local defaultEssenceDef = { @@ -15,7 +11,6 @@ local defaultEssenceDef = { local defaultEssence = Item:getExtended(defaultEssenceDef) ----@type TileSheet local ts = TileSheet:new('essences_sheet.png', 16, 16) defaultEssence:new({ diff --git a/mods/GAME/ITEMS/liquids/init.lua b/mods/GAME/ITEMS/liquids/init.lua index ba657c0..7bbae67 100644 --- a/mods/GAME/ITEMS/liquids/init.lua +++ b/mods/GAME/ITEMS/liquids/init.lua @@ -1,5 +1,4 @@ ----@type Node -local Node = Mod.getInfo('smc__core__node').require('Node') +local Node = Smc.requireNode() ---@type Node.NodeDefinition local defaultLiquidDef = { diff --git a/mods/GAME/ITEMS/plants/init.lua b/mods/GAME/ITEMS/plants/init.lua index d02473a..b883308 100644 --- a/mods/GAME/ITEMS/plants/init.lua +++ b/mods/GAME/ITEMS/plants/init.lua @@ -1,10 +1,4 @@ -local modInfo = Mod.getInfo('smc__core__plant') - ----@type TileSheet -local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet') - ----@type Plant -local Plant = modInfo.require('Plant') +local Plant, TileSheet = Smc.requirePlant(), Smc.requireTileSheet() Plant:new({ settings = { diff --git a/mods/GAME/ITEMS/rocks/init.lua b/mods/GAME/ITEMS/rocks/init.lua index 13c6e90..b0a15cb 100644 --- a/mods/GAME/ITEMS/rocks/init.lua +++ b/mods/GAME/ITEMS/rocks/init.lua @@ -1,8 +1,4 @@ ----@type TileSheet -local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet') - ----@type Node -local Node = Mod.getInfo('smc__core__node').require('Node') +local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet() ---@type Node.NodeDefinition local defaultRockDef = { diff --git a/mods/GAME/ITEMS/soils/init.lua b/mods/GAME/ITEMS/soils/init.lua index e02a771..8dacbdd 100644 --- a/mods/GAME/ITEMS/soils/init.lua +++ b/mods/GAME/ITEMS/soils/init.lua @@ -1,8 +1,4 @@ ----@type TileSheet -local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet') - ----@type Node -local Node = Mod.getInfo('smc__core__node').require('Node') +local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet() ---@type Node.NodeDefinition local defaultSoilDef = { diff --git a/mods/GAME/ITEMS/wood/init.lua b/mods/GAME/ITEMS/wood/init.lua index 9020e36..09d2b00 100644 --- a/mods/GAME/ITEMS/wood/init.lua +++ b/mods/GAME/ITEMS/wood/init.lua @@ -1,8 +1,4 @@ ----@type Node -local Node = Mod.getInfo('smc__core__node').require('Node') - ----@type TileSheet -local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet') +local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet() ---@type Node.NodeDefinition local defaultLogDef = { diff --git a/mods/SYSTEM/HelperLib/src/Lib.lua b/mods/SYSTEM/HelperLib/src/Lib.lua index e8050ee..dd32ba8 100644 --- a/mods/SYSTEM/HelperLib/src/Lib.lua +++ b/mods/SYSTEM/HelperLib/src/Lib.lua @@ -7,4 +7,5 @@ require('Lib.globalStep') require('Lib.color') require('Lib.immersiveCraftData') require('Lib.getObjectByGUID') -require('Lib.receiveFields') \ No newline at end of file +require('Lib.receiveFields') +require('Lib.requires') \ No newline at end of file diff --git a/mods/SYSTEM/HelperLib/src/Lib/requires.lua b/mods/SYSTEM/HelperLib/src/Lib/requires.lua new file mode 100644 index 0000000..9d8ab94 --- /dev/null +++ b/mods/SYSTEM/HelperLib/src/Lib/requires.lua @@ -0,0 +1,41 @@ +-- Global methods for require classes. + +---@return Item +function Smc.requireItem() + ---@type Item + local class = Mod.getInfo('smc__core__item').require('Item') + + return class +end + +---@return Node +function Smc.requireNode() + ---@type Node + local class = Mod.getInfo('smc__core__node').require('Node') + + return class +end + +---@return Plant +function Smc.requirePlant() + ---@type Plant + local class = Mod.getInfo('smc__core__plant').require('Plant') + + return class +end + +---@return ItemFactory +function Smc.requireItemFactory() + ---@type ItemFactory + local class = Mod.getInfo('smc__core__item_factory').require('ItemFactory') + + return class +end + +---@return TileSheet +function Smc.requireTileSheet() + ---@type TileSheet + local class = Mod.getInfo('smc__core__tilesheet').require('TileSheet') + + return class +end