Merge pull request YimMenu-Lua#86 from acidlabsdev/main

refactor(YRV3): refactor businesses into objects

Author: xesdoog

SSV2/includes/backend.lua

@@ -1,4 +1,11 @@
----@diagnostic disable: lowercase-global
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
 
 local PreviewService = require("includes.services.PreviewService")
 local function ClearPreview()
@@ -35,36 +42,38 @@ Enums.eEntityType = {
 ---@class Backend
 ---@field private api_version eAPIVersion
 local Backend = {
-	__version          = "",
-	target_build       = "",
-	target_version     = "",
-	disable_input      = false, -- Never serialize this runtime variable!
+	__version                = "",
+	target_build             = "",
+	target_version           = "",
+	disable_input            = false, -- Never serialize this runtime variable!
+	is_in_session_transition = false,
+	is_in_player_transition  = false,
 
 	---@type table<integer, integer>
-	ControlsToDisable  = {},
+	ControlsToDisable        = {},
 
 	---@type table<integer, BlipData>
-	CreatedBlips       = {},
+	CreatedBlips             = {},
 
 	---@type array<handle>
-	AttachedEntities   = {},
+	AttachedEntities         = {},
 
 	---@type table<eBackendEvent, array<function>>
-	EventCallbacks     = {
+	EventCallbacks           = {
 		[Enums.eBackendEvent.RELOAD_UNLOAD]  = { ClearPreview },
 		[Enums.eBackendEvent.SESSION_SWITCH] = { ClearPreview },
 		[Enums.eBackendEvent.PLAYER_SWITCH]  = { ClearPreview }
 	},
 
 	---@type table<eEntityType, table<handle, handle>>
-	SpawnedEntities    = {
+	SpawnedEntities          = {
 		[Enums.eEntityType.Ped]     = {},
 		[Enums.eEntityType.Vehicle] = {},
 		[Enums.eEntityType.Object]  = {},
 	},
 
 	---@type table<eEntityType, integer>
-	MaxAllowedEntities = {
+	MaxAllowedEntities       = {
 		[Enums.eEntityType.Ped]     = 50,
 		[Enums.eEntityType.Vehicle] = 25,
 		[Enums.eEntityType.Object]  = 75,
@@ -411,29 +420,47 @@ function Backend:Cleanup()
 end
 
 function Backend:OnSessionSwitch()
+	if (self.is_in_session_transition) then
+		return
+	end
+
 	if (not script.is_active("maintransition")) then
 		return
 	end
 
-	self:TriggerEventCallbacks(Enums.eBackendEvent.SESSION_SWITCH)
+	self.is_in_session_transition = true
+	ThreadManager:Run(function()
+		self:TriggerEventCallbacks(Enums.eBackendEvent.SESSION_SWITCH)
 
-	repeat
-		sleep(100)
-	until not script.is_active("maintransition")
-	sleep(1000)
+		while (script.is_active("maintransition")) do
+			yield()
+		end
+
+		sleep(1000)
+		self.is_in_session_transition = false
+	end)
 end
 
 function Backend:OnPlayerSwitch()
+	if (self.is_in_player_transition) then
+		return
+	end
+
 	if (not self:IsPlayerSwitchInProgress()) then
 		return
 	end
 
-	self:TriggerEventCallbacks(Enums.eBackendEvent.PLAYER_SWITCH)
+	self.is_in_player_transition = true
+
+	ThreadManager:Run(function()
+		self:TriggerEventCallbacks(Enums.eBackendEvent.PLAYER_SWITCH)
 
-	repeat
-		sleep(100)
-	until not self:IsPlayerSwitchInProgress()
-	sleep(1000)
+		while (self:IsPlayerSwitchInProgress()) do
+			yield()
+		end
+
+		self.is_in_player_transition = false
+	end)
 end
 
 function Backend:RegisterHandlers()

SSV2/includes/classes/Mutex.lua

@@ -1,3 +1,12 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
 --------------------------------------
 -- Class: Mutex
 --------------------------------------

SSV2/includes/classes/Pair.lua

@@ -1,3 +1,15 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
+--------------------------------------
+-- Class: Pair
+--------------------------------------
 ---@class Pair<K, V> : { first: K, second: V }
 Pair = {}
 Pair.__index = Pair

SSV2/includes/classes/Range.lua

@@ -1,4 +1,11 @@
----@diagnostic disable: param-type-mismatch
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
 
 --------------------------------------
 -- Class: Range
@@ -12,6 +19,7 @@
 ---@overload fun(from: number, to: number, step?: number): Range
 Range = {}
 Range.__index = Range
+---@diagnostic disable-next-line
 setmetatable(Range, {
 	__call = function(_, from, to, step)
 		return Range.new(from, to, step)
@@ -31,17 +39,14 @@ function Range.new(from, to, step)
 		m_min = from,
 		m_max = to,
 		m_step = step,
+		---@diagnostic disable-next-line
 	}, Range)
 end
 
 ---@param value number
 ---@return boolean
 function Range:Contains(value)
-	if (self.m_step > 0) then
-		return value >= self.m_min and value <= self.m_max -- or math.inrange(value, self.m_min, self.m_max)
-	else
-		return value <= self.m_min and value >= self.m_max
-	end
+	return value >= self.m_min and value <= self.m_max -- or math.isinrange(value, self.m_min, self.m_max)
 end
 
 ---@return fun(): number Iterator

SSV2/includes/classes/Rect.lua

@@ -1,11 +1,22 @@
----@diagnostic disable: param-type-mismatch
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
 
+
+--------------------------------------
+-- Class: Rect
+--------------------------------------
 ---@class Rect
 ---@field min vec2
 ---@field max vec2
 ---@overload fun(min: vec2, max: vec2) : Rect
 Rect = {}
 Rect.__index = Rect
+---@diagnostic disable-next-line
 setmetatable(Rect, {
 	__call = function(_, ...)
 		return Rect.new(...)
@@ -16,6 +27,7 @@ setmetatable(Rect, {
 ---@param max vec2
 ---@return Rect
 function Rect.new(min, max)
+	---@diagnostic disable-next-line
 	return setmetatable({ min = min, max = max }, Rect)
 end
 

SSV2/includes/classes/Set.lua

@@ -1,3 +1,15 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
+--------------------------------------
+-- Class: Set
+--------------------------------------
 ---@generic T
 ---@class Set<T> : { [T]: true }
 ---@field protected m_data table<anyval, true>

SSV2/includes/classes/Vector2.lua

@@ -1,3 +1,12 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
 ---@diagnostic disable: unknown-operator
 
 --------------------------------------

SSV2/includes/classes/Vector3.lua

@@ -1,3 +1,12 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
 ---@diagnostic disable: unknown-operator
 
 --------------------------------------

SSV2/includes/classes/Vector4.lua

@@ -1,3 +1,12 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
 ---@diagnostic disable: unknown-operator
 
 --------------------------------------

SSV2/includes/classes/gta/CBaseSubHandlingData.lua

@@ -1,3 +1,12 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
 ---@class CBaseSubHandlingData
 ---@field protected m_ptr pointer
 ---@field protected m_handling_type pointer<int32_t> -- 0x00C8