Skip to content

Commit dc01f1c

Browse files
authored
Merge pull request #24 from TeamMeadows/develop
merge 1.0.0-rc.4
2 parents 22b0eea + 1471976 commit dc01f1c

4 files changed

Lines changed: 22 additions & 5 deletions

File tree

lua/atomic/libraries/logger.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ end
7474

7575
atomic._config.logLevel = atomic.logger.getCurrentLevel()
7676

77+
---@private
78+
function Logger:__tostring()
79+
return "Logger [" .. tostring(self.prefix) .. "]"
80+
end
81+
7782
---@param prefix string
7883
function Logger:init(prefix)
7984
self.prefix = prefix

lua/atomic/libraries/package/class.lua

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ function Package:disable()
220220

221221
local localization = self._metadata.language
222222

223-
-- todo why its is not in registry?
223+
-- todo why it is not in registry?
224224
if (localization) then
225225
for language, tab in pairs(localization) do
226226
for phraseId in pairs(tab) do
@@ -313,6 +313,11 @@ function Package:getKind()
313313
return self._metadata.kind or "system"
314314
end
315315

316+
---@return Atomic.Logger
317+
function Package:getLogger()
318+
return self.logger
319+
end
320+
316321
---@private
317322
function Package:getClientFiles()
318323
return self._metadata.files.client or {}
@@ -595,7 +600,7 @@ end
595600
---@param data table<string, any>
596601
---@param player? Player | table | Vector
597602
---@param sendFunction? "Send" | "SendOmit" | "SendPAS" | "SendPVS" | "Broadcast"
598-
---@return string? Message id
603+
---@return boolean
599604
function Package:sendNetworkMessage(name, data, player, sendFunction)
600605
---@type Atomic.Network.Schema
601606
local schema = self._registry:lookup("netschemas", name)

lua/atomic/libraries/semver.lua

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,11 @@ end
217217
---@return boolean
218218
function SemanticVersion:__eq(other)
219219
other = isstring(other) and atomic.class.new(SemanticVersion, other) or other
220-
return self:getString() == other:getString()
220+
221+
return self.major == other.major
222+
and self.minor == other.minor
223+
and self.patch == other.patch
224+
and comparePreRelease(self.prerelease, other.prerelease) == 0
221225
end
222226

223227
---@private
@@ -234,7 +238,10 @@ function atomic.semver.new(version)
234238
return atomic.class.new(SemanticVersion, version)
235239
end
236240

237-
atomic.class.pseudo._metadata.version = atomic.semver.new(atomic.class.pseudo._metadata.version)
241+
local metadataVersion = atomic.class.pseudo._metadata.version
242+
if (type(metadataVersion) == "string") then
243+
atomic.class.pseudo._metadata.version = atomic.semver.new(metadataVersion)
244+
end
238245

239246
---@type table<string, fun(version: Atomic.SemanticVersion, base: Atomic.SemanticVersion): boolean>
240247
local prefixActions = {

lua/autorun/atomic_autorun.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ atomic = atomic or {
22
meta = {
33
author = "smokingplaya",
44
versionName = "Cherry",
5-
version = "1.0.0-rc.3",
5+
version = "1.0.0-rc.4",
66
},
77
_config = {},
88
_isGamemodeLoaded = false

0 commit comments

Comments
 (0)