Merge pull request #1585 from esx-framework/revert-1584-dev

Revert "Dev"

[core]/cron/README.md

@@ -1,4 +1,4 @@
-<h1 align='center'>[ESX] Cron</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://docs.esx-legacy.com/legacy/installation'>Documentation</a></b></h5>
+<h1 align='center'>[ESX] Cron</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://esx-framework.org/'>Website</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
 
 A simple, but vital, resource that allows resources to Run tasks at specific intervals.
 

[core]/es_extended/README.md

@@ -1,13 +1,13 @@
-<h1 align='center'>es_extended</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://docs.esx-legacy.com/legacy/installation'>Documentation</a></b></h5>
-
-## Legal
-
-es_extended
-
-Copyright (C) 2015-2024 Jérémie N'gadi
-
-This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
-
-This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
-
-You should have received a copy Of the GNU General Public License along with this program. If Not, see <http://www.gnu.org/licenses/>.
+<h1 align='center'>es_extended</a></h1><p align='center'><b><a href='https://discord.esx-framework.org/'>Discord</a> - <a href='https://documentation.esx-framework.org/legacy/installation'>Documentation</a></b></h5>
+
+## Legal
+
+es_extended
+
+Copyright (C) 2015-2024 Jérémie N'gadi
+
+This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
+
+This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
+
+You should have received a copy Of the GNU General Public License along with this program. If Not, see <http://www.gnu.org/licenses/>.

[core]/es_extended/client/modules/scaleform.lua

@@ -2,7 +2,12 @@ ESX.Scaleform = {}
 ESX.Scaleform.Utils = {}
 
 function ESX.Scaleform.ShowFreemodeMessage(title, msg, sec)
-    local scaleform = ESX.Scaleform.Utils.RunMethod("MP_BIG_MESSAGE_FREEMODE", "SHOW_SHARD_WASTED_MP_MESSAGE", false, title, msg)
+    local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie("MP_BIG_MESSAGE_FREEMODE")
+
+    BeginScaleformMovieMethod(scaleform, "SHOW_SHARD_WASTED_MP_MESSAGE")
+    ScaleformMovieMethodAddParamTextureNameString(title)
+    ScaleformMovieMethodAddParamTextureNameString(msg)
+    EndScaleformMovieMethod()
 
     while sec > 0 do
         Wait(0)
@@ -15,9 +20,25 @@ function ESX.Scaleform.ShowFreemodeMessage(title, msg, sec)
 end
 
 function ESX.Scaleform.ShowBreakingNews(title, msg, bottom, sec)
-    local scaleform = ESX.Scaleform.Utils.RunMethod("BREAKING_NEWS", "SET_TEXT", false, msg, bottom)
-    ESX.Scaleform.Utils.RunMethod(scaleform, "SET_SCROLL_TEXT", false, 0, 0, title)
-    ESX.Scaleform.Utils.RunMethod(scaleform, "DISPLAY_SCROLL_TEXT", false, 0, 0)
+    local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie("BREAKING_NEWS")
+
+    BeginScaleformMovieMethod(scaleform, "SET_TEXT")
+    ScaleformMovieMethodAddParamTextureNameString(msg)
+    ScaleformMovieMethodAddParamTextureNameString(bottom)
+    EndScaleformMovieMethod()
+
+    BeginScaleformMovieMethod(scaleform, "SET_SCROLL_TEXT")
+    ScaleformMovieMethodAddParamInt(0) -- top ticker
+    ScaleformMovieMethodAddParamInt(0) -- Since this is the first string, start at 0
+    ScaleformMovieMethodAddParamTextureNameString(title)
+
+    EndScaleformMovieMethod()
+
+    BeginScaleformMovieMethod(scaleform, "DISPLAY_SCROLL_TEXT")
+    ScaleformMovieMethodAddParamInt(0) -- Top ticker
+    ScaleformMovieMethodAddParamInt(0) -- Index of string
+
+    EndScaleformMovieMethod()
 
     while sec > 0 do
         Wait(0)
@@ -30,7 +51,17 @@ function ESX.Scaleform.ShowBreakingNews(title, msg, bottom, sec)
 end
 
 function ESX.Scaleform.ShowPopupWarning(title, msg, bottom, sec)
-    local scaleform = ESX.Scaleform.Utils.RunMethod("POPUP_WARNING", "SHOW_POPUP_WARNING", false, 500.0, title, msg, bottom, true)
+    local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie("POPUP_WARNING")
+
+    BeginScaleformMovieMethod(scaleform, "SHOW_POPUP_WARNING")
+
+    ScaleformMovieMethodAddParamFloat(500.0) -- black background
+    ScaleformMovieMethodAddParamTextureNameString(title)
+    ScaleformMovieMethodAddParamTextureNameString(msg)
+    ScaleformMovieMethodAddParamTextureNameString(bottom)
+    ScaleformMovieMethodAddParamBool(true)
+
+    EndScaleformMovieMethod()
 
     while sec > 0 do
         Wait(0)
@@ -43,7 +74,11 @@ function ESX.Scaleform.ShowPopupWarning(title, msg, bottom, sec)
 end
 
 function ESX.Scaleform.ShowTrafficMovie(sec)
-    local scaleform = ESX.Scaleform.Utils.RunMethod("TRAFFIC_CAM", "PLAY_CAM_MOVIE", false)
+    local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie("TRAFFIC_CAM")
+
+    BeginScaleformMovieMethod(scaleform, "PLAY_CAM_MOVIE")
+
+    EndScaleformMovieMethod()
 
     while sec > 0 do
         Wait(0)
@@ -64,40 +99,3 @@ function ESX.Scaleform.Utils.RequestScaleformMovie(movie)
 
     return scaleform
 end
-
---- Executes a method on a scaleform movie with optional arguments and return value.
---- The caller is responsible for disposing of the scaleform using `SetScaleformMovieAsNoLongerNeeded`.
----@param scaleform number|string # Scaleform handle or name to request the scaleform movie
----@param methodName string # The method name to call on the scaleform
----@param returnValue? boolean # Whether to return the value from the method
----@param ... number|string|boolean # Arguments to pass to the method
----@return number, number? # The scaleform handle, and the return value if `returnValue` is true
-function ESX.Scaleform.Utils.RunMethod(scaleform, methodName, returnValue, ...)
-    scaleform = type(scaleform) == "number" and scaleform or ESX.Scaleform.Utils.RequestScaleformMovie(scaleform)
-    BeginScaleformMovieMethod(scaleform, methodName)
-
-    local args = { ... }
-    for i, arg in ipairs(args) do
-        local typeArg = type(arg)
-
-        if typeArg == "number" then
-            if math.type(arg) == "float" then
-                ScaleformMovieMethodAddParamFloat(arg)
-            else
-                ScaleformMovieMethodAddParamInt(arg)
-            end
-        elseif typeArg == "string" then
-            ScaleformMovieMethodAddParamTextureNameString(arg)
-        elseif typeArg == "boolean" then
-            ScaleformMovieMethodAddParamBool(arg)
-        end
-    end
-
-    if returnValue then
-        return scaleform, EndScaleformMovieMethodReturnValue()
-    end
-
-    EndScaleformMovieMethod()
-
-    return scaleform
-end

[core]/es_extended/imports.lua

@@ -1,5 +1,5 @@
 ESX = exports["es_extended"]:getSharedObject()
-ESX.currentResourceName = GetCurrentResourceName()
+_resourceName = GetCurrentResourceName()
 
 OnPlayerData = function (key, val, last) end
 
@@ -44,188 +44,67 @@ if not IsDuplicityVersion() then -- Only register this event for the client
     end
 end
 
-if GetResourceState("ox_lib") == "missing" then
-    ---@Credits: https://github.com/overextended/ox_lib/blob/master/imports/require/shared.lua - Licensed under the GNU Lesser General Public License v3.0
-    local loaded = {}
-    local _require = require
-
-    package = {
-        path = './?.lua;./?/init.lua',
-        preload = {},
-        loaded = setmetatable({}, {
-            __index = loaded,
-            __newindex = function() end,
-            __metatable = false,
-        })
-    }
-
-    ---@param modName string
-    ---@return string
-    ---@return string
-    local function getModuleInfo(modName)
-        local resource = modName:match('^@(.-)/.+') --[[@as string?]]
+if not lib?.require then
+    local cachedModules = {} ---@type table<string, any>
+    local loadingModules = {} ---@type table<string, true?>
 
-        if resource then
-            return resource, modName:sub(#resource + 3)
+    ---@param modulePath string
+    ---@return string
+    local function getResourceNameFromModulePath(modulePath)
+        local externalResourceName = modulePath:match("^@(.-)%.")
+        if externalResourceName then
+            return externalResourceName
         end
 
-        local idx = 4 -- call stack depth (kept slightly lower than expected depth "just in case")
-
-        while true do
-            local dbgInfo = debug.getinfo(idx, 'S')
-            local src = dbgInfo and dbgInfo.source
-
-            if not src then
-                return ESX.currentResourceName, modName
-            end
-
-            resource = src:match('^@@([^/]+)/.+')
-
-            if resource and not src:find('^@@es_extended/imports') then
-                return resource, modName
-            end
-
-            idx = idx + 1
-        end
+        return _resourceName
     end
 
-    local tempData = {}
-
-    ---@param name string
-    ---@param path string
-    ---@return string? filename
-    ---@return string? errmsg
-    ---@diagnostic disable-next-line: duplicate-set-field
-    function package.searchpath(name, path)
-        local resource, modName = getModuleInfo(name:gsub('%.', '/'))
-        local tried = {}
-
-        for template in path:gmatch('[^;]+') do
-            local fileName = template:gsub('^%./', ''):gsub('?', modName:gsub('%.', '/') or modName)
-            local file = LoadResourceFile(resource, fileName)
-
-            if file then
-                tempData[1] = file
-                tempData[2] = resource
-                return fileName
-            end
-
-            tried[#tried + 1] = ("no file '@%s/%s'"):format(resource, fileName)
+    ---@param modulePath string
+    ---@return string, number
+    local function getModuleFilePath(modulePath)
+        if modulePath:sub(1, 1) == "@" then
+            modulePath = modulePath:sub(modulePath:find("%.") + 1)
         end
 
-        return nil, table.concat(tried, "\n\t")
+        return modulePath:gsub("%.", "/")
     end
 
-    ---Attempts to load a module at the given path relative to the resource root directory.\
-    ---Returns a function to load the module chunk, or a string containing all tested paths.
-    ---@param modName string
-    ---@param env? table
-    local function loadModule(modName, env)
-        local fileName, err = package.searchpath(modName, package.path)
+    ---@param modulePath string
+    ---@return any
+    function require(modulePath)
+        assert(type(modulePath) == "string", "Module path must be a string")
 
-        if fileName then
-            local file = tempData[1]
-            local resource = tempData[2]
-
-            ESX.Table.Wipe(tempData)
-            return assert(load(file, ('@@%s/%s'):format(resource, fileName), 't', env or _ENV))
+        if loadingModules[modulePath] then
+            error(("Circular dependency detected for module '%s'."):format(modulePath))
         end
 
-        return nil, err or 'unknown error'
-    end
-
-    ---@alias PackageSearcher
-    ---| fun(modName: string): function loader
-    ---| fun(modName: string): nil, string errmsg
-
-    ---@type PackageSearcher[]
-    package.searchers = {
-        function(modName)
-            local ok, result = pcall(_require, modName)
-
-            if ok then return result end
-
-            return ok, result
-        end,
-        function(modName)
-            if package.preload[modName] ~= nil then
-                return package.preload[modName]
-            end
-
-            return nil, ("no field package.preload['%s']"):format(modName)
-        end,
-        function(modName) return loadModule(modName) end,
-    }
-
-    ---@param filePath string
-    ---@param env? table
-    ---@return unknown
-    ---Loads and runs a Lua file at the given path. Unlike require, the chunk is not cached for future use.
-    function ESX.load(filePath, env)
-        if type(filePath) ~= 'string' then
-            error(("file path must be a string (received '%s')"):format(filePath), 2)
+        if cachedModules[modulePath] then
+            return cachedModules[modulePath]
         end
 
-        local result, err = loadModule(filePath, env)
-
-        if result then return result() end
-
-        error(("file '%s' not found\n\t%s"):format(filePath, err))
-    end
-
-    ---@param filePath string
-    ---@return table
-    ---Loads and decodes a json file at the given path.
-    function ESX.loadJson(filePath)
-        if type(filePath) ~= 'string' then
-            error(("file path must be a string (received '%s')"):format(filePath), 2)
-        end
-
-        local resourceSrc, modPath = getModuleInfo(filePath:gsub('%.', '/'))
-        local resourceFile = LoadResourceFile(resourceSrc, ('%s.json'):format(modPath))
-
-        if resourceFile then
-            return json.decode(resourceFile)
-        end
+        loadingModules[modulePath] = true
 
-        error(("json file '%s' not found\n\tno file '@%s/%s.json'"):format(filePath, resourceSrc, modPath))
-    end
+        local resourceName = getResourceNameFromModulePath(modulePath)
+        local moduleFilePath = getModuleFilePath(modulePath)
+        local moduleFileContent = LoadResourceFile(resourceName, moduleFilePath .. ".lua")
 
-    ---Loads the given module, returns any value returned by the seacher (`true` when `nil`).\
-    ---Passing `@resourceName.modName` loads a module from a remote resource.
-    ---@param modName string
-    ---@return unknown
-    function ESX.require(modName)
-        if type(modName) ~= 'string' then
-            error(("module name must be a string (received '%s')"):format(modName), 3)
+        if not moduleFileContent then
+            loadingModules[modulePath] = nil
+            error(("Module '%s' not found in resource '%s'."):format(moduleFilePath, resourceName))
         end
 
-        local module = loaded[modName]
+        local chunk, err = load(moduleFileContent, ("@%s/%s"):format(resourceName, moduleFilePath), "t")
 
-        if module == '__loading' then
-            error(("^1circular-dependency occurred when loading module '%s'^0"):format(modName), 2)
+        if not chunk then
+            loadingModules[modulePath] = nil
+            error(("Failed to load module '%s': %s"):format(moduleFilePath, err))
         end
 
-        if module ~= nil then return module end
-
-        loaded[modName] = '__loading'
+        local result = chunk()
 
-        local err = {}
+        cachedModules[modulePath] = result ~= nil and result or true
+        loadingModules[modulePath] = nil
 
-        for i = 1, #package.searchers do
-            local result, errMsg = package.searchers[i](modName)
-            if result then
-                if type(result) == 'function' then result = result() end
-                loaded[modName] = result or result == nil
-
-                return loaded[modName]
-            end
-
-            err[#err + 1] = errMsg
-        end
-
-        error(("%s"):format(table.concat(err, "\n\t")))
+        return result
     end
-
-    require = ESX.require
 end

[core]/es_extended/server/functions.lua

@@ -563,7 +563,7 @@ end
 
 ---@return table
 function ESX.GetItems()
-    return ESX.Items
+    return Core.Items
 end
 
 ---@return table