Merge pull request #120 from The-Order-Of-The-Sacred-Framework/dev

Dev 0.9.2

README.md

@@ -3,6 +3,7 @@
 
 <div align="center">
 
+![Used by 500+ servers](https://img.shields.io/badge/used%20by-500%2B%20servers-6e7781?style=flat&logo=github)
 ![](https://img.shields.io/github/contributors/The-Order-Of-The-Sacred-Framework/community_bridge?logo=github)
 ![](https://img.shields.io/github/v/release/The-Order-Of-The-Sacred-Framework/community_bridge?logo=github)
 

fxmanifest.lua

@@ -5,7 +5,7 @@ use_experimental_fxv2_oal 'yes'
 author 'The Order of the Sacred Framework'
 name 'community_bridge'
 description 'A Universal Bridge for Our Community, created by a group of contributors with a shared vision to enhance both user and developer experiences. This bridge connects various frameworks, inventories, target systems, notification systems, and more, fostering compatibility and seamless integration.'
-version '0.9.1'
+version '0.9.2'
 
 shared_scripts {
     '@ox_lib/init.lua',

init.lua

@@ -72,7 +72,7 @@ Bridge.RegisterModule("Require", Require)
 -- Bridge.RegisterModule("Perlin", cLib.Perlin)
 -- Bridge.RegisterModule("Actions", cLib.Actions)
 -- Bridge.RegisterModule("Cache", cLib.Cache)
--- Bridge.RegisterModule("Skills", Skills)
+Bridge.RegisterModule("Skills", Skills)
 
 
 for k, v in pairs(cLib) do

modules/inventory/codem-inventory/server.lua

@@ -184,21 +184,4 @@ Inventory.GetImagePath = function(item)
     return imagePath or "https://avatars.githubusercontent.com/u/47620135"
 end
 
-
--- This will open the specified shop for the src passed.
----@param src number
----@param shopTitle string
-Inventory.OpenShop = function(src, shopTitle)
-    print("Unable to open shop for codem-inventory, I do not have access to a copy of this inventory to bridge the feature.")
-end
-
--- This will register a shop, if it already exists it will return true.
----@param shopTitle string
----@param shopInventory table
----@param shopCoords table
----@param shopGroups table
-Inventory.RegisterShop = function(shopTitle, shopInventory, shopCoords, shopGroups)
-    return true, print("Unable to Create Shop for codem-inventory, I do not have access to a copy of this inventory to bridge the feature.")
-end
-
 return Inventory

modules/inventory/core_inventory/server.lua

@@ -244,22 +244,6 @@ Inventory.GetImagePath = function(item)
     return imagePath or "https://avatars.githubusercontent.com/u/47620135"
 end
 
----This will open the specified shop for the src passed.
----@param src number
----@param shopTitle string
-Inventory.OpenShop = function(src, shopTitle)
-    return false, print("Unable to open shop for core_inventory, I do not have access to a copy of this inventory to bridge the feature.")
-end
-
----This will register a shop, if it already exists it will return true.
----@param shopTitle string
----@param shopInventory table
----@param shopCoords table
----@param shopGroups table
-Inventory.RegisterShop = function(shopTitle, shopInventory, shopCoords, shopGroups)
-    return false, print("Unable to open shop for core_inventory, I do not have access to a copy of this inventory to bridge the feature.")
-end
-
 ---<-- TODO swap to internal callback system
 ---This is used for the esx users, documentation doesnt show a client side available option for the inventory so we use jank callbacks to get this.
 lib.callback.register('community_bridge:Callback:core_inventory', function(source)

modules/inventory/origen_inventory/server.lua

@@ -233,21 +233,4 @@ Inventory.GetImagePath = function(item)
     return imagePath or "https://avatars.githubusercontent.com/u/47620135"
 end
 
--- This will open the specified shop for the src passed.
----@param src number
----@param shopTitle string
-Inventory.OpenShop = function(src, shopTitle)
-    print("Currently runtime shops are not supported in origen_inventory")
-end
-
--- This will register a shop, if it already exists it will return true.
----@param shopTitle string
----@param shopInventory table
----@param shopCoords table
----@param shopGroups table
-Inventory.RegisterShop = function(shopTitle, shopInventory, shopCoords, shopGroups)
-    return true, print("Currently runtime shops are not supported in origen_inventory")
-end
-
-
 return Inventory

modules/inventory/ox_inventory/client.lua

@@ -1,5 +1,8 @@
 ---@diagnostic disable: duplicate-set-field
 if GetResourceState('ox_inventory') ~= 'started' then return end
+if GetResourceState('qs-inventory') == 'started' then return end
+if GetResourceState('origen_inventory') == 'started' then return end
+
 local ox_inventory = exports.ox_inventory
 
 Inventory = Inventory or {}
@@ -50,8 +53,4 @@ Inventory.GetPlayerInventory = function()
     return ox_inventory:GetPlayerItems()
 end
 
-Inventory.OpenShop = function(shopTitle, shopInventory)
-    ox_inventory:openInventory("shop", { type = shopTitle, id = 1 })
-end
-
 return Inventory

modules/inventory/ox_inventory/server.lua

@@ -1,5 +1,7 @@
 ---@diagnostic disable: duplicate-set-field
 if GetResourceState('ox_inventory') ~= 'started' then return end
+if GetResourceState('qs-inventory') == 'started' then return end
+if GetResourceState('origen_inventory') == 'started' then return end
 
 local ox_inventory = exports.ox_inventory
 local registeredShops = {}

modules/inventory/qs-inventory/server.lua

@@ -227,20 +227,4 @@ Inventory.GetImagePath = function(item)
     return imagePath or "https://avatars.githubusercontent.com/u/47620135"
 end
 
--- This will open the specified shop for the src passed.
----@param src number
----@param shopTitle string
-Inventory.OpenShop = function(src, shopTitle)
-    print("Currently qs shop is not bridged")
-end
-
--- This will register a shop, if it already exists it will return true.
----@param shopTitle string
----@param shopInventory table
----@param shopCoords table
----@param shopGroups table
-Inventory.RegisterShop = function(shopTitle, shopInventory, shopCoords, shopGroups)
-    return false, print("Currently qs shop is not bridged")
-end
-
 return Inventory

modules/inventory/tgiann-inventory/server.lua

@@ -206,22 +206,6 @@ Inventory.GetImagePath = function(item)
 end
 
 
--- This will open the specified shop for the src passed.
----@param src number
----@param shopTitle string
-Inventory.OpenShop = function(src, shopTitle)
-    return false, print("Currently tgiann-inventory is not bridged for shops")
-end
-
--- This will register a shop, if it already exists it will return true.
----@param shopTitle string
----@param shopInventory table
----@param shopCoords table
----@param shopGroups table
-Inventory.RegisterShop = function(shopTitle, shopInventory, shopCoords, shopGroups)
-    return false, print("Currently tgiann-inventory is not bridged for shops")
-end
-
 ---UNUSED:
 ---This will return generic item data from the specified inventory, with the items total count.
 ---