5 Commits

6 changed files with 40 additions and 7 deletions

View File

@@ -30,6 +30,10 @@ function BaseUI:new(name, getFormSpecString, clearContex)
end) end)
end end
instance:registerOnFormQuit(function(player)
Smc.clearActiveFormspec(player:get_player_name())
end)
return instance return instance
end end
@@ -117,6 +121,7 @@ end
---@param playerName string ---@param playerName string
function BaseUI:showForm(playerName, ...) function BaseUI:showForm(playerName, ...)
core.show_formspec(playerName, self.name, self:getFormSpecString(playerName, ...)) core.show_formspec(playerName, self.name, self:getFormSpecString(playerName, ...))
Smc.setActiveFormspec(playerName, self.name)
end end
---Close the player the FormSpec registered by the instance of this UI. ---Close the player the FormSpec registered by the instance of this UI.

View File

@@ -21,7 +21,9 @@ end
---@param ... any ---@param ... any
function Events.call(eventName, ...) function Events.call(eventName, ...)
local callbacks = registeredEvents[eventName] local callbacks = registeredEvents[eventName]
assert(callbacks ~= nil, ('Event %s does not exist'):format(eventName)) if callbacks == nil then
return
end
for _, func in ipairs(callbacks) do for _, func in ipairs(callbacks) do
func(eventName, ...) func(eventName, ...)

View File

@@ -3,6 +3,7 @@ Smc = {}
local modInfo = Mod.getInfo('smc__system__helper_lib') local modInfo = Mod.getInfo('smc__system__helper_lib')
local require = modInfo.require local require = modInfo.require
require('Lib.activeFormspecs')
require('Lib.globalStep') require('Lib.globalStep')
require('Lib.color') require('Lib.color')
require('Lib.immersiveCraftData') require('Lib.immersiveCraftData')

View File

@@ -0,0 +1,19 @@
---@type table<string, string>
local activeFormspecsList = {}
---@param playerName string
---@param formName string?
function Smc.setActiveFormspec(playerName, formName)
activeFormspecsList[playerName] = formName
end
---@param playerName string
---@return string?
function Smc.getActiveFormspec(playerName)
return activeFormspecsList[playerName]
end
---@param playerName string
function Smc.clearActiveFormspec(playerName)
Smc.setActiveFormspec(playerName, nil)
end

View File

@@ -41,7 +41,7 @@ local callsForEachPlayer = {}
---@param timeDelay number ---@param timeDelay number
---@param callbackFunc fun(deltaTime:number, player:Player) ---@param callbackFunc fun(deltaTime:number, player:Player)
function Smc.registerGlobalStepForEachPlayer(timeDelay, callbackFunc) function Smc.registerGlobalStepForEachPlayer(timeDelay, callbackFunc)
table.insert(callsWithDelay, { table.insert(callsForEachPlayer, {
timeDelay = timeDelay, timeDelay = timeDelay,
callbackFunc = callbackFunc, callbackFunc = callbackFunc,
timer = 0.0, timer = 0.0,

View File

@@ -1,11 +1,11 @@
---@type table<string, Item> ---@type table<string, Item|Node>
local registeredItems = {} local registeredItems = {}
---@type table<string, table<string, Item>> ---@type table<string, table<string, Item|Node>>
local registeredItemsByMod = {} local registeredItemsByMod = {}
---@param shortModName string ---@param shortModName string
---@param item Item ---@param item Item|Node
function Smc.addRegisteredItem(shortModName, item) function Smc.addRegisteredItem(shortModName, item)
local itemName = item.itemDef.settings.name local itemName = item.itemDef.settings.name
local modItems = registeredItemsByMod[shortModName] local modItems = registeredItemsByMod[shortModName]
@@ -18,7 +18,7 @@ function Smc.addRegisteredItem(shortModName, item)
assert(modItems[itemName] == nil) assert(modItems[itemName] == nil)
registeredItems[itemName] = item registeredItems[itemName] = item
modItems[itemName] = item modItems[itemName] = item
end end
---@param shortModName string ---@param shortModName string
@@ -27,7 +27,13 @@ function Smc.getRegisteredItemsByMod(shortModName)
return table.copy_with_metatables(registeredItemsByMod[shortModName]) return table.copy_with_metatables(registeredItemsByMod[shortModName])
end end
---@return table<string, Item>? ---@param itemName string
---@return Item|Node
function Smc.getRegisteredItemByName(itemName)
return table.copy_with_metatables(registeredItems[itemName])
end
---@return table<string, Item|Node>?
function Smc.getRegisteredItems() function Smc.getRegisteredItems()
return table.copy_with_metatables(registeredItems) return table.copy_with_metatables(registeredItems)
end end