From 8642733b78d98678a1ddea555489639e5a12c293 Mon Sep 17 00:00:00 2001 From: Jim Shield Date: Sun, 21 Jan 2024 17:17:55 +0000 Subject: [PATCH 1/4] version.txt - Version bump - 1.0.5 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index cbe16b3..f1cd2a9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.4 +1.0.5 From 2ca1cbd11046f2f45d899429bee9a4a64b956680 Mon Sep 17 00:00:00 2001 From: Jim Shield Date: Sun, 21 Jan 2024 17:20:15 +0000 Subject: [PATCH 2/4] fxmanifest.lua - Version Bump v1.0.5 --- fxmanifest.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index 014697c..7a4a8b5 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -1,6 +1,6 @@ name "Jim_Bridge" author "Jimathy" -version "1.0.4" +version "1.0.5" description "Framework Bridge By Jimathy" fx_version "cerulean" game "gta5" @@ -11,4 +11,4 @@ files { 'functions.lua', 'wrapper.lua', 'crafting.lua', -} \ No newline at end of file +} From 0592c3ebc8802226f67a8d63ef39db5b03a5d5f6 Mon Sep 17 00:00:00 2001 From: Jim Shield Date: Sun, 21 Jan 2024 17:24:10 +0000 Subject: [PATCH 3/4] Fix stashRemoveItem for QS-Inv --- crafting.lua | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/crafting.lua b/crafting.lua index 4e20ef1..0b9c381 100644 --- a/crafting.lua +++ b/crafting.lua @@ -348,8 +348,21 @@ function stashRemoveItem(stashItems, stashName, items) local amount = amount and end elseif GetResourceState(QSInv):find("start") then for k, v in pairs(items) do - exports[QSInv]:RemoveItemIntoStash(stashName, k, v) - if Config.System.Debug then print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QSInv, k, v) end + for l in pairs(stashItems) do + if stashItems[l].name == k then + if (stashItems[l].amount - v) <= 0 then + if Config.System.Debug then + print("^6Bridge^7: ^2None of this item left in stash ^3Stash^7", k, v) + end + stashItems[l] = nil + else + if Config.System.Debug then + print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QBInv, k, v) + end + exports[QSInv]:RemoveItemIntoStash(stashName, k, v, l) + end + end + end end elseif GetResourceState(CodeMInv):find("start") then for k, v in pairs(items) do From 6847639c6567bab99ef654e6db7c3fabf3917480 Mon Sep 17 00:00:00 2001 From: Jim Shield Date: Sun, 21 Jan 2024 17:24:32 +0000 Subject: [PATCH 4/4] Fix version checking system being dumb --- functions.lua | 4 ++-- wrapper.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/functions.lua b/functions.lua index f2cfb9a..987e6ff 100644 --- a/functions.lua +++ b/functions.lua @@ -685,12 +685,12 @@ local function CheckVersion() PerformHttpRequest('https://raw.githubusercontent.com/jimathy/'..GetCurrentResourceName()..'/master/version.txt', function(err, freeVersion, headers) if not freeVersion then print("^1Currently unable to run a version check for ^7'^3"..GetCurrentResourceName().."^7' ("..currentVersion.."^7)") return end local currentVersion = "^3"..GetResourceMetadata(GetCurrentResourceName(), 'version'):gsub("%.", "^7.^3").."^7" - freeVersion = "^3"..freeVersion:sub(1, -2):gsub("%.", "^7.^3").."^7" + freeVersion = "^3"..freeVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7" print("^6Version Check^7: ^2Running^7: "..currentVersion.." ^2Latest^7: "..freeVersion) print(freeVersion == currentVersion and "^7'^3"..GetCurrentResourceName().."^7' - ^6You are running the latest version.^7 ("..currentVersion..")" or "^7'^3"..GetCurrentResourceName().."^7' - ^1You are currently running an outdated version^7, ^1please update^7!") end) else - newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3").."^7" + newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7" print("^6Version Check^7: ^2Running^7: "..currentVersion.." ^2Latest^7: "..newestVersion) print(newestVersion == currentVersion and '^6You are running the latest version.^7 ('..currentVersion..')' or "^1You are currently running an outdated version^7, ^1please update^7!") end diff --git a/wrapper.lua b/wrapper.lua index 01eba4b..df031a0 100644 --- a/wrapper.lua +++ b/wrapper.lua @@ -23,7 +23,7 @@ function CheckBridgeVersion() local currentVersion = "^3"..GetResourceMetadata("jim_bridge", 'version'):gsub("%.", "^7.^3").."^7" PerformHttpRequest('https://raw.githubusercontent.com/jimathy/jim_bridge/master/version.txt', function(err, newestVersion, headers) if not newestVersion then print("^1Currently unable to run a version check for ^7'^3jim_bridge^7' ("..currentVersion.."^7)") return end - newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3").."^7" + newestVersion = "^3"..newestVersion:sub(1, -2):gsub("%.", "^7.^3"):gsub("%\r", "").."^7" print(newestVersion == currentVersion and "^7'^3jim_bridge^7' - ^6You are running the latest version.^7 ("..currentVersion..")" or "^7'^3jim_bridge^7' - ^1You are currently running an outdated version^7, ^1please update^7!") end) end