mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-17 05:56:02 +01:00
Bump to 2.0.01
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
name "Jim_Bridge"
|
||||
author "Jimathy"
|
||||
version "2.0"
|
||||
version "2.0.01"
|
||||
description "Framework Bridge By Jimathy"
|
||||
fx_version "cerulean"
|
||||
rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
|
||||
|
||||
@@ -661,6 +661,7 @@ end
|
||||
-------------------------------------------------------------
|
||||
-- Server Callback Registration
|
||||
-------------------------------------------------------------
|
||||
AuthEvent = nil
|
||||
currentToken = nil
|
||||
if isServer() then
|
||||
createCallback(getScript()..":server:canCarry", function(source, itemTable)
|
||||
@@ -720,6 +721,8 @@ if isServer() then
|
||||
end
|
||||
end)
|
||||
else
|
||||
debugPrint("^1Auth^7: ^2Requesting ^3Auth Event^7")
|
||||
AuthEvent = triggerCallback(getScript()..":callback:GetAuthEvent")
|
||||
onPlayerLoaded(function()
|
||||
debugPrint("^1Auth^7: ^2Requesting ^3Auth Event^7")
|
||||
AuthEvent = triggerCallback(getScript()..":callback:GetAuthEvent")
|
||||
end, true)
|
||||
end
|
||||
|
||||
@@ -295,7 +295,9 @@ end
|
||||
--- stashRemoveItem(currentItems, "playerStash", { iron = 2, wood = 5 })
|
||||
--- ```
|
||||
function stashRemoveItem(stashItems, stashName, items)
|
||||
|
||||
if type(stashName) ~= "table" then
|
||||
stashName = { stashName }
|
||||
end
|
||||
if isStarted(OXInv) then
|
||||
for k, v in pairs(items) do
|
||||
if type(stashName) == "table" then
|
||||
|
||||
21
starter.lua
21
starter.lua
@@ -55,9 +55,28 @@ QBInvNew = true
|
||||
|
||||
InventoryWeight = 120000
|
||||
|
||||
-- Testing loading the core files here instead of in fxmanifests
|
||||
--for k, v in pairs({ -- This is a specific load order
|
||||
-- [Exports.OXLibExport] = "init.lua",
|
||||
-- [Exports.OXCoreExport] = "lib/init.lua",
|
||||
-- [Exports.ESXExport] = "imports.lua",
|
||||
-- [Exports.QBXExport] = "modules/playerdata.lua",
|
||||
--}) do
|
||||
-- if GetResourceState(k) == "started" then
|
||||
-- print("^5Loading^7: '"..k.."/"..v.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
|
||||
-- local fileLoader = assert(load(LoadResourceFile(k, (v)), ('@@'..k..'/'..v)))
|
||||
-- fileLoader()
|
||||
-- print("^2Success^7: ^2loaded ^1Core ^2file^7: ^3"..k.."^7/^3"..(v):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").."^7")
|
||||
-- else
|
||||
-- if debugMode then
|
||||
-- print("^3Warning^7: ^3"..k.." ^2not found^7, ^2skipping")
|
||||
-- end
|
||||
-- end
|
||||
--end
|
||||
|
||||
-- Load files here into the invoking script
|
||||
for _, v in pairs({ -- This is a specific load order
|
||||
--'convarCheck.lua',
|
||||
|
||||
'helpers.lua', -- needs to be first
|
||||
'_loaders.lua',
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
2.0
|
||||
2.0.01
|
||||
Reference in New Issue
Block a user