From 96289375b11a0aaa3402fade5a18391fb9c25c83 Mon Sep 17 00:00:00 2001 From: Vanic Date: Mon, 29 Dec 2025 15:29:44 +0300 Subject: [PATCH] CallbacksControl: add base logic --- mods/API/ApiLoader/src/Api/GlobalStep.lua | 12 +-- mods/API/Callbacks/init.lua | 9 +- mods/API/Callbacks/mod.conf | 2 +- mods/CORE/CallbacksControl/init.lua | 4 + mods/CORE/CallbacksControl/mod.conf | 2 + mods/CORE/CallbacksControl/src/Control.lua | 101 +++++++++++++++++++++ 6 files changed, 119 insertions(+), 11 deletions(-) create mode 100644 mods/CORE/CallbacksControl/init.lua create mode 100644 mods/CORE/CallbacksControl/mod.conf create mode 100644 mods/CORE/CallbacksControl/src/Control.lua diff --git a/mods/API/ApiLoader/src/Api/GlobalStep.lua b/mods/API/ApiLoader/src/Api/GlobalStep.lua index 6248d49..c5ab45b 100644 --- a/mods/API/ApiLoader/src/Api/GlobalStep.lua +++ b/mods/API/ApiLoader/src/Api/GlobalStep.lua @@ -2,12 +2,12 @@ local callsWithDelay = {} ---@param timeDelay number ----@param callbackFunc fun(deltaTime) +---@param callbackFunc fun(deltaTime:number) function Api.registerGlobalStepWithDelay(timeDelay, callbackFunc) table.insert(callsWithDelay, { timeDelay = timeDelay, callbackFunc = callbackFunc, - timer = 0 + timer = 0.0 }) end @@ -21,7 +21,7 @@ core.register_globalstep(function(deltaTime) if timer >= callback.timeDelay then callback.callbackFunc(deltaTime) - callback.timer = 0 + callback.timer = 0.0 else callback.timer = timer end @@ -32,12 +32,12 @@ end) local callsForEachPlayer = {} ---@param timeDelay number ----@param callbackFunc fun(player, deltaTime) +---@param callbackFunc fun(player:Player, deltaTime:number) function Api.registerGlobalStepForEachPlayer(timeDelay, callbackFunc) table.insert(callsWithDelay, { timeDelay = timeDelay, callbackFunc = callbackFunc, - timer = 0 + timer = 0.0 }) end @@ -51,7 +51,7 @@ core.register_globalstep(function(deltaTime) if timer >= callback.timeDelay then callback.callbackFunc(deltaTime, player) - callback.timer = 0 + callback.timer = 0.0 else callback.timer = timer end diff --git a/mods/API/Callbacks/init.lua b/mods/API/Callbacks/init.lua index 0741704..a9f35a6 100644 --- a/mods/API/Callbacks/init.lua +++ b/mods/API/Callbacks/init.lua @@ -1,9 +1,8 @@ ----Global API for implementing callbacks. Callbacks = {} ----@alias callbackFunc fun(callbackName, ...) +---@alias Callbacks.callbackFunc fun(callbackName, ...) ----@type table +---@type table local registeredCallbacks = {} ---@param callbackName string @@ -14,7 +13,7 @@ function Callbacks.registerCallback(callbackName) end ---@param callbackName string ----@param callbackFunc callbackFunc +---@param callbackFunc Callbacks.callbackFunc function Callbacks.subscribe(callbackName, callbackFunc) local callbacks = registeredCallbacks[callbackName] assert(callbacks ~= nil, ('Callback %s does not exist'):format(callbackName)) @@ -22,6 +21,8 @@ function Callbacks.subscribe(callbackName, callbackFunc) table.insert(callbacks, callbackFunc) end +---@param callbackName string +---@param ... any function Callbacks.call(callbackName, ...) local callbacks = registeredCallbacks[callbackName] assert(callbacks ~= nil, ('Callback %s does not exist'):format(callbackName)) diff --git a/mods/API/Callbacks/mod.conf b/mods/API/Callbacks/mod.conf index 000b9e5..c491b0b 100644 --- a/mods/API/Callbacks/mod.conf +++ b/mods/API/Callbacks/mod.conf @@ -1,2 +1,2 @@ name = smc__api__callbacks -depends = smc__api__ensure, smc__api__logger, smc__api__math, smc__api__ensure +depends = smc__api__table diff --git a/mods/CORE/CallbacksControl/init.lua b/mods/CORE/CallbacksControl/init.lua new file mode 100644 index 0000000..73c3e80 --- /dev/null +++ b/mods/CORE/CallbacksControl/init.lua @@ -0,0 +1,4 @@ +local modInfo = Mod.getInfo('smc__api__callbacks_control') +local require = modInfo.require + +return require('Control') \ No newline at end of file diff --git a/mods/CORE/CallbacksControl/mod.conf b/mods/CORE/CallbacksControl/mod.conf new file mode 100644 index 0000000..3be755d --- /dev/null +++ b/mods/CORE/CallbacksControl/mod.conf @@ -0,0 +1,2 @@ +name = smc__api__callbacks_control +depends = smc__api__callbacks diff --git a/mods/CORE/CallbacksControl/src/Control.lua b/mods/CORE/CallbacksControl/src/Control.lua new file mode 100644 index 0000000..3e915a9 --- /dev/null +++ b/mods/CORE/CallbacksControl/src/Control.lua @@ -0,0 +1,101 @@ +---@class Callbacks.Control +local Control = {} + +-- control.on_press +Callbacks.registerCallback('control.on_press') + +---@param callbackFunc fun(player:Player, controlName:string) +function Control.subcribeOnPress(callbackFunc) + Callbacks.subscribe('control.on_press', callbackFunc) +end + + +-- control.on_release +Callbacks.registerCallback('control.on_release') + +---@param callbackFunc fun(player:Player, controlName:string, holdTime:number) +function Control.subcribeOnRelease(callbackFunc) + Callbacks.subscribe('control.on_release', callbackFunc) +end + + +-- control.on_hold +Callbacks.registerCallback('control.on_hold') + +---@param callbackFunc fun(player:Player, controlName:string, holdTime:number, dtime:number) +function Control.subcribeOnHold(callbackFunc) + Callbacks.subscribe('control.on_hold', callbackFunc) +end + + +-- control.on_wield_change +Callbacks.registerCallback('control.on_wield_change') + +---@param callbackFunc fun(player:Player, player_wield_index:number, player_last_wield_index:number) +function Control.subcribeOnWieldChange(callbackFunc) + Callbacks.subscribe('control.on_wield_change', callbackFunc) +end + +local ControlKeys = { + 'up', 'down', 'left', 'right', 'jump', 'aux1', 'sneak', 'dig', 'place', 'zoom' +} + +local playersLastControl = {} +local playersControlTimer = {} + +--TODO: on_join & on_leave + +Api.registerGlobalStepForEachPlayer(0, function(player, deltaTime) + if player == nil then + return + end + + local playerName = player:get_player_name() + if playerName == nil then + return + end + + local lastControl = playersLastControl[playerName] + if lastControl == nil then + return + end + + local controlTimer = playersControlTimer[playerName] + if controlTimer == nil then + return + end + + local nowControl = player:get_player_control() + if nowControl == nil then + return + end + + local control + for _, key in ipairs(ControlKeys) do + local lastPressed = lastControl[key] + local nowPressed = nowControl[key] + + -- on_press + if not lastPressed and nowPressed then + Callbacks.call('control.on_press', key) + + controlTimer[key] = 0 + + -- on_release + elseif lastPressed and not nowPressed then + Callbacks.call('control.on_release', key, controlTimer[key]) + + controlTimer[key] = 0 + + -- on_hold + elseif lastPressed and nowPressed then + Callbacks.call('control.on_hold', key, controlTimer[key], deltaTime) + + controlTimer[key] = controlTimer[key] + deltaTime + end + end + + playersLastControl[playerName] = nowControl +end) + +return Control \ No newline at end of file