mff/homedecor_modpack
1
0
Fork 0
forked from mtcontrib/homedecor_modpack
Code Issues Pull Requests Releases Wiki Activity

Whitespace damage fixes.

Browse Source 
This is cleaned up by `cleanfile` (from the linux kernel tree
tool set).
This commit is contained in:
Auke Kok 2016-12-15 13:23:31 -08:00 committed by Auke Kok
parent 6256427ce7
commit 138e078f1b
26 changed files with 109 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
homedecor/bathroom_furniture.lua
View File

@ -103,4 +103,3 @@ homedecor.register("medicine_cabinet_open", {
minetest.swap_node(pos, node)
end,
})

2
homedecor/bedroom.lua
View File

@ -167,7 +167,7 @@ for _, w in pairs({"mahogany", "oak"}) do
type = "fixed",
fixed = {
{ -8/16, 0, -30/64, 8/16, 8/16, 8/16 }, -- top half
{ -7/16, 1/16, -32/64, 7/16, 7/16, -29/64}, -- drawer face
{ -7/16, 1/16, -32/64, 7/16, 7/16, -29/64}, -- drawer face
{ -8/16, -8/16, -30/64, -7/16, 0, 8/16 }, -- left
{ 7/16, -8/16, -30/64, 8/16, 0, 8/16 }, -- right
{ -8/16, -8/16, 7/16, 8/16, 0, 8/16 }, -- back

117
homedecor/crafts.lua
View File

@ -639,7 +639,7 @@ minetest.register_craft({
minetest.register_craft( {
type = "shapeless",
output = "homedecor:shutter_mahogany 4",
recipe = {
recipe = {
"homedecor:shutter_oak",
"homedecor:shutter_oak",
"homedecor:shutter_oak",
@ -649,14 +649,14 @@ minetest.register_craft( {
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:shutter_mahogany",
burntime = 30,
type = "fuel",
recipe = "homedecor:shutter_mahogany",
burntime = 30,
})
minetest.register_craft( {
type = "shapeless",
output = "homedecor:shutter_red 4",
recipe = {
recipe = {
"homedecor:shutter_oak",
"homedecor:shutter_oak",
"homedecor:shutter_oak",
@ -666,15 +666,15 @@ minetest.register_craft( {
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:shutter_red",
burntime = 30,
type = "fuel",
recipe = "homedecor:shutter_red",
burntime = 30,
})
minetest.register_craft( {
type = "shapeless",
output = "homedecor:shutter_yellow 4",
recipe = {
recipe = {
"homedecor:shutter_oak",
"homedecor:shutter_oak",
"homedecor:shutter_oak",
@ -684,9 +684,9 @@ minetest.register_craft( {
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:shutter_yellow",
burntime = 30,
type = "fuel",
recipe = "homedecor:shutter_yellow",
burntime = 30,
})
--
@ -714,7 +714,7 @@ minetest.register_craft({
minetest.register_craft( {
type = "shapeless",
output = "homedecor:shutter_light_blue 4",
recipe = {
recipe = {
"homedecor:shutter_oak",
"homedecor:shutter_oak",
"homedecor:shutter_oak",
@ -724,15 +724,15 @@ minetest.register_craft( {
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:shutter_light_blue",
burntime = 30,
type = "fuel",
recipe = "homedecor:shutter_light_blue",
burntime = 30,
})
minetest.register_craft( {
type = "shapeless",
output = "homedecor:shutter_violet 4",
recipe = {
recipe = {
"homedecor:shutter_oak",
"homedecor:shutter_oak",
"homedecor:shutter_oak",
@ -742,9 +742,9 @@ minetest.register_craft( {
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:shutter_violet",
burntime = 30,
type = "fuel",
recipe = "homedecor:shutter_violet",
burntime = 30,
})
--
@ -931,7 +931,7 @@ minetest.register_craft( {
minetest.register_craft( {
type = "shapeless",
output = "homedecor:rug_small 8",
recipe = {
recipe = {
"wool:red",
"wool:yellow",
"wool:blue",
@ -953,7 +953,7 @@ minetest.register_craft( {
minetest.register_craft( {
type = "shapeless",
output = "homedecor:rug_small 8",
recipe = {
recipe = {
"cotton:red",
"cotton:yellow",
"cotton:blue",
@ -973,37 +973,37 @@ minetest.register_craft( {
-- fuel recipes for same
minetest.register_craft({
type = "fuel",
recipe = "homedecor:rug_small",
burntime = 30,
type = "fuel",
recipe = "homedecor:rug_small",
burntime = 30,
})
minetest.register_craft( {
type = "shapeless",
output = "homedecor:rug_large 2",
recipe = {
recipe = {
"homedecor:rug_small",
"homedecor:rug_small",
},
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:rug_large",
burntime = 30,
type = "fuel",
recipe = "homedecor:rug_large",
burntime = 30,
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:rug_persian",
burntime = 30,
type = "fuel",
recipe = "homedecor:rug_persian",
burntime = 30,
})
-- Speakers
minetest.register_craft( {
output = "homedecor:speaker_driver 2",
recipe = {
recipe = {
{ "", "default:steel_ingot", "" },
{ "default:paper", "homedecor:copper_wire", "default:iron_lump" },
{ "", "default:steel_ingot", "" },
@ -1012,14 +1012,14 @@ minetest.register_craft( {
minetest.register_craft( {
output = "homedecor:speaker_small",
recipe = {
recipe = {
{ "wool:black", "homedecor:speaker_driver", "group:wood" },
},
})
minetest.register_craft( {
output = "homedecor:speaker",
recipe = {
recipe = {
{ "wool:black", "homedecor:speaker_driver", "group:wood" },
{ "wool:black", "homedecor:speaker_driver", "group:wood" },
{ "wool:black", "group:wood", "group:wood" },
@ -1030,14 +1030,14 @@ minetest.register_craft( {
minetest.register_craft( {
output = "homedecor:speaker_small",
recipe = {
recipe = {
{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
},
})
minetest.register_craft( {
output = "homedecor:speaker",
recipe = {
recipe = {
{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
{ "cotton:black", "group:wood", "group:wood" },
@ -1059,7 +1059,7 @@ for c in ipairs(curtaincolors) do
local color = curtaincolors[c]
minetest.register_craft( {
output = "homedecor:curtain_"..color.." 3",
recipe = {
recipe = {
{ "wool:"..color, "", ""},
{ "wool:"..color, "", ""},
{ "wool:"..color, "", ""},
@ -2120,64 +2120,64 @@ minetest.register_craft({
local painting_patterns = {
[1] = { { "brown", "red", "brown" },
{ "dark_green", "red", "green" } },
{ "dark_green", "red", "green" } },
[2] = { { "green", "yellow", "green" },
{ "green", "yellow", "green" } },
{ "green", "yellow", "green" } },
[3] = { { "green", "pink", "green" },
{ "brown", "pink", "brown" } },
{ "brown", "pink", "brown" } },
[4] = { { "black", "orange", "grey" },
{ "dark_green", "orange", "orange" } },
{ "dark_green", "orange", "orange" } },
[5] = { { "blue", "orange", "yellow" },
{ "green", "red", "brown" } },
{ "green", "red", "brown" } },
[6] = { { "green", "red", "orange" },
{ "orange", "yellow", "green" } },
{ "orange", "yellow", "green" } },
[7] = { { "blue", "dark_green", "dark_green" },
{ "green", "grey", "green" } },
{ "green", "grey", "green" } },
[8] = { { "blue", "blue", "blue" },
{ "green", "green", "green" } },
{ "green", "green", "green" } },
[9] = { { "blue", "blue", "dark_green" },
{ "green", "grey", "dark_green" } },
{ "green", "grey", "dark_green" } },
[10] = { { "green", "white", "green" },
{ "dark_green", "white", "dark_green" } },
{ "dark_green", "white", "dark_green" } },
[11] = { { "blue", "white", "blue" },
{ "blue", "grey", "dark_green" } },
{ "blue", "grey", "dark_green" } },
[12] = { { "green", "green", "green" },
{ "grey", "grey", "green" } },
{ "grey", "grey", "green" } },
[13] = { { "blue", "blue", "grey" },
{ "dark_green", "white", "white" } },
{ "dark_green", "white", "white" } },
[14] = { { "red", "yellow", "blue" },
{ "blue", "green", "violet" } },
{ "blue", "green", "violet" } },
[15] = { { "blue", "yellow", "blue" },
{ "black", "black", "black" } },
{ "black", "black", "black" } },
[16] = { { "red", "orange", "blue" },
{ "black", "dark_grey", "grey" } },
{ "black", "dark_grey", "grey" } },
[17] = { { "orange", "yellow", "orange" },
{ "black", "black", "black" } },
{ "black", "black", "black" } },
[18] = { { "grey", "dark_green", "grey" },
{ "white", "white", "white" } },
{ "white", "white", "white" } },
[19] = { { "white", "brown", "green" },
{ "green", "brown", "brown" } },
{ "green", "brown", "brown" } },
[20] = { { "blue", "blue", "blue" },
{ "red", "brown", "grey" } }
{ "red", "brown", "grey" } }
}
for i,recipe in pairs(painting_patterns) do
@ -3414,4 +3414,3 @@ end
if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then
technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} })
end

8
homedecor/doors_and_gates.lua
View File

@ -303,13 +303,13 @@ local gate_models_closed = {
{{ -0.5, -0.5, 0.498, 0.5, 0.5, 0.498 }},
{{ -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, -- left post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ -8/16, 7/16, 13/32, 8/16, 8/16, 15/32 }, -- top piece
{ -8/16, -8/16, 13/32, 8/16, -7/16, 15/32 }, -- bottom piece
{ -6/16, -8/16, 7/16, 6/16, 8/16, 7/16 }}, -- the wire
{{ -8/16, -8/16, 6/16, -7/16, 8/16, 8/16 }, -- left post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ -8/16, 7/16, 13/32, 8/16, 8/16, 15/32 }, -- top piece
{ -8/16, -8/16, 13/32, 8/16, -7/16, 15/32 }, -- bottom piece
{ -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }, -- the chainlink itself
@ -322,13 +322,13 @@ local gate_models_open = {
{{ 0.498, -0.5, -0.5, 0.498, 0.5, 0.5 }},
{{ 6/16, -8/16, -8/16, 8/16, 8/16, -6/16 }, -- left post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 13/32, 7/16, -8/16, 15/32, 8/16, 8/16 }, -- top piece
{ 13/32, -8/16, -8/16, 15/32, -7/16, 8/16 }, -- bottom piece
{ 7/16, -8/16, -6/16, 7/16, 8/16, 6/16 }}, -- the wire
{{ 6/16, -8/16, -8/16, 8/16, 8/16, -7/16 }, -- left post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post
{ 13/32, 7/16, -8/16, 15/32, 8/16, 8/16 }, -- top piece
{ 13/32, -8/16, -8/16, 15/32, -7/16, 8/16 }, -- bottom piece
{ 7/16, -8/16, -8/16, 7/16, 8/16, 8/16 }, -- the chainlink itself

1
homedecor/fences.lua
View File

@ -301,4 +301,3 @@ if signs_modpath then
signs_lib.register_fence_with_sign("homedecor:fence_brass", "homedecor:fence_brass_with_sign")
signs_lib.register_fence_with_sign("homedecor:fence_wrought_iron", "homedecor:fence_wrought_iron_with_sign")
end

1
homedecor/handlers/expansion.lua
View File

@ -359,4 +359,3 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
itemstack:take_item()
return itemstack
end

3
homedecor/handlers/nodeboxes.lua
View File

@ -57,6 +57,3 @@ mt.__index = function(table, key)
error("unexpected datatype " .. tostring(type(ref)) .. " while looking for " .. key)
end
setmetatable(homedecor.nodebox, mt)

1
homedecor/handlers/water_particles.lua
View File

@ -112,4 +112,3 @@ function homedecor.stop_particle_spawner(pos)
this_spawner_meta:set_int("active", nil)
this_spawner_meta:set_int("sound", nil)
end

4
homedecor/misc-nodes.lua
View File

@ -80,8 +80,8 @@ homedecor.register("flower_pot_"..p, {
end
local flowers_list = {
{ "Rose", "rose", "flowers:rose" },
{ "Tulip", "tulip", "flowers:tulip" },
{ "Rose", "rose", "flowers:rose" },
{ "Tulip", "tulip", "flowers:tulip" },
{ "Yellow Dandelion", "dandelion_yellow", "flowers:dandelion_yellow" },
{ "White Dandelion", "dandelion_white", "flowers:dandelion_white" },
{ "Blue Geranium", "geranium", "flowers:geranium" },

1
homedecor/shutters.lua
View File

@ -49,4 +49,3 @@ for i in ipairs(shutters) do
end
minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet")

2
homedecor/trash_cans.lua
View File

@ -11,7 +11,7 @@ homedecor.register("trash_can_green", {
tiles = { "homedecor_pool_table_baize.png" },
inventory_image = "homedecor_trash_can_green_inv.png",
description = "Trash Can (green)",
groups = {snappy=3},
groups = {snappy=3},
selection_box = tg_cbox,
collision_box = tg_cbox,
on_punch = function(pos, node, puncher, pointed_thing)

1
homedecor_3d_extras/init.lua
View File

@ -89,4 +89,3 @@ if minetest.get_modpath("moreblocks") then
}
})
end