MinetestForFun
/
server-minetestforfun-creative
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove whitespaces

master
LeMagnesium 2015-09-23 20:56:42 +02:00
parent a4dd0fba50
commit 777a473f17
25 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minetestforfun_game/mods/default/nodes.lua
View File

@ -563,7 +563,7 @@ minetest.register_node("default:sapling", {
type = "fixed", type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3} fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
}, },
groups = {snappy = 3, flammable=2, groups = {snappy = 3, flammable=2,
attached_node = 1, sapling = 1}, attached_node = 1, sapling = 1},
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })

2
mods/ambience/init.lua
View File

@ -177,7 +177,7 @@ local get_ambience = function(player)
if num_desert > 150 then if num_desert > 150 then
return {desert=desert} return {desert=desert}
end end
if pos.y > 60 then if pos.y > 60 then
return {high_up=high_up} return {high_up=high_up}
end end

2
mods/irc_modpack

@ -1 +1 @@
Subproject commit 9fae29e3b91be9ce07f01a42761ab52788d0b500 Subproject commit eca49efd4a337a42e6f9dd8c42ab901b7352bb4c

4
mods/jukebox/init.lua
View File

@ -65,7 +65,7 @@ minetest.register_node("jukebox:box", {
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
}, },
on_rightclick = function(pos, node, clicker, itemstack) on_rightclick = function(pos, node, clicker, itemstack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
@ -108,7 +108,7 @@ minetest.register_node("jukebox:box", {
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
inv:set_size("main", 1) inv:set_size("main", 1)
end, end,
on_destruct = function(pos) on_destruct = function(pos)
local meta = minetest.env:get_meta(pos) local meta = minetest.env:get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()

2
mods/liquid_security/init.lua
View File

@ -67,5 +67,5 @@ local function save_liquid(loop)
end end
save_liquid(true) save_liquid(true)
minetest.register_on_shutdown(save_liquid) minetest.register_on_shutdown(save_liquid)

2
mods/mff_hud

@ -1 +1 @@
Subproject commit ce776002d036cfcbba7639e91daf41a1b731bf8f Subproject commit fec4bedfbe637144aea69965dea6c9e188f3d5fc

2
mods/mobs/api.lua
View File

@ -388,7 +388,7 @@ function mobs:register_mob(name, def)
self.jumptimer = 0 self.jumptimer = 0
end end
end end
-- environmental damage timer (every 1 second) -- environmental damage timer (every 1 second)
self.env_damage_timer = self.env_damage_timer + dtime self.env_damage_timer = self.env_damage_timer + dtime
if self.state == "attack" if self.state == "attack"

2
mods/mobs/bee.lua
View File

@ -80,7 +80,7 @@ minetest.register_node("mobs:beehive", {
minetest.add_entity(pos, "mobs:bee") minetest.add_entity(pos, "mobs:bee")
end end
end, end,
}) })
minetest.register_craft({ minetest.register_craft({

6
mods/mobs/mff_menu.lua
View File

@ -20,14 +20,14 @@ end
minetest.register_on_player_receive_fields(function(player, formname, fields) minetest.register_on_player_receive_fields(function(player, formname, fields)
local player_name = player:get_player_name() local player_name = player:get_player_name()
if not player_name then return end if not player_name then return end
if formname == "mobs:spawner" then if formname == "mobs:spawner" then
for f in pairs(fields) do for f in pairs(fields) do
if string.find(f, "mobs:") then if string.find(f, "mobs:") then
local pos = player:getpos() local pos = player:getpos()
pos.y = pos.y+1 pos.y = pos.y+1
minetest.add_entity(pos, f) minetest.add_entity(pos, f)
return return
end end
end end
end end
end) end)
@ -55,5 +55,5 @@ else
func = function(name, param) func = function(name, param)
mobs.shown_spawner_menu(name) mobs.shown_spawner_menu(name)
end, end,
}) })
end end

4
mods/multitest/init.lua
View File

@ -1,7 +1,7 @@
multitest = {} multitest = {}
multitest.colors = {"black", "blue", "brown", "cyan", "dark_green", multitest.colors = {"black", "blue", "brown", "cyan", "dark_green",
"dark_grey", "green", "grey", "magenta", "orange", "dark_grey", "green", "grey", "magenta", "orange",
"pink", "red", "violet", "white", "yellow"} "pink", "red", "violet", "white", "yellow"}
multitest.colornames = {"Black", "Blue", "Brown", "Cyan", "Dark Green", multitest.colornames = {"Black", "Blue", "Brown", "Cyan", "Dark Green",

34
mods/multitest/nodes.lua
View File

@ -24,7 +24,7 @@ minetest.register_node("multitest:blackstone_paved", {
description = "Paved Blackstone", description = "Paved Blackstone",
tiles = {"multitest_blackstone_paved.png"}, tiles = {"multitest_blackstone_paved.png"},
groups = {cracky=2, stone=1}, groups = {cracky=2, stone=1},
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults(),
}) })
minetest.register_node("multitest:blackstone_paved", { minetest.register_node("multitest:blackstone_paved", {
@ -122,28 +122,28 @@ minetest.register_node("multitest:sandstone_carved", {
}) })
-- stairs:stair_blackstone -- stairs:stair_blackstone
stairs.register_stair_and_slab("blackstone", "multitest:blackstone", stairs.register_stair_and_slab("blackstone", "multitest:blackstone",
{cracky=3, stone=1}, {cracky=3, stone=1},
{"multitest_blackstone.png"}, {"multitest_blackstone.png"},
"Blackstone Stairs", "Blackstone Stairs",
"Blackstone Slab", nil) "Blackstone Slab", nil)
stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble", stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble",
{cracky=3, stone=1}, {cracky=3, stone=1},
{"multitest_blackcobble.png"}, {"multitest_blackcobble.png"},
"Black Cobble Stairs", "Black Cobble Stairs",
"Black Cobble Slab", nil) "Black Cobble Slab", nil)
stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick", stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick",
{cracky=3, stone=1}, {cracky=3, stone=1},
{"multitest_blackstone_brick.png"}, {"multitest_blackstone_brick.png"},
"Blackstonestone brick Stairs", "Blackstonestone brick Stairs",
"Blackstone Brick Slab", nil) "Blackstone Brick Slab", nil)
stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved", stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved",
{cracky=3, stone=1}, {cracky=3, stone=1},
{"multitest_blackstone_paved.png"}, {"multitest_blackstone_paved.png"},
"Paved Blackstone Stairs", "Paved Blackstone Stairs",
"Paved Blackstone Slab", nil) "Paved Blackstone Slab", nil)
-- others -- others

14
mods/nether/nether/furnace.lua
View File

@ -250,7 +250,7 @@ minetest.register_abm({
if last_time == current_time then if last_time == current_time then
return return
end end
local timediff = get_timediff(last_time, current_time)+meta:get_string("timedif") local timediff = get_timediff(last_time, current_time)+meta:get_string("timedif")
local times = math.floor(timediff) local times = math.floor(timediff)
meta:set_string("last_active", current_time) meta:set_string("last_active", current_time)
@ -272,13 +272,13 @@ minetest.register_abm({
local srclist = inv:get_list("src") local srclist = inv:get_list("src")
local cooked = nil local cooked = nil
local aftercooked local aftercooked
if srclist then if srclist then
cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
end end
local was_active = false local was_active = false
if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then
was_active = true was_active = true
meta:set_float("fuel_time", meta:get_float("fuel_time") + 1) meta:set_float("fuel_time", meta:get_float("fuel_time") + 1)
@ -298,7 +298,7 @@ minetest.register_abm({
meta:set_string("src_time", 0) meta:set_string("src_time", 0)
end end
end end
if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then
local percent = math.floor(meta:get_float("fuel_time") / local percent = math.floor(meta:get_float("fuel_time") /
meta:get_float("fuel_totaltime") * 100) meta:get_float("fuel_totaltime") * 100)
@ -313,7 +313,7 @@ minetest.register_abm({
local cooked = nil local cooked = nil
local fuellist = inv:get_list("fuel") local fuellist = inv:get_list("fuel")
local srclist = inv:get_list("src") local srclist = inv:get_list("src")
if srclist then if srclist then
cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) cooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
end end
@ -339,7 +339,7 @@ minetest.register_abm({
meta:set_string("fuel_totaltime", fuel.time) meta:set_string("fuel_totaltime", fuel.time)
meta:set_string("fuel_time", 0) meta:set_string("fuel_time", 0)
inv:set_stack("fuel", 1, afterfuel.items[1]) inv:set_stack("fuel", 1, afterfuel.items[1])
end end
end, end,

8
mods/plantlife_modpack/dryplants/crafting.lua
View File

@ -2,10 +2,10 @@
-- Dry Plants - Recipes 0.1.0 -- Short Grass -> Dirt -- Dry Plants - Recipes 0.1.0 -- Short Grass -> Dirt
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
-- by Mossmanikin -- by Mossmanikin
-- License (everything): WTFPL -- License (everything): WTFPL
-- Looked at code from: darkage, default, farming, sickle, stairs -- Looked at code from: darkage, default, farming, sickle, stairs
-- Dependencies: default, farming -- Dependencies: default, farming
-- Supports: flint, stoneage, sumpf -- Supports: flint, stoneage, sumpf
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
@ -220,7 +220,7 @@ for i in pairs(ReeD) do
recipe = { recipe = {
{slab}, {slab},
} }
}) })
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
-- Roof Corner -- Roof Corner
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
@ -343,7 +343,7 @@ minetest.register_craft({
burntime = 2, burntime = 2,
}) })
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
-- Dandelion Leave -- Dandelion Leave
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
--[[minetest.register_craftitem("dryplants:dandelion_leave", { --[[minetest.register_craftitem("dryplants:dandelion_leave", {
description = "Dandelion Leave", description = "Dandelion Leave",

4
mods/plantlife_modpack/dryplants/init.lua
View File

@ -7,10 +7,10 @@ local mname = "dryplants"
-- textures & ideas partly by Neuromancer -- textures & ideas partly by Neuromancer
-- License (everything): WTFPL -- License (everything): WTFPL
-- Contains code from: default, farming -- Contains code from: default, farming
-- Looked at code from: darkage, sickle, stairs -- Looked at code from: darkage, sickle, stairs
-- Dependencies: default, farming, biome_lib -- Dependencies: default, farming, biome_lib
-- Supports: -- Supports:
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
abstract_dryplants = {} abstract_dryplants = {}

2
mods/plantlife_modpack/dryplants/moregrass.lua
View File

@ -5,7 +5,7 @@
-- License (everything): WTFPL -- License (everything): WTFPL
-- Contains code from: biome_lib -- Contains code from: biome_lib
-- Looked at code from: default -- Looked at code from: default
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
abstract_dryplants.grow_grass = function(pos) abstract_dryplants.grow_grass = function(pos)

18
mods/plantlife_modpack/dryplants/reed.lua
View File

@ -4,7 +4,7 @@
-- by Mossmanikin -- by Mossmanikin
-- License (everything): WTFPL -- License (everything): WTFPL
-- Looked at code from: darkage, default, stairs -- Looked at code from: darkage, default, stairs
-- Dependencies: default -- Dependencies: default
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_alias("stairs:stair_wetreed", "dryplants:wetreed_roof") minetest.register_alias("stairs:stair_wetreed", "dryplants:wetreed_roof")
minetest.register_alias("stairs:slab_wetreed", "dryplants:wetreed_slab") minetest.register_alias("stairs:slab_wetreed", "dryplants:wetreed_slab")
@ -93,7 +93,7 @@ if AUTO_ROOF_CORNER == true then
interval = 1, interval = 1,
chance = 1, chance = 1,
action = function(pos) action = function(pos)
local node_east = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z }) local node_east = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z })
local node_west = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z }) local node_west = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z })
local node_north = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1}) local node_north = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1})
@ -106,7 +106,7 @@ if AUTO_ROOF_CORNER == true then
then then
minetest.set_node(pos, {name=corner, param2=0}) minetest.set_node(pos, {name=corner, param2=0})
end end
if ((node_north.name == roof and node_north.param2 == 1) if ((node_north.name == roof and node_north.param2 == 1)
or (node_north.name == corner and node_north.param2 == 2)) or (node_north.name == corner and node_north.param2 == 2))
and ((node_east.name == roof and node_east.param2 == 0) and ((node_east.name == roof and node_east.param2 == 0)
@ -114,7 +114,7 @@ if AUTO_ROOF_CORNER == true then
then then
minetest.set_node(pos, {name=corner, param2=1}) minetest.set_node(pos, {name=corner, param2=1})
end end
if ((node_east.name == roof and node_east.param2 == 2) if ((node_east.name == roof and node_east.param2 == 2)
or (node_east.name == corner and node_east.param2 == 3)) or (node_east.name == corner and node_east.param2 == 3))
and ((node_south.name == roof and node_south.param2 == 1) and ((node_south.name == roof and node_south.param2 == 1)
@ -122,7 +122,7 @@ if AUTO_ROOF_CORNER == true then
then then
minetest.set_node(pos, {name=corner, param2=2}) minetest.set_node(pos, {name=corner, param2=2})
end end
if ((node_south.name == roof and node_south.param2 == 3) if ((node_south.name == roof and node_south.param2 == 3)
or (node_south.name == corner and node_south.param2 == 0)) or (node_south.name == corner and node_south.param2 == 0))
and ((node_west.name == roof and node_west.param2 == 2) and ((node_west.name == roof and node_west.param2 == 2)
@ -138,7 +138,7 @@ if AUTO_ROOF_CORNER == true then
then then
minetest.set_node(pos, {name=corner_2, param2=0}) minetest.set_node(pos, {name=corner_2, param2=0})
end end
if ((node_north.name == roof and node_north.param2 == 3) if ((node_north.name == roof and node_north.param2 == 3)
or (node_north.name == corner_2 and node_north.param2 == 2)) or (node_north.name == corner_2 and node_north.param2 == 2))
and ((node_east.name == roof and node_east.param2 == 2) and ((node_east.name == roof and node_east.param2 == 2)
@ -146,7 +146,7 @@ if AUTO_ROOF_CORNER == true then
then then
minetest.set_node(pos, {name=corner_2, param2=1}) minetest.set_node(pos, {name=corner_2, param2=1})
end end
if ((node_east.name == roof and node_east.param2 == 0) if ((node_east.name == roof and node_east.param2 == 0)
or (node_east.name == corner_2 and node_east.param2 == 3)) or (node_east.name == corner_2 and node_east.param2 == 3))
and ((node_south.name == roof and node_south.param2 == 3) and ((node_south.name == roof and node_south.param2 == 3)
@ -154,7 +154,7 @@ if AUTO_ROOF_CORNER == true then
then then
minetest.set_node(pos, {name=corner_2, param2=2}) minetest.set_node(pos, {name=corner_2, param2=2})
end end
if ((node_south.name == roof and node_south.param2 == 1) if ((node_south.name == roof and node_south.param2 == 1)
or (node_south.name == corner_2 and node_south.param2 == 0)) or (node_south.name == corner_2 and node_south.param2 == 0))
and ((node_west.name == roof and node_west.param2 == 0) and ((node_west.name == roof and node_west.param2 == 0)
@ -227,7 +227,7 @@ minetest.register_node("dryplants:wetreed_roof_corner_2", {
groups = {snappy=3, flammable=2}, groups = {snappy=3, flammable=2},
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
}) })
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
-- Wet Reed becomes (dry) Reed over time -- Wet Reed becomes (dry) Reed over time
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------

2
mods/plantlife_modpack/ferns/crafting.lua
View File

@ -2,7 +2,7 @@
-- Ferns - Crafting 0.0.5 -- Ferns - Crafting 0.0.5
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
-- (by Mossmanikin) -- (by Mossmanikin)
-- License (everything): WTFPL -- License (everything): WTFPL
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",

2
mods/plantlife_modpack/ferns/fern.lua
View File

@ -6,7 +6,7 @@
-- Contains code from: biome_lib -- Contains code from: biome_lib
-- Looked at code from: default, flowers, painting, trees -- Looked at code from: default, flowers, painting, trees
-- Dependencies: biome_lib -- Dependencies: biome_lib
-- Supports: dryplants, stoneage, sumpf -- Supports: dryplants, stoneage, sumpf
----------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------
-- some inspiration from here -- some inspiration from here
-- https://en.wikipedia.org/wiki/Athyrium_yokoscense -- https://en.wikipedia.org/wiki/Athyrium_yokoscense

2
mods/spawn/init.lua
View File

@ -15,5 +15,5 @@ minetest.register_chatcommand("spawn", {
minetest.chat_send_player(player:get_player_name(), "ERROR: No spawn point is set on this server!") minetest.chat_send_player(player:get_player_name(), "ERROR: No spawn point is set on this server!")
return false return false
end end
end end
}) })

28
mods/xdecor/crafts.lua
View File

@ -1,10 +1,10 @@
minetest.register_craft({ minetest.register_craft({
output = "xdecor:baricade", output = "xdecor:baricade",
recipe = { recipe = {
{"group:stick", "", "group:stick"}, {"group:stick", "", "group:stick"},
{"", "default:steel_ingot", ""}, {"", "default:steel_ingot", ""},
{"group:stick", "", "group:stick"} {"group:stick", "", "group:stick"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
@ -16,11 +16,11 @@ minetest.register_craft({
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "xdecor:candle", output = "xdecor:candle",
recipe = { recipe = {
{"default:torch"} {"default:torch"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
@ -71,7 +71,7 @@ minetest.register_craft({
{"group:stick", "", "group:stick"} {"group:stick", "", "group:stick"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "xdecor:chandelier", output = "xdecor:chandelier",
recipe = { recipe = {
@ -120,7 +120,7 @@ minetest.register_craft({
{"default:desert_cobble", "default:desert_cobble"} {"default:desert_cobble", "default:desert_cobble"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "xdecor:empty_shelf", output = "xdecor:empty_shelf",
recipe = { recipe = {
@ -163,7 +163,7 @@ minetest.register_craft({
{"group:stick", "group:stick", "group:stick"} {"group:stick", "group:stick", "group:stick"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "xdecor:hammer", output = "xdecor:hammer",
recipe = { recipe = {
@ -212,7 +212,7 @@ minetest.register_craft({
{"group:wood", "default:paper"} {"group:wood", "default:paper"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "xdecor:lantern", output = "xdecor:lantern",
recipe = { recipe = {
@ -324,7 +324,7 @@ minetest.register_craft({
{"group:wood", "group:wood"} {"group:wood", "group:wood"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "xdecor:stereo", output = "xdecor:stereo",
recipe = { recipe = {
@ -333,7 +333,7 @@ minetest.register_craft({
{"default:steel_ingot", "default:copper_ingot", "default:steel_ingot"} {"default:steel_ingot", "default:copper_ingot", "default:steel_ingot"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "xdecor:stone_tile 2", output = "xdecor:stone_tile 2",
recipe = { recipe = {
@ -341,7 +341,7 @@ minetest.register_craft({
{"default:cobble", "default:cobble"} {"default:cobble", "default:cobble"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "xdecor:stone_rune 4", output = "xdecor:stone_rune 4",
recipe = { recipe = {
@ -369,11 +369,11 @@ minetest.register_craft({
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "xdecor:tatami", output = "xdecor:tatami",
recipe = { recipe = {
{"farming:wheat", "farming:wheat", "farming:wheat"} {"farming:wheat", "farming:wheat", "farming:wheat"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
@ -393,7 +393,7 @@ minetest.register_craft({
{"group:wood", "group:wood", "group:wood"} {"group:wood", "group:wood", "group:wood"}
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "xdecor:woodframed_glass", output = "xdecor:woodframed_glass",
recipe = { recipe = {

2
mods/xdecor/handlers/registration.lua
View File

@ -37,7 +37,7 @@ function xdecor.register(name, def)
def.drawtype = def.drawtype or (def.node_box and "nodebox") def.drawtype = def.drawtype or (def.node_box and "nodebox")
def.paramtype = def.paramtype or "light" def.paramtype = def.paramtype or "light"
def.sounds = def.sounds or default.node_sound_defaults() def.sounds = def.sounds or default.node_sound_defaults()
if not (def.drawtype == "glasslike_framed" or if not (def.drawtype == "glasslike_framed" or
def.drawtype == "glasslike_framed_optional" or def.drawtype == "plantlike" or def.drawtype == "glasslike_framed_optional" or def.drawtype == "plantlike" or
def.drawtype == "signlike" or def.drawtype == "normal") then def.drawtype == "signlike" or def.drawtype == "normal") then

4
mods/xdecor/itemframe.lua
View File

@ -57,7 +57,7 @@ local update_item = function(pos, node)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local str_item = meta:get_string("item") local str_item = meta:get_string("item")
if str_item == "" then return end if str_item == "" then return end
local posad = facedir[node.param2] local posad = facedir[node.param2]
if not posad then return end if not posad then return end
pos.x = pos.x + posad.x * 6.5/16 pos.x = pos.x + posad.x * 6.5/16
@ -91,7 +91,7 @@ xdecor.register("frame", {
tiles = { tiles = {
"xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png", "xdecor_wood.png",
"xdecor_wood.png", "xdecor_wood.png", "xdecor_frame.png" "xdecor_wood.png", "xdecor_wood.png", "xdecor_frame.png"
}, },
inventory_image = "xdecor_frame.png", inventory_image = "xdecor_frame.png",
after_place_node = function(pos, placer, itemstack) after_place_node = function(pos, placer, itemstack)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)

4
mods/xdecor/nodes.lua
View File

@ -89,7 +89,7 @@ xdecor.register("cardboard_box", {
inventory = {size=8}, inventory = {size=8},
infotext = "Cardboard Box", infotext = "Cardboard Box",
groups = {snappy=3, flammable=3}, groups = {snappy=3, flammable=3},
tiles = {"xdecor_cardbox_top.png", "xdecor_cardbox_top.png", tiles = {"xdecor_cardbox_top.png", "xdecor_cardbox_top.png",
"xdecor_cardbox_sides.png"}, "xdecor_cardbox_sides.png"},
node_box = { node_box = {
type = "fixed", fixed = {{-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125}} type = "fixed", fixed = {{-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125}}
@ -359,7 +359,7 @@ xdecor.register("lantern", {
light_source = 12, light_source = 12,
drawtype = "torchlike", drawtype = "torchlike",
inventory_image = "xdecor_lantern_floor.png", inventory_image = "xdecor_lantern_floor.png",
wield_image = "xdecor_lantern_floor.png", wield_image = "xdecor_lantern_floor.png",
paramtype2 = "wallmounted", paramtype2 = "wallmounted",
legacy_wallmounted = true, legacy_wallmounted = true,
walkable = false, walkable = false,

2
mods/xdecor/worktable.lua
View File

@ -7,7 +7,7 @@ local material = {
"cobble", "mossycobble", "desert_cobble", "cobble", "mossycobble", "desert_cobble",
"stone", "sandstone", "desert_stone", "obsidian", "stone", "sandstone", "desert_stone", "obsidian",
"stonebrick", "sandstonebrick", "desert_stonebrick", "obsidianbrick", "stonebrick", "sandstonebrick", "desert_stonebrick", "obsidianbrick",
"coalblock", "copperblock", "steelblock", "goldblock", "coalblock", "copperblock", "steelblock", "goldblock",
"bronzeblock", "mese", "diamondblock", "bronzeblock", "mese", "diamondblock",
"brick", "cactus", "ice", "meselamp", "brick", "cactus", "ice", "meselamp",
"glass", "obsidian_glass" "glass", "obsidian_glass"

4
mods/xdecor/xwall.lua
View File

@ -131,7 +131,7 @@ function xwall.construct_node_box_data(node_box_list, center_node_box_list, node
res.c2[#res.c2+1] = v res.c2[#res.c2+1] = v
res.c3[#res.c3+1] = v res.c3[#res.c3+1] = v
res.c4[#res.c4+1] = v res.c4[#res.c4+1] = v
end end
if #res.c0 < 1 then res.c0 = nil end if #res.c0 < 1 then res.c0 = nil end
@ -146,7 +146,7 @@ function xwall.register_wall(name, tiles, def)
) )
if def then return end if def then return end
def = { def = {
description = string.sub(name:gsub("%l", string.upper, 7), 8, -6).." Wall", description = string.sub(name:gsub("%l", string.upper, 7), 8, -6).." Wall",
textures = {tiles, tiles, tiles, tiles}, textures = {tiles, tiles, tiles, tiles},
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults(),