From 99f7f4eb1144f5e8fde2992c6d113a604880b547 Mon Sep 17 00:00:00 2001 From: qwezert Date: Thu, 9 Jan 2025 19:06:33 +0200 Subject: [PATCH] fixes init file, remove old code, add template for core_inventory --- init.lua | 41 ++++++--------------- modules/Inventory/_default/client.lua | 6 +-- modules/Inventory/_default/server.lua | 18 ++++----- modules/Inventory/core_inventory/client.lua | 7 ++++ modules/Inventory/core_inventory/server.lua | 7 ++++ 5 files changed, 37 insertions(+), 42 deletions(-) create mode 100644 modules/Inventory/core_inventory/client.lua create mode 100644 modules/Inventory/core_inventory/server.lua diff --git a/init.lua b/init.lua index 701eb4e..95a2a93 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,15 @@ Bridge = {} -local function registerModule(moduleName, moduleTable) +function Bridge.RegisterModule(moduleName, moduleTable) + if not moduleTable then + print("No moduleTable provided for module and no defaultsTable found: ", moduleName) + return + end + if Bridge[moduleName] then + print("Module already registered:", moduleName) + return + end + local wrappedModule = {} for functionName, func in pairs(moduleTable) do wrappedModule[functionName] = func @@ -9,38 +18,10 @@ local function registerModule(moduleName, moduleTable) Bridge[moduleName] = wrappedModule end -function Bridge.RegisterModule(moduleName, moduleTable, defaultsTable) - if not moduleTable then - if not defaultsTable then - print("No moduleTable or defaultsTable provided for module:", moduleName) - return - end - moduleTable = defaultsTable - registerModule(moduleName, moduleTable) - return - end - - if Bridge[moduleName] then - print("Module already registered:", moduleName) - return - end - - if defaultsTable and type(defaultsTable) == "table" then - for functionName, func in pairs(defaultsTable) do - if not moduleTable[functionName] then - moduleTable[functionName] = func - print(string.format("Added function '%s' from defaultsTable to module '%s'", functionName, moduleName)) - end - end - end - - registerModule(moduleName, moduleTable) -end - --TODO: Create a way to overide functions or create a new functions for module Bridge.RegisterModule("Framework", Framework) -Bridge.RegisterModule("Inventory", Inventory, DefaultInventory) +Bridge.RegisterModule("Inventory", Inventory) Bridge.RegisterModule("Notify", Notify) Bridge.RegisterModule("Utility", Utility) Bridge.RegisterModule("Progressbar", Progressbar) diff --git a/modules/Inventory/_default/client.lua b/modules/Inventory/_default/client.lua index 48a46a6..db02090 100644 --- a/modules/Inventory/_default/client.lua +++ b/modules/Inventory/_default/client.lua @@ -1,10 +1,10 @@ -DefaultInventory = DefaultInventory or {} +Inventory = Inventory or {} -DefaultInventory.GetItemInfo = function(item) +Inventory.GetItemInfo = function(item) print('client funct') return Framework.GetItemInfo(item) end -DefaultInventory.GetImagePath = function(item) +Inventory.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 cbfbce9..42ec76d 100644 --- a/modules/Inventory/_default/server.lua +++ b/modules/Inventory/_default/server.lua @@ -1,33 +1,33 @@ -DefaultInventory = DefaultInventory or {} +Inventory = Inventory or {} -DefaultInventory.AddItem = function(src, item, count, slot, metadata) +Inventory.AddItem = function(src, item, count, slot, metadata) return Framework.AddItem(src, item, count, slot, metadata) end -DefaultInventory.RemoveItem = function(src, item, count, slot, metadata) +Inventory.RemoveItem = function(src, item, count, slot, metadata) return Framework.RemoveItem(src, item, count, slot, metadata) end -DefaultInventory.GetItemInfo = function(item) +Inventory.GetItemInfo = function(item) return false, print("This Inventory Has Not Been Bridged For An Item Info Feature.") end -DefaultInventory.GetItemCount = function(src, item, metadata) +Inventory.GetItemCount = function(src, item, metadata) return Framework.GetItemCount(src, item, metadata) end -DefaultInventory.GetInventoryItems = function(src) +Inventory.GetInventoryItems = function(src) return Framework.GetPlayerInventory(src) end -DefaultInventory.SetMetadata = function(src, item, slot, metadata) +Inventory.SetMetadata = function(src, item, slot, metadata) return Framework.SetMetadata(src, item, slot, metadata) end -DefaultInventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) +Inventory.OpenStash = function(src, id, label, slots, weight, owner, groups, coords) return false, print("This Inventory Has Not Been Bridged For A Stash Feature.") end -DefaultInventory.GetImagePath = function(item) +Inventory.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 new file mode 100644 index 0000000..124acd1 --- /dev/null +++ b/modules/Inventory/core_inventory/client.lua @@ -0,0 +1,7 @@ +if GetResourceState('core_inventory') ~= 'started' then return end + +Inventory = Inventory or {} + +Inventory.TestFunction = function(item) + return 'test funct client inv' +end \ No newline at end of file diff --git a/modules/Inventory/core_inventory/server.lua b/modules/Inventory/core_inventory/server.lua new file mode 100644 index 0000000..bf8e186 --- /dev/null +++ b/modules/Inventory/core_inventory/server.lua @@ -0,0 +1,7 @@ +if GetResourceState('core_inventory') ~= 'started' then return end + +Inventory = Inventory or {} + +Inventory.TestFunction = function(item) + return 'test funct server inv' +end \ No newline at end of file