Skip to content

Commit 2e3c6a6

Browse files
authored
merge 0.7.2 Guava
merge 0.7.2 Guava
2 parents 7a4df09 + ea6d8f9 commit 2e3c6a6

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
<h1 align="center">
1+
<div align="center">
22
<img src="assets/logo.png"/>
3-
<p align="center">Atomic Framework</p>
3+
<h1 align="center">Atomic Framework</h1>
44

55
<img src="https://img.shields.io/github/actions/workflow/status/TeamMeadows/atomic-framework/build.yml">
66
<img src="https://img.shields.io/github/release/TeamMeadows/atomic-framework.svg">
77
<img src="https://img.shields.io/github/issues/TeamMeadows/atomic-framework.svg">
88
<img src="https://img.shields.io/github/license/TeamMeadows/atomic-framework.svg">
99

10-
| [Download](/releases/latest/) | [Documentation](/wiki) |
11-
</h1>
10+
[Download] | [Getting Started] | [Documentation]
11+
</div>
12+
13+
[Download]: https://github.com/TeamMeadows/atomic-framework/releases/latest
14+
[Getting Started]: https://github.com/TeamMeadows/atomic-framework/wiki#getting-started
15+
[Documentation]: https://github.com/TeamMeadows/atomic-framework/wiki
1216

1317
Atomic is a flexible, OOP-driven framework for building Garry’s Mod addons and gamemodes with a clean, modular architecture.
1418
Each **package** is a self-contained unit - just like an addon - with built-in dependency management and powerful libraries for writing structured, maintainable Lua code.
@@ -18,7 +22,7 @@ local package = current()
1822
local libui = package:getDependency("com.developername.libui")
1923

2024
package:listen(function(self)
21-
libui:drawText(self:getPhrase("en", "hello_world"), libui.textSize.small, ScrW() / 2, ScrH()/2, color_white, TEXT_ALIGN_CENTER)
25+
libui:drawText(self:getPhrase("en", "hello_world"), libui.textSize.small, ScrW() / 2, ScrH() / 2, libui.color.white, libui.position.center)
2226
end, "HUDPaint")
2327

2428
package:listen(function(self)

lua/atomic/libraries/class.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ function atomic.class.register(class, package)
138138
storage[id][version] = {}
139139
end
140140

141-
storage[id][version][class._name] = class
141+
storage[id][version][class._classname] = class
142142

143143
atomic.class._storage = storage
144144
end
@@ -147,7 +147,7 @@ function atomic.class.unregister(class, package)
147147
local storage = atomic.class._storage
148148
local id, version = package.id, package.version
149149

150-
storage[id][version][class._name] = nil
150+
storage[id][version][class._classname] = nil
151151

152152
atomic.class._storage = storage
153153
end

lua/atomic/libraries/package/class.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ end
469469
function Package:class(name, parent)
470470
local class = atomic.class.create(name, parent)
471471

472-
self:register("classes", class._name, class)
472+
self:register("classes", class:__classname(), class)
473473

474474
return class
475475
end

lua/autorun/atomic_autorun.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ atomic = {
22
meta = {
33
author = "smokingplaya",
44
versionName = "Guava",
5-
version = "0.7.1",
5+
version = "0.7.2",
66
}
77
}
88

0 commit comments

Comments
 (0)