-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from Rui914/patch-1
Improved API
- Loading branch information
Showing
1 changed file
with
122 additions
and
136 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,149 +1,135 @@ | ||
| ts_furniture = {} | ||
|
|
||
| function ts_furniture.register_furniture(mod, name, description, texture) | ||
| local groups = minetest.registered_nodes[mod .. ":" ..name].groups | ||
| local furniture_groups = {} | ||
| for k,v in pairs(groups) do | ||
| if k ~= "wood" then | ||
| furniture_groups[k] = v | ||
| end | ||
| end | ||
| minetest.register_node("ts_furniture:" .. mod .. "_" ..name .. "_table", { | ||
| description = description .. " Table", | ||
| tiles = {texture}, | ||
| drawtype = "nodebox", | ||
| sunlight_propagates = true, | ||
| paramtype = "light", | ||
| paramtype2 = "facedir", | ||
| node_box = { | ||
| type = "fixed", | ||
| fixed = { | ||
| {-0.4,-0.5,-0.4, -0.3, 0.4,-0.3}, -- foot 1 | ||
| { 0.3,-0.5,-0.4, 0.4, 0.4,-0.3}, -- foot 2 | ||
| {-0.4,-0.5, 0.3, -0.3, 0.4, 0.4}, -- foot 3 | ||
| { 0.3,-0.5, 0.3, 0.4, 0.4, 0.4}, -- foot 4 | ||
| {-0.5, 0.4,-0.5, 0.5, 0.5, 0.5}, -- table top | ||
| }, | ||
| local furnitures = { | ||
| ["chair"] = { | ||
| description = "Chair", | ||
| nodebox = { | ||
| {-0.3,-0.5, 0.2, -0.2, 0.5, 0.3}, -- foot 1 | ||
| { 0.2,-0.5, 0.2, 0.3, 0.5, 0.3}, -- foot 2 | ||
| { 0.2,-0.5,-0.3, 0.3,-0.1,-0.2}, -- foot 3 | ||
| {-0.3,-0.5,-0.3, -0.2,-0.1,-0.2}, -- foot 4 | ||
| {-0.3,-0.1,-0.3, 0.3, 0 , 0.2}, -- seating | ||
| {-0.2, 0.1, 0.25, 0.2, 0.4, 0.26} -- conector 1-2 | ||
| }, | ||
| groups = furniture_groups | ||
| }) | ||
| minetest.register_craft({ | ||
| output = "ts_furniture:" .. mod .. "_" ..name .. "_table", | ||
| recipe = { | ||
| {mod .. ":" .. name, mod .. ":" .. name, mod .. ":" .. name}, | ||
| {"group:stick" , "" , "group:stick" }, | ||
| {"group:stick" , "" , "group:stick" }, | ||
| } | ||
| }) | ||
| craft = function(recipe) | ||
| return { | ||
| {"group:stick", "" }, | ||
| {recipe , recipe }, | ||
| {"group:stick", "group:stick"} | ||
| } | ||
| end | ||
| }, | ||
|
|
||
| minetest.register_node("ts_furniture:" .. mod .. "_" .. name .."_chair", { | ||
| description = description .. " Chair", | ||
| tiles = {texture}, | ||
| drawtype = "nodebox", | ||
| sunlight_propagates = true, | ||
| paramtype = "light", | ||
| paramtype2 = "facedir", | ||
| node_box = { | ||
| type = "fixed", | ||
| fixed = { | ||
| {-0.3,-0.5, 0.2, -0.2, 0.5, 0.3}, -- foot 1 | ||
| { 0.2,-0.5, 0.2, 0.3, 0.5, 0.3}, -- foot 2 | ||
| { 0.2,-0.5,-0.3, 0.3,-0.1,-0.2}, -- foot 3 | ||
| {-0.3,-0.5,-0.3, -0.2,-0.1,-0.2}, -- foot 4 | ||
| {-0.3,-0.1,-0.3, 0.3, 0 , 0.2}, -- seating | ||
| {-0.2, 0.1, 0.25, 0.2, 0.4, 0.26} -- conector 1-2 | ||
| }, | ||
| ["table"] = { | ||
| description = "Table", | ||
| nodebox = { | ||
| {-0.4,-0.5,-0.4, -0.3, 0.4,-0.3}, -- foot 1 | ||
| { 0.3,-0.5,-0.4, 0.4, 0.4,-0.3}, -- foot 2 | ||
| {-0.4,-0.5, 0.3, -0.3, 0.4, 0.4}, -- foot 3 | ||
| { 0.3,-0.5, 0.3, 0.4, 0.4, 0.4}, -- foot 4 | ||
| {-0.5, 0.4,-0.5, 0.5, 0.5, 0.5}, -- table top | ||
| }, | ||
| groups = furniture_groups | ||
| }) | ||
| minetest.register_craft({ | ||
| output = "ts_furniture:" .. mod .. "_" ..name .. "_chair", | ||
| recipe = { | ||
| {"group:stick" , "" , ""}, | ||
| {mod .. ":" .. name, mod .. ":" .. name, ""}, | ||
| {"group:stick" , "group:stick" , ""}, | ||
| } | ||
| }) | ||
| craft = function(recipe) | ||
| return { | ||
| {recipe , recipe, recipe }, | ||
| {"group:stick", "" , "group:stick"}, | ||
| {"group:stick", "" , "group:stick"} | ||
| } | ||
| end | ||
| }, | ||
|
|
||
| minetest.register_node("ts_furniture:" .. mod .. "_" .. name .."_bench", { | ||
| description = description .. " Bench", | ||
| tiles = {texture}, | ||
| drawtype = "nodebox", | ||
| sunlight_propagates = true, | ||
| paramtype = "light", | ||
| paramtype2 = "facedir", | ||
| node_box = { | ||
| type = "fixed", | ||
| fixed = { | ||
| {-0.5, -0.1, 0, 0.5, 0 , 0.5}, -- seating | ||
| {-0.4, -0.5, 0, -0.3,-0.1, 0.5}, -- foot 1 | ||
| { 0.3, -0.5, 0, 0.4,-0.1, 0.5}, -- foot 2 | ||
| }, | ||
| ["small_table"] = { | ||
| description = "Small Table", | ||
| nodebox = { | ||
| {-0.4,-0.5,-0.4, -0.3, 0.1,-0.3}, -- foot 1 | ||
| { 0.3,-0.5,-0.4, 0.4, 0.1,-0.3}, -- foot 2 | ||
| {-0.4,-0.5, 0.3, -0.3, 0.1, 0.4}, -- foot 3 | ||
| { 0.3,-0.5, 0.3, 0.4, 0.1, 0.4}, -- foot 4 | ||
| {-0.5, 0.1,-0.5, 0.5, 0.2, 0.5}, -- table top | ||
| }, | ||
| groups = furniture_groups | ||
| }) | ||
| minetest.register_craft({ | ||
| output = "ts_furniture:" .. mod .. "_" ..name .. "_bench", | ||
| recipe = { | ||
| {mod .. ":" .. name, mod .. ":" .. name, ""}, | ||
| {"group:stick" , "group:stick" , ""}, | ||
| } | ||
| }) | ||
| craft = function(recipe) | ||
| return { | ||
| {recipe , recipe, recipe }, | ||
| {"group:stick", "" , "group:stick"} | ||
| } | ||
| end | ||
| }, | ||
|
|
||
| minetest.register_node("ts_furniture:" .. mod .. "_" .. name .."_tiny_table", { | ||
| description = description .. " Tiny Table", | ||
| tiles = {texture}, | ||
| drawtype = "nodebox", | ||
| sunlight_propagates = true, | ||
| paramtype = "light", | ||
| paramtype2 = "facedir", | ||
| node_box = { | ||
| type = "fixed", | ||
| fixed = { | ||
| {-0.5, -0.1, -0.5, 0.5, 0 , 0.5}, -- table top | ||
| {-0.4, -0.5, -0.5, -0.3,-0.1, 0.5}, -- foot 1 | ||
| { 0.3, -0.5, -0.5, 0.4,-0.1, 0.5}, -- foot 2 | ||
| }, | ||
| ["tiny_table"] = { | ||
| description = "Tiny Table", | ||
| nodebox = { | ||
| {-0.5, -0.1, -0.5, 0.5, 0 , 0.5}, -- table top | ||
| {-0.4, -0.5, -0.5, -0.3,-0.1, 0.5}, -- foot 1 | ||
| { 0.3, -0.5, -0.5, 0.4,-0.1, 0.5}, -- foot 2 | ||
| }, | ||
| groups = furniture_groups | ||
| }) | ||
| minetest.register_craft({ | ||
| output = "ts_furniture:" .. mod .. "_" ..name .. "_tiny_table", | ||
| recipe = { | ||
| {"ts_furniture:" .. mod .. "_" ..name .. "_bench", "ts_furniture:" .. mod .. "_" ..name .. "_bench"}, | ||
| } | ||
| }) | ||
| craft = function(recipe) | ||
| local bench_name = "ts_furniture:" .. recipe:gsub(":", "_") .. "_bench" | ||
| return { | ||
| {bench_name, bench_name} | ||
| } | ||
| end | ||
| }, | ||
|
|
||
| minetest.register_node("ts_furniture:" .. mod .. "_" .. name .."_small_table", { | ||
| description = description .. " Small Table", | ||
| tiles = {texture}, | ||
| drawtype = "nodebox", | ||
| sunlight_propagates = true, | ||
| paramtype = "light", | ||
| paramtype2 = "facedir", | ||
| node_box = { | ||
| type = "fixed", | ||
| fixed = { | ||
| {-0.4,-0.5,-0.4, -0.3, 0.1,-0.3}, -- foot 1 | ||
| { 0.3,-0.5,-0.4, 0.4, 0.1,-0.3}, -- foot 2 | ||
| {-0.4,-0.5, 0.3, -0.3, 0.1, 0.4}, -- foot 3 | ||
| { 0.3,-0.5, 0.3, 0.4, 0.1, 0.4}, -- foot 4 | ||
| {-0.5, 0.1,-0.5, 0.5, 0.2, 0.5}, -- table top | ||
| }, | ||
| ["bench"] = { | ||
| description = "Bench", | ||
| nodebox = { | ||
| {-0.5, -0.1, 0, 0.5, 0 , 0.5}, -- seating | ||
| {-0.4, -0.5, 0, -0.3,-0.1, 0.5}, -- foot 1 | ||
| { 0.3, -0.5, 0, 0.4,-0.1, 0.5}, -- foot 2 | ||
| }, | ||
| groups = furniture_groups | ||
| }) | ||
| minetest.register_craft({ | ||
| output = "ts_furniture:" .. mod .. "_" ..name .. "_small_table", | ||
| recipe = { | ||
| {mod .. ":" .. name, mod .. ":" .. name, mod .. ":" .. name}, | ||
| {"group:stick" , "" , "group:stick" }, | ||
| } | ||
| }) | ||
| craft = function(recipe) | ||
| return { | ||
| {recipe , recipe }, | ||
| {"group:stick", "group:stick"} | ||
| } | ||
| end | ||
| }, | ||
| } | ||
|
|
||
| local ignore_groups = { | ||
| ["wood"] = true, | ||
| ["stone"] = true, | ||
| } | ||
|
|
||
| function ts_furniture.register_furniture(recipe, description, texture) | ||
| local recipe_def = minetest.registered_items[recipe] | ||
| if not recipe_def then | ||
| return | ||
| end | ||
|
|
||
| local groups = {} | ||
| for k, v in pairs(recipe_def.groups) do | ||
| if not ignore_groups[k] then | ||
| groups[k] = v | ||
| end | ||
| end | ||
|
|
||
| for furniture, def in pairs(furnitures) do | ||
| local node_name = "ts_furniture:" .. recipe:gsub(":", "_") .. "_" .. furniture | ||
|
|
||
| minetest.register_node(":" .. node_name, { | ||
| description = description .. " " .. def.description, | ||
| drawtype = "nodebox", | ||
| paramtype = "light", | ||
| paramtype2 = "facedir", | ||
| sunlight_propagates = true, | ||
| tiles = {texture}, | ||
| groups = groups, | ||
| node_box = { | ||
| type = "fixed", | ||
| fixed = def.nodebox | ||
| } | ||
| }) | ||
|
|
||
| minetest.register_craft({ | ||
| output = node_name, | ||
| recipe = def.craft(recipe) | ||
| }) | ||
| end | ||
| end | ||
|
|
||
| ts_furniture.register_furniture("default", "aspen_wood" , "Aspen" , "default_aspen_wood.png" ) | ||
| ts_furniture.register_furniture("default", "pine_wood" , "Pine" , "default_pine_wood.png" ) | ||
| ts_furniture.register_furniture("default", "acacia_wood", "Acacia" , "default_acacia_wood.png") | ||
| ts_furniture.register_furniture("default", "wood" , "Wooden" , "default_wood.png" ) | ||
| ts_furniture.register_furniture("default", "junglewood" , "Jungle Wood", "default_junglewood.png" ) | ||
| ts_furniture.register_furniture("default:aspen_wood" , "Aspen" , "default_aspen_wood.png" ) | ||
| ts_furniture.register_furniture("default:pine_wood" , "Pine" , "default_pine_wood.png" ) | ||
| ts_furniture.register_furniture("default:acacia_wood", "Acacia" , "default_acacia_wood.png") | ||
| ts_furniture.register_furniture("default:wood" , "Wooden" , "default_wood.png" ) | ||
| ts_furniture.register_furniture("default:junglewood" , "Jungle Wood", "default_junglewood.png" ) |