Controls & Events: add controls events and refactoring code

This commit is contained in:
Van
2026-06-08 22:07:26 +03:00
parent 5146fd3e07
commit 90cf189b1a
8 changed files with 162 additions and 145 deletions

View File

@@ -1,7 +1,8 @@
---@alias Events.Callback fun(eventName:string, ...)
---@alias Events.Callback fun(...)
---@alias Events.Types
--- ''
--- 'ControlsEvents'
---@class Events : Class
---@field registeredEvents table<string, Events.Callback[]>
Events = Class:extend({
@@ -29,7 +30,7 @@ function Events:call(eventName, ...)
end
for _, func in ipairs(callbacks) do
func(eventName, ...)
func(...)
end
end

View File

@@ -0,0 +1,64 @@
---@alias Events.ControlsEvents.EventName 'on_press'|'on_release'|'on_hold'|'on_wield_change'
---@class Events.ControlsEvents : Events
---@field subscribe fun(self:Events.ControlsEvents, eventName:Events.ControlsEvents.EventName, callback:Events.Callback)
---@field call fun(self:Events.ControlsEvents, eventName:Events.ControlsEvents.EventName, ...)
local ControlsEvents = Events:extend()
-- On press --
---@param callback fun(player:Player, controlName:Controls.PressKey)
function ControlsEvents:subscribeOnPress(callback)
self:subscribe('on_press', callback)
end
---@param player Player
---@param controlName Controls.PressKey
function ControlsEvents:callOnPress(player, controlName)
self:call('on_press', player, controlName)
end
-- On release --
---@param callback fun(player:Player, controlName:Controls.PressKey, holdTime:number)
function ControlsEvents:subscribeOnRelease(callback)
self:subscribe('on_release', callback)
end
---@param player Player
---@param controlName Controls.PressKey
---@param holdTime number
function ControlsEvents:callOnRelease(player, controlName, holdTime)
self:call('on_release', player, controlName, holdTime)
end
-- On hold --
---@param callback fun(player:Player, controlName:Controls.PressKey, holdTime:number, dtime:number)
function ControlsEvents:subscribeOnHold(callback)
self:subscribe('on_hold', callback)
end
---@param player Player
---@param controlName Controls.PressKey
---@param holdTime number
---@param dtime number
function ControlsEvents:callOnHold(player, controlName, holdTime, dtime)
self:call('on_hold', player, controlName, holdTime, dtime)
end
-- On wield change --
---@param callback fun(player:Player, currentWieldIndex:integer, lastWieldIndex:integer)
function ControlsEvents:subscribeOnWieldChange(callback)
self:subscribe('on_wield_change', callback)
end
---@param player Player
---@param currentWieldIndex integer
---@param lastWieldIndex integer
function ControlsEvents:callOnWieldChange(player, currentWieldIndex, lastWieldIndex)
self:call('on_wield_change', player, currentWieldIndex, lastWieldIndex)
end
return ControlsEvents