Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tweak(natives/rpc): Use client-native names and apply aliases #2550

Merged
merged 1 commit into from
May 28, 2024
Merged

tweak(natives/rpc): Use client-native names and apply aliases #2550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 71 additions & 58 deletions ext/natives/codegen.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,22 +168,26 @@ end

local function getNative(nativeName)
-- get the native
local n
for _, v in ipairs(natives) do
if #v.apiset == 0 or v.apiset[1] == 'client' then
if v.name == nativeName then
return v
end

for k, v in ipairs(natives) do
if v.name == nativeName and (#v.apiset == 0 or v.apiset[1] == 'client') then
n = v
break
for _, aliasName in ipairs(v.aliases) do
if nativeName == aliasName then
return v
end
end
end
end

return n
return nil
end

local function getServerNative(nativeName)
-- get the native
local n

for k, v in ipairs(natives) do
if v.name == nativeName and #v.apiset > 0 and v.apiset[1] == 'server' then
n = v
Expand Down Expand Up @@ -251,14 +255,14 @@ function rpcEnvironment.context_rpc(nativeName)
if not ctx then
if v.pointer then
ctx = { idx = k - 1, type = 'ObjDel' }

table.insert(args, {
translate = true,
type = 'ObjDel'
})
else
ctx = { idx = k - 1, type = 'ObjRef' }

table.insert(args, {
translate = true,
type = 'ObjRef'
Expand All @@ -281,67 +285,70 @@ function rpcEnvironment.context_rpc(nativeName)
rn.ctx = ctx
rn.args = args

removeServerNative(nativeName)
codeEnvironment.native(nativeName)
codeEnvironment.arguments(n.arguments)
codeEnvironment.apiset('server')
codeEnvironment.returns('void')
curNative.rpc = true
curNative.ogHash = n.hash
removeServerNative(n.name)
codeEnvironment.native(n.name)
codeEnvironment.arguments(n.arguments)
codeEnvironment.apiset('server')
codeEnvironment.returns('void')
for _, aliasName in ipairs(n.aliases) do
codeEnvironment.alias(aliasName)
tens0rfl0w marked this conversation as resolved.
Show resolved Hide resolved
end
curNative.rpc = true
curNative.ogHash = n.hash

if n.doc then
codeEnvironment.doc(n.doc)
end
if n.doc then
codeEnvironment.doc(n.doc)
end

rn.hash = n.hash
rn.name = nativeName
rn.name = n.name

rn.type = 'ctx'

table.insert(rpcNatives, rn)

return function(tbl)
-- single getter
if type(tbl) == 'table' and #tbl == 1 then
tbl = { getter = tbl[1] }
end

-- if we need to define a getter
if tbl.getter then
local rvArg = n.arguments[2].type

local function isFloat(arg)
return arg.type.nativeType == 'float'
end

-- check if this is perhaps a vector3
if #n.arguments >= 4 and isFloat(n.arguments[2]) and isFloat(n.arguments[3]) and isFloat(n.arguments[4]) then
rvArg = types['Vector3']
end

rn.getter = {
returnType = rvArg.name,
returnArgStart = 1,
name = tbl.getter
}

local cxtRef

if ctx.type == 'Player' then
cxtRef = codeEnvironment.Player
elseif ctx.type == 'Entity' then
cxtRef = codeEnvironment.Entity
elseif ctx.type == 'ObjRef' then
cxtRef = codeEnvironment.int
end

if not getServerNative(tbl.getter) then
codeEnvironment.native(tbl.getter)
codeEnvironment.arguments {
cxtRef 'self'
}
codeEnvironment.apiset('server')
codeEnvironment.returns(rvArg)
codeEnvironment.arguments {
cxtRef 'self'
}
codeEnvironment.apiset('server')
codeEnvironment.returns(rvArg)
end
end
end
Expand Down Expand Up @@ -390,20 +397,23 @@ function rpcEnvironment.entity_rpc(nativeName)

rn.args = args

removeServerNative(nativeName)
codeEnvironment.native(nativeName)
codeEnvironment.arguments(n.arguments)
codeEnvironment.apiset('server')
codeEnvironment.returns('Entity')
curNative.rpc = true
curNative.ogHash = n.hash
removeServerNative(n.name)
codeEnvironment.native(n.name)
codeEnvironment.arguments(n.arguments)
codeEnvironment.apiset('server')
codeEnvironment.returns('Entity')
for _, aliasName in ipairs(n.aliases) do
codeEnvironment.alias(aliasName)
end
curNative.rpc = true
curNative.ogHash = n.hash

if n.doc then
codeEnvironment.doc(n.doc)
end
if n.doc then
codeEnvironment.doc(n.doc)
end

rn.hash = n.hash
rn.name = nativeName
rn.name = n.name

rn.type = 'entity'

Expand Down Expand Up @@ -452,21 +462,24 @@ function rpcEnvironment.object_rpc(nativeName)
end

rn.args = args

removeServerNative(nativeName)
codeEnvironment.native(nativeName)
codeEnvironment.arguments(n.arguments)
codeEnvironment.apiset('server')
codeEnvironment.returns(n.returns)
curNative.rpc = true
curNative.ogHash = n.hash

if n.doc then
codeEnvironment.doc(n.doc)
end

removeServerNative(n.name)
codeEnvironment.native(n.name)
codeEnvironment.arguments(n.arguments)
codeEnvironment.apiset('server')
codeEnvironment.returns(n.returns)
for _, aliasName in ipairs(n.aliases) do
codeEnvironment.alias(aliasName)
end
curNative.rpc = true
curNative.ogHash = n.hash

if n.doc then
codeEnvironment.doc(n.doc)
end

rn.hash = n.hash
rn.name = nativeName
rn.name = n.name

rn.type = 'object'

Expand Down
Loading