FumeNodes/jim_bridge
1
0
Fork 0
mirror of https://github.com/jimathy/jim_bridge.git synced 2026-08-19 06:46:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump to 2.0.01

Browse Source
This commit is contained in:
Jim Shield
2025-04-29 12:31:05 +01:00
committed by GitHub
parent 25dadae446 a308f82be9
commit dc9e090889
5 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fxmanifest.lua
View File

@@ -1,6 +1,6 @@
name "Jim_Bridge" name "Jim_Bridge"
author "Jimathy" author "Jimathy"
version "2.0" version "2.0.01"
description "Framework Bridge By Jimathy" description "Framework Bridge By Jimathy"
fx_version "cerulean" 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.' rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'

3
shared/itemcontrol.lua
View File

@@ -661,6 +661,7 @@ end
------------------------------------------------------------- -------------------------------------------------------------
-- Server Callback Registration -- Server Callback Registration
------------------------------------------------------------- -------------------------------------------------------------
AuthEvent = nil
currentToken = nil currentToken = nil
if isServer() then if isServer() then
createCallback(getScript()..":server:canCarry", function(source, itemTable) createCallback(getScript()..":server:canCarry", function(source, itemTable)
@@ -720,6 +721,8 @@ if isServer() then
end end
end) end)
else else
onPlayerLoaded(function()
debugPrint("^1Auth^7: ^2Requesting ^3Auth Event^7") debugPrint("^1Auth^7: ^2Requesting ^3Auth Event^7")
AuthEvent = triggerCallback(getScript()..":callback:GetAuthEvent") AuthEvent = triggerCallback(getScript()..":callback:GetAuthEvent")
end, true)
end end

4
shared/stashcontrol.lua
View File

@@ -295,7 +295,9 @@ end
--- stashRemoveItem(currentItems, "playerStash", { iron = 2, wood = 5 }) --- stashRemoveItem(currentItems, "playerStash", { iron = 2, wood = 5 })
--- ``` --- ```
function stashRemoveItem(stashItems, stashName, items) function stashRemoveItem(stashItems, stashName, items)
if type(stashName) ~= "table" then
stashName = { stashName }
end
if isStarted(OXInv) then if isStarted(OXInv) then
for k, v in pairs(items) do for k, v in pairs(items) do
if type(stashName) == "table" then if type(stashName) == "table" then

21
starter.lua
View File

@@ -55,9 +55,28 @@ QBInvNew = true
InventoryWeight = 120000 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 -- Load files here into the invoking script
for _, v in pairs({ -- This is a specific load order for _, v in pairs({ -- This is a specific load order
--'convarCheck.lua',
'helpers.lua', -- needs to be first 'helpers.lua', -- needs to be first
'_loaders.lua', '_loaders.lua',

2
version.txt
View File

@@ -1 +1 @@
2.0 2.0.01