diff --git a/computers/init.lua b/computers/init.lua index 76c2b46..6a3a1d2 100644 --- a/computers/init.lua +++ b/computers/init.lua @@ -14,12 +14,12 @@ computers.os = { license = "MIT", } -dofile(computers.modpath .. "/old_stuff/init.lua") - dofile(computers.modpath .. "/api.lua") dofile(computers.modpath .. "/networks.lua") dofile(computers.modpath .. "/formspec.lua") dofile(computers.modpath .. "/commands.lua") dofile(computers.modpath .. "/gui.lua") + +dofile(computers.modpath .. "/nodes/init.lua") + dofile(computers.modpath .. "/demo.lua") -dofile(computers.modpath .. "/tetris.lua") diff --git a/computers/old_stuff/aliases.lua b/computers/nodes/aliases.lua similarity index 100% rename from computers/old_stuff/aliases.lua rename to computers/nodes/aliases.lua diff --git a/computers/nodes/init.lua b/computers/nodes/init.lua new file mode 100644 index 0000000..f15f95d --- /dev/null +++ b/computers/nodes/init.lua @@ -0,0 +1,10 @@ +local path = computers.modpath .. "/nodes" + +dofile(path .. "/node_api.lua") +dofile(path .. "/nodes.lua") +dofile(path .. "/tetris.lua") +dofile(path .. "/aliases.lua") + +if minetest.get_modpath("default") and minetest.get_modpath("basic_materials") then + dofile(path .. "/recipes.lua") +end \ No newline at end of file diff --git a/computers/old_stuff/init.lua b/computers/nodes/node_api.lua similarity index 90% rename from computers/old_stuff/init.lua rename to computers/nodes/node_api.lua index 7af2c33..5f33377 100644 --- a/computers/old_stuff/init.lua +++ b/computers/nodes/node_api.lua @@ -1,5 +1,3 @@ ---computers = {} - computers.register = function (name, def) if (name:sub(1, 1) == ":") then name = name:sub(2) end local modname, basename = name:match("^([^:]+):(.*)") @@ -89,12 +87,4 @@ computers.pixelnodebox = function (size, boxes) type = "fixed", fixed = fixed } -end - -local MODPATH = minetest.get_modpath("computers") .. "/old_stuff" -dofile(MODPATH.."/computers.lua") -dofile(MODPATH.."/aliases.lua") - -if minetest.get_modpath("default") and minetest.get_modpath("basic_materials") then - dofile(MODPATH.."/recipes.lua") end \ No newline at end of file diff --git a/computers/old_stuff/computers.lua b/computers/nodes/nodes.lua similarity index 100% rename from computers/old_stuff/computers.lua rename to computers/nodes/nodes.lua diff --git a/computers/old_stuff/recipes.lua b/computers/nodes/recipes.lua similarity index 98% rename from computers/old_stuff/recipes.lua rename to computers/nodes/recipes.lua index 75eafb0..96c04d4 100644 --- a/computers/old_stuff/recipes.lua +++ b/computers/nodes/recipes.lua @@ -1,5 +1,3 @@ --- Copyright (C) 2012-2013 Diego Martínez - minetest.register_craft({ output = "computers:shefriendSOO", recipe = { diff --git a/computers/tetris.lua b/computers/nodes/tetris.lua similarity index 100% rename from computers/tetris.lua rename to computers/nodes/tetris.lua