aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAuke Kok <sofar@foo-projects.org>2016-12-15 14:56:45 -0800
committerAuke Kok <sofar+github@foo-projects.org>2016-12-31 12:33:09 -0800
commit5500c9906c1c95e6d00acb06e0d29e21d36ff77f (patch)
treea0cb511cbb2f05076b3cb6855bdff1fd31e121d8
parentd587b4d23f9d386b1a3b924d0a3860b05941eee8 (diff)
downloadmoreblocks-5500c9906c1c95e6d00acb06e0d29e21d36ff77f.tar.gz
moreblocks-5500c9906c1c95e6d00acb06e0d29e21d36ff77f.tar.bz2
moreblocks-5500c9906c1c95e6d00acb06e0d29e21d36ff77f.zip
Run cleanfile on all files, fixing whitespace issues.
-rw-r--r--aliases.lua1
-rw-r--r--circular_saw.lua14
-rw-r--r--crafting.lua2
-rw-r--r--nodes.lua1
-rw-r--r--ownership.lua4
-rw-r--r--stairsplus/conversion.lua5
-rw-r--r--stairsplus/microblocks.lua18
-rw-r--r--stairsplus/panels.lua8
-rw-r--r--stairsplus/slabs.lua52
-rw-r--r--stairsplus/slopes.lua32
10 files changed, 67 insertions, 70 deletions
diff --git a/aliases.lua b/aliases.lua
index c34472d..e1ddc64 100644
--- a/aliases.lua
+++ b/aliases.lua
@@ -77,4 +77,3 @@ minetest.register_abm({
})
end,
})
-
diff --git a/circular_saw.lua b/circular_saw.lua
index 09fbd90..d676c3b 100644
--- a/circular_saw.lua
+++ b/circular_saw.lua
@@ -145,7 +145,7 @@ function circular_saw:update_inventory(pos, amount)
self:reset(pos)
return
end
-
+
local stack = inv:get_stack("input", 1)
-- At least one "normal" block is necessary to see what kind of stairs are requested.
if stack:is_empty() then
@@ -371,14 +371,14 @@ function circular_saw.can_dig(pos,player)
end
minetest.register_node("moreblocks:circular_saw", {
- description = S("Circular Saw"),
- drawtype = "nodebox",
+ description = S("Circular Saw"),
+ drawtype = "nodebox",
node_box = {
- type = "fixed",
+ type = "fixed",
fixed = {
{-0.4, -0.5, -0.4, -0.25, 0.25, -0.25}, -- Leg
{0.25, -0.5, 0.25, 0.4, 0.25, 0.4}, -- Leg
- {-0.4, -0.5, 0.25, -0.25, 0.25, 0.4}, -- Leg
+ {-0.4, -0.5, 0.25, -0.25, 0.25, 0.4}, -- Leg
{0.25, -0.5, -0.4, 0.4, 0.25, -0.25}, -- Leg
{-0.5, 0.25, -0.5, 0.5, 0.375, 0.5}, -- Tabletop
{-0.01, 0.4375, -0.125, 0.01, 0.5, 0.125}, -- Saw blade (top)
@@ -389,9 +389,9 @@ minetest.register_node("moreblocks:circular_saw", {
tiles = {"moreblocks_circular_saw_top.png",
"moreblocks_circular_saw_bottom.png",
"moreblocks_circular_saw_side.png"},
- paramtype = "light",
+ paramtype = "light",
sunlight_propagates = true,
- paramtype2 = "facedir",
+ paramtype2 = "facedir",
groups = {choppy = 2,oddly_breakable_by_hand = 2},
sounds = default.node_sound_wood_defaults(),
on_construct = circular_saw.on_construct,
diff --git a/crafting.lua b/crafting.lua
index 3cdce2a..16753c3 100644
--- a/crafting.lua
+++ b/crafting.lua
@@ -477,7 +477,7 @@ minetest.register_craft({
if minetest.setting_getbool("moreblocks.circular_saw_crafting") ~= false then -- “If nil or true then”
minetest.register_craft({
- output = "moreblocks:circular_saw",
+ output = "moreblocks:circular_saw",
recipe = {
{ "", "default:steel_ingot", "" },
{ "group:wood", "group:wood", "group:wood"},
diff --git a/nodes.lua b/nodes.lua
index 7c4450b..8d90614 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -358,4 +358,3 @@ minetest.register_craftitem("moreblocks:nothing", {
inventory_image = "invisible.png",
on_use = function() end,
})
-
diff --git a/ownership.lua b/ownership.lua
index 1c2431b..355d7f1 100644
--- a/ownership.lua
+++ b/ownership.lua
@@ -22,11 +22,11 @@ function moreblocks.node_is_owned(pos, placer)
end
end
- elseif type(isprotect)=="function" then -- glomie's protection mod
+ elseif type(isprotect)=="function" then -- glomie's protection mod
if not isprotect(5, pos, placer) then
ownername = S("someone")
end
- elseif type(protector)=="table" and type(protector.can_dig)=="function" then -- Zeg9's protection mod
+ elseif type(protector)=="table" and type(protector.can_dig)=="function" then -- Zeg9's protection mod
if not protector.can_dig(5, pos, placer) then
ownername = S("someone")
end
diff --git a/stairsplus/conversion.lua b/stairsplus/conversion.lua
index 13966b6..1c8981b 100644
--- a/stairsplus/conversion.lua
+++ b/stairsplus/conversion.lua
@@ -81,7 +81,7 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
action = function(pos, node, active_object_count, active_object_count_wider)
local fdir = node.param2 or 0
- if flip_upside_down and not flip_to_wall then
+ if flip_upside_down and not flip_to_wall then
nfdir = dirs1[fdir + 2]
elseif flip_to_wall and not flip_upside_down then
nfdir = dirs2[fdir + 1]
@@ -125,7 +125,7 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
local fdir = node.param2
local nfdir = 20
- if flip_upside_down and not flip_to_wall then
+ if flip_upside_down and not flip_to_wall then
nfdir = dirs1[fdir + 1]
elseif flip_to_wall and not flip_upside_down then
nfdir = dirs2[fdir + 2]
@@ -136,4 +136,3 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
})
end
end
-
diff --git a/stairsplus/microblocks.lua b/stairsplus/microblocks.lua
index a457d10..6271e27 100644
--- a/stairsplus/microblocks.lua
+++ b/stairsplus/microblocks.lua
@@ -98,53 +98,53 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
minetest.register_node(":" ..modname.. ":micro_" ..subname..alternate, def)
end
minetest.register_alias(modname.. ":micro_" ..subname.. "_bottom", modname.. ":micro_" ..subname)
-
+
circular_saw.known_nodes[recipeitem] = {modname, subname}
-- Some saw-less recipes:
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 7",
recipe = {modname .. ":stair_" .. subname .. "_inner"},
})
-
+
minetest.register_craft({
output = modname .. ":micro_" .. subname .. " 6",
type = "shapeless",
recipe = {modname .. ":stair_" .. subname},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 5",
recipe = {modname .. ":stair_" .. subname .. "_outer"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 4",
recipe = {modname .. ":slab_" .. subname},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 4",
recipe = {modname .. ":stair_" .. subname .. "_alt"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 3",
recipe = {modname .. ":stair_" .. subname .. "_right_half"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 2",
recipe = {modname .. ":panel_" .. subname},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
diff --git a/stairsplus/panels.lua b/stairsplus/panels.lua
index 314939b..df4e2bf 100644
--- a/stairsplus/panels.lua
+++ b/stairsplus/panels.lua
@@ -98,7 +98,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
minetest.register_node(":" ..modname.. ":panel_" ..subname..alternate, def)
end
minetest.register_alias(modname.. ":panel_" ..subname.. "_bottom", modname.. ":panel_" ..subname)
-
+
circular_saw.known_nodes[recipeitem] = {modname, subname}
-- Some saw-less recipes:
@@ -110,7 +110,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
{recipeitem, recipeitem},
},
})
-
+
minetest.register_craft({
output = modname .. ":panel_" .. subname .. " 12",
recipe = {
@@ -118,13 +118,13 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
{recipeitem, recipeitem},
},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":panel_" .. subname,
recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
diff --git a/stairsplus/slabs.lua b/stairsplus/slabs.lua
index 2acdd41..53bfa57 100644
--- a/stairsplus/slabs.lua
+++ b/stairsplus/slabs.lua
@@ -78,27 +78,27 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
output = modname .. ":slab_" .. subname .. " 6",
recipe = {{recipeitem, recipeitem, recipeitem}},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
})
-
+
-- uncomment this rule when conflict is no longer likely to happen
- -- https://github.com/minetest/minetest/issues/2881
+ -- https://github.com/minetest/minetest/issues/2881
-- minetest.register_craft({
- -- type = "shapeless",
- -- output = modname .. ":slab_" .. subname,
- -- recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
+ -- type = "shapeless",
+ -- output = modname .. ":slab_" .. subname,
+ -- recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
-- })
-
+
-- then remove these two
minetest.register_craft({
output = modname .. ":slab_" .. subname,
recipe = {{modname .. ":panel_" .. subname, modname .. ":panel_" .. subname}},
})
-
+
minetest.register_craft({
output = modname .. ":slab_" .. subname,
recipe = {
@@ -113,109 +113,109 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
output = recipeitem,
recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_three_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_14", modname .. ":slab_" .. subname .. "_2"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_15", modname .. ":slab_" .. subname .. "_1"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_quarter",
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_quarter",
recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_2",
recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_three_quarter",
recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname .. "_quarter"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_three_quarter",
recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_three_quarter",
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_14",
recipe = {modname .. ":slab_" .. subname .. "_three_quarter", modname .. ":slab_" .. subname .. "_2"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_14",
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_15",
recipe = {modname .. ":slab_" .. subname .. "_14", modname .. ":slab_" .. subname .. "_1"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. " 3",
diff --git a/stairsplus/slopes.lua b/stairsplus/slopes.lua
index da524b6..66fa6f5 100644
--- a/stairsplus/slopes.lua
+++ b/stairsplus/slopes.lua
@@ -261,99 +261,99 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
output = recipeitem,
recipe = {modname .. ":slope_" .. subname, modname .. ":slope_" .. subname},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half_raised"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half",
modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer", modname .. ":slope_" .. subname .. "_inner"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_half", modname .. ":slope_" .. subname .. "_inner_half_raised"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_half_raised", modname .. ":slope_" .. subname .. "_inner_half"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut", modname .. ":slope_" .. subname .. "_inner_cut"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut_half", modname .. ":slope_" .. subname .. "_inner_cut_half_raised"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_cut", modname .. ":slope_" .. subname .. "_cut"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slope_" .. subname .. "_outer_half", modname .. ":slope_" .. subname .. "_inner_half"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut_half", modname .. ":slope_" .. subname .. "_inner_cut_half"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_half_raised",
recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half",
modname .. ":slope_" .. subname .. "_half"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_half_raised",
recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_half"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_inner_half_raised",
recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_inner_half"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_outer_half_raised",
recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_outer_half"},
})
-
+
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_inner_cut_half_raised",