diff --git a/CSTM-RESOURCE-GENERATOR-0.3.0.vsix b/CSTM-RESOURCE-GENERATOR-0.3.0.vsix deleted file mode 100644 index 02cf41e..0000000 Binary files a/CSTM-RESOURCE-GENERATOR-0.3.0.vsix and /dev/null differ diff --git a/CSTM-RESOURCE-GENERATOR-0.4.0.vsix b/CSTM-RESOURCE-GENERATOR-0.5.0.vsix similarity index 99% rename from CSTM-RESOURCE-GENERATOR-0.4.0.vsix rename to CSTM-RESOURCE-GENERATOR-0.5.0.vsix index ff50d72..cc4ac5e 100644 Binary files a/CSTM-RESOURCE-GENERATOR-0.4.0.vsix and b/CSTM-RESOURCE-GENERATOR-0.5.0.vsix differ diff --git a/package.json b/package.json index 09de029..d2bcb05 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "name": "CSTM-RESOURCE-GENERATOR", "displayName": "CSTM Five Alive Resource Generator", "description": "This is an internal tool to help you in creating a new basic lua resource for FiveAlive", - "version": "0.4.0", + "version": "0.5.0", "engines": { "vscode": "^1.59.0" }, diff --git a/template/client/client.lua b/template/client/client.lua index 5831c93..3cfa987 100644 --- a/template/client/client.lua +++ b/template/client/client.lua @@ -19,7 +19,11 @@ local RESOURCE_CODE = GetResourceMetadata(GetCurrentResourceName(), "resource_co ------------------------------------------------------------------------------------------------ ---SLF Server Logging Function DO NOT TOUCH unless you know what you are doing. +--SLF Server Logging Function DO NOT TOUCH unless you know what you are doing + +---Used to send logs to the client console +---@param message any Preformatted message or VARIABLES to be sent to log +---@param logLevel integer Level of log, 1-Error, 2-Warn, 3-Info, 4-Debug function Log(message, logLevel) local line = debug.getinfo(2, "l").currentline local name = debug.getinfo(2, "n").name @@ -27,8 +31,13 @@ function Log(message, logLevel) name = "Thread" end local value = "{"..CLASS.."."..name.."("..line..")} "..message - if tonumber(LOG_LEVEL) >= logLevel then + if logLevel then + if tonumber(LOG_LEVEL) >= logLevel then exports.SLF:LogToClient(RESOURCE_CODE, logLevel, value) + end + else + exports.SLF:LogToClient(RESOURCE_CODE, 4, value) + Log("Warning line was logged without a level value... Logged it as debug as that is the safest route.", 1) end end diff --git a/template/server/server.lua b/template/server/server.lua index f5f65a6..1b91213 100644 --- a/template/server/server.lua +++ b/template/server/server.lua @@ -20,6 +20,10 @@ local RESOURCE_CODE = GetResourceMetadata(GetCurrentResourceName(), "resource_co ------------------------------------------------------------------------------------------------ --SLF Server Logging Function DO NOT TOUCH unless you know what you are doing. + +---Used to send logs to the server console +---@param message any Preformatted message or VARIABLES to be sent to log +---@param logLevel integer Level of log, 1-Error, 2-Warn, 3-Info, 4-Debug function Log(message, logLevel) local line = debug.getinfo(2, "l").currentline local name = debug.getinfo(2, "n").name @@ -27,8 +31,13 @@ function Log(message, logLevel) name = "Thread" end local value = "{"..CLASS.."."..name.."("..line..")} "..message - if tonumber(LOG_LEVEL) >= logLevel then + if logLevel then + if tonumber(LOG_LEVEL) >= logLevel then exports.SLF:LogToServer(RESOURCE_CODE, logLevel, value) + end + else + exports.SLF:LogToServer(RESOURCE_CODE, 4, value) + Log("Warning line was logged without a level value... Logged it as debug as that is the safest route.", 1) end end