From 2a71d0e4f9418539005baaf8272fe3cf97279e50 Mon Sep 17 00:00:00 2001 From: nitrogenez Date: Sat, 14 Oct 2023 11:04:30 +0300 Subject: [PATCH 1/4] moved modular_computers.registered_commands to the modular_computers.os namespace --- init.lua | 3 +-- src/nodes/computer.lua | 2 +- src/os/api/cli.lua | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index df4392a..05ea598 100644 --- a/init.lua +++ b/init.lua @@ -14,7 +14,7 @@ modular_computers.mod = {} modular_computers.mod.name = minetest.get_current_modname() modular_computers.mod.path = minetest.get_modpath(modular_computers.mod.name) -modular_computers.registered_commands = {} +modular_computers.os.registered_commands = {} modular_computers.S = minetest.get_translator(modular_computers.mod.name) @@ -26,4 +26,3 @@ dofile(modular_computers.mod.path .. "/src/os/bin/init.lua") dofile(modular_computers.mod.path .. "/src/nodes/init.lua") dofile(modular_computers.mod.path .. "/src/items/init.lua") dofile(modular_computers.mod.path .. "/src/os/init.lua") - diff --git a/src/nodes/computer.lua b/src/nodes/computer.lua index 6ba0199..98e0029 100644 --- a/src/nodes/computer.lua +++ b/src/nodes/computer.lua @@ -63,7 +63,7 @@ minetest.register_on_player_receive_fields( -- Execute the command local args = string.split(command, "%s+", false, -1, true) - local def = modular_computers.registered_commands[args[1]] + local def = modular_computers.internal.command.registered_commands[args[1]] if def ~= nil then local stdin, stdout, stderr, exit_code = def.func(player, #args - 1, diff --git a/src/os/api/cli.lua b/src/os/api/cli.lua index 6b1bb5b..49c392d 100644 --- a/src/os/api/cli.lua +++ b/src/os/api/cli.lua @@ -1,3 +1,3 @@ function modular_computers.register_command(name, def) - modular_computers.registered_commands[name] = def + modular_computers.os.registered_commands[name] = def end From 53492766180c8c771a794ef22b47aaab021aedf3 Mon Sep 17 00:00:00 2001 From: nitrogenez Date: Sun, 15 Oct 2023 12:08:09 +0300 Subject: [PATCH 2/4] fixes according to a discussion --- init.lua | 5 ++--- src/os/api/cli.lua | 7 +++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index 05ea598..4c5a5a0 100644 --- a/init.lua +++ b/init.lua @@ -7,15 +7,14 @@ -- global mod namespace modular_computers = {} +modular_computers.internal = {} +modular_computers.mod = {} modular_computers.mod_storage = minetest.get_mod_storage() -modular_computers.mod = {} modular_computers.mod.name = minetest.get_current_modname() modular_computers.mod.path = minetest.get_modpath(modular_computers.mod.name) -modular_computers.os.registered_commands = {} - modular_computers.S = minetest.get_translator(modular_computers.mod.name) -- Load the scripts diff --git a/src/os/api/cli.lua b/src/os/api/cli.lua index 49c392d..dfe4650 100644 --- a/src/os/api/cli.lua +++ b/src/os/api/cli.lua @@ -1,3 +1,6 @@ -function modular_computers.register_command(name, def) - modular_computers.os.registered_commands[name] = def +modular_computers.command = {} +modular_computers.internal.command.registered_commands = {} + +function modular_computers.command.register_command(name, callback) + modular_computers.internal.command.registered_commands[name] = callback end From 05092153df3157af3e606589d0dff4de0939fa91 Mon Sep 17 00:00:00 2001 From: y5nw <37980625+y5nw@users.noreply.github.com> Date: Sun, 15 Oct 2023 16:56:14 +0200 Subject: [PATCH 3/4] Post-rebase fixup --- init.lua | 4 +--- src/os/api/cli.lua | 2 +- src/os/bin/echo.lua | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index 4c5a5a0..7871612 100644 --- a/init.lua +++ b/init.lua @@ -20,8 +20,6 @@ modular_computers.S = minetest.get_translator(modular_computers.mod.name) -- Load the scripts dofile(modular_computers.mod.path .. "/src/utilities.lua") dofile(modular_computers.mod.path .. "/src/item_tracking.lua") -dofile(modular_computers.mod.path .. "/src/os/api/cli.lua") -dofile(modular_computers.mod.path .. "/src/os/bin/init.lua") +dofile(modular_computers.mod.path .. "/src/os/init.lua") dofile(modular_computers.mod.path .. "/src/nodes/init.lua") dofile(modular_computers.mod.path .. "/src/items/init.lua") -dofile(modular_computers.mod.path .. "/src/os/init.lua") diff --git a/src/os/api/cli.lua b/src/os/api/cli.lua index dfe4650..dfbd53f 100644 --- a/src/os/api/cli.lua +++ b/src/os/api/cli.lua @@ -1,5 +1,5 @@ modular_computers.command = {} -modular_computers.internal.command.registered_commands = {} +modular_computers.internal.command = {registered_commands = {}} function modular_computers.command.register_command(name, callback) modular_computers.internal.command.registered_commands[name] = callback diff --git a/src/os/bin/echo.lua b/src/os/bin/echo.lua index d599665..e20bcb7 100644 --- a/src/os/bin/echo.lua +++ b/src/os/bin/echo.lua @@ -1,4 +1,4 @@ -modular_computers.register_command("echo", { +modular_computers.command.register_command("echo", { func = function(player, argc, ...) return "", table.concat({...}, " ") .. "\n", "", 0 end, From b3ad6e2342d27178850a2d68d2227e2c8d479802 Mon Sep 17 00:00:00 2001 From: y5nw <37980625+y5nw@users.noreply.github.com> Date: Sun, 15 Oct 2023 18:22:35 +0200 Subject: [PATCH 4/4] command.register_command -> command.register as requested on Matrix --- src/os/api/cli.lua | 2 +- src/os/bin/echo.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/os/api/cli.lua b/src/os/api/cli.lua index dfbd53f..b16f7fe 100644 --- a/src/os/api/cli.lua +++ b/src/os/api/cli.lua @@ -1,6 +1,6 @@ modular_computers.command = {} modular_computers.internal.command = {registered_commands = {}} -function modular_computers.command.register_command(name, callback) +function modular_computers.command.register(name, callback) modular_computers.internal.command.registered_commands[name] = callback end diff --git a/src/os/bin/echo.lua b/src/os/bin/echo.lua index e20bcb7..f17942d 100644 --- a/src/os/bin/echo.lua +++ b/src/os/bin/echo.lua @@ -1,4 +1,4 @@ -modular_computers.command.register_command("echo", { +modular_computers.command.register("echo", { func = function(player, argc, ...) return "", table.concat({...}, " ") .. "\n", "", 0 end,