Mod: .getInfo() -> :getInfo()

This commit is contained in:
Van
2026-11-13 17:43:26 +03:00
parent 1e91290b02
commit e540107876
55 changed files with 73 additions and 73 deletions

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__base_processing_station')
local modInfo = Mod:getInfo('smc__core__base_processing_station')
local require = modInfo.require
return require('BaseProcessingStation')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__base_ui')
local modInfo = Mod:getInfo('smc__core__base_ui')
local require = modInfo.require
return require('BaseUI')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__controls')
local modInfo = Mod:getInfo('smc__core__controls')
local require = modInfo.require
return require('Controls')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__craft_system')
local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require
return require('CraftSystem')

View File

@@ -1,6 +1,6 @@
local tableJoin = table.join
local modInfo = Mod.getInfo('smc__core__craft_system')
local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.PrimitiveCraftHandler

View File

@@ -3,7 +3,7 @@ local assert, pairs, ipairs = assert, pairs, ipairs
local tableInsert, tableSort, tableJoin = table.insert, table.sort, table.join
local stringMatch, stringLower = string.match, string_utf8.lower
local require = Mod.getInfo('smc__core__craft_system').require
local require = Mod:getInfo('smc__core__craft_system').require
---@type CraftSystem.BaseCraftHandler.PlayerCraftsCache
local PlayerCraftsCache = require('CraftSystem.BaseCraftHandler.PlayerCraftsCache')

View File

@@ -2,7 +2,7 @@ local v = vector.new
local assert, ipairs, tostring = assert, ipairs, tostring
local coreChatSendPlayer, coreItemDrop = core.chat_send_player, core.item_drop
local require = Mod.getInfo('smc__core__craft_system').require
local require = Mod:getInfo('smc__core__craft_system').require
local ImmersiveCraftEvents = Smc.requireEvents('ImmersiveCraftEvents') --[[@as Events.ImmersiveCraftEvents]]

View File

@@ -2,7 +2,7 @@ local assert = assert
local tableInsert, tableMerge = table.insert, table.merge
local modInfo = Mod.getInfo('smc__core__craft_system')
local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.BaseCraftHandler

View File

@@ -1,5 +1,5 @@
---@type Creature
local Creature = Mod.getInfo('smc__core__creature').require('Creature')
local Creature = Mod:getInfo('smc__core__creature').require('Creature')
---The entity the player interacts with during immersive crafting.
---@class CraftSystem.ImmersiveCraftNode : Creature

View File

@@ -1,4 +1,4 @@
local require = Mod.getInfo('smc__core__craft_system').require
local require = Mod:getInfo('smc__core__craft_system').require
local ImmersiveCraftEvents = Smc.requireEvents('ImmersiveCraftEvents') --[[@as Events.ImmersiveCraftEvents]]

View File

@@ -3,7 +3,7 @@ local assert = assert
local extend = Class.extend
local coreItemDrop = core.item_drop
local require = Mod.getInfo('smc__core__craft_system').require
local require = Mod:getInfo('smc__core__craft_system').require
local ImmersiveCraftEvents = Smc.requireEvents('ImmersiveCraftEvents') --[[@as Events.ImmersiveCraftEvents]]

View File

@@ -1,6 +1,6 @@
local getInstance, extend = Class.getInstance, Class.extend
local modInfo = Mod.getInfo('smc__core__craft_system')
local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.BaseCraft

View File

@@ -2,7 +2,7 @@ local extend = Class.extend
local tableInsert, tableSort, tableJoin = table.insert, table.sort, table.join
local modInfo = Mod.getInfo('smc__core__craft_system')
local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.BaseCraftHandler

View File

@@ -1,6 +1,6 @@
local getInstance, extend = Class.getInstance, Class.extend
local modInfo = Mod.getInfo('smc__core__craft_system')
local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.BaseCraft

View File

@@ -2,7 +2,7 @@ local HASH_SEPARATOR = ','
local tableInsert, tableCopy, tableSort, tableConcat, tableIsEmpty = table.insert, table.copy, table.sort, table.concat, table.is_empty
local modInfo = Mod.getInfo('smc__core__craft_system')
local modInfo = Mod:getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.BaseCraftHandler

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__creature')
local modInfo = Mod:getInfo('smc__core__creature')
local require = modInfo.require
return require('Creature')

View File

@@ -48,7 +48,7 @@ function Creature:new(entityDef)
-- Add the short mod name prefix to the entity name.
if s._add_mod_name then
s._name = Mod.getInfo().shortName .. ':' .. s._name
s._name = Mod:getInfo().shortName .. ':' .. s._name
end
local onActivate = c.on_activate or function() end

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__formspec')
local modInfo = Mod:getInfo('smc__core__formspec')
local require = modInfo.require
return require('Formspec')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__immersive_work_station')
local modInfo = Mod:getInfo('smc__core__immersive_work_station')
local require = modInfo.require
return require('ImmersiveWorkStation')

View File

@@ -178,7 +178,7 @@ end
local handler = CraftSystem:getImmersiveCraftHandler('workbench')
local require = Mod.getInfo('smc__ui__player_inventory').require
local require = Mod:getInfo('smc__ui__player_inventory').require
local baseGetCraftTab = require('PlayerInventoryUI.baseGetCraftTab')
---@param self PlayerInventoryUI

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__item')
local modInfo = Mod:getInfo('smc__core__item')
local require = modInfo.require
return require('Item')

View File

@@ -86,7 +86,7 @@ end
---@param itemDef Item.ItemDefinition
---@return ItemDefinition
local function itemDefToLuantiDef(itemDef)
local modName = Mod.getInfo().shortName
local modName = Mod:getInfo().shortName
local S = core.get_translator(modName)
local s = itemDef.settings
@@ -167,7 +167,7 @@ function Item:new(itemDef)
itemDef = tableMerge(itemDef, self.defaultDef, true) --[[@as Item.ItemDefinition]]
local s = itemDef.settings
local shortModName = Mod.getInfo().shortName
local shortModName = Mod:getInfo().shortName
if s._add_mod_name then
s.name = shortModName .. ':' .. s.name

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__item_factory')
local modInfo = Mod:getInfo('smc__core__item_factory')
local require = modInfo.require
return require('ItemFactory')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__map_gen')
local modInfo = Mod:getInfo('smc__core__map_gen')
local require = modInfo.require
return require('MapGen')

View File

@@ -20,7 +20,7 @@ local function mglog(text, ...)
core.log((text):format(...))
end
local require = Mod.getInfo('smc__core__map_gen').require
local require = Mod:getInfo('smc__core__map_gen').require
---Numeric values ​​defining the surface height and climate for the node.
---@alias MapGen.Factors {height:number, temp:number, humidity:number, weight:number}

View File

@@ -1,6 +1,6 @@
local extend = Class.extend
local require = Mod.getInfo('smc__core__map_gen').require
local require = Mod:getInfo('smc__core__map_gen').require
---@type MapGen.Peak
local Peak = require('MapGen.Peak')

View File

@@ -9,7 +9,7 @@ local corePosToString, coreGetValueNoise = core.pos_to_string, core.get_value_no
local getInstance = Class.getInstance
local require = Mod.getInfo('smc__core__map_gen').require
local require = Mod:getInfo('smc__core__map_gen').require
---@type MapGen.Peak
local Peak = require('MapGen.Peak')

View File

@@ -32,7 +32,7 @@ function Tree:new(name, def)
local intance = getInstance(self, {})
intance.name = name
intance.path = def.path
intance.placerName = Mod.getInfo().shortName..':'..name..'_placer'
intance.placerName = Mod:getInfo().shortName..':'..name..'_placer'
intance:registerPlacer()

View File

@@ -6,7 +6,7 @@ local v = vector.new
local getInstance = Class.getInstance
local require = Mod.getInfo('smc__core__map_gen').require
local require = Mod:getInfo('smc__core__map_gen').require
---@type MapGen.Edge
local Edge = require('MapGen.Edge')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__node')
local modInfo = Mod:getInfo('smc__core__node')
local require = modInfo.require
return require('Node')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__plant')
local modInfo = Mod:getInfo('smc__core__plant')
local require = modInfo.require
return require('Plant')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__player')
local modInfo = Mod:getInfo('smc__core__player')
local require = modInfo.require
return require('Player')

View File

@@ -2,7 +2,7 @@
local Player = {}
---@type PlayerInventoryUI
local PlayerInventoryUI = Mod.getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
local PlayerInventoryUI = Mod:getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
core.register_on_joinplayer(function(player)
player:set_inventory_formspec(PlayerInventoryUI:getFormSpecString(player:get_player_name()))
@@ -29,7 +29,7 @@ core.register_chatcommand('show_inv',
}
)
local require = Mod.getInfo('smc__core__player').require
local require = Mod:getInfo('smc__core__player').require
require('Player.inventory')

View File

@@ -1,2 +1,2 @@
---@type PlayerInventoryUI
local PlayerInventoryUI = Mod.getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
local PlayerInventoryUI = Mod:getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__processing_container_station')
local modInfo = Mod:getInfo('smc__core__processing_container_station')
local require = modInfo.require
return require('ProcessingContainerStation')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__processing_fuel_station')
local modInfo = Mod:getInfo('smc__core__processing_fuel_station')
local require = modInfo.require
return require('ProcessingFuelStation')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__processing_station')
local modInfo = Mod:getInfo('smc__core__processing_station')
local require = modInfo.require
return require('ProcessingStation')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__progression_system')
local modInfo = Mod:getInfo('smc__core__progression_system')
local require = modInfo.require
return require('ProgressionSystem')

View File

@@ -1,6 +1,6 @@
local assert = assert
local require = Mod.getInfo('smc__core__progression_system').require
local require = Mod:getInfo('smc__core__progression_system').require
---@type ProgressionSystem.Age
local Age = require('ProgressionSystem.Age')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__sound')
local modInfo = Mod:getInfo('smc__core__sound')
local require = modInfo.require
return require('Sound')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__tilesheet')
local modInfo = Mod:getInfo('smc__core__tilesheet')
local require = modInfo.require
return require('TileSheet')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__core__tool')
local modInfo = Mod:getInfo('smc__core__tool')
local require = modInfo.require
return require('Tool')

View File

@@ -3,7 +3,7 @@
--core.set_mapgen_setting('chunksize', '{x=2,y=10,z=2}', true)
local mapGeneneratorRequire = Mod.getInfo('smc__core__map_generator').require
local mapGeneneratorRequire = Mod:getInfo('smc__core__map_generator').require
-- Main env init
local mapGenerator = mapGeneneratorRequire('mapGenerator')

View File

@@ -3,7 +3,7 @@ local id = core.get_content_id
local mathRound = math.round
local mapGenRequire = Mod.getInfo('smc__core__map_gen').require
local mapGenRequire = Mod:getInfo('smc__core__map_gen').require
---@type MapGen
local MapGen = mapGenRequire('MapGen')

View File

@@ -32,7 +32,7 @@ local function registerRock(name, y, def, staff)
def = {}
end
local modPrefix = Mod.getInfo().shortName..':'
local modPrefix = Mod:getInfo().shortName..':'
local craftGroup = 'rocks_'..name..'_staff'
-- Default rock

View File

@@ -1,8 +1,8 @@
local modInfo = Mod.getInfo('smc__core__formspec')
local modInfo = Mod:getInfo('smc__core__formspec')
local require = modInfo.require
---@type PlayerInventoryUI
local PlayerInventoryUI = Mod.getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
local PlayerInventoryUI = Mod:getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
core.register_chatcommand('list', {
privs = {give = true},

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__system__events')
local modInfo = Mod:getInfo('smc__system__events')
local require = modInfo.require
return require('Events')

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__system__helper_lib')
local modInfo = Mod:getInfo('smc__system__helper_lib')
local require = modInfo.require
require('Lib')

View File

@@ -5,7 +5,7 @@ Smc = {}
---@type boolean
Smc.isAsync = false
local modInfo = Mod.getInfo('smc__system__helper_lib')
local modInfo = Mod:getInfo('smc__system__helper_lib')
local doFile = modInfo.doFile
-- Independent of SMC methods

View File

@@ -3,7 +3,7 @@
---@return Item
function Smc.requireItem()
---@type Item
local class = Mod.getInfo('smc__core__item').require('Item')
local class = Mod:getInfo('smc__core__item').require('Item')
return class
end
@@ -11,7 +11,7 @@ end
---@return Node
function Smc.requireNode()
---@type Node
local class = Mod.getInfo('smc__core__node').require('Node')
local class = Mod:getInfo('smc__core__node').require('Node')
return class
end
@@ -19,7 +19,7 @@ end
---@return Tool
function Smc.requireTool()
---@type Tool
local class = Mod.getInfo('smc__core__tool').require('Tool')
local class = Mod:getInfo('smc__core__tool').require('Tool')
return class
end
@@ -27,7 +27,7 @@ end
---@return Plant
function Smc.requirePlant()
---@type Plant
local class = Mod.getInfo('smc__core__plant').require('Plant')
local class = Mod:getInfo('smc__core__plant').require('Plant')
return class
end
@@ -35,7 +35,7 @@ end
---@return ItemFactory
function Smc.requireItemFactory()
---@type ItemFactory
local class = Mod.getInfo('smc__core__item_factory').require('ItemFactory')
local class = Mod:getInfo('smc__core__item_factory').require('ItemFactory')
return class
end
@@ -43,7 +43,7 @@ end
---@return TileSheet
function Smc.requireTileSheet()
---@type TileSheet
local class = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
local class = Mod:getInfo('smc__core__tilesheet').require('TileSheet')
return class
end
@@ -51,7 +51,7 @@ end
---@return BaseUI
function Smc.requireBaseUI()
---@type BaseUI
local class = Mod.getInfo('smc__core__base_ui').require('BaseUI')
local class = Mod:getInfo('smc__core__base_ui').require('BaseUI')
return class
end
@@ -59,7 +59,7 @@ end
---@return Formspec
function Smc.requireFormspec()
---@type Formspec
local class = Mod.getInfo('smc__core__formspec').require('Formspec')
local class = Mod:getInfo('smc__core__formspec').require('Formspec')
return class
end
@@ -67,7 +67,7 @@ end
---@return ProgressionSystem
function Smc.requireProgressionSystem()
---@type ProgressionSystem
local class = Mod.getInfo('smc__core__progression_system').require('ProgressionSystem')
local class = Mod:getInfo('smc__core__progression_system').require('ProgressionSystem')
return class
end
@@ -75,7 +75,7 @@ end
---@return CraftSystem
function Smc.requireCraftSystem()
---@type CraftSystem
local class = Mod.getInfo('smc__core__craft_system').require('CraftSystem')
local class = Mod:getInfo('smc__core__craft_system').require('CraftSystem')
return class
end
@@ -83,7 +83,7 @@ end
---@return PlayerInventoryUI
function Smc.requirePlayerInventoryUI()
---@type PlayerInventoryUI
local class = Mod.getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
local class = Mod:getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
return class
end
@@ -91,7 +91,7 @@ end
---@return BaseProcessingStation
function Smc.requireBaseProcessingStation()
---@type BaseProcessingStation
local class = Mod.getInfo('smc__core__base_processing_station').require('BaseProcessingStation')
local class = Mod:getInfo('smc__core__base_processing_station').require('BaseProcessingStation')
return class
end
@@ -99,7 +99,7 @@ end
---@return ProcessingContainerStation
function Smc.requireProcessingContainerStation()
---@type ProcessingContainerStation
local class = Mod.getInfo('smc__core__processing_container_station').require('ProcessingContainerStation')
local class = Mod:getInfo('smc__core__processing_container_station').require('ProcessingContainerStation')
return class
end
@@ -107,7 +107,7 @@ end
---@return ProcessingFuelStation
function Smc.requireProcessingFuelStation()
---@type ProcessingFuelStation
local class = Mod.getInfo('smc__core__processing_fuel_station').require('ProcessingFuelStation')
local class = Mod:getInfo('smc__core__processing_fuel_station').require('ProcessingFuelStation')
return class
end
@@ -116,7 +116,7 @@ end
---@return Events
function Smc.requireEvents(eventsType)
---@type Events
local class = Mod.getInfo('smc__system__events').require('Events.'..eventsType)
local class = Mod:getInfo('smc__system__events').require('Events.'..eventsType)
return class
end

View File

@@ -22,7 +22,7 @@ end
---Return table with mod name, path and require function.
---@param modname? string Specify a name of mod to get its info
---@return Mod.Info
function Mod.getInfo(modname)
function Mod:getInfo(modname)
local name = modname or core.get_current_modname()
local shortName = getShortModName(name)
local path = core.get_modpath(name)
@@ -46,7 +46,7 @@ end
--[[
function Mod:new()
---@type Mod
local instance = setmetatable(Mod.getInfo(), { __index = self })
local instance = setmetatable(Mod:getInfo(), { __index = self })
return instance
end

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__ui__player_inventory')
local modInfo = Mod:getInfo('smc__ui__player_inventory')
local require = modInfo.require
return require('PlayerInventoryUI')

View File

@@ -11,7 +11,7 @@ local SmcGetActiveFormspec = Smc.getActiveFormspec
local BaseUI, Formspec = Smc.requireBaseUI(), Smc.requireFormspec()
local modInfo = Mod.getInfo('smc__ui__player_inventory')
local modInfo = Mod:getInfo('smc__ui__player_inventory')
local require = modInfo.require
local loadFile = modInfo.loadFile

View File

@@ -1,4 +1,4 @@
local require = Mod.getInfo('smc__ui__player_inventory').require
local require = Mod:getInfo('smc__ui__player_inventory').require
local getCraftTabTemplate = require('PlayerInventoryUI.baseGetCraftTab')
local CraftSystem = Smc.requireCraftSystem()

View File

@@ -1,4 +1,4 @@
local modInfo = Mod.getInfo('smc__ui__work_station')
local modInfo = Mod:getInfo('smc__ui__work_station')
local require = modInfo.require
return require('WorkStationUI')