diff --git a/init.lua b/init.lua index 7fc095c..7e22867 100644 --- a/init.lua +++ b/init.lua @@ -35,8 +35,6 @@ end --TODO: Create a way to overide functions or create a new functions for module -local DefaultInventory = Require("components/modules_defaults/inventory/defaults.lua") - Bridge.RegisterModule("Framework", Framework) Bridge.RegisterModule("Inventory", Inventory, DefaultInventory) Bridge.RegisterModule("Notify", Notify) diff --git a/modules/Inventory/_default/client.lua b/modules/Inventory/_default/client.lua index d19ca5c..f7f5e7d 100644 --- a/modules/Inventory/_default/client.lua +++ b/modules/Inventory/_default/client.lua @@ -1,9 +1,9 @@ -Inventory = Inventory or {} +DefaultInventory = DefaultInventory or {} -Inventory.GetItemInfo = function(item) +DefaultInventory.GetItemInfo = function(item) return Framework.GetItemInfo(item) end -Inventory.GetImagePath = function(item) +DefaultInventory.GetImagePath = function(item) return "https://avatars.githubusercontent.com/u/47620135" end \ No newline at end of file diff --git a/modules/Inventory/_default/server.lua b/modules/Inventory/_default/server.lua index 8d058c5..8879f4e 100644 --- a/modules/Inventory/_default/server.lua +++ b/modules/Inventory/_default/server.lua @@ -1,33 +1,33 @@ -Inventory = Inventory or {} +DefaultInventory = DefaultInventory or {} -Inventory.AddItem = function(src, item, count, slot, metadata) +DefaultInventory.AddItem = function(src, item, count, slot, metadata) return Framework.AddItem(src, item, count, slot, metadata) end -Inventory.RemoveItem = function(src, item, count, slot, metadata) +DefaultInventory.RemoveItem = function(src, item, count, slot, metadata) return Framework.RemoveItem(src, item, count, slot, metadata) end -Inventory.GetItemInfo = function(item) +DefaultInventory.GetItemInfo = function(item) return false, Print.Error("This Inventory Has Not Been Bridged For An Item Info Feature.") end -Inventory.GetItemCount = function(src, item, metadata) +DefaultInventory.GetItemCount = function(src, item, metadata) return Framework.GetItemCount(src, item, metadata) end -Inventory.GetInventoryItems = function(src) +DefaultInventory.GetInventoryItems = function(src) return Framework.GetPlayerInventory(src) end -Inventory.SetMetadata = function(src, item, slot, metadata) +DefaultInventory.SetMetadata = function(src, item, slot, metadata) return Framework.SetMetadata(src, item, slot, metadata) end -Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) +DefaultInventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) return false, Print.Error("This Inventory Has Not Been Bridged For A Stash Feature.") end -Inventory.GetImagePath = function(item) +DefaultInventory.GetImagePath = function(item) return "https://avatars.githubusercontent.com/u/47620135" end \ No newline at end of file diff --git a/modules/inventory/core_inventory/client.lua b/modules/inventory/core_inventory/client.lua deleted file mode 100644 index 0e57436..0000000 --- a/modules/inventory/core_inventory/client.lua +++ /dev/null @@ -1,6 +0,0 @@ -if GetResourceState('core_inventory') ~= 'started' then return end - -Inventory = Inventory or {} -Inventory.TestText = function() - return 'test client' -end diff --git a/modules/inventory/core_inventory/server.lua b/modules/inventory/core_inventory/server.lua deleted file mode 100644 index e98fd99..0000000 --- a/modules/inventory/core_inventory/server.lua +++ /dev/null @@ -1,6 +0,0 @@ -if GetResourceState('core_inventory') ~= 'started' then return end - -Inventory = Inventory or {} -Inventory.TestText = function() - return 'test' -end \ No newline at end of file