Version Bump - 1.0.6

1.0.5

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)
+            for l in pairs(stashItems) do
-            if Config.System.Debug then print("^6Bridge^7: ^2Removing item from ^3Stash^2 with ^7"..QSInv, k, v) end
+                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

functions.lua

@@ -29,7 +29,7 @@ function pairsByKeys(t) local a = {} for n in pairs(t) do a[#a+1] = n end table.
 
 function playAnim(animDict, animName, duration, flag, ped)
 	loadAnimDict(animDict)
-	TaskPlayAnim(ped and ped or PlayerPedId(), animDict, animName, 1.0, -1.0, duration or 30000, flag or 50, 1, false, false, false)
+	TaskPlayAnim(ped and ped or PlayerPedId(), animDict, animName, 8.0, -8.0, duration or 30000, flag or 50, 1, false, false, false)
 end
 
 function stopAnim(animDict, animName)
@@ -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

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "1.0.4"
+version "1.0.6"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 game "gta5"

version.txt

@@ -1 +1 @@
-1.0.4
+1.0.6

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
@@ -767,6 +767,7 @@ function createInput(title, opts)
                 options[i] = {
                     type = "input",
                     label = opts[i].text ..(opts[i].txt and " - "..opts[i].txt or ""),
+                    default = opts[i].default,
                     isRequired = opts[i].isRequired,
                 }
             end
@@ -925,23 +926,47 @@ function getVehicleProperties(vehicle)
     if vehicle == nil then return nil end
     if GetResourceState(QBExport):find("start") and not GetResourceState(QBXExport):find("start") then
         properties = Core.Functions.GetVehicleProperties(vehicle)
+        if Config.System.Debug then print("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]") end
     elseif GetResourceState(OXLibExport):find("start") then
         properties = lib.getVehicleProperties(vehicle)
+        if Config.System.Debug then print("^6Bridge^7: ^2Getting Vehicle Properties ^7[^6"..OXLibExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..properties.model.."^7] - [^3"..properties.plate.."^7]") end
     end
     return properties
 end
 
 function setVehicleProperties(vehicle, props)
+    local oldProps = getVehicleProperties(vehicle)
+    if checkDifferences(vehicle, props) then
+        --if Config.System.Debug then debugDifferences(vehicle, props) end
         if not DoesEntityExist(vehicle) then
             print(("Unable to set vehicle properties for '%s' (entity does not exist)"):
             format(vehicle))
         end
         if GetResourceState(QBExport):find("start") and not GetResourceState(QBXExport):find("start") then
-        if Config.System.Debug then print("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7] - [^3"..props.plate.."^7]") end
             Core.Functions.SetVehicleProperties(vehicle, props)
+            if Config.System.Debug then print("^6Bridge^7: ^2Setting Vehicle Properties ^7[^6"..QBExport.."^7] - [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]") end
         else
             TriggerServerEvent(GetCurrentResourceName()..":ox:setVehicleProperties", VehToNet(vehicle), props)
         end
+    else
+        if Config.System.Debug then print("^6Bridge^7: ^2No Changes Found ^7 [^3"..vehicle.."^7] - [^3"..GetEntityModel(vehicle).."^7/^3"..props.model.."^7] - [^3"..props.plate.."^7]") end
+    end
+end
+
+function checkDifferences(vehicle, newProps)
+    local oldProps = getVehicleProperties(vehicle)
+    if Config.System.Debug then print("^6Bridge^7: ^2Finding differences in ^3Vehicle Properties^7") end
+    local allow = false
+    for k in pairs(oldProps) do
+        if json.encode(oldProps[k]) ~= json.encode(newProps[k]) then
+            allow = true
+            if Config.System.Debug then
+                print("^6Bridge^7: ^5Old ^7[^3"..k.."^7] - "..json.encode(oldProps[k], { indent = true }))
+                print("^6Bridge^7: ^5New ^7[^3"..k.."^7] - "..json.encode(newProps[k], { indent = true }))
+            end
+        end
+    end
+    return allow
 end
 
 RegisterNetEvent(GetCurrentResourceName()..":ox:setVehicleProperties", function(netId, props)