diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua index 7f2c1b3b..3d4a41e4 100644 --- a/building_blocks/alias.lua +++ b/building_blocks/alias.lua @@ -1,35 +1,35 @@ -local S = minetest.get_translator("building_blocks") +local S = core.get_translator("building_blocks") -if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then - minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar") - minetest.register_alias("building_blocks:stair_tar", "stairs:stair_Tar") - minetest.register_alias("building_blocks:slab_marble", "stairs:slab_Marble") - minetest.register_alias("building_blocks:stair_marble", "stairs:stair_Marble") +if core.get_modpath("moreblocks") or core.get_modpath("stairs") then + core.register_alias("building_blocks:slab_tar", "stairs:slab_Tar") + core.register_alias("building_blocks:stair_tar", "stairs:stair_Tar") + core.register_alias("building_blocks:slab_marble", "stairs:slab_Marble") + core.register_alias("building_blocks:stair_marble", "stairs:stair_Marble") end -if minetest.get_modpath("moreblocks") then - minetest.register_alias_force("moreblocks:tar", "building_blocks:Tar") +if core.get_modpath("moreblocks") then + core.register_alias_force("moreblocks:tar", "building_blocks:Tar") stairsplus:register_alias_all("building_blocks", "tar", "building_blocks", "Tar") stairsplus:register_alias_all("building_blocks", "marble", "building_blocks", "Marble") stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar") - if minetest.get_modpath("gloopblocks") then - minetest.register_alias("building_blocks:gravel_spread", "gloopblocks:slab_gravel_1") + if core.get_modpath("gloopblocks") then + core.register_alias("building_blocks:gravel_spread", "gloopblocks:slab_gravel_1") end end -minetest.register_alias("adobe", "building_blocks:Adobe") -minetest.register_alias("fakegrass", "building_blocks:fakegrass") -minetest.register_alias("hardwood", "building_blocks:hardwood") -minetest.register_alias("tar_knife", "building_blocks:knife") -minetest.register_alias("marble", "building_blocks:Marble") -minetest.register_alias("building_blocks_roofing", "building_blocks:Roofing") -minetest.register_alias("sticks", "building_blocks:sticks") -minetest.register_alias("building_blocks:faggot", "building_blocks:sticks") -minetest.register_alias("tar", "building_blocks:Tar") +core.register_alias("adobe", "building_blocks:Adobe") +core.register_alias("fakegrass", "building_blocks:fakegrass") +core.register_alias("hardwood", "building_blocks:hardwood") +core.register_alias("tar_knife", "building_blocks:knife") +core.register_alias("marble", "building_blocks:Marble") +core.register_alias("building_blocks_roofing", "building_blocks:Roofing") +core.register_alias("sticks", "building_blocks:sticks") +core.register_alias("building_blocks:faggot", "building_blocks:sticks") +core.register_alias("tar", "building_blocks:Tar") -if not minetest.get_modpath("technic") then - minetest.register_node( ":technic:granite", { +if not core.get_modpath("technic") then + core.register_node( ":technic:granite", { description = S("Granite"), tiles = { "technic_granite.png" }, is_ground_content = true, @@ -39,7 +39,7 @@ if not minetest.get_modpath("technic") then key = "node_sound_stone_defaults", }, }) - minetest.register_craft({ + core.register_craft({ output = "technic:granite 9", recipe = { { "group:tar_block", "group:marble", "group:tar_block" }, @@ -47,7 +47,7 @@ if not minetest.get_modpath("technic") then { "group:tar_block", "group:marble", "group:tar_block" } }, }) - if minetest.get_modpath("moreblocks") then + if core.get_modpath("moreblocks") then stairsplus:register_all("technic", "granite", "technic:granite", { description=S("Granite"), groups={cracky=1, not_in_creative_inventory=1}, diff --git a/building_blocks/init.lua b/building_blocks/init.lua index 4e2da83d..b6e9d021 100644 --- a/building_blocks/init.lua +++ b/building_blocks/init.lua @@ -1,4 +1,4 @@ -local modpath = minetest.get_modpath("building_blocks") +local modpath = core.get_modpath("building_blocks") dofile(modpath.."/alias.lua") dofile(modpath.."/node_stairs.lua") diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index 349c4bcb..787033f2 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("building_blocks") +local S = core.get_translator("building_blocks") local function building_blocks_stairs(nodename, def) @@ -15,15 +15,15 @@ local function building_blocks_stairs(nodename, def) def.is_ground_content = def.is_ground_content == true - minetest.register_node(nodename, def) - if minetest.get_modpath("moreblocks") then + core.register_node(nodename, def) + if core.get_modpath("moreblocks") then local mod, name = nodename:match("(.*):(.*)") stairsplus:register_all(mod, name, nodename, def) - minetest.register_alias("stairs:slab_" .. name, mod .. ":slab_" .. name) - minetest.register_alias("stairs:stair_" .. name, mod .. ":stair_" .. name) - minetest.register_alias("stairs:stair_inner_" .. name, mod .. ":stair_" .. name .. "_inner") - minetest.register_alias("stairs:stair_outer_" .. name, mod .. ":stair_" .. name .. "_outer") + core.register_alias("stairs:slab_" .. name, mod .. ":slab_" .. name) + core.register_alias("stairs:stair_" .. name, mod .. ":stair_" .. name) + core.register_alias("stairs:stair_inner_" .. name, mod .. ":stair_" .. name .. "_inner") + core.register_alias("stairs:stair_outer_" .. name, mod .. ":stair_" .. name .. "_outer") end end @@ -127,7 +127,7 @@ building_blocks_stairs("building_blocks:Marble", { }, }) -minetest.register_node("building_blocks:brobble_spread", { +core.register_node("building_blocks:brobble_spread", { drawtype = "raillike", -- Translators: "Brobble" is a portmanteau of "Brick" and "Cobble". -- Translate however you see fit. @@ -147,9 +147,9 @@ minetest.register_node("building_blocks:brobble_spread", { _mcl_hardness=0.6 }) -if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then +if not core.get_modpath("moreblocks") or not core.get_modpath("gloopblocks") then local graveltex = homedecor.textures.gravel - minetest.register_node("building_blocks:gravel_spread", { + core.register_node("building_blocks:gravel_spread", { drawtype = "raillike", description = S("Gravel Spread"), tiles = {graveltex}, @@ -171,7 +171,7 @@ if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopbloc }) end -minetest.register_node("building_blocks:Tarmac_spread", { +core.register_node("building_blocks:Tarmac_spread", { drawtype = "raillike", description = S("Tarmac Spread"), tiles = {"building_blocks_tar.png"}, @@ -191,7 +191,7 @@ minetest.register_node("building_blocks:Tarmac_spread", { key = "node_sound_dirt_defaults", }, }) -minetest.register_node("building_blocks:terrycloth_towel", { +core.register_node("building_blocks:terrycloth_towel", { drawtype = "raillike", description = S("Terrycloth towel"), tiles = {"building_blocks_towel.png"}, @@ -209,7 +209,7 @@ minetest.register_node("building_blocks:terrycloth_towel", { _mcl_hardness=0.6 }) -minetest.register_node("building_blocks:BWtile", { +core.register_node("building_blocks:BWtile", { drawtype = "nodebox", description = S("Chess board tiling"), tiles = { @@ -233,7 +233,7 @@ minetest.register_node("building_blocks:BWtile", { _mcl_hardness=0.6 }) -minetest.register_node("building_blocks:Fireplace", { +core.register_node("building_blocks:Fireplace", { description = S("Fireplace"), tiles = { "building_blocks_cast_iron.png", @@ -243,7 +243,7 @@ minetest.register_node("building_blocks:Fireplace", { }, paramtype = "light", paramtype2 = "facedir", - light_source = minetest.LIGHT_MAX, + light_source = core.LIGHT_MAX, sunlight_propagates = true, is_ground_content = false, groups = {cracky=2, dig_generic=4, pickaxey=5}, diff --git a/building_blocks/others.lua b/building_blocks/others.lua index 0588817f..9ce683c3 100644 --- a/building_blocks/others.lua +++ b/building_blocks/others.lua @@ -1,16 +1,16 @@ -local S = minetest.get_translator("building_blocks") +local S = core.get_translator("building_blocks") -minetest.register_craftitem("building_blocks:sticks", { +core.register_craftitem("building_blocks:sticks", { description = S("Small bundle of sticks"), inventory_image = "building_blocks_sticks.png", - on_place_on_ground = minetest.craftitem_place_item, + on_place_on_ground = core.craftitem_place_item, }) -minetest.register_craftitem("building_blocks:tar_base", { +core.register_craftitem("building_blocks:tar_base", { description = S("Tar base"), inventory_image = "building_blocks_tar_base.png", }) -minetest.register_tool("building_blocks:knife", { +core.register_tool("building_blocks:knife", { description = S("Tar Knife"), inventory_image = "building_blocks_knife.png", tool_capabilities = { diff --git a/building_blocks/recipes.lua b/building_blocks/recipes.lua index 86e665f8..0324c191 100644 --- a/building_blocks/recipes.lua +++ b/building_blocks/recipes.lua @@ -1,7 +1,7 @@ local materials = homedecor.materials -if minetest.get_modpath("moreblocks") then - minetest.register_craft({ +if core.get_modpath("moreblocks") then + core.register_craft({ output = 'building_blocks:sticks 2', recipe = { {'group:stick', '' , 'group:stick'}, @@ -10,7 +10,7 @@ if minetest.get_modpath("moreblocks") then } }) else - minetest.register_craft({ + core.register_craft({ output = 'building_blocks:sticks', recipe = { {'group:stick', 'group:stick'}, @@ -19,7 +19,7 @@ else }) end -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:Adobe 3', recipe = { {materials.sand}, @@ -27,33 +27,33 @@ minetest.register_craft({ {"group:stick"}, } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:brobble_spread 4', recipe = { {materials.brick, materials.cobble, materials.brick}, } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:BWtile 10', recipe = { {"group:marble", "group:tar_block"}, {"group:tar_block", "group:marble"}, } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:fakegrass 2', recipe = { {'group:leaves'}, {materials.dirt}, } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:Fireplace 1', recipe = { {materials.steel_ingot, "building_blocks:sticks", materials.steel_ingot}, } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:grate 1', recipe = { {materials.steel_ingot, materials.steel_ingot}, @@ -61,8 +61,8 @@ minetest.register_craft({ } }) -if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then - minetest.register_craft({ +if not core.get_modpath("moreblocks") or not core.get_modpath("gloopblocks") then + core.register_craft({ output = 'building_blocks:gravel_spread 4', recipe = { {materials.gravel, materials.gravel, materials.gravel}, @@ -70,15 +70,15 @@ if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopbloc }) end -if minetest.get_modpath("default") then - minetest.register_craft({ +if core.get_modpath("default") then + core.register_craft({ output = 'building_blocks:hardwood 2', recipe = { {"default:wood", "default:junglewood"}, {"default:junglewood", "default:wood"}, } }) - minetest.register_craft({ + core.register_craft({ output = 'building_blocks:hardwood 2', recipe = { {"default:junglewood", "default:wood"}, @@ -86,14 +86,14 @@ if minetest.get_modpath("default") then } }) end -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:knife 1', recipe = { {"group:tar_block"}, {"group:stick"}, } }) -minetest.register_craft({ +core.register_craft({ output = "building_blocks:Marble 9", recipe = { {materials.clay_lump, "group:tar_block", materials.clay_lump}, @@ -101,46 +101,46 @@ minetest.register_craft({ {materials.clay_lump, "group:tar_block",materials.clay_lump}, } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:Roofing 10', recipe = { {"building_blocks:Adobe", "building_blocks:Adobe"}, {"building_blocks:Adobe", "building_blocks:Adobe"}, } }) -minetest.register_craft({ +core.register_craft({ output = 'default:stick 4', recipe = { {'building_blocks:sticks'}, } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:tar_base 4', recipe = { {materials.coal_lump, materials.gravel}, {materials.gravel, materials.coal_lump} } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:tar_base 4', recipe = { {materials.gravel, materials.coal_lump}, {materials.coal_lump, materials.gravel} } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:Tarmac_spread 4', recipe = { {"group:tar_block", "group:tar_block"}, } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:terrycloth_towel 2', recipe = { {"farming:string", "farming:string", "farming:string"}, } }) -minetest.register_craft({ +core.register_craft({ output = 'building_blocks:woodglass 1', recipe = { {"group:wood"}, @@ -148,28 +148,28 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "cooking", output = "building_blocks:smoothglass", recipe = materials.glass_block }) -minetest.register_craft({ +core.register_craft({ type = "cooking", output = "building_blocks:Tar", recipe = "building_blocks:tar_base", }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "building_blocks:hardwood", burntime = 28, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "building_blocks:sticks", burntime = 5, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "building_blocks:Tar", burntime = 40, diff --git a/fake_fire/init.lua b/fake_fire/init.lua index b718c821..78a315ec 100644 --- a/fake_fire/init.lua +++ b/fake_fire/init.lua @@ -1,10 +1,10 @@ -local S = minetest.get_translator("fake_fire") +local S = core.get_translator("fake_fire") local fake_fire_reload_particles_nodes = {} local function fire_particles_on(pos) -- 3 layers of fire - local meta = minetest.get_meta(pos) - local id1 = minetest.add_particlespawner({ -- 1 layer big particles fire + local meta = core.get_meta(pos) + local id1 = core.add_particlespawner({ -- 1 layer big particles fire amount = 9, time = 0, minpos = {x = pos.x - 0.2, y = pos.y - 0.4, z = pos.z - 0.2}, @@ -24,7 +24,7 @@ local function fire_particles_on(pos) -- 3 layers of fire }) meta:set_int("layer_1", id1) - local id2 = minetest.add_particlespawner({ -- 2 layer smol particles fire + local id2 = core.add_particlespawner({ -- 2 layer smol particles fire amount = 1, time = 0, minpos = {x = pos.x - 0.1, y = pos.y, z = pos.z - 0.1}, @@ -44,7 +44,7 @@ local function fire_particles_on(pos) -- 3 layers of fire }) meta:set_int("layer_2", id2) - local id3 = minetest.add_particlespawner({ --3 layer smoke + local id3 = core.add_particlespawner({ --3 layer smoke amount = 1, time = 0, minpos = {x = pos.x - 0.1, y = pos.y - 0.2, z = pos.z - 0.1}, @@ -66,35 +66,35 @@ local function fire_particles_on(pos) -- 3 layers of fire end local function fire_particles_off(pos) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local id_1 = meta:get_int("layer_1"); local id_2 = meta:get_int("layer_2"); local id_3 = meta:get_int("layer_3"); - minetest.delete_particlespawner(id_1) - minetest.delete_particlespawner(id_2) - minetest.delete_particlespawner(id_3) + core.delete_particlespawner(id_1) + core.delete_particlespawner(id_2) + core.delete_particlespawner(id_3) end local function start_fire_effects(pos, node, clicker, chimney) - local this_spawner_meta = minetest.get_meta(pos) + local this_spawner_meta = core.get_meta(pos) local id = this_spawner_meta:get_int("smoky") local s_handle = this_spawner_meta:get_int("sound") - local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name + local above = core.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name if id ~= 0 then if s_handle then - minetest.after(0, function(handle) - minetest.sound_stop(handle) + core.after(0, function(handle) + core.sound_stop(handle) end, s_handle) end - minetest.delete_particlespawner(id) + core.delete_particlespawner(id) this_spawner_meta:set_int("smoky", 0) this_spawner_meta:set_int("sound", 0) return end if above == "air" and (not id or id == 0) then - id = minetest.add_particlespawner({ + id = core.add_particlespawner({ amount = 4, time = 0, collisiondetection = true, minpos = {x=pos.x-0.25, y=pos.y+0.4, z=pos.z-0.25}, maxpos = {x=pos.x+0.25, y=pos.y+5, z=pos.z+0.25}, @@ -108,7 +108,7 @@ local function start_fire_effects(pos, node, clicker, chimney) if chimney == 1 then this_spawner_meta:set_int("sound", 0) else - s_handle = minetest.sound_play("fire_small", { + s_handle = core.sound_play("fire_small", { pos = pos, max_hear_distance = 5, loop = true @@ -121,17 +121,17 @@ local function start_fire_effects(pos, node, clicker, chimney) end local function stop_smoke(pos) - local this_spawner_meta = minetest.get_meta(pos) + local this_spawner_meta = core.get_meta(pos) local id = this_spawner_meta:get_int("smoky") local s_handle = this_spawner_meta:get_int("sound") if id ~= 0 then - minetest.delete_particlespawner(id) + core.delete_particlespawner(id) end if s_handle then - minetest.after(0, function(handle) - minetest.sound_stop(handle) + core.after(0, function(handle) + core.sound_stop(handle) end, s_handle) end @@ -139,7 +139,7 @@ local function stop_smoke(pos) this_spawner_meta:set_int("sound", 0) end -minetest.register_node("fake_fire:ice_fire", { +core.register_node("fake_fire:ice_fire", { inventory_image = "ice_fire_inv.png", description = S("Ice fire"), drawtype = "plantlike", @@ -164,14 +164,14 @@ minetest.register_node("fake_fire:ice_fire", { on_destruct = function (pos) stop_smoke(pos) fire_particles_off(pos) - minetest.sound_play("fire_extinguish", { + core.sound_play("fire_extinguish", { pos = pos, max_hear_distance = 5 }) end, drop = "" }) -minetest.register_alias("fake_fire:fake_fire", "fire:permanent_flame") +core.register_alias("fake_fire:fake_fire", "fire:permanent_flame") local sbox = { type = 'fixed', @@ -180,7 +180,7 @@ local sbox = { local wtex = homedecor.textures.wood.jungle.planks -minetest.register_node("fake_fire:fancy_fire", { +core.register_node("fake_fire:fancy_fire", { inventory_image = "fancy_fire_inv.png", description = S("Fancy Fire"), drawtype = "mesh", @@ -212,7 +212,7 @@ minetest.register_node("fake_fire:fancy_fire", { end, on_destruct = function(pos, oldnode, oldmetadata, digger) fire_particles_off(pos) - minetest.sound_play("fire_extinguish", { + core.sound_play("fire_extinguish", { pos = pos, max_hear_distance = 5 }) end, @@ -228,7 +228,7 @@ minetest.register_node("fake_fire:fancy_fire", { }) -- EMBERS -minetest.register_node("fake_fire:embers", { +core.register_node("fake_fire:embers", { description = S("Glowing Embers"), tiles = { {name="embers_animated.png", animation={type="vertical_frames", @@ -245,12 +245,12 @@ minetest.register_node("fake_fire:embers", { }) local sandstone_tex = "default_sandstone.png" -if not minetest.get_modpath("default") then - local sname = minetest.registered_nodes["mapgen_stone"].name +if not core.get_modpath("default") then + local sname = core.registered_nodes["mapgen_stone"].name local names = sname:split(":") local nitem = names[2] and string.gsub(names[2], "stone", "sandstone") or nil - if nitem and minetest.registered_nodes[names[1]..":"..nitem] then - sandstone_tex = minetest.registered_nodes[names[1]..":"..nitem].tiles[1] + if nitem and core.registered_nodes[names[1]..":"..nitem] then + sandstone_tex = core.registered_nodes[names[1]..":"..nitem].tiles[1] else sandstone_tex = "[combine:16x16^[noalpha^[colorize:#fefebe" end @@ -258,14 +258,14 @@ end -- CHIMNEYS local materials = { - { "stone", S("Stone chimney top"), minetest.registered_nodes["mapgen_stone"].tiles[1] }, + { "stone", S("Stone chimney top"), core.registered_nodes["mapgen_stone"].tiles[1] }, { "sandstone", S("Sandstone chimney top"), sandstone_tex }, } for _, mat in ipairs(materials) do local name, desc, tex = unpack(mat) table.insert(fake_fire_reload_particles_nodes, "fake_fire:chimney_top_"..name) - minetest.register_node("fake_fire:chimney_top_"..name, { + core.register_node("fake_fire:chimney_top_"..name, { description = desc, tiles = {tex.."^chimney_top.png", tex}, groups = {snappy=3, dig_stone=2, handy=1}, @@ -290,8 +290,8 @@ for _, mat in ipairs(materials) do end }) - if minetest.get_modpath("default") then - minetest.register_craft({ + if core.get_modpath("default") then + core.register_craft({ type = "shapeless", output = 'fake_fire:chimney_top_'..name, recipe = {"default:torch", "stairs:slab_"..name} @@ -299,28 +299,28 @@ for _, mat in ipairs(materials) do end end -minetest.register_alias("fake_fire:flint_and_steel", "fire:flint_and_steel") +core.register_alias("fake_fire:flint_and_steel", "fire:flint_and_steel") -if minetest.get_modpath("default") then - minetest.override_item("default:ice", { +if core.get_modpath("default") then + core.override_item("default:ice", { on_ignite = function(pos, igniter) local flame_pos = {x = pos.x, y = pos.y + 1, z = pos.z} - if minetest.get_node(flame_pos).name == "air" then - minetest.set_node(flame_pos, {name = "fake_fire:ice_fire"}) + if core.get_node(flame_pos).name == "air" then + core.set_node(flame_pos, {name = "fake_fire:ice_fire"}) end end }) end -- CRAFTS -if minetest.get_modpath("default") then - minetest.register_craft({ +if core.get_modpath("default") then + core.register_craft({ type = "shapeless", output = 'fake_fire:embers', recipe = {"default:torch", "group:wood", "default:torch"} }) - minetest.register_craft({ + core.register_craft({ type = "shapeless", output = 'fake_fire:fancy_fire', recipe = {"default:torch", "building_blocks:sticks", "default:torch" } @@ -329,15 +329,15 @@ end -- ALIASES -minetest.register_alias("fake_fire:smokeless_fire", "fake_fire:fake_fire") -minetest.register_alias("fake_fire:smokeless_ice_fire", "fake_fire:ice_fire") -minetest.register_alias("fake_fire:smokeless_chimney_top_stone", "fake_fire:chimney_top_stone") -minetest.register_alias("fake_fire:smokeless_chimney_top_sandstone", "fake_fire:chimney_top_sandstone") -minetest.register_alias("fake_fire:flint", "fake_fire:flint_and_steel") +core.register_alias("fake_fire:smokeless_fire", "fake_fire:fake_fire") +core.register_alias("fake_fire:smokeless_ice_fire", "fake_fire:ice_fire") +core.register_alias("fake_fire:smokeless_chimney_top_stone", "fake_fire:chimney_top_stone") +core.register_alias("fake_fire:smokeless_chimney_top_sandstone", "fake_fire:chimney_top_sandstone") +core.register_alias("fake_fire:flint", "fake_fire:flint_and_steel") -- OTHER -minetest.register_lbm({ +core.register_lbm({ name = "fake_fire:reload_particles", label = "restart fire particles on reload", nodenames = { "fake_fire:fancy_fire" }, @@ -348,13 +348,13 @@ minetest.register_lbm({ end }) -minetest.register_lbm({ +core.register_lbm({ name = "fake_fire:reload_particles_chimney", label = "restart chimney smoke on reload", nodenames = fake_fire_reload_particles_nodes, run_at_every_load = true, action = function(pos, node) - if minetest.get_meta(pos):get_int("smoky") ~= 0 then + if core.get_meta(pos):get_int("smoky") ~= 0 then stop_smoke(pos) start_fire_effects(pos, node, nil, 1) end diff --git a/homedecor_3d_extras/init.lua b/homedecor_3d_extras/init.lua index 3ed2ca6f..24a521fe 100644 --- a/homedecor_3d_extras/init.lua +++ b/homedecor_3d_extras/init.lua @@ -1,5 +1,5 @@ -if minetest.get_modpath("default") then - minetest.override_item("default:bookshelf", { +if core.get_modpath("default") then + core.override_item("default:bookshelf", { drawtype = "mesh", mesh = "homedecor_3d_bookshelf.obj", tiles = { @@ -12,8 +12,8 @@ if minetest.get_modpath("default") then }) end -if minetest.get_modpath("vessels") then - minetest.override_item("vessels:shelf", { +if core.get_modpath("vessels") then + core.override_item("vessels:shelf", { drawtype = "mesh", mesh = "homedecor_3d_vessels_shelf.obj", tiles = { @@ -30,7 +30,7 @@ if minetest.get_modpath("vessels") then fixed = { -0.15, -0.5, -0.15, 0.15, -0.1, 0.15 } } - minetest.override_item("vessels:glass_bottle", { + core.override_item("vessels:glass_bottle", { drawtype = "mesh", mesh = "homedecor_3d_vessels_bottle.obj", tiles = {"homedecor_3d_vessels_shelf_glass.png"}, @@ -39,7 +39,7 @@ if minetest.get_modpath("vessels") then selection_box = sbox }) - minetest.override_item("vessels:steel_bottle", { + core.override_item("vessels:steel_bottle", { drawtype = "mesh", mesh = "homedecor_3d_vessels_bottle_steel.obj", tiles = {"homedecor_3d_bottle_metal_bright.png"}, @@ -48,7 +48,7 @@ if minetest.get_modpath("vessels") then selection_box = sbox }) - minetest.override_item("vessels:drinking_glass", { + core.override_item("vessels:drinking_glass", { drawtype = "mesh", mesh = "homedecor_3d_vessels_drink.obj", tiles = {"homedecor_3d_vessels_shelf_glass.png"}, @@ -58,8 +58,8 @@ if minetest.get_modpath("vessels") then }) end -if minetest.get_modpath("moreblocks") then - minetest.override_item("moreblocks:empty_bookshelf", { +if core.get_modpath("moreblocks") then + core.override_item("moreblocks:empty_bookshelf", { drawtype = "nodebox", tiles = { "default_wood.png^[transformR180", @@ -87,24 +87,24 @@ end -- 3d-ify default mtg wood and steel doors and trap doors -if minetest.get_modpath("doors") then +if core.get_modpath("doors") then local def for _,mat in ipairs({"wood", "steel"}) do - def = table.copy(minetest.registered_nodes["doors:door_"..mat.."_a"]) + def = table.copy(core.registered_nodes["doors:door_"..mat.."_a"]) def.groups.handy = 1 def._mcl_hardness=0.6 def.mesh = "homedecor_3d_door_"..mat.."_a.obj" - minetest.register_node(":doors:door_"..mat.."_a", def) + core.register_node(":doors:door_"..mat.."_a", def) - def = table.copy(minetest.registered_nodes["doors:door_"..mat.."_b"]) + def = table.copy(core.registered_nodes["doors:door_"..mat.."_b"]) def.groups.handy = 1 def._mcl_hardness=0.6 def.mesh = "homedecor_3d_door_"..mat.."_b.obj" - minetest.register_node(":doors:door_"..mat.."_b", def) + core.register_node(":doors:door_"..mat.."_b", def) end for _,mat in ipairs({"", "_steel"}) do - def = table.copy(minetest.registered_nodes["doors:trapdoor"..mat]) + def = table.copy(core.registered_nodes["doors:trapdoor"..mat]) def.groups.handy = 1 def._mcl_hardness=0.6 def.drawtype = "mesh" @@ -113,9 +113,9 @@ if minetest.get_modpath("doors") then "doors_trapdoor"..mat..".png", "doors_trapdoor"..mat.."_side.png" } - minetest.register_node(":doors:trapdoor"..mat, def) + core.register_node(":doors:trapdoor"..mat, def) - def = table.copy(minetest.registered_nodes["doors:trapdoor"..mat.."_open"]) + def = table.copy(core.registered_nodes["doors:trapdoor"..mat.."_open"]) def.groups.handy = 1 def._mcl_hardness=0.6 def.mesh = "homedecor_3d_trapdoor"..mat.."_open.obj" @@ -124,7 +124,7 @@ if minetest.get_modpath("doors") then "doors_trapdoor"..mat..".png", "doors_trapdoor"..mat.."_side.png" } - minetest.register_node(":doors:trapdoor"..mat.."_open", def) + core.register_node(":doors:trapdoor"..mat.."_open", def) end end diff --git a/homedecor_bathroom/init.lua b/homedecor_bathroom/init.lua index 14f726dd..cf3d3799 100644 --- a/homedecor_bathroom/init.lua +++ b/homedecor_bathroom/init.lua @@ -1,6 +1,6 @@ -local S = minetest.get_translator("homedecor_bathroom") +local S = core.get_translator("homedecor_bathroom") -local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil +local sc_disallow = core.get_modpath("screwdriver") and screwdriver.disallow or nil local wood_tex = homedecor.textures.wood.apple.planks local water_tex = homedecor.textures.water.tile @@ -137,10 +137,10 @@ homedecor.register("medicine_cabinet", { }, on_punch = function(pos, node, puncher, pointed_thing) node.name = "homedecor:medicine_cabinet_open" - minetest.swap_node(pos, node) + core.swap_node(pos, node) end, can_dig = function(pos) - local inv = minetest.get_meta(pos):get_inventory("main") + local inv = core.get_meta(pos):get_inventory("main") return inv:is_empty("main") end, infotext=S("Medicine cabinet"), @@ -174,10 +174,10 @@ homedecor.register("medicine_cabinet_open", { drop = "homedecor:medicine_cabinet", on_punch = function(pos, node, puncher, pointed_thing) node.name = "homedecor:medicine_cabinet" - minetest.swap_node(pos, node) + core.swap_node(pos, node) end, can_dig = function(pos) - local inv = minetest.get_meta(pos):get_inventory("main") + local inv = core.get_meta(pos):get_inventory("main") return inv:is_empty("main") end, }) @@ -214,7 +214,7 @@ homedecor.register("toilet", { }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) node.name = "homedecor:toilet_open" - minetest.set_node(pos, node) + core.set_node(pos, node) end, crafts = { { @@ -245,8 +245,8 @@ homedecor.register("toilet_open", { }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) node.name = "homedecor:toilet" - minetest.set_node(pos, node) - minetest.sound_play("homedecor_toilet_flush", { + core.set_node(pos, node) + core.sound_play("homedecor_toilet_flush", { pos=pos, max_hear_distance = 5, gain = 1, @@ -336,7 +336,7 @@ homedecor.register("sink", { --Taps local function taps_on_rightclick(pos, node, clicker, itemstack, pointed_thing) - local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) + local below = core.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) if below and below.name == "homedecor:shower_tray" or string.find(below.name, "homedecor:.*sink") then @@ -475,7 +475,7 @@ homedecor.register("shower_head", { walkable = false, on_rotate = sc_disallow or nil, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-2.0, z=pos.z}) + local below = core.get_node_or_nil({x=pos.x, y=pos.y-2.0, z=pos.z}) if below and ( below.name == "homedecor:shower_tray" or below.name == "homedecor:bathtub_clawfoot_brass_taps" or @@ -618,20 +618,20 @@ homedecor.register("bathroom_set", { -- aliases -minetest.register_alias("3dforniture:toilet", "homedecor:toilet") -minetest.register_alias("3dforniture:toilet_open", "homedecor:toilet_open") -minetest.register_alias("3dforniture:sink", "homedecor:sink") -minetest.register_alias("3dforniture:taps", "homedecor:taps") -minetest.register_alias("3dforniture:shower_tray", "homedecor:shower_tray") -minetest.register_alias("3dforniture:shower_head", "homedecor:shower_head") -minetest.register_alias("3dforniture:table_lamp", "homedecor:table_lamp_off") +core.register_alias("3dforniture:toilet", "homedecor:toilet") +core.register_alias("3dforniture:toilet_open", "homedecor:toilet_open") +core.register_alias("3dforniture:sink", "homedecor:sink") +core.register_alias("3dforniture:taps", "homedecor:taps") +core.register_alias("3dforniture:shower_tray", "homedecor:shower_tray") +core.register_alias("3dforniture:shower_head", "homedecor:shower_head") +core.register_alias("3dforniture:table_lamp", "homedecor:table_lamp_off") -minetest.register_alias("toilet", "homedecor:toilet") -minetest.register_alias("sink", "homedecor:sink") -minetest.register_alias("taps", "homedecor:taps") -minetest.register_alias("shower_tray", "homedecor:shower_tray") -minetest.register_alias("shower_head", "homedecor:shower_head") -minetest.register_alias("table_lamp", "homedecor:table_lamp_off") +core.register_alias("toilet", "homedecor:toilet") +core.register_alias("sink", "homedecor:sink") +core.register_alias("taps", "homedecor:taps") +core.register_alias("shower_tray", "homedecor:shower_tray") +core.register_alias("shower_head", "homedecor:shower_head") +core.register_alias("table_lamp", "homedecor:table_lamp_off") -- convert old static nodes @@ -654,7 +654,7 @@ local old_to_color = { "black" } -minetest.register_lbm({ +core.register_lbm({ name = ":homedecor:convert_bathroom_tiles", label = "Convert bathroom tiles to use param2 color", run_at_every_load = false, @@ -678,8 +678,8 @@ minetest.register_lbm({ local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "extended") - minetest.set_node(pos, { name = newname, param2 = paletteidx }) - local meta = minetest.get_meta(pos) + core.set_node(pos, { name = newname, param2 = paletteidx }) + local meta = core.get_meta(pos) meta:set_string("dye", "unifieddyes:"..color) meta:set_string("palette", "ext") end diff --git a/homedecor_bedroom/init.lua b/homedecor_bedroom/init.lua index f0a6cddf..03d0d3fb 100644 --- a/homedecor_bedroom/init.lua +++ b/homedecor_bedroom/init.lua @@ -1,6 +1,6 @@ -local S = minetest.get_translator("homedecor_bedroom") +local S = core.get_translator("homedecor_bedroom") -local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil +local sc_disallow = core.get_modpath("screwdriver") and screwdriver.disallow or nil local wood_tex, wool_tex = homedecor.textures.wood.apple.planks, homedecor.textures.wool.white @@ -33,7 +33,7 @@ local kbed_cbox = { } -local bed_def = minetest.registered_nodes["beds:bed"] +local bed_def = core.registered_nodes["beds:bed"] local bed_on_rightclick = bed_def and bed_def.on_rightclick or nil homedecor.register("bed_regular", { @@ -256,7 +256,7 @@ for _, color in ipairs(bedcolors) do table.insert(old_bed_nodes, "homedecor:bed_"..color.."_kingsize") end -minetest.register_lbm({ +core.register_lbm({ name = ":homedecor:convert_beds", label = "Convert homedecor static bed nodes to use param2 color", run_at_every_load = false, @@ -297,8 +297,8 @@ minetest.register_lbm({ new_name = "homedecor:bed_kingsize" end - minetest.set_node(pos, { name = new_name, param2 = param2 }) - local meta = minetest.get_meta(pos) + core.node(pos, { name = new_name, param2 = param2 }) + local meta = core.get_meta(pos) meta:set_string("dye", "unifieddyes:"..color) end }) @@ -306,7 +306,7 @@ minetest.register_lbm({ -- crafting -minetest.register_craft( { +core.register_craft( { output = "homedecor:nightstand_oak_one_drawer", recipe = { { "homedecor:drawer_small" }, @@ -314,13 +314,13 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:nightstand_oak_one_drawer", burntime = 30, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:nightstand_oak_two_drawers", recipe = { { "homedecor:drawer_small" }, @@ -329,7 +329,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:nightstand_oak_two_drawers", recipe = { { "homedecor:nightstand_oak_one_drawer" }, @@ -337,7 +337,7 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:nightstand_oak_two_drawers", burntime = 30, @@ -345,7 +345,7 @@ minetest.register_craft({ -- -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:nightstand_mahogany_one_drawer", recipe = { @@ -354,13 +354,13 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:nightstand_mahogany_one_drawer", burntime = 30, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:nightstand_mahogany_two_drawers", recipe = { @@ -369,7 +369,7 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:nightstand_mahogany_two_drawers", burntime = 30, diff --git a/homedecor_books/init.lua b/homedecor_books/init.lua index a34cc3b1..2ab8683e 100644 --- a/homedecor_books/init.lua +++ b/homedecor_books/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_books") +local S = core.get_translator("homedecor_books") local bookcolors = { { "red", 0xffd26466 }, @@ -27,9 +27,9 @@ for _, c in ipairs(bookcolors) do local color, hue = unpack(c) local function book_dig(pos, node, digger) - if not digger or minetest.is_protected(pos, digger:get_player_name()) then return end - local meta = minetest.get_meta(pos) - local data = minetest.serialize({ + if not digger or core.is_protected(pos, digger:get_player_name()) then return end + local meta = core.get_meta(pos) + local data = core.serialize({ title = meta:get_string("title") or "", text = meta:get_string("text") or "", owner = meta:get_string("owner") or "", @@ -41,9 +41,9 @@ for _, c in ipairs(bookcolors) do }) stack = digger:get_inventory():add_item("main", stack) if not stack:is_empty() then - minetest.item_drop(stack, digger, pos) + core.item_drop(stack, digger, pos) end - minetest.remove_node(pos) + core.remove_node(pos) end homedecor.register("book_"..color, { @@ -62,28 +62,28 @@ for _, c in ipairs(bookcolors) do stack_max = 1, on_punch = function(pos, node, puncher, pointed_thing) local fdir = node.param2 - minetest.swap_node(pos, { name = "homedecor:book_open_"..color, param2 = fdir }) + core.swap_node(pos, { name = "homedecor:book_open_"..color, param2 = fdir }) end, on_place = function(itemstack, placer, pointed_thing) local plname = placer:get_player_name() local pos = pointed_thing.under - local node = minetest.get_node_or_nil(pos) - local def = node and minetest.registered_nodes[node.name] + local node = core.get_node_or_nil(pos) + local def = node and core.registered_nodes[node.name] if not def or not def.buildable_to then pos = pointed_thing.above - node = minetest.get_node_or_nil(pos) - def = node and minetest.registered_nodes[node.name] + node = core.get_node_or_nil(pos) + def = node and core.registered_nodes[node.name] if not def or not def.buildable_to then return itemstack end end - if minetest.is_protected(pos, plname) then return itemstack end - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - minetest.set_node(pos, { + if core.is_protected(pos, plname) then return itemstack end + local fdir = core.dir_to_facedir(placer:get_look_dir()) + core.set_node(pos, { name = "homedecor:book_"..color, param2 = fdir, }) local text = itemstack:get_meta():get_string("") - local meta = minetest.get_meta(pos) - local data = minetest.deserialize(text) or {} + local meta = core.get_meta(pos) + local data = core.deserialize(text) or {} if type(data) ~= "table" then data = {} -- Store raw metadata in case some data is lost by the @@ -97,7 +97,7 @@ for _, c in ipairs(bookcolors) do if data.title and data.title ~= "" then meta:set_string("infotext", data.title) end - if not minetest.is_creative_enabled(plname) then + if not core.is_creative_enabled(plname) then itemstack:take_item() end return itemstack @@ -121,7 +121,7 @@ for _, c in ipairs(bookcolors) do walkable = false, on_dig = book_dig, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local player_name = clicker:get_player_name() local title = meta:get_string("title") or "" local text = meta:get_string("text") or "" @@ -130,25 +130,25 @@ for _, c in ipairs(bookcolors) do if owner == "" or owner == player_name then formspec = "size[8,8]".. "field[0.5,1;7.5,0;title;Book title :;".. - minetest.formspec_escape(title).."]".. + core.formspec_escape(title).."]".. "textarea[0.5,1.5;7.5,7;text;Book content :;".. - minetest.formspec_escape(text).."]".. + core.formspec_escape(text).."]".. "button_exit[2.5,7.5;3,1;save;Save]" else formspec = "size[8,8]".. "button_exit[7,0.25;1,0.5;close;X]".. "label[0.5,0.5;by "..owner.."]".. - "label[0.5,0;"..minetest.formspec_escape(title).."]".. - "textarea[0.5,1.5;7.5,7;;"..minetest.formspec_escape(text)..";]" + "label[0.5,0;"..core.formspec_escape(title).."]".. + "textarea[0.5,1.5;7.5,7;;"..core.formspec_escape(text)..";]" end player_current_book[player_name] = pos - minetest.show_formspec(player_name, BOOK_FORMNAME, formspec) + core.show_formspec(player_name, BOOK_FORMNAME, formspec) return itemstack end, on_punch = function(pos, node, puncher, pointed_thing) local fdir = node.param2 - minetest.swap_node(pos, { name = "homedecor:book_"..color, param2 = fdir }) - minetest.sound_play("homedecor_book_close", { + core.swap_node(pos, { name = "homedecor:book_"..color, param2 = fdir }) + core.sound_play("homedecor_book_close", { pos=pos, max_hear_distance = 3, gain = 2, @@ -161,7 +161,7 @@ for _, c in ipairs(bookcolors) do }) -- crafting - minetest.register_craft({ + core.register_craft({ type = "shapeless", output = "homedecor:book_"..color, recipe = { @@ -172,7 +172,7 @@ for _, c in ipairs(bookcolors) do end -minetest.register_on_player_receive_fields(function(player, form_name, fields) +core.register_on_player_receive_fields(function(player, form_name, fields) if form_name ~= BOOK_FORMNAME then return false end @@ -181,7 +181,7 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields) if not pos then return true end - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local owner = meta:get_string("owner") if owner ~= "" and player_name ~= owner or not fields.save then player_current_book[player_name] = nil @@ -193,8 +193,8 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields) if (fields.title or "") ~= "" then meta:set_string("infotext", fields.title) end - minetest.log("action", ("%s has written in a book (title: \"%s\"): \"%s\" at location %s"):format( - player:get_player_name(), fields.title, fields.text, minetest.pos_to_string(pos))) + core.log("action", ("%s has written in a book (title: \"%s\"): \"%s\" at location %s"):format( + player:get_player_name(), fields.title, fields.text, core.pos_to_string(pos))) player_current_book[player_name] = nil return true @@ -204,5 +204,5 @@ end) -- aliases -minetest.register_alias("homedecor:book", "homedecor:book_grey") -minetest.register_alias("homedecor:book_open", "homedecor:book_open_grey") +core.register_alias("homedecor:book", "homedecor:book_grey") +core.register_alias("homedecor:book_open", "homedecor:book_open_grey") diff --git a/homedecor_climate_control/init.lua b/homedecor_climate_control/init.lua index 9b1e70ad..7dd9141d 100644 --- a/homedecor_climate_control/init.lua +++ b/homedecor_climate_control/init.lua @@ -1,6 +1,6 @@ -- Nodes that would affect the local temperature e.g. fans, heater, A/C -local S = minetest.get_translator("homedecor_climate_control") +local S = core.get_translator("homedecor_climate_control") homedecor.register("air_conditioner", { description = S("Air Conditioner"), @@ -35,7 +35,7 @@ homedecor.register("air_conditioner", { -- fans -minetest.register_entity(":homedecor:mesh_desk_fan", { +core.register_entity(":homedecor:mesh_desk_fan", { initial_properties = { collisionbox = homedecor.nodebox.null, visual = "mesh", @@ -46,13 +46,13 @@ minetest.register_entity(":homedecor:mesh_desk_fan", { }) local add_mesh_desk_fan_entity = function(pos) - local param2 = minetest.get_node(pos).param2 - local entity = minetest.add_entity(pos, "homedecor:mesh_desk_fan") + local param2 = core.get_node(pos).param2 + local entity = core.add_entity(pos, "homedecor:mesh_desk_fan") if param2 == 0 then entity:set_yaw(3.142) -- 180 degrees - elseif minetest.get_node(pos).param2 == 1 then + elseif core.get_node(pos).param2 == 1 then entity:set_yaw(3.142/2) -- 90 degrees - elseif minetest.get_node(pos).param2 == 3 then + elseif core.get_node(pos).param2 == 3 then entity:set_yaw((-3.142/2)) -- 270 degrees else entity:set_yaw(0) @@ -73,15 +73,15 @@ homedecor.register("desk_fan", { inventory_image = "homedecor_desk_fan_inv.png", wield_image = "homedecor_desk_fan_inv.png", selection_box = { type = "regular" }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, on_construct = function(pos) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:set_string("active", "no") add_mesh_desk_fan_entity(pos) end, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - local meta = minetest.get_meta(pos) - local entities = minetest.get_objects_inside_radius(pos, 0.1) + local meta = core.get_meta(pos) + local entities = core.get_objects_inside_radius(pos, 0.1) local entity = entities[1] or add_mesh_desk_fan_entity(pos) if meta:get_string("active") == "no" then meta:set_string("active", "yes") @@ -92,7 +92,7 @@ homedecor.register("desk_fan", { end end, after_dig_node = function(pos) - local entities = minetest.get_objects_inside_radius(pos, 0.1) + local entities = core.get_objects_inside_radius(pos, 0.1) if entities[1] then entities[1]:remove() end end, crafts = { @@ -126,7 +126,7 @@ homedecor.register("ceiling_fan", { }, use_texture_alpha = "clip", groups = { snappy = 3, dig_stone = 3 }, - light_source = minetest.LIGHT_MAX-1, + light_source = core.LIGHT_MAX-1, _sound_def = { key = "node_sound_glass_defaults", }, @@ -213,12 +213,12 @@ homedecor.register("radiator", { }) -- crafting -minetest.register_craftitem(":homedecor:fan_blades", { +core.register_craftitem(":homedecor:fan_blades", { description = S("Fan blades"), inventory_image = "homedecor_fan_blades.png" }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:fan_blades 2", recipe = { { "", "basic_materials:plastic_sheet", "" }, diff --git a/homedecor_clocks/init.lua b/homedecor_clocks/init.lua index 854a4b50..29a1d594 100644 --- a/homedecor_clocks/init.lua +++ b/homedecor_clocks/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_clocks") +local S = core.get_translator("homedecor_clocks") local wood = homedecor.textures.wood.apple.planks @@ -144,7 +144,7 @@ homedecor.register("grandfather_clock", { key = "node_sound_wood_defaults", }, expand = { top="placeholder" }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, crafts = { { recipe = { @@ -158,5 +158,5 @@ homedecor.register("grandfather_clock", { -- aliases -minetest.register_alias("homedecor:grandfather_clock_bottom", "homedecor:grandfather_clock") -minetest.register_alias("homedecor:grandfather_clock_top", "air") +core.register_alias("homedecor:grandfather_clock_bottom", "homedecor:grandfather_clock") +core.register_alias("homedecor:grandfather_clock_top", "air") diff --git a/homedecor_cobweb/init.lua b/homedecor_cobweb/init.lua index ad8a9331..ec7e6b1a 100644 --- a/homedecor_cobweb/init.lua +++ b/homedecor_cobweb/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_cobweb") +local S = core.get_translator("homedecor_cobweb") homedecor_cobweb = {} homedecor.register("cobweb_corner", { @@ -115,10 +115,10 @@ homedecor.register("cobweb_plantlike", { -- helper function to rotate the cobweb after it's placed function homedecor_cobweb.rotate(pos) - local wall_xm = minetest.get_node({ x=pos.x-1, y=pos.y, z=pos.z }).name - local wall_xp = minetest.get_node({ x=pos.x+1, y=pos.y, z=pos.z }).name - local wall_zm = minetest.get_node({ x=pos.x, y=pos.y, z=pos.z-1}).name - local wall_zp = minetest.get_node({ x=pos.x, y=pos.y, z=pos.z+1}).name + local wall_xm = core.get_node({ x=pos.x-1, y=pos.y, z=pos.z }).name + local wall_xp = core.get_node({ x=pos.x+1, y=pos.y, z=pos.z }).name + local wall_zm = core.get_node({ x=pos.x, y=pos.y, z=pos.z-1}).name + local wall_zp = core.get_node({ x=pos.x, y=pos.y, z=pos.z+1}).name local iswall_xm = (wall_xm ~= "air" and not string.find(wall_xm, "homedecor:cobweb")) local iswall_xp = (wall_xp ~= "air" and not string.find(wall_xp, "homedecor:cobweb")) @@ -129,43 +129,43 @@ function homedecor_cobweb.rotate(pos) if (iswall_xm and iswall_zp and not iswall_xp and not iswall_zm) or (iswall_xp and iswall_zm and not iswall_xm and not iswall_zp) then - minetest.set_node(pos, {name = "homedecor:cobweb_corner", param2 = 1}) + core.set_node(pos, {name = "homedecor:cobweb_corner", param2 = 1}) -- only xm+zm, or only xp+zp means on-ceiling torchlike elseif (iswall_xm and iswall_zm and not iswall_xp and not iswall_zp) or (iswall_xp and iswall_zp and not iswall_xm and not iswall_zm) then - minetest.set_node(pos, {name = "homedecor:cobweb_corner", param2 = 0}) + core.set_node(pos, {name = "homedecor:cobweb_corner", param2 = 0}) -- only xm+xp means nodebox (not rotated, 0 degrees) elseif iswall_xm and iswall_xp and not iswall_zm and not iswall_zp then - minetest.set_node(pos, {name = "homedecor:cobweb_centered", param2 = 0}) + core.set_node(pos, {name = "homedecor:cobweb_centered", param2 = 0}) -- only zm+zp means nodebox rotated to 90 degrees elseif iswall_zm and iswall_zp and not iswall_xm and not iswall_xp then - minetest.set_node(pos, {name = "homedecor:cobweb_centered", param2 = 1}) + core.set_node(pos, {name = "homedecor:cobweb_centered", param2 = 1}) -- ok, there aren't any simple two-wall corners or opposing walls. -- Are there any standalone walls? elseif iswall_xm and not iswall_xp and not iswall_zm and not iswall_zp then - minetest.set_node(pos, {name = "homedecor:cobweb_flat", param2 = 3}) + core.set_node(pos, {name = "homedecor:cobweb_flat", param2 = 3}) elseif iswall_xp and not iswall_xm and not iswall_zm and not iswall_zp then - minetest.set_node(pos, {name = "homedecor:cobweb_flat", param2 = 1}) + core.set_node(pos, {name = "homedecor:cobweb_flat", param2 = 1}) elseif iswall_zm and not iswall_xm and not iswall_xp and not iswall_zp then - minetest.set_node(pos, {name = "homedecor:cobweb_flat", param2 = 2}) + core.set_node(pos, {name = "homedecor:cobweb_flat", param2 = 2}) elseif iswall_zp and not iswall_xm and not iswall_xp and not iswall_zm then - minetest.set_node(pos, {name = "homedecor:cobweb_flat", param2 = 0}) + core.set_node(pos, {name = "homedecor:cobweb_flat", param2 = 0}) -- if all else fails, place the plantlike version as a fallback. else - minetest.set_node(pos, {name = "homedecor:cobweb_plantlike", param2 = 0}) + core.set_node(pos, {name = "homedecor:cobweb_plantlike", param2 = 0}) end end diff --git a/homedecor_common/crafts.lua b/homedecor_common/crafts.lua index cd377e9c..a8f0f954 100644 --- a/homedecor_common/crafts.lua +++ b/homedecor_common/crafts.lua @@ -1,28 +1,28 @@ -- crafts for common items that are used by more than one home decor component -local S = minetest.get_translator("homedecor_common") +local S = core.get_translator("homedecor_common") -- items -minetest.register_craftitem(":homedecor:roof_tile_terracotta", { +core.register_craftitem(":homedecor:roof_tile_terracotta", { description = S("Terracotta Roof Tile"), inventory_image = "homedecor_roof_tile_terracotta.png", }) -minetest.register_craftitem(":homedecor:drawer_small", { +core.register_craftitem(":homedecor:drawer_small", { description = S("Small Wooden Drawer"), inventory_image = "homedecor_drawer_small.png", }) -- cooking/fuel -minetest.register_craft({ +core.register_craft({ type = "cooking", output = "homedecor:roof_tile_terracotta", recipe = "basic_materials:terracotta_base", }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:shingles_wood", burntime = 30, @@ -31,7 +31,7 @@ minetest.register_craft({ -- crafing -minetest.register_craft( { +core.register_craft( { output = "homedecor:shingles_terracotta", recipe = { { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta"}, @@ -39,14 +39,14 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:roof_tile_terracotta 8", recipe = { { "homedecor:shingles_terracotta", "homedecor:shingles_terracotta" } } }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:shingles_wood 12", recipe = { { "group:stick", "group:wood"}, @@ -54,7 +54,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:shingles_wood 12", recipe = { { "group:wood", "group:stick"}, @@ -62,7 +62,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:shingles_asphalt 6", recipe = { { "building_blocks:gravel_spread", "dye:black", "building_blocks:gravel_spread" }, diff --git a/homedecor_common/expansion.lua b/homedecor_common/expansion.lua index 05a989b5..b9ad275e 100644 --- a/homedecor_common/expansion.lua +++ b/homedecor_common/expansion.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_common") +local S = core.get_translator("homedecor_common") -- vectors to place one node next to or behind another @@ -53,19 +53,19 @@ homedecor.wall_fdir_to_fwd = { } local placeholder_node = "air" -minetest.register_alias("homedecor:expansion_placeholder", "air") +core.register_alias("homedecor:expansion_placeholder", "air") --- select which node was pointed at based on it being known, not ignored, buildable_to -- returns nil if no node could be selected local function select_node(pointed_thing) local pos = pointed_thing.under - local node = minetest.get_node_or_nil(pos) - local def = node and minetest.registered_nodes[node.name] + local node = core.get_node_or_nil(pos) + local def = node and core.registered_nodes[node.name] if not def or not def.buildable_to then pos = pointed_thing.above - node = minetest.get_node_or_nil(pos) - def = node and minetest.registered_nodes[node.name] + node = core.get_node_or_nil(pos) + def = node and core.registered_nodes[node.name] end return def and pos, def end @@ -73,9 +73,9 @@ end --- check if all nodes can and may be build to local function is_buildable_to(placer_name, ...) for _, pos in ipairs({...}) do - local node = minetest.get_node_or_nil(pos) - local def = node and minetest.registered_nodes[node.name] - if not (def and def.buildable_to) or minetest.is_protected(pos, placer_name) then + local node = core.get_node_or_nil(pos) + local def = node and core.registered_nodes[node.name] + if not (def and def.buildable_to) or core.is_protected(pos, placer_name) then return false end end @@ -86,8 +86,8 @@ end local function stack(itemstack, placer, fdir, pos, def, pos2, node1, node2, pointed_thing) local placer_name = placer:get_player_name() or "" if is_buildable_to(placer_name, pos, pos2) then - local lfdir = fdir or minetest.dir_to_facedir(placer:get_look_dir()) - minetest.set_node(pos, { name = node1, param2 = lfdir }) + local lfdir = fdir or core.dir_to_facedir(placer:get_look_dir()) + core.set_node(pos, { name = node1, param2 = lfdir }) node2 = node2 or "air" -- this can be used to clear buildable_to nodes even though we are using a multinode mesh -- do not assume by default, as we still might want to allow overlapping in some cases local has_facedir = node2 ~= "air" @@ -95,15 +95,15 @@ local function stack(itemstack, placer, fdir, pos, def, pos2, node1, node2, poin has_facedir = false node2 = placeholder_node end - minetest.set_node(pos2, { name = node2, param2 = (has_facedir and lfdir) or nil }) + core.set_node(pos2, { name = node2, param2 = (has_facedir and lfdir) or nil }) -- call after_place_node of the placed node if available - local ctrl_node_def = minetest.registered_nodes[node1] + local ctrl_node_def = core.registered_nodes[node1] if ctrl_node_def and ctrl_node_def.after_place_node then ctrl_node_def.after_place_node(pos, placer, itemstack, pointed_thing) end - if not minetest.is_creative_enabled(placer_name) then + if not core.is_creative_enabled(placer_name) then itemstack:take_item() end end @@ -111,9 +111,9 @@ local function stack(itemstack, placer, fdir, pos, def, pos2, node1, node2, poin end local function rightclick_pointed_thing(pos, placer, itemstack, pointed_thing) - local node = minetest.get_node_or_nil(pos) + local node = core.get_node_or_nil(pos) if not node then return false end - local def = minetest.registered_nodes[node.name] + local def = core.registered_nodes[node.name] if not def or not def.on_rightclick then return false end return def.on_rightclick(pos, node, placer, itemstack, pointed_thing) or itemstack end @@ -144,9 +144,9 @@ function homedecor.stack_wing(itemstack, placer, pointed_thing, node1, node2, no if not pos then return itemstack end local forceright = placer:get_player_control()["sneak"] - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + local fdir = core.dir_to_facedir(placer:get_look_dir()) - local is_right_wing = node1 == minetest.get_node( + local is_right_wing = node1 == core.get_node( { x = pos.x + homedecor.fdir_to_left[fdir+1][1], y = pos.y, @@ -166,7 +166,7 @@ function homedecor.stack_sideways(itemstack, placer, pointed_thing, node1, node2 local pos, def = select_node(pointed_thing) if not pos then return itemstack end - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + local fdir = core.dir_to_facedir(placer:get_look_dir()) local fdir_transform = dir and homedecor.fdir_to_right or homedecor.fdir_to_fwd local pos2 = { x = pos.x + fdir_transform[fdir+1][1], y=pos.y, z = pos.z + fdir_transform[fdir+1][2] } @@ -176,7 +176,7 @@ end function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks) - local thisnode = minetest.get_node(pos) + local thisnode = core.get_node(pos) local param2 = thisnode.param2 local fdir = param2 % 8 @@ -184,46 +184,46 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks local fzd = homedecor.wall_fdir_to_fwd[fdir+1][2] local forwardpos = {x=pos.x+fxd, y=pos.y, z=pos.z+fzd} - local forwardnode = minetest.get_node(forwardpos) + local forwardnode = core.get_node(forwardpos) - local def = minetest.registered_nodes[forwardnode.name] + local def = core.registered_nodes[forwardnode.name] local placer_name = placer:get_player_name() if not (def and def.buildable_to) then - minetest.chat_send_player( placer:get_player_name(), + core.chat_send_player( placer:get_player_name(), S("Not enough room - the space for the headboard is occupied!")) - minetest.set_node(pos, {name = "air"}) + core.set_node(pos, {name = "air"}) return true end - if minetest.is_protected(forwardpos, placer_name) then - minetest.chat_send_player( placer:get_player_name(), + if core.is_protected(forwardpos, placer_name) then + core.chat_send_player( placer:get_player_name(), S("Someone already owns the spot where the headboard goes.")) return true end - minetest.set_node(forwardpos, {name = "air"}) + core.set_node(forwardpos, {name = "air"}) local lxd = homedecor.wall_fdir_to_left[fdir+1][1] local lzd = homedecor.wall_fdir_to_left[fdir+1][2] local leftpos = {x=pos.x+lxd, y=pos.y, z=pos.z+lzd} - local leftnode = minetest.get_node(leftpos) + local leftnode = core.get_node(leftpos) local rxd = homedecor.wall_fdir_to_right[fdir+1][1] local rzd = homedecor.wall_fdir_to_right[fdir+1][2] local rightpos = {x=pos.x+rxd, y=pos.y, z=pos.z+rzd} - local rightnode = minetest.get_node(rightpos) + local rightnode = core.get_node(rightpos) if leftnode.name == "homedecor:bed_regular" then local newname = string.gsub(thisnode.name, "_regular", "_kingsize") - minetest.set_node(pos, {name = "air"}) - minetest.swap_node(leftpos, { name = newname, param2 = param2}) + core.set_node(pos, {name = "air"}) + core.swap_node(leftpos, { name = newname, param2 = param2}) elseif rightnode.name == "homedecor:bed_regular" then local newname = string.gsub(thisnode.name, "_regular", "_kingsize") - minetest.set_node(rightpos, {name = "air"}) - minetest.swap_node(pos, { name = newname, param2 = param2}) + core.set_node(rightpos, {name = "air"}) + core.swap_node(pos, { name = newname, param2 = param2}) end local toppos = {x=pos.x, y=pos.y+1.0, z=pos.z} @@ -234,18 +234,18 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks -- local newparam2 = param2 % 8 -- FIXME: is newparam2 a legacy unused variable from a8729575abfbd15cc622b413b71976c9157fbab4? -- or should this variable be used somewhere? - minetest.swap_node(toppos, { name = thisnode.name, param2 = param2}) - minetest.swap_node(pos, { name = newname, param2 = param2}) + core.swap_node(toppos, { name = thisnode.name, param2 = param2}) + core.swap_node(pos, { name = newname, param2 = param2}) itemstack:take_item() end end function homedecor.unextend_bed(pos) - local bottomnode = minetest.get_node({x=pos.x, y=pos.y-1.0, z=pos.z}) + local bottomnode = core.get_node({x=pos.x, y=pos.y-1.0, z=pos.z}) local param2 = bottomnode.param2 if bottomnode.name == "homedecor:bed_extended" then local newname = string.gsub(bottomnode.name, "_extended", "_regular") - minetest.swap_node({x=pos.x, y=pos.y-1.0, z=pos.z}, { name = newname, param2 = param2}) + core.swap_node({x=pos.x, y=pos.y-1.0, z=pos.z}, { name = newname, param2 = param2}) end end @@ -256,23 +256,23 @@ function homedecor.place_banister(itemstack, placer, pointed_thing) local pos, _ = select_node(pointed_thing) if not pos then return itemstack end - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + local fdir = core.dir_to_facedir(placer:get_look_dir()) local meta = itemstack:get_meta() local pindex = meta:get_int("palette_index") local abovepos = { x=pos.x, y=pos.y+1, z=pos.z } - local abovenode = minetest.get_node(abovepos) + local abovenode = core.get_node(abovepos) - local adef = minetest.registered_nodes[abovenode.name] + local adef = core.registered_nodes[abovenode.name] local placer_name = placer:get_player_name() if not (adef and adef.buildable_to) then - minetest.chat_send_player(placer_name, S("Not enough room - the upper space is occupied!" )) + core.chat_send_player(placer_name, S("Not enough room - the upper space is occupied!" )) return itemstack end - if minetest.is_protected(abovepos, placer_name) then - minetest.chat_send_player(placer_name, S("Someone already owns that spot.")) + if core.is_protected(abovepos, placer_name) then + core.chat_send_player(placer_name, S("Someone already owns that spot.")) return itemstack end @@ -296,18 +296,18 @@ function homedecor.place_banister(itemstack, placer, pointed_thing) local right_fwd_below_pos = { x=pos.x+rxd+fxd, y=pos.y-1, z=pos.z+rzd+fzd } local left_fwd_below_pos = { x=pos.x+lxd+fxd, y=pos.y-1, z=pos.z+lzd+fzd } - local below_node = minetest.get_node(below_pos) - --local fwd_node = minetest.get_node(fwd_pos) - local left_node = minetest.get_node(left_pos) - local right_node = minetest.get_node(right_pos) - local left_fwd_node = minetest.get_node(left_fwd_pos) - local right_fwd_node = minetest.get_node(right_fwd_pos) - local left_below_node = minetest.get_node({x=left_pos.x, y=left_pos.y-1, z=left_pos.z}) - local right_below_node = minetest.get_node({x=right_pos.x, y=right_pos.y-1, z=right_pos.z}) - --local right_fwd_above_node = minetest.get_node(right_fwd_above_pos) - --local left_fwd_above_node = minetest.get_node(left_fwd_above_pos) - local right_fwd_below_node = minetest.get_node(right_fwd_below_pos) - local left_fwd_below_node = minetest.get_node(left_fwd_below_pos) + local below_node = core.get_node(below_pos) + --local fwd_node = core.get_node(fwd_pos) + local left_node = core.get_node(left_pos) + local right_node = core.get_node(right_pos) + local left_fwd_node = core.get_node(left_fwd_pos) + local right_fwd_node = core.get_node(right_fwd_pos) + local left_below_node = core.get_node({x=left_pos.x, y=left_pos.y-1, z=left_pos.z}) + local right_below_node = core.get_node({x=right_pos.x, y=right_pos.y-1, z=right_pos.z}) + --local right_fwd_above_node = core.get_node(right_fwd_above_pos) + --local left_fwd_above_node = core.get_node(left_fwd_above_pos) + local right_fwd_below_node = core.get_node(right_fwd_below_pos) + local left_fwd_below_node = core.get_node(left_fwd_below_pos) local new_place_name = itemstack:get_name() @@ -373,7 +373,7 @@ function homedecor.place_banister(itemstack, placer, pointed_thing) end end - minetest.set_node(pos, {name = new_place_name, param2 = fdir+pindex}) + core.set_node(pos, {name = new_place_name, param2 = fdir+pindex}) itemstack:take_item() return itemstack end diff --git a/homedecor_common/furnaces.lua b/homedecor_common/furnaces.lua index 9a444222..fcef8f7a 100644 --- a/homedecor_common/furnaces.lua +++ b/homedecor_common/furnaces.lua @@ -1,12 +1,12 @@ -- This code supplies an oven/stove. Basically it's just a copy of the default furnace with different textures. -local S = minetest.get_translator("homedecor_common") +local S = core.get_translator("homedecor_common") local function swap_node(pos, name) - local node = minetest.get_node(pos) + local node = core.get_node(pos) if node.name == name then return end node.name = name - minetest.swap_node(pos, node) + core.swap_node(pos, node) end local function make_formspec(furnacedef, percent) @@ -73,7 +73,7 @@ local function make_tiles(tiles, fmt, active) end local furnace_can_dig = function(pos,player) - local meta = minetest.get_meta(pos); + local meta = core.get_meta(pos); local inv = meta:get_inventory() return inv:is_empty("fuel") and inv:is_empty("dst") @@ -92,10 +92,10 @@ function homedecor.register_furnace(name, furnacedef) local description = furnacedef.description or S("Furnace") local furnace_allow_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() if listname == "fuel" then - if minetest.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then + if core.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then if inv:is_empty("src") then meta:set_string("infotext", S("@1 (empty)", description)) end @@ -110,11 +110,11 @@ function homedecor.register_furnace(name, furnacedef) end end local furnace_allow_move = function(pos, from_list, from_index, to_list, to_index, count, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() local stack = inv:get_stack(from_list, from_index) if to_list == "fuel" then - if minetest.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then + if core.get_craft_result({method="fuel",width=1,items={stack}}).time ~= 0 then if inv:is_empty("src") then meta:set_string("infotext", S("@1 (empty)", description)) end @@ -136,7 +136,7 @@ function homedecor.register_furnace(name, furnacedef) -- -- Initialize metadata -- - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local fuel_time = meta:get_float("fuel_time") or 0 local src_time = meta:get_float("src_time") or 0 local fuel_totaltime = meta:get_float("fuel_totaltime") or 0 @@ -164,7 +164,7 @@ function homedecor.register_furnace(name, furnacedef) -- Check if we have cookable content local aftercooked - cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) + cooked, aftercooked = core.get_craft_result({method = "cooking", width = 1, items = srclist}) cookable = cooked.time ~= 0 local el = math.min(elapsed, fuel_totaltime - fuel_time) @@ -199,7 +199,7 @@ function homedecor.register_furnace(name, furnacedef) if cookable then -- We need to get new fuel local afterfuel - fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist}) + fuel, afterfuel = core.get_craft_result({method = "fuel", width = 1, items = fuellist}) if fuel.time == 0 then -- No valid fuel in fuel list @@ -207,7 +207,7 @@ function homedecor.register_furnace(name, furnacedef) src_time = 0 else -- prevent blocking of fuel inventory (for automatization mods) - local is_fuel = minetest.get_craft_result({method = "fuel", width = 1, items = {afterfuel.items[1]:to_string()}}) + local is_fuel = core.get_craft_result({method = "fuel", width = 1, items = {afterfuel.items[1]:to_string()}}) if is_fuel.time == 0 then table.insert(fuel.replacements, afterfuel.items[1]) inv:set_stack("fuel", 1, "") @@ -221,8 +221,8 @@ function homedecor.register_furnace(name, furnacedef) local leftover = inv:add_item("dst", replacements[1]) if not leftover:is_empty() then local above = vector.new(pos.x, pos.y + 1, pos.z) - local drop_pos = minetest.find_node_near(above, 1, {"air"}) or above - minetest.item_drop(replacements[1], nil, drop_pos) + local drop_pos = core.find_node_near(above, 1, {"air"}) or above + core.item_drop(replacements[1], nil, drop_pos) end end update = true @@ -256,9 +256,9 @@ function homedecor.register_furnace(name, furnacedef) local result = false - local node = minetest.get_node(pos) + local node = core.get_node(pos) local locked = node.name:find("_locked$") and "_locked" or "" - local desc = minetest.registered_nodes[nname..locked].description + local desc = core.registered_nodes[nname..locked].description if fuel_totaltime ~= 0 then formspec = make_formspec(furnacedef, percent) @@ -270,7 +270,7 @@ function homedecor.register_furnace(name, furnacedef) infotext = S("@1 (out of fuel)", desc) swap_node(pos, nname .. locked) -- stop timer on the inactive furnace - minetest.get_node_timer(pos):stop() + core.get_node_timer(pos):stop() meta:set_int("timer_elapsed", 0) end @@ -284,7 +284,7 @@ function homedecor.register_furnace(name, furnacedef) formspec = make_formspec(furnacedef, 0) swap_node(pos, nname .. locked) -- stop timer on the inactive furnace - minetest.get_node_timer(pos):stop() + core.get_node_timer(pos):stop() meta:set_int("timer_elapsed", 0) fuel_totaltime, fuel_time, src_time = 0, 0, 0 end @@ -306,7 +306,7 @@ function homedecor.register_furnace(name, furnacedef) end local furnace_construct = function(pos) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() inv:set_size("fuel", 1) inv:set_size("src", 1) @@ -330,15 +330,15 @@ function homedecor.register_furnace(name, furnacedef) is_furnace = true, on_timer = furnace_node_timer, on_metadata_inventory_move = function(pos) - minetest.get_node_timer(pos):start(1.0) + core.get_node_timer(pos):start(1.0) end, on_metadata_inventory_put = function(pos) -- start timer function, it will sort out whether furnace can burn or not. - minetest.get_node_timer(pos):start(1.0) + core.get_node_timer(pos):start(1.0) end, on_metadata_inventory_take = function(pos) -- check whether the furnace is empty or not. - minetest.get_node_timer(pos):start(1.0) + core.get_node_timer(pos):start(1.0) end } @@ -360,15 +360,15 @@ function homedecor.register_furnace(name, furnacedef) is_furnace = true, on_timer = furnace_node_timer, on_metadata_inventory_move = function(pos) - minetest.get_node_timer(pos):start(1.0) + core.get_node_timer(pos):start(1.0) end, on_metadata_inventory_put = function(pos) -- start timer function, it will sort out whether furnace can burn or not. - minetest.get_node_timer(pos):start(1.0) + core.get_node_timer(pos):start(1.0) end, on_metadata_inventory_take = function(pos) -- check whether the furnace is empty or not. - minetest.get_node_timer(pos):start(1.0) + core.get_node_timer(pos):start(1.0) end } diff --git a/homedecor_common/init.lua b/homedecor_common/init.lua index 0a177910..be6c1beb 100644 --- a/homedecor_common/init.lua +++ b/homedecor_common/init.lua @@ -1,7 +1,7 @@ -- Home Decor API/functions, and common textures and models -- by VanessaE -local modpath = minetest.get_modpath("homedecor_common") +local modpath = core.get_modpath("homedecor_common") homedecor = {} homedecor.modpath = modpath @@ -63,6 +63,6 @@ dofile(modpath.."/registration.lua") dofile(modpath.."/water_particles.lua") dofile(modpath.."/crafts.lua") -if minetest.settings:get_bool("log_mod") then - minetest.log("action", "[HomeDecor API] Loaded!") +if core.settings:get_bool("log_mod") then + core.log("action", "[HomeDecor API] Loaded!") end diff --git a/homedecor_common/inventory.lua b/homedecor_common/inventory.lua index 614e0eef..a3c25baa 100644 --- a/homedecor_common/inventory.lua +++ b/homedecor_common/inventory.lua @@ -1,6 +1,6 @@ -local S = minetest.get_translator("homedecor_common") +local S = core.get_translator("homedecor_common") -local has_hopper = minetest.get_modpath("hopper") +local has_hopper = core.get_modpath("hopper") local has_safe_hopper = has_hopper and -- mod from https://github.com/minetest-mods/hopper respects the owner (hopper.neighbors or @@ -8,7 +8,7 @@ local has_safe_hopper = has_hopper and (hopper.version and hopper.version >= "20220123")) local default_can_dig = function(pos,player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) return meta:get_inventory():is_empty("main") end @@ -82,7 +82,7 @@ function homedecor.handle_inventory(name, def, original_def) local on_construct = def.on_construct def.on_construct = function(pos) local size = inventory.size - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:get_inventory():set_size("main", size) meta:set_string("formspec", inventory.formspec or get_formspec_by_size(size)) if on_construct then on_construct(pos) end @@ -92,15 +92,15 @@ function homedecor.handle_inventory(name, def, original_def) def.can_dig = def.can_dig or default_can_dig def.on_metadata_inventory_move = def.on_metadata_inventory_move or function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().." moves stuff in "..name.." at "..minetest.pos_to_string(pos)) + core.log("action", player:get_player_name().." moves stuff in "..name.." at "..core.pos_to_string(pos)) end def.on_metadata_inventory_put = def.on_metadata_inventory_put or function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().." moves "..stack:get_name() - .." to "..name.." at "..minetest.pos_to_string(pos)) + core.log("action", player:get_player_name().." moves "..stack:get_name() + .." to "..name.." at "..core.pos_to_string(pos)) end def.on_metadata_inventory_take = def.on_metadata_inventory_take or function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().." takes "..stack:get_name() - .." from "..name.." at "..minetest.pos_to_string(pos)) + core.log("action", player:get_player_name().." takes "..stack:get_name() + .." from "..name.." at "..core.pos_to_string(pos)) end local locked = inventory.locked @@ -124,7 +124,7 @@ function homedecor.handle_inventory(name, def, original_def) if locked then local after_place_node = def.after_place_node def.after_place_node = function(pos, placer) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local owner = placer:get_player_name() or "" meta:set_string("owner", owner) @@ -135,8 +135,8 @@ function homedecor.handle_inventory(name, def, original_def) local allow_move = def.allow_metadata_inventory_move def.allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) if not default_can_interact_with_node(player, pos) then - minetest.log("action", player:get_player_name().." tried to access a "..name.." belonging to " - ..minetest.get_meta(pos):get_string("owner").." at "..minetest.pos_to_string(pos)) + core.log("action", player:get_player_name().." tried to access a "..name.." belonging to " + ..core.get_meta(pos):get_string("owner").." at "..core.pos_to_string(pos)) return 0 end return allow_move and allow_move(pos, from_list, from_index, to_list, to_index, count, player) or @@ -146,8 +146,8 @@ function homedecor.handle_inventory(name, def, original_def) local allow_put = def.allow_metadata_inventory_put def.allow_metadata_inventory_put = function(pos, listname, index, stack, player) if not default_can_interact_with_node(player, pos) then - minetest.log("action", player:get_player_name().." tried to access a "..name.." belonging to" - ..minetest.get_meta(pos):get_string("owner").." at "..minetest.pos_to_string(pos)) + core.log("action", player:get_player_name().." tried to access a "..name.." belonging to" + ..core.get_meta(pos):get_string("owner").." at "..core.pos_to_string(pos)) return 0 end return allow_put and allow_put(pos, listname, index, stack, player) or @@ -157,8 +157,8 @@ function homedecor.handle_inventory(name, def, original_def) local allow_take = def.allow_metadata_inventory_take def.allow_metadata_inventory_take = function(pos, listname, index, stack, player) if not default_can_interact_with_node(player, pos) then - minetest.log("action", player:get_player_name().." tried to access a "..name.." belonging to" - ..minetest.get_meta(pos):get_string("owner").." at ".. minetest.pos_to_string(pos)) + core.log("action", player:get_player_name().." tried to access a "..name.." belonging to" + ..core.get_meta(pos):get_string("owner").." at ".. core.pos_to_string(pos)) return 0 end return allow_take and allow_take(pos, listname, index, stack, player) or @@ -171,7 +171,7 @@ function homedecor.handle_inventory(name, def, original_def) end def.on_key_use = function(pos, player) - local secret = minetest.get_meta(pos):get_string("key_lock_secret") + local secret = core.get_meta(pos):get_string("key_lock_secret") local itemstack = player:get_wielded_item() local key_meta = itemstack:get_meta() @@ -179,21 +179,21 @@ function homedecor.handle_inventory(name, def, original_def) return end - minetest.show_formspec( + core.show_formspec( player:get_player_name(), name.."_locked", - minetest.get_meta(pos):get_string("formspec") + core.get_meta(pos):get_string("formspec") ) end def.on_skeleton_key_use = function(pos, player, newsecret) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local owner = meta:get_string("owner") local playername = player:get_player_name() -- verify placer is owner if owner ~= playername then - minetest.record_protection_violation(pos, playername) + core.record_protection_violation(pos, playername) return nil end @@ -218,7 +218,7 @@ function homedecor.handle_inventory(name, def, original_def) local locked_name = name .. "_locked" homedecor.register(locked_name, locked_def) - minetest.register_craft({ + core.register_craft({ type = "shapeless", output = "homedecor:" .. locked_name, recipe = { "homedecor:" .. name, "basic_materials:padlock" } diff --git a/homedecor_common/registration.lua b/homedecor_common/registration.lua index cb2b13cd..3c75f384 100644 --- a/homedecor_common/registration.lua +++ b/homedecor_common/registration.lua @@ -2,7 +2,7 @@ homedecor = homedecor or {} local placeholder_node = "homedecor:expansion_placeholder" ---wrapper around minetest.register_node that sets sane defaults and interprets some specialized settings +--wrapper around core.register_node that sets sane defaults and interprets some specialized settings function homedecor.register(name, original_def) local def = table.copy(original_def) @@ -45,7 +45,7 @@ function homedecor.register(name, original_def) if infotext then local on_construct = def.on_construct def.on_construct = function(pos) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:set_string("infotext", infotext) if on_construct then on_construct(pos) end end @@ -60,7 +60,7 @@ function homedecor.register(name, original_def) -- dissallow rotating only half the expanded node by default -- unless we know better def.on_rotate = def.on_rotate or ( - minetest.get_modpath("screwdriver") and ( + core.get_modpath("screwdriver") and ( (def.mesh and expand.top and screwdriver.rotate_simple) or screwdriver.disallow ) @@ -78,9 +78,9 @@ function homedecor.register(name, original_def) def.after_dig_node = def.after_dig_node or function(pos, oldnode, oldmetadata, digger) if expand.top and expand.forward ~= "air" then local top_pos = { x=pos.x, y=pos.y+1, z=pos.z } - local node = minetest.get_node(top_pos).name + local node = core.get_node(top_pos).name if node == expand.top or node == placeholder_node then - minetest.remove_node(top_pos) + core.remove_node(top_pos) end end @@ -93,16 +93,16 @@ function homedecor.register(name, original_def) y = pos.y, z = pos.z + homedecor.fdir_to_right[fdir+1][2] } - local node = minetest.get_node(right_pos).name + local node = core.get_node(right_pos).name if node == expand.right or node == placeholder_node then - minetest.remove_node(right_pos) + core.remove_node(right_pos) end end if expand.forward and expand.forward ~= "air" then local forward_pos = { x=pos.x+homedecor.fdir_to_fwd[fdir+1][1], y=pos.y, z=pos.z+homedecor.fdir_to_fwd[fdir+1][2] } - local node = minetest.get_node(forward_pos).name + local node = core.get_node(forward_pos).name if node == expand.forward or node == placeholder_node then - minetest.remove_node(forward_pos) + core.remove_node(forward_pos) end end @@ -116,7 +116,7 @@ function homedecor.register(name, original_def) def.crafts = nil -- register the actual minetest node - minetest.register_node(":homedecor:" .. name, def) + core.register_node(":homedecor:" .. name, def) for _, cdef in pairs(crafts) do if cdef.recipe then @@ -137,6 +137,6 @@ function homedecor.register(name, original_def) cdef.output = "homedecor:" .. name end - minetest.register_craft(cdef) + core.register_craft(cdef) end end diff --git a/homedecor_common/water_particles.lua b/homedecor_common/water_particles.lua index 8042599c..e5904658 100644 --- a/homedecor_common/water_particles.lua +++ b/homedecor_common/water_particles.lua @@ -19,17 +19,17 @@ function homedecor.start_particle_spawner(pos, node, particledef, soundname) - local this_spawner_meta = minetest.get_meta(pos) + local this_spawner_meta = core.get_meta(pos) local id = this_spawner_meta:get_int("active") local s_handle = this_spawner_meta:get_int("sound") if id ~= 0 then if s_handle then - minetest.after(0, function(handle) - minetest.sound_stop(handle) + core.after(0, function(handle) + core.sound_stop(handle) end, s_handle) end - minetest.delete_particlespawner(id) + core.delete_particlespawner(id) this_spawner_meta:set_int("active", 0) this_spawner_meta:set_int("sound", 0) return @@ -67,7 +67,7 @@ function homedecor.start_particle_spawner(pos, node, particledef, soundname) local maxvelx = maxvelx_t[fdir + 1] local maxvelz = maxvelz_t[fdir + 1] - id = minetest.add_particlespawner({ + id = core.add_particlespawner({ amount = 60, time = 0, collisiondetection = true, @@ -84,7 +84,7 @@ function homedecor.start_particle_spawner(pos, node, particledef, soundname) maxsize = 1, texture = "homedecor_water_particle.png", }) - s_handle = minetest.sound_play(soundname, { + s_handle = core.sound_play(soundname, { pos = pos, max_hear_distance = 5, loop = true @@ -96,17 +96,17 @@ function homedecor.start_particle_spawner(pos, node, particledef, soundname) end function homedecor.stop_particle_spawner(pos) - local this_spawner_meta = minetest.get_meta(pos) + local this_spawner_meta = core.get_meta(pos) local id = this_spawner_meta:get_int("active") local s_handle = this_spawner_meta:get_int("sound") if id ~= 0 then - minetest.delete_particlespawner(id) + core.delete_particlespawner(id) end if s_handle then - minetest.after(0, function(handle) - minetest.sound_stop(handle) + core.after(0, function(handle) + core.sound_stop(handle) end, s_handle) end diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index 28146472..2cf14ba1 100644 --- a/homedecor_doors_and_gates/init.lua +++ b/homedecor_doors_and_gates/init.lua @@ -1,15 +1,15 @@ -- Node definitions for Homedecor doors -if not minetest.get_modpath("doors") or not minetest.get_modpath("default") then - minetest.log( +if not core.get_modpath("doors") or not core.get_modpath("default") then + core.log( "action", "[homedecor_doors_and_gates]: minetest game not detected, disabling as this mod is minetest game only at this time" ) return end -local S = minetest.get_translator("homedecor_doors_and_gates") -local mesecons_mp = minetest.get_modpath("mesecons") +local S = core.get_translator("homedecor_doors_and_gates") +local mesecons_mp = core.get_modpath("mesecons") homedecor_doors_and_gates = {} local door_list = { @@ -122,7 +122,7 @@ local function generate_door(def) local door = doors.get(pos) if door then door:close() end end, - rules = minetest.global_exists("mesecon") and mesecon.rules.pplate or nil + rules = core.global_exists("mesecon") and mesecon.rules.pplate or nil } }, } @@ -144,7 +144,7 @@ for _, door in ipairs(door_list) do if mesh then for _, v in pairs(door_types) do if door_conversion[v] then v=door_conversion[v] end - minetest.override_item("doors:homedecor_" .. name .. v, { + core.override_item("doors:homedecor_" .. name .. v, { mesh = mesh .. v .. ".obj" }) end @@ -154,8 +154,8 @@ for _, door in ipairs(door_list) do old_doors[#old_doors + 1] = "homedecor:door_"..name.."_left" old_doors[#old_doors + 1] = "homedecor:door_"..name.."_right" - minetest.register_alias("doors:"..name.."_a", "doors:homedecor_"..name.."_a") - minetest.register_alias("doors:"..name.."_b", "doors:homedecor_"..name.."_b") + core.register_alias("doors:"..name.."_a", "doors:homedecor_"..name.."_a") + core.register_alias("doors:"..name.."_b", "doors:homedecor_"..name.."_b") end -- Gates @@ -287,7 +287,7 @@ for i, g in ipairs(gate_list) do -- gates when placed default to closed, closed. - minetest.register_node(":homedecor:gate_"..gate.."_closed", def) + core.register_node(":homedecor:gate_"..gate.."_closed", def) -- this is either a terrible idea or a great one def = table.copy(def) @@ -315,17 +315,17 @@ for i, g in ipairs(gate_list) do } end - minetest.register_node(":homedecor:gate_"..gate.."_open", def) + core.register_node(":homedecor:gate_"..gate.."_open", def) end -minetest.register_alias("homedecor:fence_barbed_wire_gate_open", "homedecor:gate_barbed_wire_open") -minetest.register_alias("homedecor:fence_barbed_wire_gate_closed", "homedecor:gate_barbed_wire_closed") -minetest.register_alias("homedecor:fence_chainlink_gate_open", "homedecor:gate_chainlink_open") -minetest.register_alias("homedecor:fence_chainlink_gate_closed", "homedecor:gate_chainlink_closed") -minetest.register_alias("homedecor:fence_picket_gate_open", "homedecor:gate_picket_open") -minetest.register_alias("homedecor:fence_picket_gate_closed", "homedecor:gate_picket_closed") -minetest.register_alias("homedecor:fence_picket_gate_white_open", "homedecor:gate_picket_white_open") -minetest.register_alias("homedecor:fence_picket_gate_white_closed", "homedecor:gate_picket_white_closed") +core.register_alias("homedecor:fence_barbed_wire_gate_open", "homedecor:gate_barbed_wire_open") +core.register_alias("homedecor:fence_barbed_wire_gate_closed", "homedecor:gate_barbed_wire_closed") +core.register_alias("homedecor:fence_chainlink_gate_open", "homedecor:gate_chainlink_open") +core.register_alias("homedecor:fence_chainlink_gate_closed", "homedecor:gate_chainlink_closed") +core.register_alias("homedecor:fence_picket_gate_open", "homedecor:gate_picket_open") +core.register_alias("homedecor:fence_picket_gate_closed", "homedecor:gate_picket_closed") +core.register_alias("homedecor:fence_picket_gate_white_open", "homedecor:gate_picket_white_open") +core.register_alias("homedecor:fence_picket_gate_white_closed", "homedecor:gate_picket_white_closed") function homedecor_doors_and_gates.flip_gate(pos, node, player, gate, oc) @@ -339,8 +339,8 @@ function homedecor_doors_and_gates.flip_gate(pos, node, player, gate, oc) gateresult = "homedecor:gate_"..gate.."_closed" end - minetest.set_node(pos, {name = gateresult, param2 = fdir}) - minetest.sound_play("homedecor_gate_open_close", { + core.set_node(pos, {name = gateresult, param2 = fdir}) + core.sound_play("homedecor_gate_open_close", { pos=pos, max_hear_distance = 5, gain = 2, @@ -350,15 +350,15 @@ function homedecor_doors_and_gates.flip_gate(pos, node, player, gate, oc) local above = {x=pos.x, y=pos.y+1, z=pos.z} local below = {x=pos.x, y=pos.y-1, z=pos.z} - local nodeabove = minetest.get_node(above) - local nodebelow = minetest.get_node(below) + local nodeabove = core.get_node(above) + local nodebelow = core.get_node(below) if string.find(nodeabove.name, "homedecor:gate_"..gate) then - minetest.set_node(above, {name = gateresult, param2 = fdir}) + core.set_node(above, {name = gateresult, param2 = fdir}) end if string.find(nodebelow.name, "homedecor:gate_"..gate) then - minetest.set_node(below, {name = gateresult, param2 = fdir}) + core.set_node(below, {name = gateresult, param2 = fdir}) end end @@ -383,7 +383,7 @@ homedecor.register("door_japanese_closed", { }, expand = { top = "placeholder" }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "homedecor:door_japanese_open", param2 = node.param2}) + core.set_node(pos, {name = "homedecor:door_japanese_open", param2 = node.param2}) return itemstack end }) @@ -396,7 +396,7 @@ homedecor.register("door_japanese_open", { mesh = "homedecor_door_japanese_open.obj", groups = { snappy = 3, not_in_creative_inventory = 1 }, sounds = default.node_sound_wood_defaults(), - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, selection_box = { type = "fixed", fixed = {-1.5, -0.5, -0.0625, 0.5, 1.5, 0}, @@ -407,7 +407,7 @@ homedecor.register("door_japanese_open", { }, expand = { top = "placeholder" }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "homedecor:door_japanese_closed", param2 = node.param2}) + core.set_node(pos, {name = "homedecor:door_japanese_closed", param2 = node.param2}) return itemstack end, drop = "homedecor:door_japanese_closed", @@ -417,7 +417,7 @@ homedecor.register("door_japanese_open", { -- half-doors -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:gate_half_door_closed 4", recipe = { @@ -426,7 +426,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:gate_half_door_white_closed 4", recipe = { @@ -437,7 +437,7 @@ minetest.register_craft( { -- Gates -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:gate_picket_white_closed", recipe = { @@ -445,7 +445,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:fence_picket_white", recipe = { @@ -453,7 +453,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:gate_picket_closed", recipe = { @@ -461,7 +461,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:fence_picket", recipe = { @@ -469,7 +469,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:gate_barbed_wire_closed", recipe = { @@ -477,7 +477,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:fence_barbed_wire", recipe = { @@ -485,7 +485,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:gate_chainlink_closed", recipe = { @@ -493,7 +493,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:fence_chainlink", recipe = { @@ -505,7 +505,7 @@ minetest.register_craft( { -- plain wood, non-windowed -minetest.register_craft( { +core.register_craft( { output = "doors:homedecor_wood_plain 2", recipe = { { "group:wood", "group:wood", "" }, @@ -516,7 +516,7 @@ minetest.register_craft( { -- fancy exterior -minetest.register_craft( { +core.register_craft( { output = "doors:homedecor_exterior_fancy 2", recipe = { { "group:wood", "default:glass" }, @@ -527,7 +527,7 @@ minetest.register_craft( { -- French style wood/glass -minetest.register_craft( { +core.register_craft( { output = "doors:homedecor_french_oak 2", recipe = { { "default:glass", "group:wood" }, @@ -536,7 +536,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "doors:homedecor_french_oak 2", recipe = { { "group:wood", "default:glass" }, @@ -545,7 +545,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "doors:homedecor_french_mahogany 2", recipe = { @@ -555,7 +555,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "doors:homedecor_french_white 2", recipe = { @@ -569,7 +569,7 @@ minetest.register_craft( { -- oak -minetest.register_craft( { +core.register_craft( { output = "doors:homedecor_closet_oak 2", recipe = { { "", "group:stick", "group:stick" }, @@ -580,7 +580,7 @@ minetest.register_craft( { -- mahogany -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "doors:homedecor_closet_mahogany 2", recipe = { @@ -592,7 +592,7 @@ minetest.register_craft( { -- wrought iron fence-like door -minetest.register_craft( { +core.register_craft( { output = "doors:homedecor_wrought_iron 2", recipe = { { "homedecor:pole_wrought_iron", "default:iron_lump" }, @@ -603,7 +603,7 @@ minetest.register_craft( { -- bedroom/panel door -minetest.register_craft( { +core.register_craft( { output = "doors:homedecor_basic_panel", recipe = { { "dye:white", "dye:white", "" }, @@ -614,7 +614,7 @@ minetest.register_craft( { -- basic wood/glass single-lite door -minetest.register_craft( { +core.register_craft( { output = "doors:homedecor_woodglass", recipe = { { "group:wood", "default:glass", "" }, @@ -625,7 +625,7 @@ minetest.register_craft( { -- "Carolina" door -minetest.register_craft( { +core.register_craft( { output = "doors:homedecor_carolina", recipe = { { "default:glass", "default:glass", "" }, @@ -635,7 +635,7 @@ minetest.register_craft( { }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:door_japanese_closed", recipe = { { "homedecor:japanese_wall_top" }, @@ -645,44 +645,44 @@ minetest.register_craft({ -- aliases -minetest.register_alias("homedecor:jpn_door_top", "air") -minetest.register_alias("homedecor:jpn_door_top_open", "air") +core.register_alias("homedecor:jpn_door_top", "air") +core.register_alias("homedecor:jpn_door_top_open", "air") -minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_closed") -minetest.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japanese_open") +core.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_closed") +core.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japanese_open") -minetest.register_alias("homedecor:door_glass_right", "doors:door_glass_b") -minetest.register_alias("homedecor:door_glass_left", "doors:door_glass_a") +core.register_alias("homedecor:door_glass_right", "doors:door_glass_b") +core.register_alias("homedecor:door_glass_left", "doors:door_glass_a") -minetest.register_alias("doors:wood_glass_oak_a", "doors:homedecor_french_oak_a") -minetest.register_alias("doors:wood_glass_oak_b", "doors:homedecor_french_oak_b") +core.register_alias("doors:wood_glass_oak_a", "doors:homedecor_french_oak_a") +core.register_alias("doors:wood_glass_oak_b", "doors:homedecor_french_oak_b") -minetest.register_alias("doors:wood_glass_white_a", "doors:homedecor_french_white_a") -minetest.register_alias("doors:wood_glass_white_b", "doors:homedecor_french_white_b") +core.register_alias("doors:wood_glass_white_a", "doors:homedecor_french_white_a") +core.register_alias("doors:wood_glass_white_b", "doors:homedecor_french_white_b") -minetest.register_alias("doors:wood_glass_mahogany_a", "doors:homedecor_french_mahogany_a") -minetest.register_alias("doors:wood_glass_mahogany_b", "doors:homedecor_french_mahogany_b") +core.register_alias("doors:wood_glass_mahogany_a", "doors:homedecor_french_mahogany_a") +core.register_alias("doors:wood_glass_mahogany_b", "doors:homedecor_french_mahogany_b") -minetest.register_alias("doors:homedecor_wood_glass_oak_a", "doors:homedecor_french_oak_a") -minetest.register_alias("doors:homedecor_wood_glass_oak_b", "doors:homedecor_french_oak_b") +core.register_alias("doors:homedecor_wood_glass_oak_a", "doors:homedecor_french_oak_a") +core.register_alias("doors:homedecor_wood_glass_oak_b", "doors:homedecor_french_oak_b") -minetest.register_alias("doors:homedecor_wood_glass_white_a", "doors:homedecor_french_white_a") -minetest.register_alias("doors:homedecor_wood_glass_white_b", "doors:homedecor_french_white_b") +core.register_alias("doors:homedecor_wood_glass_white_a", "doors:homedecor_french_white_a") +core.register_alias("doors:homedecor_wood_glass_white_b", "doors:homedecor_french_white_b") -minetest.register_alias("doors:homedecor_wood_glass_mahogany_a", "doors:homedecor_french_mahogany_a") -minetest.register_alias("doors:homedecor_wood_glass_mahogany_b", "doors:homedecor_french_mahogany_b") +core.register_alias("doors:homedecor_wood_glass_mahogany_a", "doors:homedecor_french_mahogany_a") +core.register_alias("doors:homedecor_wood_glass_mahogany_b", "doors:homedecor_french_mahogany_b") -minetest.register_alias("doors:homedecor_woodglass2_a", "doors:homedecor_carolina_a") -minetest.register_alias("doors:homedecor_woodglass2_b", "doors:homedecor_carolina_b") +core.register_alias("doors:homedecor_woodglass2_a", "doors:homedecor_carolina_a") +core.register_alias("doors:homedecor_woodglass2_b", "doors:homedecor_carolina_b") -minetest.register_alias("doors:woodglass2_a", "doors:homedecor_carolina_a") -minetest.register_alias("doors:woodglass2_b", "doors:homedecor_carolina_b") +core.register_alias("doors:woodglass2_a", "doors:homedecor_carolina_a") +core.register_alias("doors:woodglass2_b", "doors:homedecor_carolina_b") -minetest.register_alias("doors:homedecor_bedroom_a", "doors:homedecor_basic_panel_a") -minetest.register_alias("doors:homedecor_bedroom_b", "doors:homedecor_basic_panel_b") +core.register_alias("doors:homedecor_bedroom_a", "doors:homedecor_basic_panel_a") +core.register_alias("doors:homedecor_bedroom_b", "doors:homedecor_basic_panel_b") -minetest.register_alias("doors:bedroom_a", "doors:homedecor_basic_panel_a") -minetest.register_alias("doors:bedroom_b", "doors:homedecor_basic_panel_b") +core.register_alias("doors:bedroom_a", "doors:homedecor_basic_panel_a") +core.register_alias("doors:bedroom_b", "doors:homedecor_basic_panel_b") -- flip old homedecor doors around, since they use minetest_game doors API now @@ -701,7 +701,7 @@ old_doors[#old_doors + 1] = "homedecor:door_woodglass2_right" old_doors[#old_doors + 1] = "homedecor:door_bedroom_left" old_doors[#old_doors + 1] = "homedecor:door_bedroom_right" -minetest.register_lbm({ +core.register_lbm({ name = ":homedecor:convert_doors_3", label = "Convert Homedecor doors to mtg doors API", nodenames = old_doors, @@ -714,11 +714,11 @@ minetest.register_lbm({ local newname = "doors:homedecor_"..string.sub(node.name, 16, e-1) if dir == "right" then print("Want to replace "..node.name.." with "..newname.."_a") - minetest.set_node(pos, {name = newname.."_a", param2 = newparam2 }) + core.set_node(pos, {name = newname.."_a", param2 = newparam2 }) else print("Want to replace "..node.name.." with "..newname.."_b") - minetest.set_node(pos, {name = newname.."_b", param2 = newparam2 }) + core.set_node(pos, {name = newname.."_b", param2 = newparam2 }) end - minetest.set_node({x=pos.x, y=pos.y+1, z=pos.z}, {name = "doors:hidden"}) + core.set_node({x=pos.x, y=pos.y+1, z=pos.z}, {name = "doors:hidden"}) end }) diff --git a/homedecor_electrical/init.lua b/homedecor_electrical/init.lua index 3feaa141..b60481b7 100644 --- a/homedecor_electrical/init.lua +++ b/homedecor_electrical/init.lua @@ -1,23 +1,23 @@ -local S = minetest.get_translator("homedecor_electrical") +local S = core.get_translator("homedecor_electrical") homedecor_electrical = {} function homedecor_electrical.toggle_switch(pos, node, clicker, itemstack, pointed_thing) if not clicker then return false end local playername = clicker:get_player_name() - if minetest.is_protected(pos, playername) then - minetest.record_protection_violation(pos, playername) + if core.is_protected(pos, playername) then + core.record_protection_violation(pos, playername) return false end local sep = string.find(node.name, "_o", -5) local onoff = string.sub(node.name, sep + 1) local newname = string.sub(node.name, 1, sep - 1)..((onoff == "off") and "_on" or "_off") - minetest.swap_node(pos, {name = newname, param2 = node.param2}) + core.swap_node(pos, {name = newname, param2 = node.param2}) return true end local on_rc -if minetest.get_modpath("mesecons") then +if core.get_modpath("mesecons") then on_rc = function(pos, node, clicker, itemstack, pointed_thing) local t = homedecor_electrical.toggle_switch(pos, node, clicker, itemstack, pointed_thing) if not t then return end @@ -68,7 +68,7 @@ homedecor.register("power_outlet", { for _, onoff in ipairs ({"on", "off"}) do local switch_receptor - if minetest.get_modpath("mesecons") then + if core.get_modpath("mesecons") then switch_receptor = { receptor = { state = mesecon.state[onoff], @@ -139,7 +139,7 @@ homedecor.register("doorbell", { } }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.sound_play("homedecor_doorbell", { + core.sound_play("homedecor_doorbell", { pos = pos, gain = 1.0, max_hear_distance = 15 @@ -156,7 +156,7 @@ homedecor.register("doorbell", { -- crafting -minetest.register_craft( { +core.register_craft( { output = "homedecor:light_switch_off", recipe = { {"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}, @@ -167,4 +167,4 @@ minetest.register_craft( { -- aliases -minetest.register_alias("homedecor:light_switch", "homedecor:light_switch_on") +core.register_alias("homedecor:light_switch", "homedecor:light_switch_on") diff --git a/homedecor_electronics/init.lua b/homedecor_electronics/init.lua index 953b73ea..8fad4de1 100644 --- a/homedecor_electronics/init.lua +++ b/homedecor_electronics/init.lua @@ -1,6 +1,6 @@ -- Various home electronics -local S = minetest.get_translator("homedecor_electronics") +local S = core.get_translator("homedecor_electronics") homedecor.register("speaker", { description = S("Large Stereo Speaker"), @@ -14,7 +14,7 @@ homedecor.register("speaker", { key = "node_sound_wood_defaults", }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "homedecor:speaker_open", param2 = node.param2}) + core.set_node(pos, {name = "homedecor:speaker_open", param2 = node.param2}) end, crafts = { { @@ -48,7 +48,7 @@ homedecor.register("speaker_open", { key = "node_sound_wood_defaults", }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "homedecor:speaker", param2 = node.param2}) + core.set_node(pos, {name = "homedecor:speaker", param2 = node.param2}) end }) @@ -151,7 +151,7 @@ homedecor.register("television", { } } }, - light_source = minetest.LIGHT_MAX - 1, + light_source = core.LIGHT_MAX - 1, groups = { snappy = 3, dig_tree = 2 }, _sound_def = { key = "node_sound_wood_defaults", @@ -250,24 +250,24 @@ homedecor.register("telephone", { -- craft items -minetest.register_craftitem(":homedecor:vcr", { +core.register_craftitem(":homedecor:vcr", { description = S("VCR"), inventory_image = "homedecor_vcr.png" }) -minetest.register_craftitem(":homedecor:dvd_player", { +core.register_craftitem(":homedecor:dvd_player", { description = S("DVD Player"), inventory_image = "homedecor_dvd_player.png" }) -minetest.register_craftitem(":homedecor:speaker_driver", { +core.register_craftitem(":homedecor:speaker_driver", { description = S("Speaker driver"), inventory_image = "homedecor_speaker_driver_inv.png" }) --crafts -minetest.register_craft( { +core.register_craft( { output = "basic_materials:ic 4", recipe = { { "basic_materials:silicon", "basic_materials:silicon" }, @@ -275,7 +275,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:speaker_driver 2", recipe = { { "", homedecor.materials["steel_ingot"], "" }, @@ -284,7 +284,7 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:vcr 2", recipe = { { "basic_materials:ic", homedecor.materials["steel_ingot"], "basic_materials:plastic_sheet" }, @@ -293,7 +293,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:projection_screen", burntime = 30, diff --git a/homedecor_exterior/init.lua b/homedecor_exterior/init.lua index 7fbc4668..e1bb691c 100644 --- a/homedecor_exterior/init.lua +++ b/homedecor_exterior/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_exterior") +local S = core.get_translator("homedecor_exterior") homedecor_exterior = {} local bbq_cbox = { @@ -41,7 +41,7 @@ homedecor.register("barbecue", { } }) -minetest.register_alias("homedecor:barbecue_meat", "air") +core.register_alias("homedecor:barbecue_meat", "air") local wood_tex = homedecor.textures.wood.apple.planks @@ -61,7 +61,7 @@ homedecor.register("doghouse", { _sound_def = { key = "node_sound_wood_defaults", }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, crafts = { { recipe = { @@ -73,13 +73,13 @@ homedecor.register("doghouse", { } }) -minetest.register_alias("homedecor:doghouse_roof", "air") -minetest.register_alias("homedecor:doghouse_base", "homedecor:doghouse") +core.register_alias("homedecor:doghouse_roof", "air") +core.register_alias("homedecor:doghouse_base", "homedecor:doghouse") homedecor.register("stonepath", { description = S("Garden stone path"), tiles = { - minetest.registered_nodes["mapgen_stone"].tiles[1], + core.registered_nodes["mapgen_stone"].tiles[1], }, inventory_image = "homedecor_stonepath_inv.png", groups = { snappy=3, dig_stone = 2 }, @@ -182,7 +182,7 @@ homedecor.register("swing", { key = "node_sound_wood_defaults", }, walkable = false, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, node_box = { type = "fixed", fixed = { @@ -207,12 +207,12 @@ homedecor.register("swing", { for i = 0, 4 do -- search up to 5 spaces downward from the ceiling for the first non-buildable-to node... height = i local testpos = { x=pos.x, y=pos.y-i-1, z=pos.z } - local testnode = minetest.get_node_or_nil(testpos) + local testnode = core.get_node_or_nil(testpos) local testreg = testnode and core.registered_nodes[testnode.name] if not testreg or not testreg.buildable_to then if i < 1 then - minetest.chat_send_player(placer_name, S("No room under there to hang a swing.")) + core.chat_send_player(placer_name, S("No room under there to hang a swing.")) return itemstack else break @@ -220,19 +220,19 @@ homedecor.register("swing", { end end - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + local fdir = core.dir_to_facedir(placer:get_look_dir()) for j = 0, height do -- then fill that space with ropes... local testpos = { x=pos.x, y=pos.y-j, z=pos.z } - minetest.set_node(testpos, { name = "homedecor:swing_rope", param2 = fdir }) + core.set_node(testpos, { name = "homedecor:swing_rope", param2 = fdir }) end - minetest.set_node({ x=pos.x, y=pos.y-height, z=pos.z }, { name = "homedecor:swing", param2 = fdir }) + core.set_node({ x=pos.x, y=pos.y-height, z=pos.z }, { name = "homedecor:swing", param2 = fdir }) - if not minetest.is_creative_enabled(placer_name) then + if not core.is_creative_enabled(placer_name) then itemstack:take_item() end else - minetest.chat_send_player(placer_name, + core.chat_send_player(placer_name, S("You have to point at the bottom side of an overhanging object to place a swing.")) end return itemstack @@ -240,8 +240,8 @@ homedecor.register("swing", { after_dig_node = function(pos, oldnode, oldmetadata, digger) for i = 0, 4 do local testpos = { x=pos.x, y=pos.y+i+1, z=pos.z } - if minetest.get_node(testpos).name == "homedecor:swing_rope" then - minetest.remove_node(testpos) + if core.get_node(testpos).name == "homedecor:swing_rope" then + core.remove_node(testpos) else return end @@ -289,12 +289,12 @@ homedecor.register("swing_rope", { }) local water_tex = homedecor.textures.water.tile -local cobble_tex = minetest.registered_nodes["mapgen_stone"].tiles[1] -local stone_drop = minetest.registered_nodes["mapgen_stone"].drop +local cobble_tex = core.registered_nodes["mapgen_stone"].tiles[1] +local stone_drop = core.registered_nodes["mapgen_stone"].drop if stone_drop and type(stone_drop) == "string" then - cobble_tex = minetest.registered_nodes[stone_drop].tiles[1] + cobble_tex = core.registered_nodes[stone_drop].tiles[1] elseif stone_drop and type(stone_drop) == "table" then - cobble_tex = minetest.registered_nodes[stone_drop.items[1].items[1]].tiles[1] + cobble_tex = core.registered_nodes[stone_drop.items[1].items[1]].tiles[1] end homedecor.register("well", { @@ -317,7 +317,7 @@ homedecor.register("well", { _sound_def = { key = "node_sound_wood_defaults", }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, crafts = { { recipe = { @@ -330,18 +330,18 @@ homedecor.register("well", { }) --because the engine of all people cant follow right to a name, need to verify bucket empty -if minetest.get_modpath("bucket") and minetest.registered_items["bucket:bucket_empty"] then - local original_bucket_on_use = minetest.registered_items["bucket:bucket_empty"].on_use - minetest.override_item("bucket:bucket_empty", { +if core.get_modpath("bucket") and core.registered_items["bucket:bucket_empty"] then + local original_bucket_on_use = core.registered_items["bucket:bucket_empty"].on_use + core.override_item("bucket:bucket_empty", { on_use = function(itemstack, user, pointed_thing) local inv = user:get_inventory() - if pointed_thing.type == "node" and minetest.get_node(pointed_thing.under).name == "homedecor:well" then + if pointed_thing.type == "node" and core.get_node(pointed_thing.under).name == "homedecor:well" then if inv:room_for_item("main", "bucket:bucket_water 1") then itemstack:take_item() inv:add_item("main", "bucket:bucket_water 1") else - minetest.chat_send_player(user:get_player_name(), S("No room in your inventory to add a filled bucket!")) + core.chat_send_player(user:get_player_name(), S("No room in your inventory to add a filled bucket!")) end return itemstack else if original_bucket_on_use then @@ -412,7 +412,7 @@ for color, color_loc in pairs(homedecor_exterior.shrub_colors) do }) if color ~= "green" then - minetest.register_craft({ + core.register_craft({ type = "shapeless", output = "homedecor:shrubbery_large_"..color, recipe = { @@ -421,7 +421,7 @@ for color, color_loc in pairs(homedecor_exterior.shrub_colors) do } }) - minetest.register_craft({ + core.register_craft({ type = "shapeless", output = "homedecor:shrubbery_"..color, recipe = { @@ -435,7 +435,7 @@ end -- crafting -minetest.register_craft({ +core.register_craft({ output = "homedecor:lattice_wood 8", recipe = { {"group:stick", "group:wood", "group:stick"}, @@ -444,7 +444,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:lattice_white_wood 8", recipe = { {"group:stick", "group:wood", "group:stick"}, @@ -453,7 +453,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:lattice_wood_vegetal 8", recipe = { {"group:stick", "group:wood", "group:stick"}, @@ -462,7 +462,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:lattice_white_wood_vegetal 8", recipe = { {"group:stick", "group:wood", "group:stick"}, @@ -472,7 +472,7 @@ minetest.register_craft({ }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:shrubbery_green 3", recipe = { { "group:leaves", "group:leaves", "group:leaves" }, @@ -483,8 +483,8 @@ minetest.register_craft({ -- aliases -minetest.register_alias("homedecor:well_top", "air") -minetest.register_alias("homedecor:well_base", "homedecor:well") +core.register_alias("homedecor:well_top", "air") +core.register_alias("homedecor:well_base", "homedecor:well") -minetest.register_alias("gloopblocks:shrubbery", "homedecor:shrubbery_green") -minetest.register_alias("gloopblocks:shrubbery_large", "homedecor:shrubbery_large_green") +core.register_alias("gloopblocks:shrubbery", "homedecor:shrubbery_green") +core.register_alias("gloopblocks:shrubbery_large", "homedecor:shrubbery_large_green") diff --git a/homedecor_fences/init.lua b/homedecor_fences/init.lua index 6389d691..e0c9202c 100644 --- a/homedecor_fences/init.lua +++ b/homedecor_fences/init.lua @@ -1,6 +1,6 @@ -- This file adds fences of various types -local S = minetest.get_translator("homedecor_fences") +local S = core.get_translator("homedecor_fences") local brass = { output = "homedecor:fence_brass 6", @@ -465,7 +465,7 @@ homedecor.register("fence_wrought_iron_2_corner", { }) -- insert the old wood signs-on-metal-fences into signs_lib's conversion LBM -if minetest.get_modpath("signs_lib") and minetest.get_modpath("default") then +if core.get_modpath("signs_lib") and core.get_modpath("default") then -- FIXME: export a function in signs_lib API to allow signs_lib to be read only in .luacheckrc table.insert(signs_lib.old_fenceposts_with_signs, "homedecor:fence_brass_with_sign") signs_lib.old_fenceposts["homedecor:fence_brass_with_sign"] = "homedecor:fence_brass" diff --git a/homedecor_foyer/init.lua b/homedecor_foyer/init.lua index 10bc31aa..2948a1bd 100644 --- a/homedecor_foyer/init.lua +++ b/homedecor_foyer/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_foyer") +local S = core.get_translator("homedecor_foyer") homedecor.register("coatrack_wallmount", { tiles = { homedecor.plain_wood }, @@ -49,7 +49,7 @@ homedecor.register("coat_tree", { type = "fixed", fixed = { -0.4, -0.5, -0.4, 0.4, 1.5, 0.4 } }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, crafts = { { recipe = { diff --git a/homedecor_furniture/init.lua b/homedecor_furniture/init.lua index 9c7e33af..9e441de2 100644 --- a/homedecor_furniture/init.lua +++ b/homedecor_furniture/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_furniture") +local S = core.get_translator("homedecor_furniture") local ob_cbox = { type = "fixed", diff --git a/homedecor_furniture_medieval/init.lua b/homedecor_furniture_medieval/init.lua index 5dde4f20..8bc57307 100644 --- a/homedecor_furniture_medieval/init.lua +++ b/homedecor_furniture_medieval/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_furniture_medieval") +local S = core.get_translator("homedecor_furniture_medieval") homedecor.register("bars", { description = S("Bars"), @@ -90,10 +90,10 @@ homedecor.register("chains", { } }) -minetest.register_alias("3dforniture:bars", "homedecor:bars") -minetest.register_alias("3dforniture:L_binding_bars", "homedecor:L_binding_bars") -minetest.register_alias("3dforniture:chains", "homedecor:chains") +core.register_alias("3dforniture:bars", "homedecor:bars") +core.register_alias("3dforniture:L_binding_bars", "homedecor:L_binding_bars") +core.register_alias("3dforniture:chains", "homedecor:chains") -minetest.register_alias('bars', 'homedecor:bars') -minetest.register_alias('binding_bars', 'homedecor:L_binding_bars') -minetest.register_alias('chains', 'homedecor:chains') +core.register_alias('bars', 'homedecor:bars') +core.register_alias('binding_bars', 'homedecor:L_binding_bars') +core.register_alias('chains', 'homedecor:chains') diff --git a/homedecor_gastronomy/init.lua b/homedecor_gastronomy/init.lua index 8bff5847..d28ed190 100644 --- a/homedecor_gastronomy/init.lua +++ b/homedecor_gastronomy/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_gastronomy") +local S = core.get_translator("homedecor_gastronomy") local cutlery_cbox = { type = "fixed", @@ -14,14 +14,14 @@ local fdir_to_steampos = { } local function sfx(pos) - local node = minetest.get_node(pos) + local node = core.get_node(pos) local fdir = node.param2 if fdir and fdir < 4 then local steamx = fdir_to_steampos.x[fdir + 1] local steamz = fdir_to_steampos.z[fdir + 1] - minetest.add_particlespawner({ + core.add_particlespawner({ amount = 1, time = 1, minpos = {x=pos.x - steamx, y=pos.y - 0.35, z=pos.z - steamz}, @@ -171,7 +171,7 @@ homedecor.register("coffee_maker", { groups = {snappy=3, dig_stone=3}, selection_box = cm_cbox, node_box = cm_cbox, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, crafts = { { recipe = { @@ -183,7 +183,7 @@ homedecor.register("coffee_maker", { }, on_timer = sfx, on_construct = function(pos) - minetest.get_node_timer(pos):start(2) + core.get_node_timer(pos):start(2) end }) @@ -202,8 +202,8 @@ homedecor.register("toaster", { }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local fdir = node.param2 - minetest.set_node(pos, { name = "homedecor:toaster_loaf", param2 = fdir }) - minetest.sound_play("toaster", { + core.set_node(pos, { name = "homedecor:toaster_loaf", param2 = fdir }) + core.sound_play("toaster", { pos = pos, gain = 1.0, max_hear_distance = 5 @@ -242,7 +242,7 @@ homedecor.register("toaster_loaf", { }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local fdir = node.param2 - minetest.set_node(pos, { name = "homedecor:toaster", param2 = fdir }) + core.set_node(pos, { name = "homedecor:toaster", param2 = fdir }) return itemstack end, drop = "homedecor:toaster" @@ -250,21 +250,21 @@ homedecor.register("toaster_loaf", { -- crafting -minetest.register_craft( { +core.register_craft( { output = "homedecor:bottle_green", recipe = { { homedecor.materials["glass_bottle"], homedecor.materials["dye_green"] } }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:bottle_brown", recipe = { { homedecor.materials["glass_bottle"], homedecor.materials["dye_brown"] } }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:4_bottles_brown", recipe = { @@ -275,7 +275,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:4_bottles_green", recipe = { @@ -286,7 +286,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:4_bottles_multi", recipe = { @@ -297,7 +297,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:wine_rack", recipe = { { "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" }, @@ -306,11 +306,11 @@ minetest.register_craft({ }, }) -minetest.register_lbm({ +core.register_lbm({ name = "homedecor_gastronomy:sfx_init", nodenames = {"homedecor:coffee_maker"}, run_at_every_load = false, action = function(pos) - minetest.get_node_timer(pos):start(2) + core.get_node_timer(pos):start(2) end }) diff --git a/homedecor_inbox/init.lua b/homedecor_inbox/init.lua index 6d870dc4..1ee91258 100644 --- a/homedecor_inbox/init.lua +++ b/homedecor_inbox/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("inbox") +local S = core.get_translator("inbox") local inbox = {} @@ -25,9 +25,9 @@ homedecor.register("inbox", { _sound_def = { key = "node_sound_wood_defaults", }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, after_place_node = function(pos, placer, itemstack) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local owner = placer:get_player_name() meta:set_string("owner", owner) meta:set_string("infotext", S("@1's Mailbox", owner)) @@ -36,18 +36,18 @@ homedecor.register("inbox", { inv:set_size("drop", 1) end, on_rightclick = function(pos, node, clicker, itemstack) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local player = clicker:get_player_name() local owner = meta:get_string("owner") if owner == player or - minetest.check_player_privs(player, "protection_bypass") and + core.check_player_privs(player, "protection_bypass") and clicker:get_player_control().aux1 then - minetest.show_formspec( + core.show_formspec( player, "inbox:mailbox", inbox.get_inbox_formspec(pos)) else - minetest.show_formspec( + core.show_formspec( player, "inbox:mailbox", inbox.get_inbox_insert_formspec(pos)) @@ -55,14 +55,14 @@ homedecor.register("inbox", { return itemstack end, can_dig = function(pos,player) - local meta = minetest.get_meta(pos); + local meta = core.get_meta(pos); local name = player and player:get_player_name() local owner = meta:get_string("owner") local inv = meta:get_inventory() return name == owner and inv:is_empty("main") end, on_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() if listname == "drop" and inv:room_for_item("main", stack) then inv:remove_item("drop", stack) @@ -74,7 +74,7 @@ homedecor.register("inbox", { return 0 end if listname == "drop" then - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() if inv:room_for_item("main", stack) then return -1 @@ -84,10 +84,10 @@ homedecor.register("inbox", { end end, allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local owner = meta:get_string("owner") if player:get_player_name() == owner or - minetest.check_player_privs(player, "protection_bypass") and + core.check_player_privs(player, "protection_bypass") and player:get_player_control().aux1 then return stack:get_count() end @@ -107,7 +107,7 @@ homedecor.register("inbox", { } }) -minetest.register_alias("inbox:empty", "homedecor:inbox") +core.register_alias("inbox:empty", "homedecor:inbox") function inbox.get_inbox_formspec(pos) local spos = pos.x .. "," .. pos.y .. "," ..pos.z diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua index 526d8c59..460f301d 100644 --- a/homedecor_kitchen/init.lua +++ b/homedecor_kitchen/init.lua @@ -1,6 +1,6 @@ -- This file supplies Kitchen stuff like refrigerators, sinks, etc. -local S = minetest.get_translator("homedecor_kitchen") +local S = core.get_translator("homedecor_kitchen") -- steel-textured fridge homedecor.register("refrigerator_steel", { @@ -20,7 +20,7 @@ homedecor.register("refrigerator_steel", { size=50, lockable=true, }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, }) -- white, enameled fridge @@ -41,21 +41,21 @@ homedecor.register("refrigerator_white", { size=50, lockable=true, }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, }) -minetest.register_alias("homedecor:refrigerator_white_bottom", "homedecor:refrigerator_white") -minetest.register_alias("homedecor:refrigerator_white_top", "air") +core.register_alias("homedecor:refrigerator_white_bottom", "homedecor:refrigerator_white") +core.register_alias("homedecor:refrigerator_white_top", "air") -minetest.register_alias("homedecor:refrigerator_steel_bottom", "homedecor:refrigerator_steel") -minetest.register_alias("homedecor:refrigerator_steel_top", "air") +core.register_alias("homedecor:refrigerator_steel_bottom", "homedecor:refrigerator_steel") +core.register_alias("homedecor:refrigerator_steel_top", "air") -minetest.register_alias("homedecor:refrigerator_white_bottom_locked", "homedecor:refrigerator_white_locked") -minetest.register_alias("homedecor:refrigerator_white_top_locked", "air") -minetest.register_alias("homedecor:refrigerator_locked", "homedecor:refrigerator_white_locked") +core.register_alias("homedecor:refrigerator_white_bottom_locked", "homedecor:refrigerator_white_locked") +core.register_alias("homedecor:refrigerator_white_top_locked", "air") +core.register_alias("homedecor:refrigerator_locked", "homedecor:refrigerator_white_locked") -minetest.register_alias("homedecor:refrigerator_steel_bottom_locked", "homedecor:refrigerator_steel_locked") -minetest.register_alias("homedecor:refrigerator_steel_top_locked", "air") +core.register_alias("homedecor:refrigerator_steel_bottom_locked", "homedecor:refrigerator_steel_locked") +core.register_alias("homedecor:refrigerator_steel_top_locked", "air") -- kitchen "furnaces" homedecor.register_furnace("oven", { @@ -476,7 +476,7 @@ homedecor.register("copper_pans", { groups = { snappy=3, dig_stone=1 }, selection_box = cp_cbox, walkable = false, - on_place = minetest.rotate_node + on_place = core.rotate_node }) local kf_cbox = { @@ -492,9 +492,9 @@ homedecor.register("kitchen_faucet", { groups = {snappy=3, dig_stone=1}, selection_box = kf_cbox, walkable = false, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) + local below = core.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) if below and string.find(below.name, "homedecor:.*sink") then local particledef = { outlet = { x = 0, y = -0.19, z = 0.13 }, @@ -529,7 +529,7 @@ homedecor.register("paper_towel", { -- crafting -minetest.register_craft({ +core.register_craft({ output = "homedecor:oven_steel", recipe = { {"basic_materials:heating_element", homedecor.materials.steel_ingot, "basic_materials:heating_element", }, @@ -538,7 +538,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:oven_steel", recipe = { {"basic_materials:heating_element", homedecor.materials.steel_ingot, "basic_materials:heating_element", }, @@ -547,7 +547,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:oven", recipe = { @@ -557,7 +557,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:microwave_oven 2", recipe = { {homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, }, @@ -566,7 +566,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:microwave_oven 2", recipe = { {homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, }, @@ -575,7 +575,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:refrigerator_steel", recipe = { {homedecor.materials.steel_ingot, "homedecor:glowlight_small_cube", homedecor.materials.steel_ingot, }, @@ -584,7 +584,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:refrigerator_white", recipe = { @@ -595,7 +595,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:kitchen_cabinet_colorable", recipe = { {"group:wood", "group:stick", "group:wood", }, @@ -604,7 +604,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:kitchen_cabinet_colorable_with_drawers", recipe = { {"homedecor:kitchen_cabinet_colorable", }, @@ -615,7 +615,7 @@ minetest.register_craft({ local cabinet_types = { "homedecor:kitchen_cabinet_colorable", "homedecor:kitchen_cabinet_colorable_with_drawers" } for _, cabinet in ipairs(cabinet_types) do - minetest.register_craft({ + core.register_craft({ output = cabinet.."_steel", recipe = { {homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot}, @@ -623,7 +623,7 @@ for _, cabinet in ipairs(cabinet_types) do } }) - minetest.register_craft({ + core.register_craft({ output = cabinet.."_steel", recipe = { {"moreblocks:slab_steelblock_1"}, @@ -631,7 +631,7 @@ for _, cabinet in ipairs(cabinet_types) do } }) - minetest.register_craft({ + core.register_craft({ output = cabinet.."_marble", recipe = { {"building_blocks:slab_marble"}, @@ -639,7 +639,7 @@ for _, cabinet in ipairs(cabinet_types) do } }) - minetest.register_craft({ + core.register_craft({ output = cabinet.."_marble", recipe = { {"technic:slab_marble_1"}, @@ -647,7 +647,7 @@ for _, cabinet in ipairs(cabinet_types) do } }) - minetest.register_craft({ + core.register_craft({ output = cabinet.."_granite", recipe = { {"technic:slab_granite_1"}, @@ -656,13 +656,13 @@ for _, cabinet in ipairs(cabinet_types) do }) end -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:kitchen_cabinet_colorable_half 2", recipe = { "homedecor:kitchen_cabinet_colorable" } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:kitchen_cabinet_colorable_with_sink", recipe = { {"group:wood", homedecor.materials.steel_ingot, "group:wood", }, @@ -671,7 +671,7 @@ minetest.register_craft({ } }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:dishwasher", recipe = { { "basic_materials:ic", "building_blocks:slab_grate_1", homedecor.materials.steel_ingot, }, @@ -680,7 +680,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:dishwasher", recipe = { { "basic_materials:ic", "homedecor:fence_chainlink", homedecor.materials.steel_ingot, }, @@ -689,7 +689,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:dishwasher_wood", recipe = { { "stairs:slab_wood" }, @@ -697,7 +697,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:dishwasher_wood", recipe = { { "moreblocks:slab_wood" }, @@ -705,7 +705,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:dishwasher_wood", recipe = { { "moreblocks:slab_wood_1" }, @@ -713,7 +713,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:dishwasher_steel", recipe = { { homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot }, @@ -721,7 +721,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:dishwasher_steel", recipe = { { "moreblocks:slab_steelblock_1" }, @@ -729,7 +729,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:dishwasher_marble", recipe = { { "building_blocks:slab_marble" }, @@ -737,7 +737,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:dishwasher_marble", recipe = { { "technic:slab_marble_1" }, @@ -745,7 +745,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:dishwasher_granite", recipe = { { "technic:slab_granite_1" }, @@ -753,7 +753,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:kitchen_faucet", recipe = { { "", homedecor.materials.steel_ingot }, @@ -762,7 +762,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:kitchen_faucet", recipe = { { homedecor.materials.steel_ingot,"" }, @@ -771,7 +771,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:cutlery_set", recipe = { { "", "vessels:drinking_glass", "" }, @@ -779,7 +779,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:cutlery_set", recipe = { { "", "vessels:drinking_glass", "" }, @@ -787,7 +787,7 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:copper_pans", recipe = { { "basic_materials:copper_strip","","basic_materials:copper_strip" }, @@ -796,14 +796,14 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:paper_towel", recipe = { { "homedecor:toilet_paper", "homedecor:toilet_paper" } }, }) -minetest.register_lbm({ +core.register_lbm({ name = ":homedecor:convert_kitchen_cabinets", label = "Convert homedecor kitchen cabinets to use [color]wallmounted", run_at_every_load = false, @@ -825,6 +825,6 @@ minetest.register_lbm({ new_fdir = 5 end - minetest.swap_node(pos, { name = newname, param2 = new_fdir }) + core.swap_node(pos, { name = newname, param2 = new_fdir }) end }) diff --git a/homedecor_laundry/init.lua b/homedecor_laundry/init.lua index 96508220..f12f2a01 100644 --- a/homedecor_laundry/init.lua +++ b/homedecor_laundry/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_laundry") +local S = core.get_translator("homedecor_laundry") -- laundry devices homedecor.register("washing_machine", { diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index ac7b11c5..b3a1586a 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -1,19 +1,19 @@ -- This file supplies the majority of homedecor's lighting -local S = minetest.get_translator("homedecor_lighting") +local S = core.get_translator("homedecor_lighting") homedecor_lighting = {} local function is_protected(pos, clicker) - if minetest.is_protected(pos, clicker:get_player_name()) then - minetest.record_protection_violation(pos, + if core.is_protected(pos, clicker:get_player_name()) then + core.record_protection_violation(pos, clicker:get_player_name()) return true end return false end -local hd_mesecons = minetest.get_modpath("mesecons") +local hd_mesecons = core.get_modpath("mesecons") -- control and brightness for dimmable lamps @@ -52,17 +52,17 @@ if hd_mesecons then actions = { action_off = function(pos, node) local sep = string.find(node.name, "_", -5) - if minetest.get_meta(pos):get_int("toggled") > 0 then - minetest.swap_node(pos, { + if core.get_meta(pos):get_int("toggled") > 0 then + core.swap_node(pos, { name = string.sub(node.name, 1, sep - 1).."_off", param2 = node.param2 }) end end, action_on = function(pos, node) - minetest.get_meta(pos):set_int("toggled", 1) + core.get_meta(pos):set_int("toggled", 1) local sep = string.find(node.name, "_", -5) - minetest.swap_node(pos, { + core.swap_node(pos, { name = string.sub(node.name, 1, sep - 1).."_on", param2 = node.param2 }) @@ -87,11 +87,11 @@ local player_last_clicked = {} local digiline_on_punch -if minetest.get_modpath("digilines") then +if core.get_modpath("digilines") then local on_digiline_receive_string = function(pos, node, channel, msg) if not msg or not channel then return end - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local setchan = meta:get_string("channel") if setchan ~= channel then return end @@ -101,27 +101,27 @@ if minetest.get_modpath("digilines") then local basename = string.sub(node.name, 1, string.find(node.name, "_", -5) - 1) - if minetest.registered_nodes[basename.."_"..msg] then - minetest.swap_node(pos, {name = basename.."_"..msg, param2 = node.param2}) - elseif minetest.registered_nodes[basename.."_"..suff] then - minetest.swap_node(pos, {name = basename.."_"..suff, param2 = node.param2}) - elseif minetest.registered_nodes[basename.."_on"] + if core.registered_nodes[basename.."_"..msg] then + core.swap_node(pos, {name = basename.."_"..msg, param2 = node.param2}) + elseif core.registered_nodes[basename.."_"..suff] then + core.swap_node(pos, {name = basename.."_"..suff, param2 = node.param2}) + elseif core.registered_nodes[basename.."_on"] and (msg == "med" or msg == "hi" or msg == "max" or (n and n > 3)) then - minetest.swap_node(pos, {name = basename.."_on", param2 = node.param2}) - elseif minetest.registered_nodes[basename.."_off"] + core.swap_node(pos, {name = basename.."_on", param2 = node.param2}) + elseif core.registered_nodes[basename.."_off"] and (msg == "low" or (n and n < 4)) then - minetest.swap_node(pos, {name = basename.."_off", param2 = node.param2}) + core.swap_node(pos, {name = basename.."_off", param2 = node.param2}) end end end - minetest.register_on_player_receive_fields(function(player, formname, fields) + core.register_on_player_receive_fields(function(player, formname, fields) local name = player:get_player_name() local pos = player_last_clicked[name] if pos and formname == "homedecor:lamp_set_channel" then if is_protected(pos, player) then return end if (fields.channel) then - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:set_string("channel", fields.channel) end end @@ -166,7 +166,7 @@ if minetest.get_modpath("digilines") then "size[8,4]".. "button_exit[3,2.5;2,0.5;proceed;Proceed]".. "field[1.75,1.5;4.5,0.5;channel;Channel;]" - minetest.show_formspec(name, "homedecor:lamp_set_channel", form) + core.show_formspec(name, "homedecor:lamp_set_channel", form) end end end @@ -190,7 +190,7 @@ function homedecor_lighting.toggle_light(pos, node, clicker, itemstack, pointed_ newsuff = "_14" end - minetest.swap_node(pos, {name = string.sub(node.name, 1, sep - 1)..newsuff, param2 = node.param2}) + core.swap_node(pos, {name = string.sub(node.name, 1, sep - 1)..newsuff, param2 = node.param2}) end ------------------ @@ -259,7 +259,7 @@ for brightness_level = 0, 14 do overlay = nil end - minetest.register_node(":homedecor:glowlight_half_"..brightness_level, { + core.register_node(":homedecor:glowlight_half_"..brightness_level, { description = S("Thick Glowlight"), tiles = tiles, overlay_tiles = overlay, @@ -329,7 +329,7 @@ for brightness_level = 0, 14 do overlay = nil end - minetest.register_node(":homedecor:glowlight_quarter_"..brightness_level, { + core.register_node(":homedecor:glowlight_quarter_"..brightness_level, { description = S("Thin Glowlight"), tiles = tiles, overlay_tiles = overlay, @@ -400,7 +400,7 @@ for brightness_level = 0, 14 do overlay = nil end - minetest.register_node(":homedecor:glowlight_small_cube_"..brightness_level, { + core.register_node(":homedecor:glowlight_small_cube_"..brightness_level, { description = S("Small Glowlight Cube"), tiles = tiles, overlay_tiles = overlay, @@ -558,7 +558,7 @@ for brightness_level = 0, 14 do on_punch = digiline_on_punch }) - if not minetest.get_modpath("darkage") then + if not core.get_modpath("darkage") then homedecor.register("lattice_lantern_large_"..brightness_level, { description = S("Lattice lantern/Light (large)"), tiles = { gen_ls_tex_yellow.."^homedecor_lattice_lantern_large_overlay.png" }, @@ -612,7 +612,7 @@ for brightness_level = 0, 14 do _sound_def = { key = "node_sound_glass_defaults", }, - on_place = minetest.rotate_node, + on_place = core.rotate_node, on_rightclick = homedecor_lighting.toggle_light, drop = { items = { @@ -755,7 +755,7 @@ for brightness_level = 0, 14 do _sound_def = { key = "node_sound_wood_defaults", }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, --expand = { top="air" }, drop = { items = { @@ -816,7 +816,7 @@ for _, light_brightn_name in ipairs({"off", "on"}) do }, walkable = false, use_texture_alpha = "blend", - light_source = onflag and (minetest.LIGHT_MAX - 5) or nil, + light_source = onflag and (core.LIGHT_MAX - 5) or nil, sunlight_propagates = true, groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici}, _sound_def = { @@ -840,7 +840,7 @@ for _, light_brightn_name in ipairs({"off", "on"}) do -- rope lighting - minetest.register_node(":homedecor:rope_light_on_floor_"..light_brightn_name, { + core.register_node(":homedecor:rope_light_on_floor_"..light_brightn_name, { description = S("Rope lighting (on floor)"), inventory_image = "homedecor_rope_light_on_floor.png", paramtype = "light", @@ -890,7 +890,7 @@ for _, light_brightn_name in ipairs({"off", "on"}) do } or nil, }) - minetest.register_node(":homedecor:rope_light_on_ceiling_"..light_brightn_name, { + core.register_node(":homedecor:rope_light_on_ceiling_"..light_brightn_name, { description = S("Rope lighting (on ceiling)"), inventory_image = "homedecor_rope_light_on_ceiling.png", paramtype = "light", @@ -951,7 +951,7 @@ for _, light_brightn_name in ipairs({"off", "on"}) do }, inventory_image = "homedecor_wall_lamp_inv.png", groups = {snappy=3, not_in_creative_inventory = nici, dig_glass=1}, - light_source = onflag and (minetest.LIGHT_MAX - 3) or nil, + light_source = onflag and (core.LIGHT_MAX - 3) or nil, selection_box = wl_cbox, walkable = false, drop = { @@ -988,7 +988,7 @@ homedecor.register("candle", { walkable = false, use_texture_alpha = "clip", groups = { snappy = 3, dig_glass=1 }, - light_source = minetest.LIGHT_MAX-4, + light_source = core.LIGHT_MAX-4, }) local c_cbox = { @@ -1010,7 +1010,7 @@ homedecor.register("candle_thin", { walkable = false, use_texture_alpha = "clip", groups = { snappy = 3, dig_glass=1 }, - light_source = minetest.LIGHT_MAX-4, + light_source = core.LIGHT_MAX-4, }) local cs_cbox = { @@ -1033,7 +1033,7 @@ homedecor.register("candlestick_wrought_iron", { walkable = false, use_texture_alpha = "clip", groups = { snappy = 3, dig_glass=1 }, - light_source = minetest.LIGHT_MAX-4, + light_source = core.LIGHT_MAX-4, }) homedecor.register("candlestick_brass", { @@ -1049,7 +1049,7 @@ homedecor.register("candlestick_brass", { walkable = false, use_texture_alpha = "clip", groups = { snappy = 3, dig_glass=1 }, - light_source = minetest.LIGHT_MAX-4, + light_source = core.LIGHT_MAX-4, }) homedecor.register("wall_sconce", { @@ -1069,7 +1069,7 @@ homedecor.register("wall_sconce", { walkable = false, use_texture_alpha = "clip", groups = { snappy = 3, dig_glass=1 }, - light_source = minetest.LIGHT_MAX-4, + light_source = core.LIGHT_MAX-4, }) local ol_cbox = { @@ -1095,7 +1095,7 @@ homedecor.register("oil_lamp", { selection_box = ol_cbox, walkable = false, groups = { snappy = 3, dig_glass=1 }, - light_source = minetest.LIGHT_MAX-3, + light_source = core.LIGHT_MAX-3, _sound_def = { key = "node_sound_glass_defaults", }, @@ -1109,7 +1109,7 @@ homedecor.register("oil_lamp_tabletop", { selection_box = ol_cbox, collision_box = ol_cbox, groups = { snappy = 3, dig_glass=1 }, - light_source = minetest.LIGHT_MAX-3, + light_source = core.LIGHT_MAX-3, _sound_def = { key = "node_sound_glass_defaults", }, @@ -1123,7 +1123,7 @@ local topchains_sbox = { } } -minetest.register_node(":homedecor:chain_steel_top", { +core.register_node(":homedecor:chain_steel_top", { description = S("Hanging chain (ceiling mount, steel)"), drawtype = "mesh", mesh = "homedecor_chains_top.obj", @@ -1139,7 +1139,7 @@ minetest.register_node(":homedecor:chain_steel_top", { selection_box = topchains_sbox, }) -minetest.register_node(":homedecor:chain_brass_top", { +core.register_node(":homedecor:chain_brass_top", { description = S("Hanging chain (ceiling mount, brass)"), drawtype = "mesh", mesh = "homedecor_chains_top.obj", @@ -1155,7 +1155,7 @@ minetest.register_node(":homedecor:chain_brass_top", { selection_box = topchains_sbox, }) -minetest.register_node(":homedecor:chandelier_steel", { +core.register_node(":homedecor:chandelier_steel", { description = S("Chandelier (steel)"), paramtype = "light", light_source = 12, @@ -1186,7 +1186,7 @@ minetest.register_node(":homedecor:chandelier_steel", { }, }) -minetest.register_node(":homedecor:chandelier_brass", { +core.register_node(":homedecor:chandelier_brass", { description = S("Chandelier (brass)"), paramtype = "light", light_source = 12, @@ -1276,7 +1276,7 @@ for _, power in ipairs(lamp_power) do end end -minetest.register_lbm({ +core.register_lbm({ name = ":homedecor:convert_lighting", label = "Convert homedecor glowlights, table lamps, and standing lamps to use param2 color", run_at_every_load = false, @@ -1361,13 +1361,13 @@ minetest.register_lbm({ param2 = paletteidx end - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if string.find(name, "table_lamp") or string.find(name, "standing_lamp") then meta:set_string("palette", "ext") end - minetest.set_node(pos, { name = new_node, param2 = param2 }) + core.set_node(pos, { name = new_node, param2 = param2 }) meta:set_string("dye", "unifieddyes:"..color) end }) @@ -1381,7 +1381,7 @@ homedecor_lighting.old_static_desk_lamps = { "homedecor:desk_lamp_violet", } -minetest.register_lbm({ +core.register_lbm({ name = ":homedecor:convert_desk_lamps", label = "Convert homedecor desk lamps to use param2 color", run_at_every_load = false, @@ -1412,81 +1412,81 @@ minetest.register_lbm({ local param2 = paletteidx + new_fdir - minetest.set_node(pos, { name = "homedecor:desk_lamp", param2 = param2 }) - local meta = minetest.get_meta(pos) + core.set_node(pos, { name = "homedecor:desk_lamp", param2 = param2 }) + local meta = core.get_meta(pos) meta:set_string("dye", "unifieddyes:"..color) end }) -- aliases -minetest.register_alias("chains:chain_top", "homedecor:chain_steel_top") -minetest.register_alias("chains:chain_top_brass", "homedecor:chain_brass_top") +core.register_alias("chains:chain_top", "homedecor:chain_steel_top") +core.register_alias("chains:chain_top_brass", "homedecor:chain_brass_top") -minetest.register_alias("chains:chandelier", "homedecor:chandelier_steel") -minetest.register_alias("chains:chandelier_steel", "homedecor:chandelier_steel") -minetest.register_alias("chains:chandelier_brass", "homedecor:chandelier_brass") +core.register_alias("chains:chandelier", "homedecor:chandelier_steel") +core.register_alias("chains:chandelier_steel", "homedecor:chandelier_steel") +core.register_alias("chains:chandelier_brass", "homedecor:chandelier_brass") -minetest.register_alias("homedecor:glowlight_half", "homedecor:glowlight_half_14") -minetest.register_alias("homedecor:glowlight_quarter", "homedecor:glowlight_quarter_14") -minetest.register_alias("homedecor:glowlight_small_cube", "homedecor:glowlight_small_cube_14") -minetest.register_alias("homedecor:plasma_lamp", "homedecor:plasma_lamp_14") -minetest.register_alias("homedecor:ground_lantern", "homedecor:ground_lantern_14") -minetest.register_alias("homedecor:hanging_lantern", "homedecor:hanging_lantern_14") -minetest.register_alias("homedecor:ceiling_lantern", "homedecor:ceiling_lantern_14") -minetest.register_alias("homedecor:lattice_lantern_large", "homedecor:lattice_lantern_large_14") -minetest.register_alias("homedecor:lattice_lantern_small", "homedecor:lattice_lantern_small_14") -minetest.register_alias("homedecor:desk_lamp", "homedecor:desk_lamp_14") -minetest.register_alias("homedecor:ceiling_lamp", "homedecor:ceiling_lamp_14") -minetest.register_alias("homedecor:table_lamp", "homedecor:table_lamp_14") -minetest.register_alias("homedecor:standing_lamp", "homedecor:standing_lamp_14") -minetest.register_alias("3dforniture:table_lamp", "homedecor:table_lamp_14") +core.register_alias("homedecor:glowlight_half", "homedecor:glowlight_half_14") +core.register_alias("homedecor:glowlight_quarter", "homedecor:glowlight_quarter_14") +core.register_alias("homedecor:glowlight_small_cube", "homedecor:glowlight_small_cube_14") +core.register_alias("homedecor:plasma_lamp", "homedecor:plasma_lamp_14") +core.register_alias("homedecor:ground_lantern", "homedecor:ground_lantern_14") +core.register_alias("homedecor:hanging_lantern", "homedecor:hanging_lantern_14") +core.register_alias("homedecor:ceiling_lantern", "homedecor:ceiling_lantern_14") +core.register_alias("homedecor:lattice_lantern_large", "homedecor:lattice_lantern_large_14") +core.register_alias("homedecor:lattice_lantern_small", "homedecor:lattice_lantern_small_14") +core.register_alias("homedecor:desk_lamp", "homedecor:desk_lamp_14") +core.register_alias("homedecor:ceiling_lamp", "homedecor:ceiling_lamp_14") +core.register_alias("homedecor:table_lamp", "homedecor:table_lamp_14") +core.register_alias("homedecor:standing_lamp", "homedecor:standing_lamp_14") +core.register_alias("3dforniture:table_lamp", "homedecor:table_lamp_14") -minetest.register_alias("3dforniture:torch_wall", "homedecor:torch_wall") -minetest.register_alias("torch_wall", "homedecor:torch_wall") +core.register_alias("3dforniture:torch_wall", "homedecor:torch_wall") +core.register_alias("torch_wall", "homedecor:torch_wall") -minetest.register_alias("homedecor:plasma_ball", "homedecor:plasma_ball_on") -minetest.register_alias("homedecor:wall_lamp", "homedecor:wall_lamp_on") +core.register_alias("homedecor:plasma_ball", "homedecor:plasma_ball_on") +core.register_alias("homedecor:wall_lamp", "homedecor:wall_lamp_on") -minetest.register_alias("homedecor:rope_light_on_floor_0", "homedecor:rope_light_on_floor_off") -minetest.register_alias("homedecor:rope_light_on_floor_14", "homedecor:rope_light_on_floor_on") +core.register_alias("homedecor:rope_light_on_floor_0", "homedecor:rope_light_on_floor_off") +core.register_alias("homedecor:rope_light_on_floor_14", "homedecor:rope_light_on_floor_on") -minetest.register_alias("homedecor:rope_light_on_ceiling_0", "homedecor:rope_light_on_ceiling_off") -minetest.register_alias("homedecor:rope_light_on_ceiling_14", "homedecor:rope_light_on_ceiling_on") +core.register_alias("homedecor:rope_light_on_ceiling_0", "homedecor:rope_light_on_ceiling_off") +core.register_alias("homedecor:rope_light_on_ceiling_14", "homedecor:rope_light_on_ceiling_on") for name, level in pairs(word_to_bright) do - minetest.register_alias("homedecor:glowlight_half_"..name, "homedecor:glowlight_half_"..level) - minetest.register_alias("homedecor:glowlight_quarter_"..name, "homedecor:glowlight_quarter_"..level) - minetest.register_alias("homedecor:glowlight_small_cube_"..name, "homedecor:glowlight_small_cube_"..level) - minetest.register_alias("homedecor:rope_light_on_floor_"..name, "homedecor:rope_light_on_floor_"..level) - minetest.register_alias("homedecor:rope_light_on_ceiling_"..name, "homedecor:rope_light_on_ceiling_"..level) - minetest.register_alias("homedecor:plasma_lamp_"..name, "homedecor:plasma_lamp_"..level) - minetest.register_alias("homedecor:plasma_ball_"..name, "homedecor:plasma_ball_"..level) - minetest.register_alias("homedecor:ground_lantern_"..name, "homedecor:ground_lantern_"..level) - minetest.register_alias("homedecor:hanging_lantern_"..name, "homedecor:hanging_lantern_"..level) - minetest.register_alias("homedecor:ceiling_lantern_"..name, "homedecor:ceiling_lantern_"..level) - minetest.register_alias("homedecor:lattice_lantern_large_"..name, "homedecor:lattice_lantern_large_"..level) - minetest.register_alias("homedecor:lattice_lantern_small_"..name, "homedecor:lattice_lantern_small_"..level) - minetest.register_alias("homedecor:desk_lamp_"..name, "homedecor:desk_lamp_"..level) - minetest.register_alias("homedecor:ceiling_lamp_"..name, "homedecor:ceiling_lamp_"..level) - minetest.register_alias("homedecor:table_lamp_"..name, "homedecor:table_lamp_"..level) - minetest.register_alias("homedecor:standing_lamp_"..name, "homedecor:standing_lamp_"..level) - minetest.register_alias("3dforniture:table_lamp_"..name, "homedecor:table_lamp_"..level) + core.register_alias("homedecor:glowlight_half_"..name, "homedecor:glowlight_half_"..level) + core.register_alias("homedecor:glowlight_quarter_"..name, "homedecor:glowlight_quarter_"..level) + core.register_alias("homedecor:glowlight_small_cube_"..name, "homedecor:glowlight_small_cube_"..level) + core.register_alias("homedecor:rope_light_on_floor_"..name, "homedecor:rope_light_on_floor_"..level) + core.register_alias("homedecor:rope_light_on_ceiling_"..name, "homedecor:rope_light_on_ceiling_"..level) + core.register_alias("homedecor:plasma_lamp_"..name, "homedecor:plasma_lamp_"..level) + core.register_alias("homedecor:plasma_ball_"..name, "homedecor:plasma_ball_"..level) + core.register_alias("homedecor:ground_lantern_"..name, "homedecor:ground_lantern_"..level) + core.register_alias("homedecor:hanging_lantern_"..name, "homedecor:hanging_lantern_"..level) + core.register_alias("homedecor:ceiling_lantern_"..name, "homedecor:ceiling_lantern_"..level) + core.register_alias("homedecor:lattice_lantern_large_"..name, "homedecor:lattice_lantern_large_"..level) + core.register_alias("homedecor:lattice_lantern_small_"..name, "homedecor:lattice_lantern_small_"..level) + core.register_alias("homedecor:desk_lamp_"..name, "homedecor:desk_lamp_"..level) + core.register_alias("homedecor:ceiling_lamp_"..name, "homedecor:ceiling_lamp_"..level) + core.register_alias("homedecor:table_lamp_"..name, "homedecor:table_lamp_"..level) + core.register_alias("homedecor:standing_lamp_"..name, "homedecor:standing_lamp_"..level) + core.register_alias("3dforniture:table_lamp_"..name, "homedecor:table_lamp_"..level) end -if minetest.get_modpath("darkage") then - minetest.register_alias("homedecor:lattice_lantern_large", "darkage:lamp") +if core.get_modpath("darkage") then + core.register_alias("homedecor:lattice_lantern_large", "darkage:lamp") for n = 0, 14 do - minetest.register_alias("homedecor:lattice_lantern_large_"..n, "darkage:lamp") + core.register_alias("homedecor:lattice_lantern_large_"..n, "darkage:lamp") end for name, level in pairs(word_to_bright) do - minetest.register_alias("homedecor:lattice_lantern_large_"..name, "darkage:lamp") + core.register_alias("homedecor:lattice_lantern_large_"..name, "darkage:lamp") end end -- crafting -minetest.register_craft({ +core.register_craft({ output = 'homedecor:chain_steel_top', recipe = { {'default:steel_ingot'}, @@ -1494,7 +1494,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = 'homedecor:chandelier_steel', recipe = { {'', 'basic_materials:chainlink_steel', ''}, @@ -1505,7 +1505,7 @@ minetest.register_craft({ -- brass versions -minetest.register_craft({ +core.register_craft({ output = 'homedecor:chain_brass_top', recipe = { {'basic_materials:brass_ingot'}, @@ -1513,7 +1513,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = 'homedecor:chandelier_brass', recipe = { {'', 'basic_materials:chainlink_brass', ''}, @@ -1524,7 +1524,7 @@ minetest.register_craft({ -- candles -minetest.register_craft({ +core.register_craft({ output = "homedecor:candle_thin 4", recipe = { {"farming:string" }, @@ -1532,7 +1532,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:candle 2", recipe = { {"farming:string" }, @@ -1541,7 +1541,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:wall_sconce 2", recipe = { {"default:iron_lump", "", ""}, @@ -1550,7 +1550,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:candlestick_wrought_iron", recipe = { {""}, @@ -1559,7 +1559,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:candlestick_brass", recipe = { {""}, @@ -1568,7 +1568,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:oil_lamp", recipe = { { "", "vessels:glass_bottle", "" }, @@ -1577,7 +1577,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:oil_lamp_tabletop", recipe = { { "", "vessels:glass_bottle", "" }, @@ -1588,7 +1588,7 @@ minetest.register_craft({ -- Wrought-iron wall latern -minetest.register_craft({ +core.register_craft({ output = "homedecor:ground_lantern", recipe = { { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, @@ -1599,15 +1599,15 @@ minetest.register_craft({ -- wood-lattice lamps -if minetest.get_modpath("darkage") then - minetest.register_craft( { +if core.get_modpath("darkage") then + core.register_craft( { output = "homedecor:lattice_lantern_small 8", recipe = { { "darkage:lamp" }, }, }) - minetest.register_craft( { + core.register_craft( { output = "darkage:lamp", type = "shapeless", recipe = { @@ -1622,7 +1622,7 @@ if minetest.get_modpath("darkage") then }, }) else - minetest.register_craft( { + core.register_craft( { output = "homedecor:lattice_lantern_large 2", recipe = { { "dye:black", "dye:yellow", "dye:black" }, @@ -1631,14 +1631,14 @@ else }, }) - minetest.register_craft( { + core.register_craft( { output = "homedecor:lattice_lantern_small 8", recipe = { { "homedecor:lattice_lantern_large" }, }, }) - minetest.register_craft( { + core.register_craft( { output = "homedecor:lattice_lantern_large", type = "shapeless", recipe = { @@ -1667,21 +1667,21 @@ unifieddyes.register_color_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:glowlight_half 6", recipe = { { "default:glass", "basic_materials:energy_crystal_simple", "default:glass", }, } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:glowlight_half 6", recipe = { {"moreblocks:super_glow_glass", "moreblocks:glow_glass", "moreblocks:super_glow_glass", }, } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:glowlight_half", recipe = { {"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}, @@ -1689,7 +1689,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:glowlight_half", type = "shapeless", recipe = { @@ -1709,7 +1709,7 @@ unifieddyes.register_color_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:glowlight_quarter 6", recipe = { {"homedecor:glowlight_half", "homedecor:glowlight_half", "homedecor:glowlight_half", }, @@ -1727,7 +1727,7 @@ unifieddyes.register_color_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:glowlight_small_cube 8", recipe = { { "dye:white" }, @@ -1736,7 +1736,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:glowlight_small_cube 8", recipe = { {"dye:white" }, @@ -1744,7 +1744,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:glowlight_small_cube 4", recipe = { {"homedecor:glowlight_half" }, @@ -1753,7 +1753,7 @@ minetest.register_craft({ ---- -minetest.register_craft({ +core.register_craft({ output = "homedecor:plasma_lamp", recipe = { {"", "default:glass", ""}, @@ -1762,7 +1762,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:plasma_ball 2", recipe = { {"", "default:glass", ""}, @@ -1782,7 +1782,7 @@ unifieddyes.register_color_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:desk_lamp 2", recipe = { { "", "default:steel_ingot", "homedecor:glowlight_small_cube" }, @@ -1791,7 +1791,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:hanging_lantern 2", recipe = { { "default:iron_lump", "default:iron_lump", "" }, @@ -1800,7 +1800,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:ceiling_lantern 2", recipe = { { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, @@ -1809,7 +1809,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:wall_lamp 2", recipe = { { "", "homedecor:lattice_lantern_large", "" }, @@ -1818,7 +1818,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:ceiling_lamp", recipe = { { "", "basic_materials:brass_ingot", ""}, @@ -1827,7 +1827,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:rope_light_on_floor_off", type= "shapeless", recipe = { @@ -1835,7 +1835,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:rope_light_on_ceiling_off", type= "shapeless", recipe = { @@ -1843,7 +1843,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:ceiling_lamp", recipe = { { "", "basic_materials:chain_steel_top_brass", ""}, @@ -1862,7 +1862,7 @@ unifieddyes.register_color_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:standing_lamp_hi", recipe = { {"homedecor:table_lamp_hi"}, @@ -1882,13 +1882,13 @@ unifieddyes.register_color_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:table_lamp_hi", burntime = 10, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:table_lamp_hi", recipe = { { "wool:white", "default:torch", "wool:white"}, @@ -1897,7 +1897,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:table_lamp_hi", recipe = { { "cottages:wool", "default:torch", "cottages:wool"}, @@ -1906,7 +1906,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:table_lamp_hi", recipe = { { "wool:white", "default:torch", "wool:white"}, @@ -1915,7 +1915,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:table_lamp_hi", recipe = { { "cottages:wool", "default:torch", "cottages:wool"}, @@ -1924,7 +1924,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:torch_wall 10", recipe = { { "default:coal_lump" }, diff --git a/homedecor_misc/init.lua b/homedecor_misc/init.lua index f16413d8..7aa466ea 100644 --- a/homedecor_misc/init.lua +++ b/homedecor_misc/init.lua @@ -7,7 +7,7 @@ -- The code for ovens, nightstands, refrigerators are basically modified -- copies of the code for chests and furnaces. -local S = minetest.get_translator("homedecor_misc") +local S = core.get_translator("homedecor_misc") homedecor_misc = {} @@ -106,7 +106,7 @@ for _, pot in ipairs(pot_colors) do }) end -if minetest.get_modpath("flowers") then +if core.get_modpath("flowers") then local flowers_list = { { S("Rose"), "rose", "flowers:rose" }, { S("Tulip"), "tulip", "flowers:tulip" }, @@ -141,15 +141,15 @@ if minetest.get_modpath("flowers") then } }) - minetest.register_craft({ + core.register_craft({ type = "shapeless", output = "homedecor:potted_"..flower, recipe = { craftwith, "homedecor:flower_pot_small" } }) - minetest.register_alias("flowers:flower_"..flower.."_pot", "homedecor:potted_"..flower) - minetest.register_alias("flowers:potted_"..flower, "homedecor:potted_"..flower) - minetest.register_alias("flowers:flower_pot", "homedecor:flower_pot_small") + core.register_alias("flowers:flower_"..flower.."_pot", "homedecor:potted_"..flower) + core.register_alias("flowers:potted_"..flower, "homedecor:potted_"..flower) + core.register_alias("flowers:flower_pot", "homedecor:flower_pot_small") end end @@ -217,7 +217,7 @@ homedecor.register("fishtank", { key = "node_sound_glass_defaults", }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "homedecor:fishtank_lighted", param2 = node.param2}) + core.set_node(pos, {name = "homedecor:fishtank_lighted", param2 = node.param2}) return itemstack end }) @@ -233,7 +233,7 @@ homedecor.register("fishtank_lighted", { "homedecor_fishtank_water_top_lighted.png", "homedecor_fishtank_sides_lighted.png", }, - light_source = minetest.LIGHT_MAX-4, + light_source = core.LIGHT_MAX-4, use_texture_alpha = "blend", selection_box = ft_cbox, collision_box = ft_cbox, @@ -242,7 +242,7 @@ homedecor.register("fishtank_lighted", { key = "node_sound_glass_defaults", }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "homedecor:fishtank", param2 = node.param2}) + core.set_node(pos, {name = "homedecor:fishtank", param2 = node.param2}) return itemstack end, drop = "homedecor:fishtank", @@ -330,10 +330,10 @@ homedecor.register("pool_table", { _sound_def = { key = "node_sound_wood_defaults", }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, }) -minetest.register_alias("homedecor:pool_table_2", "air") +core.register_alias("homedecor:pool_table_2", "air") local piano_cbox = { type = "fixed", @@ -356,11 +356,11 @@ homedecor.register("piano", { _sound_def = { key = "node_sound_wood_defaults", }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, }) -minetest.register_alias("homedecor:piano_left", "homedecor:piano") -minetest.register_alias("homedecor:piano_right", "air") +core.register_alias("homedecor:piano_left", "homedecor:piano") +core.register_alias("homedecor:piano_right", "air") local tr_cbox = { type = "fixed", @@ -421,7 +421,7 @@ homedecor.register("skateboard", { _sound_def = { key = "node_sound_wood_defaults", }, - on_place = minetest.rotate_node + on_place = core.rotate_node }) homedecor_misc.banister_materials = { @@ -518,7 +518,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do if name == "wood" then local nn = "homedecor:"..nodename - local def2 = table.copy(minetest.registered_items[nn]) + local def2 = table.copy(core.registered_items[nn]) def2.tiles = { homedecor.white_wood, homedecor.white_wood @@ -569,9 +569,9 @@ homedecor.register("spiral_staircase", { _sound_def = { key = "node_sound_wood_defaults", }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, after_place_node = function(pos, placer, itemstack, pointed_thing) - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) + local fdir = core.dir_to_facedir(placer:get_look_dir()) local leftx = homedecor.fdir_to_left[fdir+1][1] local leftz = homedecor.fdir_to_left[fdir+1][2] local revx = -homedecor.fdir_to_fwd[fdir+1][1] @@ -588,43 +588,43 @@ homedecor.register("spiral_staircase", { y = math.max(corner1.y, corner2.y), z = math.max(corner1.z, corner2.z) } - if #minetest.find_nodes_in_area(minp, maxp, "air") < 11 then - minetest.set_node(pos, {name = "air"}) - minetest.chat_send_player(placer:get_player_name(), S("not enough space")) + if #core.find_nodes_in_area(minp, maxp, "air") < 11 then + core.set_node(pos, {name = "air"}) + core.chat_send_player(placer:get_player_name(), S("not enough space")) return true end - local belownode = minetest.get_node({ x = pos.x, y = pos.y - 1, z = pos.z }) + local belownode = core.get_node({ x = pos.x, y = pos.y - 1, z = pos.z }) if belownode and belownode.name == "homedecor:spiral_staircase" then local newpos = { x = pos.x, y = pos.y + 2, z = pos.z } - minetest.set_node(pos, { name = "air" }) - minetest.set_node(newpos, { name = "homedecor:spiral_staircase", param2 = belownode.param2 }) + core.set_node(pos, { name = "air" }) + core.set_node(newpos, { name = "homedecor:spiral_staircase", param2 = belownode.param2 }) end end }) -minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack, pointed_thing) - local belownode = minetest.get_node({ x = pos.x, y = pos.y - 1, z = pos.z }) +core.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack, pointed_thing) + local belownode = core.get_node({ x = pos.x, y = pos.y - 1, z = pos.z }) if newnode.name ~= "homedecor:spiral_staircase" and belownode and belownode.name == "homedecor:spiral_staircase" then - minetest.set_node(pos, { name = "air" }) + core.set_node(pos, { name = "air" }) local newpos = { x = pos.x, y = pos.y + 2, z = pos.z } - local checknode = minetest.get_node(newpos) + local checknode = core.get_node(newpos) if checknode and checknode.name == "air" then - local fdir = minetest.dir_to_facedir(placer:get_look_dir()) - minetest.set_node(newpos, { name = newnode.name, param2 = fdir }) + local fdir = core.dir_to_facedir(placer:get_look_dir()) + core.set_node(newpos, { name = newnode.name, param2 = fdir }) else return true end end end) -minetest.register_node(":homedecor:tatami_mat", { +core.register_node(":homedecor:tatami_mat", { tiles = { "homedecor_tatami.png", "homedecor_tatami.png", @@ -671,7 +671,7 @@ homedecor.register("dartboard", { -- -- Mostly my own code; overall template borrowed from game default -minetest.register_craft( { +core.register_craft( { output = "homedecor:flower_pot_terracotta", recipe = { { "homedecor:roof_tile_terracotta", homedecor.materials.dirt, "homedecor:roof_tile_terracotta" }, @@ -679,7 +679,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:flower_pot_green", recipe = { { "", "dye:dark_green", "" }, @@ -688,7 +688,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:flower_pot_black", recipe = { { homedecor.materials.dye_black, homedecor.materials.dye_black, homedecor.materials.dye_black }, @@ -697,7 +697,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:ceiling_paint 20", recipe = { @@ -709,7 +709,7 @@ minetest.register_craft( { replacements = { { homedecor.materials.water_bucket,homedecor.materials.empty_bucket } } }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:ceiling_tile 10", recipe = { { "", homedecor.materials.dye_white, "" }, @@ -717,14 +717,14 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:drawer_small", recipe = { { "group:wood", homedecor.materials.steel_ingot, "group:wood" }, }, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:drawer_small", burntime = 30, @@ -732,7 +732,7 @@ minetest.register_craft({ -- vertical poles/lampposts -minetest.register_craft( { +core.register_craft( { output = "homedecor:pole_brass 4", recipe = { { "", "basic_materials:brass_ingot", "" }, @@ -741,7 +741,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:pole_wrought_iron 4", recipe = { { homedecor.materials.iron_lump, }, @@ -753,7 +753,7 @@ minetest.register_craft( { -- =========================================================== -- Recipes that require materials from wool (cotton alternate) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:rug_small 8", recipe = { @@ -764,7 +764,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:rug_persian 8", recipe = { { "", "wool:yellow", "" }, @@ -775,7 +775,7 @@ minetest.register_craft( { -- cotton versions: -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:rug_small 8", recipe = { @@ -786,7 +786,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:rug_persian 8", recipe = { { "", "cotton:yellow", "" }, @@ -797,13 +797,13 @@ minetest.register_craft( { -- fuel recipes for same -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:rug_small", burntime = 30, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:rug_large 2", recipe = { @@ -812,13 +812,13 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:rug_large", burntime = 30, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:rug_persian", burntime = 30, @@ -826,7 +826,7 @@ minetest.register_craft({ -- more misc stuff here -minetest.register_craft({ +core.register_craft({ output = "homedecor:fishtank", recipe = { { "basic_materials:plastic_sheet", "homedecor:glowlight_small_cube", "basic_materials:plastic_sheet" }, @@ -836,7 +836,7 @@ minetest.register_craft({ replacements = { {homedecor.materials.water_bucket, homedecor.materials.empty_bucket} } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:cardboard_box 2", recipe = { { homedecor.materials.paper, "", homedecor.materials.paper }, @@ -844,7 +844,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:cardboard_box_big 2", recipe = { { homedecor.materials.paper, "", homedecor.materials.paper }, @@ -855,7 +855,7 @@ minetest.register_craft({ -- japanese walls and mat -minetest.register_craft( { +core.register_craft( { output = "homedecor:japanese_wall_top", recipe = { {"group:stick", homedecor.materials.paper}, @@ -864,7 +864,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:japanese_wall_top", recipe = { {homedecor.materials.paper, "group:stick"}, @@ -873,35 +873,35 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:japanese_wall_middle", recipe = { {"homedecor:japanese_wall_top"} }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:japanese_wall_bottom", recipe = { {"homedecor:japanese_wall_middle"} }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:japanese_wall_top", recipe = { {"homedecor:japanese_wall_bottom"} }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:tatami_mat", recipe = { {"farming:wheat", "farming:wheat", "farming:wheat"} }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:pool_table", recipe = { { "wool:dark_green", "wool:dark_green", "wool:dark_green" }, @@ -910,7 +910,7 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:dartboard", recipe = { {"dye:black", "basic_materials:plastic_sheet", "dye:white"}, @@ -919,7 +919,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:piano", recipe = { { "", "basic_materials:steel_wire", "building_blocks:hardwood" }, @@ -928,14 +928,14 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:wall_shelf 2", recipe = { { "homedecor:wood_table_small_square", "homedecor:curtainrod_wood", "homedecor:curtainrod_wood" }, }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:trophy 3", recipe = { { "default:gold_ingot","","default:gold_ingot" }, @@ -944,7 +944,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:sportbench", recipe = { { "stairs:slab_steelblock","basic_materials:steel_bar","stairs:slab_steelblock" }, @@ -953,7 +953,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:skateboard", recipe = { { "dye:yellow","dye:green","dye:blue" }, @@ -962,7 +962,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:spiral_staircase", recipe = { { "default:steelblock", "homedecor:pole_wrought_iron", "" }, @@ -971,12 +971,12 @@ minetest.register_craft({ }, }) -minetest.register_craftitem(":homedecor:flower_pot_small", { +core.register_craftitem(":homedecor:flower_pot_small", { description = S("Small Flower Pot"), inventory_image = "homedecor_flowerpot_small_inv.png" }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:flower_pot_small", recipe = { { "default:clay_brick", "", "default:clay_brick" }, @@ -984,7 +984,7 @@ minetest.register_craft( { } }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:flower_pot_small 3", recipe = { { "homedecor:flower_pot_terracotta" } } }) @@ -997,7 +997,7 @@ for i in ipairs(homedecor_misc.banister_materials) do local dye1 = homedecor_misc.banister_materials[i][7] local dye2 = homedecor_misc.banister_materials[i][8] - minetest.register_craft({ + core.register_craft({ output = "homedecor:banister_"..name.."_horizontal 2", recipe = { { topmat, "", dye1 }, @@ -1027,7 +1027,7 @@ local jp_cbox = { fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, } -minetest.register_node(":homedecor:japanese_wall_top", { +core.register_node(":homedecor:japanese_wall_top", { description = S("Japanese wall (top)"), drawtype = "mesh", mesh = "homedecor_wall_japanese_top.obj", @@ -1047,7 +1047,7 @@ minetest.register_node(":homedecor:japanese_wall_top", { }, }) -minetest.register_node(":homedecor:japanese_wall_middle", { +core.register_node(":homedecor:japanese_wall_middle", { description = S("Japanese wall"), drawtype = "mesh", mesh = "homedecor_wall_japanese_middle.obj", @@ -1067,7 +1067,7 @@ minetest.register_node(":homedecor:japanese_wall_middle", { }, }) -minetest.register_node(":homedecor:japanese_wall_bottom", { +core.register_node(":homedecor:japanese_wall_bottom", { description = S("Japanese wall (bottom)"), drawtype = "mesh", mesh = "homedecor_wall_japanese_bottom.obj", diff --git a/homedecor_office/init.lua b/homedecor_office/init.lua index 13cca903..28c1d802 100644 --- a/homedecor_office/init.lua +++ b/homedecor_office/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_office") +local S = core.get_translator("homedecor_office") homedecor.register("filing_cabinet", { description = S("Filing cabinet"), @@ -69,7 +69,7 @@ homedecor.register("desk", { } } }) -minetest.register_alias("homedecor:desk_r", "air") +core.register_alias("homedecor:desk_r", "air") local globe_cbox = { type = "fixed", @@ -132,7 +132,7 @@ homedecor.register("calendar", { }, infotext = S("Date (right-click to update):\n@1", os.date("%Y-%m-%d")), -- ISO 8601 format on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local date = os.date("%Y-%m-%d") meta:set_string("infotext", S("Date (right-click to update):\n@1", date)) return itemstack diff --git a/homedecor_pictures_and_paintings/init.lua b/homedecor_pictures_and_paintings/init.lua index 39c79c24..7354bd01 100644 --- a/homedecor_pictures_and_paintings/init.lua +++ b/homedecor_pictures_and_paintings/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_pictures_and_paintings") +local S = core.get_translator("homedecor_pictures_and_paintings") local wood_tex = homedecor.textures.wood.apple.planks @@ -55,14 +55,14 @@ end -- crafting -minetest.register_craftitem(":homedecor:blank_canvas", { +core.register_craftitem(":homedecor:blank_canvas", { description = S("Blank Canvas"), inventory_image = "homedecor_blank_canvas.png" }) -- paintings -minetest.register_craft({ +core.register_craft({ output = "homedecor:blank_canvas", recipe = { { "", "group:stick", "" }, @@ -142,7 +142,7 @@ for i,recipe in pairs(painting_patterns) do local item5 = homedecor.materials["dye_"..recipe[2][2]] local item6 = homedecor.materials["dye_"..recipe[2][3]] - minetest.register_craft({ + core.register_craft({ output = "homedecor:painting_"..i, recipe = { { item1, item2, item3 }, @@ -158,7 +158,7 @@ local picture_dyes = { } for i in ipairs(picture_dyes) do - minetest.register_craft({ + core.register_craft({ output = "homedecor:picture_frame"..i, recipe = { { homedecor.materials[picture_dyes[i][1]], homedecor.materials[picture_dyes[i][2]] }, @@ -172,7 +172,7 @@ for i = 2,20 do table.insert(numbers, i) end -if minetest.get_modpath("i3") then +if core.get_modpath("i3") then i3.compress("homedecor:painting_1", { replace = "1", by = numbers diff --git a/homedecor_plasmascreen/init.lua b/homedecor_plasmascreen/init.lua index d03da70d..475c020f 100644 --- a/homedecor_plasmascreen/init.lua +++ b/homedecor_plasmascreen/init.lua @@ -1,6 +1,6 @@ -local S = minetest.get_translator("homedecor_plasmascreen") +local S = core.get_translator("homedecor_plasmascreen") -local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil +local sc_disallow = core.get_modpath("screwdriver") and screwdriver.disallow or nil homedecor.register("tv_stand", { description = S("Plasma Screen TV Stand"), @@ -56,7 +56,7 @@ local tv_cbox = { local function checkwall(pos) - local fdir = minetest.get_node(pos).param2 + local fdir = core.get_node(pos).param2 local dxl = fdir_to_left[fdir + 1][1] -- dxl = "[D]elta [X] [L]eft" local dzl = fdir_to_left[fdir + 1][2] -- Z left @@ -64,33 +64,33 @@ local function checkwall(pos) local dxr = fdir_to_right[fdir + 1][1] -- X right local dzr = fdir_to_right[fdir + 1][2] -- Z right - local node1 = minetest.get_node({x=pos.x+dxl, y=pos.y, z=pos.z+dzl}) - if not node1 or not minetest.registered_nodes[node1.name] - or not minetest.registered_nodes[node1.name].buildable_to then + local node1 = core.get_node({x=pos.x+dxl, y=pos.y, z=pos.z+dzl}) + if not node1 or not core.registered_nodes[node1.name] + or not core.registered_nodes[node1.name].buildable_to then return false end - local node2 = minetest.get_node({x=pos.x+dxr, y=pos.y, z=pos.z+dzr}) - if not node2 or not minetest.registered_nodes[node2.name] - or not minetest.registered_nodes[node2.name].buildable_to then + local node2 = core.get_node({x=pos.x+dxr, y=pos.y, z=pos.z+dzr}) + if not node2 or not core.registered_nodes[node2.name] + or not core.registered_nodes[node2.name].buildable_to then return false end - local node3 = minetest.get_node({x=pos.x+dxl, y=pos.y+1, z=pos.z+dzl}) - if not node3 or not minetest.registered_nodes[node3.name] - or not minetest.registered_nodes[node3.name].buildable_to then + local node3 = core.get_node({x=pos.x+dxl, y=pos.y+1, z=pos.z+dzl}) + if not node3 or not core.registered_nodes[node3.name] + or not core.registered_nodes[node3.name].buildable_to then return false end - local node4 = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}) - if not node4 or not minetest.registered_nodes[node4.name] - or not minetest.registered_nodes[node4.name].buildable_to then + local node4 = core.get_node({x=pos.x, y=pos.y+1, z=pos.z}) + if not node4 or not core.registered_nodes[node4.name] + or not core.registered_nodes[node4.name].buildable_to then return false end - local node5 = minetest.get_node({x=pos.x+dxr, y=pos.y+1, z=pos.z+dzr}) - if not node5 or not minetest.registered_nodes[node5.name] - or not minetest.registered_nodes[node5.name].buildable_to then + local node5 = core.get_node({x=pos.x+dxr, y=pos.y+1, z=pos.z+dzr}) + if not node5 or not core.registered_nodes[node5.name] + or not core.registered_nodes[node5.name].buildable_to then return false end @@ -124,12 +124,12 @@ homedecor.register("tv", { groups = {snappy=1, choppy=2, oddly_breakable_by_hand=2}, after_place_node = function(pos, placer, itemstack) if not checkwall(pos) then - minetest.set_node(pos, {name = "air"}) + core.set_node(pos, {name = "air"}) return true -- "API: If return true no item is taken from itemstack" end end, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "homedecor:tv_off", param2 = node.param2}) + core.set_node(pos, {name = "homedecor:tv_off", param2 = node.param2}) end, crafts = { { @@ -165,22 +165,22 @@ homedecor.register("tv_off", { groups = {snappy=1, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1}, after_place_node = function(pos, placer, itemstack) if not checkwall(pos) then - minetest.set_node(pos, {name = "air"}) + core.set_node(pos, {name = "air"}) return true -- "API: If return true no item is taken from itemstack" end end, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "homedecor:tv", param2 = node.param2}) + core.set_node(pos, {name = "homedecor:tv", param2 = node.param2}) end, drop = "homedecor:tv", }) -minetest.register_alias("plasmascreen:screen1", "air") -minetest.register_alias("plasmascreen:screen2", "air") -minetest.register_alias("plasmascreen:screen3", "air") -minetest.register_alias("plasmascreen:screen4", "air") -minetest.register_alias("plasmascreen:screen6", "air") -minetest.register_alias("plasmascreen:screen5", "homedecor:tv") -minetest.register_alias("plasmascreen:stand", "homedecor:tv_stand") -minetest.register_alias("plasmascreen:tv", "homedecor:tv") -minetest.register_alias("plasmascreen:tv_off", "homedecor:tv_off") \ No newline at end of file +core.register_alias("plasmascreen:screen1", "air") +core.register_alias("plasmascreen:screen2", "air") +core.register_alias("plasmascreen:screen3", "air") +core.register_alias("plasmascreen:screen4", "air") +core.register_alias("plasmascreen:screen6", "air") +core.register_alias("plasmascreen:screen5", "homedecor:tv") +core.register_alias("plasmascreen:stand", "homedecor:tv_stand") +core.register_alias("plasmascreen:tv", "homedecor:tv") +core.register_alias("plasmascreen:tv_off", "homedecor:tv_off") \ No newline at end of file diff --git a/homedecor_roofing/init.lua b/homedecor_roofing/init.lua index 54993f58..56e5f385 100644 --- a/homedecor_roofing/init.lua +++ b/homedecor_roofing/init.lua @@ -1,8 +1,8 @@ -local S = minetest.get_translator("homedecor_roofing") +local S = core.get_translator("homedecor_roofing") homedecor_roofing = {} -minetest.register_node(":homedecor:skylight", { +core.register_node(":homedecor:skylight", { description = S("Glass Skylight"), drawtype = "raillike", tiles = { homedecor.textures.glass.pane }, @@ -19,7 +19,7 @@ minetest.register_node(":homedecor:skylight", { collision_box = homedecor.nodebox.slab_y(0.1), }) -minetest.register_node(":homedecor:skylight_frosted", { +core.register_node(":homedecor:skylight_frosted", { description = S("Glass Skylight Frosted"), drawtype = "raillike", tiles = { "homedecor_skylight_frosted.png" }, @@ -38,7 +38,7 @@ minetest.register_node(":homedecor:skylight_frosted", { }) for s, s_loc in pairs({ ["asphalt"] = S("asphalt"), ["terracotta"] = S("terracotta"), ["wood"] = S("wood") }) do - minetest.register_node(":homedecor:shingles_"..s, { + core.register_node(":homedecor:shingles_"..s, { description = S("Shingles (@1)", s_loc), drawtype = "raillike", tiles = { "homedecor_shingles_"..s..".png" }, @@ -97,7 +97,7 @@ homedecor_roofing.register_outer_corner = function(modname, subname, groups, slo end groups.axey=5 - minetest.register_node(":"..modname..":shingle_outer_corner_" .. subname, { + core.register_node(":"..modname..":shingle_outer_corner_" .. subname, { description = S("@1 (outer corner)", description), drawtype = "mesh", mesh = "homedecor_slope_outer_corner.obj", @@ -109,7 +109,7 @@ homedecor_roofing.register_outer_corner = function(modname, subname, groups, slo groups = groups, is_ground_content = false, _mcl_hardness=1.6, - on_place = minetest.rotate_node, + on_place = core.rotate_node, _sound_def = { key = "node_sound_wood_defaults", }, @@ -124,7 +124,7 @@ homedecor_roofing.register_inner_corner = function(modname, subname, groups, slo end groups.axey=5 - minetest.register_node(":"..modname..":shingle_inner_corner_" .. subname, { + core.register_node(":"..modname..":shingle_inner_corner_" .. subname, { description = S("@1 (inner corner)", description), drawtype = "mesh", mesh = "homedecor_slope_inner_corner.obj", @@ -135,7 +135,7 @@ homedecor_roofing.register_inner_corner = function(modname, subname, groups, slo groups = groups, is_ground_content = false, _mcl_hardness=1.6, - on_place = minetest.rotate_node, + on_place = core.rotate_node, _sound_def = { key = "node_sound_wood_defaults", }, @@ -150,7 +150,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups end groups.axey=5 - minetest.register_node(":"..modname..":shingle_side_" .. subname, { + core.register_node(":"..modname..":shingle_side_" .. subname, { description = description, drawtype = "mesh", mesh = "homedecor_slope.obj", @@ -163,7 +163,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups groups = groups, is_ground_content = false, _mcl_hardness=1.6, - on_place = minetest.rotate_node, + on_place = core.rotate_node, _sound_def = { key = "node_sound_wood_defaults", }, @@ -171,14 +171,14 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups -- convert between flat shingles and slopes - minetest.register_craft({ + core.register_craft({ output = modname..":shingle_side_"..subname.." 3", recipe = { {recipeitem, recipeitem, recipeitem} } }) - minetest.register_craft({ + core.register_craft({ output = recipeitem.." 3", recipe = { {modname..":shingle_side_"..subname, modname..":shingle_side_"..subname, modname..":shingle_side_"..subname}, @@ -187,7 +187,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups -- craft outer corners - minetest.register_craft({ + core.register_craft({ output = modname..":shingle_outer_corner_"..subname.." 3", recipe = { { "", recipeitem, "" }, @@ -195,7 +195,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups } }) - minetest.register_craft({ + core.register_craft({ output = modname..":shingle_outer_corner_"..subname.." 3", recipe = { { "", modname..":shingle_side_"..subname, "" }, @@ -205,7 +205,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups -- craft inner corners - minetest.register_craft({ + core.register_craft({ output = modname..":shingle_inner_corner_"..subname.." 3", recipe = { {recipeitem, recipeitem}, @@ -213,7 +213,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups } }) - minetest.register_craft({ + core.register_craft({ output = modname..":shingle_inner_corner_"..subname.." 3", recipe = { {modname..":shingle_side_"..subname, modname..":shingle_side_"..subname}, @@ -222,60 +222,60 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups }) -- convert between flat shingles and inner/outer corners - minetest.register_craft({ + core.register_craft({ type = "shapeless", output = recipeitem.." 1", recipe = { modname..":shingle_outer_corner_"..subname } }) - minetest.register_craft({ + core.register_craft({ type = "shapeless", output = recipeitem.." 1", recipe = { modname..":shingle_inner_corner_"..subname } }) end -minetest.register_craft( { +core.register_craft( { output = "homedecor:shingle_side_glass", recipe = { { "homedecor:skylight", "homedecor:skylight", "homedecor:skylight" } } }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:roof_tile_terracotta 8", recipe = { { "homedecor:shingle_outer_corner_terracotta", "homedecor:shingle_outer_corner_terracotta" } } }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:roof_tile_terracotta 8", recipe = { { "homedecor:shingle_inner_corner_terracotta", "homedecor:shingle_inner_corner_terracotta" } } }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:roof_tile_terracotta 8", recipe = { { "homedecor:shingle_side_terracotta", "homedecor:shingle_side_terracotta" } } }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:shingle_inner_corner_wood", burntime = 30, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:shingle_outer_corner_wood", burntime = 30, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:shingle_side_wood", burntime = 30, @@ -353,7 +353,7 @@ homedecor.register("chimney", { }) -- crafting -minetest.register_craft({ +core.register_craft({ output = "homedecor:chimney 2", recipe = { { "default:clay_brick", "", "default:clay_brick" }, @@ -362,7 +362,7 @@ minetest.register_craft({ }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:skylight 4", recipe = { { "homedecor:glass_table_large", "homedecor:glass_table_large" }, @@ -370,7 +370,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { type = "shapeless", output = "homedecor:skylight_frosted", recipe = { @@ -379,7 +379,7 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ type = "cooking", output = "homedecor:skylight", recipe = "homedecor:skylight_frosted", @@ -387,7 +387,7 @@ minetest.register_craft({ -- recycling -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "vessels:glass_fragments 2", recipe = { diff --git a/homedecor_seating/armchairs.lua b/homedecor_seating/armchairs.lua index 6de86d62..493c98de 100644 --- a/homedecor_seating/armchairs.lua +++ b/homedecor_seating/armchairs.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_seating") +local S = core.get_translator("homedecor_seating") local armchair_cbox = { type = "fixed", fixed = { @@ -7,7 +7,7 @@ local armchair_cbox = { } } -minetest.register_node(":lrfurn:armchair", { +core.register_node(":lrfurn:armchair", { description = S("Armchair"), drawtype = "mesh", mesh = "lrfurn_armchair.obj", @@ -68,7 +68,7 @@ homedecor.register("armchair", { -- crafts -minetest.register_craft({ +core.register_craft({ output = "lrfurn:armchair", recipe = { {"wool:white", "", "", }, @@ -77,7 +77,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "lrfurn:armchair", recipe = { {"wool:white", "", "", }, @@ -97,7 +97,7 @@ unifieddyes.register_color_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:armchair 2", recipe = { { homedecor.materials.wool_white,""}, @@ -117,13 +117,13 @@ unifieddyes.register_color_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:armchair", burntime = 30, }) -minetest.register_alias('armchair', 'homedecor:armchair') +core.register_alias('armchair', 'homedecor:armchair') -- convert old static nodes to param2 color @@ -133,7 +133,7 @@ for _, color in ipairs(lrfurn.colors) do table.insert(lrfurn.old_static_armchairs, "lrfurn:armchair_"..color) end -minetest.register_lbm({ +core.register_lbm({ name = ":lrfurn:convert_armchairs", label = "Convert lrfurn armchairs to use param2 color", run_at_every_load = false, @@ -168,12 +168,12 @@ minetest.register_lbm({ local param2 = paletteidx + new_fdir - minetest.set_node(pos, { name = "lrfurn:armchair", param2 = param2 }) - local meta = minetest.get_meta(pos) + core.set_node(pos, { name = "lrfurn:armchair", param2 = param2 }) + local meta = core.get_meta(pos) meta:set_string("dye", "unifieddyes:"..color) end }) -if minetest.settings:get("log_mods") then - minetest.log("action", "[lrfurn/armchairs] Loaded!") +if core.settings:get("log_mods") then + core.log("action", "[lrfurn/armchairs] Loaded!") end diff --git a/homedecor_seating/init.lua b/homedecor_seating/init.lua index 99318e97..6b6c4776 100644 --- a/homedecor_seating/init.lua +++ b/homedecor_seating/init.lua @@ -1,8 +1,8 @@ -- Home decor seating -- forked from the previous lrfurn mod -local S = minetest.get_translator("homedecor_seating") -local modpath = minetest.get_modpath("homedecor_seating") +local S = core.get_translator("homedecor_seating") +local modpath = core.get_modpath("homedecor_seating") lrfurn = {} @@ -43,25 +43,25 @@ function lrfurn.check_right(pos, fdir, long, placer) y = pos.y, z = pos.z + lrfurn.fdir_to_right[fdir+1][2] * 2 } - local node2 = minetest.get_node(pos2) + local node2 = core.get_node(pos2) if node2 and node2.name ~= "air" then return false - elseif minetest.is_protected(pos2, placer:get_player_name()) then + elseif core.is_protected(pos2, placer:get_player_name()) then if not long then - minetest.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the other end goes!")) + core.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the other end goes!")) else - minetest.chat_send_player(placer:get_player_name(), + core.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the middle or far end goes!")) end return false end if long then - local node3 = minetest.get_node(pos3) + local node3 = core.get_node(pos3) if node3 and node3.name ~= "air" then return false - elseif minetest.is_protected(pos3, placer:get_player_name()) then - minetest.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the other end goes!")) + elseif core.is_protected(pos3, placer:get_player_name()) then + core.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the other end goes!")) return false end end @@ -70,18 +70,18 @@ function lrfurn.check_right(pos, fdir, long, placer) end function lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing) - local node = minetest.get_node(pos) + local node = core.get_node(pos) local colorbits = node.param2 - (node.param2 % 8) local yaw = placer:get_look_horizontal() - local dir = minetest.yaw_to_dir(yaw) - local fdir = minetest.dir_to_wallmounted(dir) - minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits }) + local dir = core.yaw_to_dir(yaw) + local fdir = core.dir_to_wallmounted(dir) + core.swap_node(pos, { name = node.name, param2 = fdir+colorbits }) end local seated_cache = {} local offset_cache = {} -minetest.register_entity("homedecor_seating:seat", { +core.register_entity("homedecor_seating:seat", { initial_properties = { visual = "cube", --comment out the following when testing so you can see it @@ -151,12 +151,12 @@ function lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, seats) } --generate posible seat positions - local valid_seats = {[minetest.hash_node_position(pos)] = pos} + local valid_seats = {[core.hash_node_position(pos)] = pos} if seats > 1 then for i=1,seats-1 do --since this are hardware colored nodes, node.param2 gives us a actual param to get a dir from local npos = vector.add(pos, vector.multiply(p2d[node.param2 % 8], i)) - valid_seats[minetest.hash_node_position(npos)] = npos + valid_seats[core.hash_node_position(npos)] = npos end end @@ -165,7 +165,7 @@ function lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, seats) local sit_hash for hash, spos in pairs(valid_seats) do local pstatus = false - for _, ref in pairs(minetest.get_objects_inside_radius(spos, 0.5)) do + for _, ref in pairs(core.get_objects_inside_radius(spos, 0.5)) do if ref:is_player() and seated_cache[ref:get_player_name()] then pstatus = true end @@ -177,18 +177,18 @@ function lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, seats) end end if not sit_pos then - minetest.chat_send_player(name, "sorry, this seat is currently occupied") + core.chat_send_player(name, "sorry, this seat is currently occupied") return itemstack end --seat the player clicker:set_pos(sit_pos) - local entity = minetest.add_entity(sit_pos, "homedecor_seating:seat") + local entity = core.add_entity(sit_pos, "homedecor_seating:seat") if not entity then return itemstack end --catch for when the entity fails to spawn just in case clicker:set_attach(entity, "", {x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0}, true) - local nodedef = minetest.registered_nodes[node.name] + local nodedef = core.registered_nodes[node.name] if nodedef.paramtype2 == "facedir" then entity:set_rotation({x = 0, y = p2r_facedir[node.param2 % 4], z = 0}) elseif string.find(node.name, "sofa") then @@ -199,7 +199,7 @@ function lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, seats) xcompat.player.player_attached[name] = true xcompat.player.set_animation(clicker, "sit", 0) - seated_cache[name] = minetest.hash_node_position(pos) + seated_cache[name] = core.hash_node_position(pos) if seated_cache[name] ~= sit_hash then offset_cache[name] = core.hash_node_position(vector.subtract(pos, sit_pos)) end @@ -225,8 +225,8 @@ end -- Called when a seat is destroyed function lrfurn.on_seat_destruct(pos) for name, seatpos in pairs(seated_cache) do - if seatpos == minetest.hash_node_position(pos) then - local player = minetest.get_player_by_name(name) + if seatpos == core.hash_node_position(pos) then + local player = core.get_player_by_name(name) if player then lrfurn.stand(player) end @@ -259,7 +259,7 @@ function lrfurn.on_seat_movenode(from_pos, to_pos) end --if the player gets killed in the seat, handle it -minetest.register_on_dieplayer(function(player) +core.register_on_dieplayer(function(player) if seated_cache[player:get_player_name()] then lrfurn.stand(player) end diff --git a/homedecor_seating/longsofas.lua b/homedecor_seating/longsofas.lua index 5d22a69e..83f5e583 100644 --- a/homedecor_seating/longsofas.lua +++ b/homedecor_seating/longsofas.lua @@ -1,11 +1,11 @@ -local S = minetest.get_translator("homedecor_seating") +local S = core.get_translator("homedecor_seating") local longsofa_cbox = { type = "wallmounted", wall_side = {-0.5, -0.5, -0.5, 0.5, 0.5, 2.5}, } -minetest.register_node(":lrfurn:longsofa", { +core.register_node(":lrfurn:longsofa", { description = S("Long Sofa"), drawtype = "mesh", mesh = "lrfurn_sofa_long.obj", @@ -26,21 +26,21 @@ minetest.register_node(":lrfurn:longsofa", { }, selection_box = longsofa_cbox, node_box = longsofa_cbox, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, after_place_node = function(pos, placer, itemstack, pointed_thing) lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing) local playername = placer:get_player_name() - if minetest.is_protected(pos, placer:get_player_name()) then return true end + if core.is_protected(pos, placer:get_player_name()) then return true end - local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) + local fdir = core.dir_to_facedir(placer:get_look_dir(), false) if lrfurn.check_right(pos, fdir, true, placer) then - if not minetest.is_creative_enabled(playername) then + if not core.is_creative_enabled(playername) then itemstack:take_item() end else - minetest.chat_send_player(placer:get_player_name(), S("No room to place the sofa!")) - minetest.set_node(pos, { name = "air" }) + core.chat_send_player(placer:get_player_name(), S("No room to place the sofa!")) + core.set_node(pos, { name = "air" }) end return itemstack end, @@ -52,7 +52,7 @@ minetest.register_node(":lrfurn:longsofa", { on_movenode = lrfurn.on_seat_movenode, }) -minetest.register_craft({ +core.register_craft({ output = "lrfurn:longsofa", recipe = { {homedecor.materials.wool_white, homedecor.materials.wool_white, homedecor.materials.wool_white, }, @@ -61,7 +61,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "lrfurn:longsofa", recipe = { {homedecor.materials.wool_white, homedecor.materials.wool_white, homedecor.materials.wool_white, }, @@ -89,7 +89,7 @@ for _, color in ipairs(lrfurn.colors) do table.insert(lrfurn.old_static_longsofas, "lrfurn:longsofa_"..color) end -minetest.register_lbm({ +core.register_lbm({ name = ":lrfurn:convert_longsofas", label = "Convert lrfurn long sofas to use param2 color", run_at_every_load = false, @@ -124,13 +124,13 @@ minetest.register_lbm({ local param2 = paletteidx + new_fdir - minetest.set_node(pos, { name = "lrfurn:longsofa", param2 = param2 }) - local meta = minetest.get_meta(pos) + core.set_node(pos, { name = "lrfurn:longsofa", param2 = param2 }) + local meta = core.get_meta(pos) meta:set_string("dye", "unifieddyes:"..color) end }) -if minetest.settings:get("log_mods") then - minetest.log("action", "[lrfurn/longsofas] Loaded!") +if core.settings:get("log_mods") then + core.log("action", "[lrfurn/longsofas] Loaded!") end diff --git a/homedecor_seating/misc.lua b/homedecor_seating/misc.lua index 4ceb5865..434ac0db 100644 --- a/homedecor_seating/misc.lua +++ b/homedecor_seating/misc.lua @@ -1,7 +1,7 @@ -- this component contains all of the random types of seating previously -- scattered among homedecor's other mods -local S = minetest.get_translator("homedecor_seating") +local S = core.get_translator("homedecor_seating") local dc_cbox = { type = "fixed", @@ -19,7 +19,7 @@ homedecor.register("deckchair", { }, selection_box = dc_cbox, collision_box = dc_cbox, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1) end, @@ -27,8 +27,8 @@ homedecor.register("deckchair", { on_movenode = lrfurn.on_seat_movenode, }) -minetest.register_alias("homedecor:deckchair_foot", "homedecor:deckchair") -minetest.register_alias("homedecor:deckchair_head", "air") +core.register_alias("homedecor:deckchair_foot", "homedecor:deckchair") +core.register_alias("homedecor:deckchair_head", "air") homedecor.register("deckchair_striped_blue", { mesh = "homedecor_deckchair.obj", @@ -41,7 +41,7 @@ homedecor.register("deckchair_striped_blue", { }, selection_box = dc_cbox, collision_box = dc_cbox, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1) end, @@ -99,11 +99,11 @@ homedecor.register("bench_large_1", { }, selection_box = bl1_sbox, node_box = bl1_cbox, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, }) -minetest.register_alias("homedecor:bench_large_1_left", "homedecor:bench_large_1") -minetest.register_alias("homedecor:bench_large_1_right", "air") +core.register_alias("homedecor:bench_large_1_left", "homedecor:bench_large_1") +core.register_alias("homedecor:bench_large_1_right", "air") local bl2_sbox = { type = "fixed", @@ -130,11 +130,11 @@ homedecor.register("bench_large_2", { _sound_def = { key = "node_sound_wood_defaults", }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, }) -minetest.register_alias("homedecor:bench_large_2_left", "homedecor:bench_large_2") -minetest.register_alias("homedecor:bench_large_2_right", "air") +core.register_alias("homedecor:bench_large_2_left", "homedecor:bench_large_2") +core.register_alias("homedecor:bench_large_2_right", "air") local kc_cbox = { type = "fixed", @@ -226,7 +226,7 @@ for _, c in pairs(chairs) do selection_box = ofchairs_sbox, collision_box = ofchairs_cbox, expand = { top = "placeholder" }, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) return lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, 1) end, @@ -237,7 +237,7 @@ end -- crafts! -minetest.register_craft( { +core.register_craft( { output = "homedecor:bench_large_1", recipe = { { "group:wood", "group:wood", "group:wood" }, @@ -246,7 +246,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:bench_large_2_left", recipe = { { "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" }, @@ -255,7 +255,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:bench_large_2_left", recipe = { { "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" }, @@ -264,7 +264,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:simple_bench", recipe = { { homedecor.materials.slab_wood, homedecor.materials.slab_wood, homedecor.materials.slab_wood }, @@ -272,7 +272,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:simple_bench", recipe = { { "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" }, @@ -281,7 +281,7 @@ minetest.register_craft( { }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:deckchair", recipe = { { "group:stick", "building_blocks:terrycloth_towel", "group:stick" }, @@ -290,7 +290,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:deckchair_striped_blue", type = "shapeless", recipe = { @@ -299,7 +299,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:kitchen_chair_wood 2", recipe = { { "group:stick",""}, @@ -308,7 +308,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:kitchen_chair_padded", recipe = { @@ -328,20 +328,20 @@ unifieddyes.register_color_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:kitchen_chair_wood", burntime = 15, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:kitchen_chair_padded", burntime = 15, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:office_chair_basic", recipe = { { "", "", homedecor.materials.wool_black }, @@ -350,7 +350,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:office_chair_upscale", recipe = { { homedecor.materials.dye_black, "building_blocks:sticks", "group:wool" }, @@ -361,5 +361,5 @@ minetest.register_craft({ -- aliases -minetest.register_alias("3dforniture:chair", "homedecor:chair") -minetest.register_alias('chair', 'homedecor:chair') +core.register_alias("3dforniture:chair", "homedecor:chair") +core.register_alias('chair', 'homedecor:chair') diff --git a/homedecor_seating/sofas.lua b/homedecor_seating/sofas.lua index ff1f3c95..b987366f 100644 --- a/homedecor_seating/sofas.lua +++ b/homedecor_seating/sofas.lua @@ -1,11 +1,11 @@ -local S = minetest.get_translator("homedecor_seating") +local S = core.get_translator("homedecor_seating") local sofa_cbox = { type = "wallmounted", wall_side = {-0.5, -0.5, -0.5, 0.5, 0.5, 1.5} } -minetest.register_node(":lrfurn:sofa", { +core.register_node(":lrfurn:sofa", { description = S("Sofa"), drawtype = "mesh", mesh = "lrfurn_sofa_short.obj", @@ -26,21 +26,21 @@ minetest.register_node(":lrfurn:sofa", { }, selection_box = sofa_cbox, node_box = sofa_cbox, - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.disallow or nil, after_place_node = function(pos, placer, itemstack, pointed_thing) lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing) local playername = placer:get_player_name() - if minetest.is_protected(pos, placer:get_player_name()) then return true end + if core.is_protected(pos, placer:get_player_name()) then return true end - local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) + local fdir = core.dir_to_facedir(placer:get_look_dir(), false) if lrfurn.check_right(pos, fdir, false, placer) then - if not minetest.is_creative_enabled(playername) then + if not core.is_creative_enabled(playername) then itemstack:take_item() end else - minetest.chat_send_player(placer:get_player_name(), S("No room to place the sofa!")) - minetest.set_node(pos, { name = "air" }) + core.chat_send_player(placer:get_player_name(), S("No room to place the sofa!")) + core.set_node(pos, { name = "air" }) end return itemstack end, @@ -52,7 +52,7 @@ minetest.register_node(":lrfurn:sofa", { on_movenode = lrfurn.on_seat_movenode, }) -minetest.register_craft({ +core.register_craft({ output = "lrfurn:sofa", recipe = { {homedecor.materials.wool_white, homedecor.materials.wool_white, "", }, @@ -61,7 +61,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "lrfurn:sofa", recipe = { {homedecor.materials.wool_white, homedecor.materials.wool_white, "", }, @@ -89,7 +89,7 @@ for _, color in ipairs(lrfurn.colors) do table.insert(lrfurn.old_static_sofas, "lrfurn:sofa_"..color) end -minetest.register_lbm({ +core.register_lbm({ name = ":lrfurn:convert_sofas", label = "Convert lrfurn short sofas to use param2 color", run_at_every_load = false, @@ -124,13 +124,13 @@ minetest.register_lbm({ local param2 = paletteidx + new_fdir - minetest.set_node(pos, { name = "lrfurn:sofa", param2 = param2 }) - local meta = minetest.get_meta(pos) + core.set_node(pos, { name = "lrfurn:sofa", param2 = param2 }) + local meta = core.get_meta(pos) meta:set_string("dye", "unifieddyes:"..color) end }) -if minetest.settings:get("log_mods") then - minetest.log("action", "[lrfurn/sofas] Loaded!") +if core.settings:get("log_mods") then + core.log("action", "[lrfurn/sofas] Loaded!") end diff --git a/homedecor_tables/coffeetable.lua b/homedecor_tables/coffeetable.lua index 70a69d02..779dd3f6 100644 --- a/homedecor_tables/coffeetable.lua +++ b/homedecor_tables/coffeetable.lua @@ -1,6 +1,6 @@ -- formerly lrfurn coffee table component -local S = minetest.get_translator("homedecor_tables") +local S = core.get_translator("homedecor_tables") local fdir_to_right = { { 1, 0 }, @@ -15,25 +15,25 @@ local function check_right(pos, fdir, long, placer) local pos2 = { x = pos.x + fdir_to_right[fdir+1][1], y=pos.y, z = pos.z + fdir_to_right[fdir+1][2] } local pos3 = { x = pos.x + fdir_to_right[fdir+1][1] * 2, y=pos.y, z = pos.z + fdir_to_right[fdir+1][2] * 2 } - local node2 = minetest.get_node(pos2) + local node2 = core.get_node(pos2) if node2 and node2.name ~= "air" then return false - elseif minetest.is_protected(pos2, placer:get_player_name()) then + elseif core.is_protected(pos2, placer:get_player_name()) then if not long then - minetest.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the other end goes!")) + core.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the other end goes!")) else - minetest.chat_send_player(placer:get_player_name(), + core.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the middle or far end goes!")) end return false end if long then - local node3 = minetest.get_node(pos3) + local node3 = core.get_node(pos3) if node3 and node3.name ~= "air" then return false - elseif minetest.is_protected(pos3, placer:get_player_name()) then - minetest.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the other end goes!")) + elseif core.is_protected(pos3, placer:get_player_name()) then + core.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the other end goes!")) return false end end @@ -41,10 +41,10 @@ local function check_right(pos, fdir, long, placer) return true end -minetest.register_alias("lrfurn:coffeetable_back", "lrfurn:coffeetable") -minetest.register_alias("lrfurn:coffeetable_front", "air") +core.register_alias("lrfurn:coffeetable_back", "lrfurn:coffeetable") +core.register_alias("lrfurn:coffeetable_front", "air") -minetest.register_node(":lrfurn:coffeetable", { +core.register_node(":lrfurn:coffeetable", { description = S("Coffee Table"), drawtype = "nodebox", tiles = { @@ -84,22 +84,22 @@ minetest.register_node(":lrfurn:coffeetable", { }, after_place_node = function(pos, placer, itemstack, pointed_thing) - if minetest.is_protected(pos, placer:get_player_name()) then return true end - local node = minetest.get_node(pos) + if core.is_protected(pos, placer:get_player_name()) then return true end + local node = core.get_node(pos) local fdir = node.param2 if check_right(pos, fdir, false, placer) then - minetest.set_node(pos, { name = node.name, param2 = (fdir + 1) % 4 }) + core.set_node(pos, { name = node.name, param2 = (fdir + 1) % 4 }) else - minetest.chat_send_player(placer:get_player_name(), + core.chat_send_player(placer:get_player_name(), S("No room to place the coffee table!")) - minetest.set_node(pos, {name = "air"}) + core.set_node(pos, {name = "air"}) return true end end, }) -minetest.register_craft({ +core.register_craft({ output = "lrfurn:coffeetable", type = "shapeless", recipe = { @@ -108,7 +108,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "lrfurn:coffeetable", recipe = { {"", "", "", }, @@ -117,7 +117,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "lrfurn:coffeetable", recipe = { {"", "", "", }, @@ -126,6 +126,6 @@ minetest.register_craft({ } }) -if minetest.settings:get("log_mods") then - minetest.log("action", "[lrfurn/coffeetable] Loaded!") +if core.settings:get("log_mods") then + core.log("action", "[lrfurn/coffeetable] Loaded!") end diff --git a/homedecor_tables/endtable.lua b/homedecor_tables/endtable.lua index 57494c31..478dd718 100644 --- a/homedecor_tables/endtable.lua +++ b/homedecor_tables/endtable.lua @@ -1,8 +1,8 @@ -- formerly lrfurn endtable component -local S = minetest.get_translator("homedecor_tables") +local S = core.get_translator("homedecor_tables") -minetest.register_node(":lrfurn:endtable", { +core.register_node(":lrfurn:endtable", { description = S("End Table"), drawtype = "nodebox", tiles = { @@ -43,7 +43,7 @@ minetest.register_node(":lrfurn:endtable", { }, }) -minetest.register_craft({ +core.register_craft({ output = "lrfurn:endtable", recipe = { {"", "", "", }, @@ -52,7 +52,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "lrfurn:endtable", recipe = { {"", "", "", }, @@ -61,6 +61,6 @@ minetest.register_craft({ } }) -if minetest.settings:get("log_mods") then - minetest.log("action", "[lrfurn/endtable] Loaded!") +if core.settings:get("log_mods") then + core.log("action", "[lrfurn/endtable] Loaded!") end diff --git a/homedecor_tables/init.lua b/homedecor_tables/init.lua index 56ae778e..b48c665d 100644 --- a/homedecor_tables/init.lua +++ b/homedecor_tables/init.lua @@ -1,4 +1,4 @@ -local modpath = minetest.get_modpath("homedecor_tables") +local modpath = core.get_modpath("homedecor_tables") dofile(modpath.."/misc.lua") dofile(modpath.."/endtable.lua") diff --git a/homedecor_tables/misc.lua b/homedecor_tables/misc.lua index f38419b6..9ab3cec8 100644 --- a/homedecor_tables/misc.lua +++ b/homedecor_tables/misc.lua @@ -1,6 +1,6 @@ -- formerly homedecor's misc tables component -local S = minetest.get_translator("homedecor_tables") +local S = core.get_translator("homedecor_tables") -- Various kinds of table legs @@ -46,8 +46,8 @@ for _, t in ipairs(leg_materials) do }) end -minetest.register_alias("homedecor:utility_table_legs", "homedecor:table_legs_wood") -minetest.register_alias("homedecor:utility_table_top", "homedecor:wood_table_small_square") +core.register_alias("homedecor:utility_table_legs", "homedecor:table_legs_wood") +core.register_alias("homedecor:utility_table_top", "homedecor:wood_table_small_square") -- table tops and combined tables @@ -88,18 +88,18 @@ for i, mat in ipairs(tabletop_materials) do collision_box = tables_cbox, on_place = function(itemstack, placer, pointed_thing) local player_name = placer:get_player_name() - if minetest.is_protected(pointed_thing.under, player_name) then return end - local node = minetest.get_node(pointed_thing.under) + if core.is_protected(pointed_thing.under, player_name) then return end + local node = core.get_node(pointed_thing.under) if string.find(node.name, "homedecor:table_legs") then local newname = string.format("homedecor:%s_table_%s_with_%s_legs", m, shape, string.sub(node.name, 22)) - minetest.set_node(pointed_thing.under, {name = newname}) + core.set_node(pointed_thing.under, {name = newname}) if not creative.is_enabled_for(player_name) then itemstack:take_item() return itemstack end else - return minetest.rotate_node(itemstack, placer, pointed_thing) + return core.rotate_node(itemstack, placer, pointed_thing) end end }) @@ -126,10 +126,10 @@ for i, mat in ipairs(tabletop_materials) do end end - minetest.register_alias('homedecor:'..m..'_table_large_square_b', 'homedecor:'..m..'_table_large_square') - minetest.register_alias('homedecor:'..m..'_table_small_square_b', 'homedecor:'..m..'_table_small_square') - minetest.register_alias('homedecor:'..m..'_table_small_round_b', 'homedecor:'..m..'_table_small_round') - minetest.register_alias('homedecor:'..m..'_table_large', 'homedecor:'..m..'_table_large_square') + core.register_alias('homedecor:'..m..'_table_large_square_b', 'homedecor:'..m..'_table_large_square') + core.register_alias('homedecor:'..m..'_table_small_square_b', 'homedecor:'..m..'_table_small_square') + core.register_alias('homedecor:'..m..'_table_small_round_b', 'homedecor:'..m..'_table_small_round') + core.register_alias('homedecor:'..m..'_table_large', 'homedecor:'..m..'_table_large_square') end @@ -170,7 +170,7 @@ end -- crafting -minetest.register_craft( { +core.register_craft( { output = "homedecor:glass_table_small_round_b 15", recipe = { { "", homedecor.materials.glass_block, "" }, @@ -179,21 +179,21 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:glass_table_small_square_b 2", recipe = { {"homedecor:glass_table_small_round", "homedecor:glass_table_small_round" }, } }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:glass_table_large_square_b 2", recipe = { { "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" }, } }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:wood_table_small_round_b 15", recipe = { { "", "group:wood", "" }, @@ -202,14 +202,14 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:wood_table_small_square_b 2", recipe = { { "homedecor:wood_table_small_round","homedecor:wood_table_small_round" }, } }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:wood_table_large_square_b 2", recipe = { { "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" }, @@ -218,26 +218,26 @@ minetest.register_craft( { -- -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:wood_table_small_round_b", burntime = 30, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:wood_table_small_square_b", burntime = 30, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:wood_table_large_square_b", burntime = 30, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:table_legs_wrought_iron 3", recipe = { { "", homedecor.materials.iron_lump, "" }, @@ -246,7 +246,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:table_legs_brass 3", recipe = { { "", "basic_materials:brass_ingot", "" }, @@ -255,7 +255,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:utility_table_legs", recipe = { { "group:stick", "group:stick", "group:stick" }, @@ -264,7 +264,7 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:utility_table_legs", burntime = 30, @@ -273,7 +273,7 @@ minetest.register_craft({ for _, shape in ipairs (table_shapes) do for _, leg in ipairs(leg_materials) do for _, mat in ipairs(tabletop_materials) do - minetest.register_craft({ + core.register_craft({ output = "homedecor:"..mat[1].."_table_"..shape.."_with_"..leg[1].."_legs", type = "shapeless", recipe = { @@ -285,7 +285,7 @@ for _, shape in ipairs (table_shapes) do end end -minetest.register_craft({ +core.register_craft({ output = "homedecor:table", recipe = { { "group:wood","group:wood", "group:wood" }, @@ -293,7 +293,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:table_mahogany", recipe = { @@ -302,7 +302,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:table_mahogany", recipe = { @@ -311,7 +311,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:table_white", recipe = { @@ -320,19 +320,19 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:table", burntime = 30, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:table_mahogany", burntime = 30, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:table_white", burntime = 30, @@ -340,7 +340,7 @@ minetest.register_craft({ -- recycling -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "vessels:glass_fragments", recipe = { @@ -350,7 +350,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "vessels:glass_fragments", recipe = { @@ -360,7 +360,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "vessels:glass_fragments", recipe = { @@ -370,7 +370,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "default:stick 4", recipe = { @@ -380,7 +380,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "default:stick 4", recipe = { @@ -390,7 +390,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "default:stick 4", recipe = { @@ -402,5 +402,5 @@ minetest.register_craft({ -- Aliases for the above 3dforniture-like tables -minetest.register_alias("3dforniture:table", "homedecor:table") -minetest.register_alias('table', 'homedecor:table') +core.register_alias("3dforniture:table", "homedecor:table") +core.register_alias('table', 'homedecor:table') diff --git a/homedecor_trash_cans/init.lua b/homedecor_trash_cans/init.lua index cd03dda1..2ac88e59 100644 --- a/homedecor_trash_cans/init.lua +++ b/homedecor_trash_cans/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_trash_cans") +local S = core.get_translator("homedecor_trash_cans") local tg_cbox = { type = "fixed", @@ -17,7 +17,7 @@ homedecor.register("trash_can_green", { selection_box = tg_cbox, collision_box = tg_cbox, on_punch = function(pos, node, puncher, pointed_thing) - minetest.set_node(pos, {name = "homedecor:trash_can_green_open", param2 = node.param2}) + core.set_node(pos, {name = "homedecor:trash_can_green_open", param2 = node.param2}) end, crafts = { { @@ -39,7 +39,7 @@ homedecor.register("trash_can_green_open", { collision_box = tg_cbox, drop = "homedecor:trash_can_green", on_punch = function(pos, node, puncher, pointed_thing) - minetest.set_node(pos, {name = "homedecor:trash_can_green", param2 = node.param2}) + core.set_node(pos, {name = "homedecor:trash_can_green", param2 = node.param2}) end, infotext=S("Trash Can"), inventory= { @@ -52,9 +52,9 @@ homedecor.register("trash_can_green_open", { }, on_receive_fields = function(pos, formname, fields, sender) if fields.empty then - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:get_inventory():set_list("main", {}) - minetest.sound_play("homedecor_trash_all", {to_player=sender:get_player_name(), gain = 1.0}) + core.sound_play("homedecor_trash_all", {to_player=sender:get_player_name(), gain = 1.0}) end end }) diff --git a/homedecor_wardrobe/init.lua b/homedecor_wardrobe/init.lua index 6e22d936..7e7e978d 100644 --- a/homedecor_wardrobe/init.lua +++ b/homedecor_wardrobe/init.lua @@ -1,27 +1,27 @@ -if not minetest.get_modpath("player_api") then - minetest.log( +if not core.get_modpath("player_api") then + core.log( "action", "[homedecor_wardrobe]: minetest game not detected, disabling as this mod is minetest game only at this time" ) return end -local S = minetest.get_translator("homedecor_wardrobe") -local modpath = minetest.get_modpath("homedecor_wardrobe") +local S = core.get_translator("homedecor_wardrobe") +local modpath = core.get_modpath("homedecor_wardrobe") local wd_cbox = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5}} -- cache set_textures function (fallback to old version) -- default.player_set_textures is deprecated and will be removed in future local set_player_textures = - minetest.get_modpath("player_api") and player_api.set_textures + core.get_modpath("player_api") and player_api.set_textures or default.player_set_textures -local armor_mod_path = minetest.get_modpath("3d_armor") +local armor_mod_path = core.get_modpath("3d_armor") local skinslist = {"male1", "male2", "male3", "male4", "male5"} local default_skin = "character.png" -local skinsdb_mod_path = minetest.get_modpath("skinsdb") +local skinsdb_mod_path = core.get_modpath("skinsdb") if skinsdb_mod_path then @@ -100,7 +100,7 @@ local def = { collision_box = wd_cbox, sounds = default.node_sound_wood_defaults(), - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rotate = core.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, on_place = function(itemstack, placer, pointed_thing) @@ -110,14 +110,14 @@ local def = { can_dig = function(pos,player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) return meta:get_inventory():is_empty("main") end, on_construct = function(pos) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:set_string("infotext", S("Wardrobe")) @@ -139,10 +139,10 @@ local def = { meta:set_string("formspec", "size[5.5,8.5]" .. default.gui_bg .. default.gui_bg_img .. default.gui_slots .. - "vertlabel[0,0.5;" .. minetest.formspec_escape(S("Clothes")) .. "]" .. + "vertlabel[0,0.5;" .. core.formspec_escape(S("Clothes")) .. "]" .. "button_exit[0,3.29;0.6,0.6;default;x]" .. clothes_strings .. - "vertlabel[0,5.2;" .. minetest.formspec_escape(S("Storage")) .. "]" .. + "vertlabel[0,5.2;" .. core.formspec_escape(S("Storage")) .. "]" .. "list[current_name;main;0.5,4.5;5,2;]" .. "list[current_player;main;0.5,6.8;5,2;]" .. "listring[]" @@ -177,28 +177,28 @@ local def = { } -- register the actual minetest node -minetest.register_node(":homedecor:wardrobe", def) +core.register_node(":homedecor:wardrobe", def) -minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe") -minetest.register_alias("homedecor:wardrobe_top", "air") +core.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe") +core.register_alias("homedecor:wardrobe_top", "air") if not skinsdb_mod_path then -- If not managed by skinsdb - minetest.register_on_joinplayer(function(player) + core.register_on_joinplayer(function(player) local skin = player:get_meta():get("homedecor:player_skin") if skin and skin ~= "" then -- setting player skin on connect has no effect, so delay skin change - minetest.after(1, function(player1, skin1) + core.after(1, function(player1, skin1) set_player_skin(player1, skin1) end, player, skin) end end) end -minetest.register_craft( { +core.register_craft( { output = "homedecor:wardrobe", recipe = { { "homedecor:drawer_small", "homedecor:kitchen_cabinet_colorable" }, diff --git a/homedecor_windows_and_treatments/init.lua b/homedecor_windows_and_treatments/init.lua index e8941c3b..ffedd20a 100644 --- a/homedecor_windows_and_treatments/init.lua +++ b/homedecor_windows_and_treatments/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("homedecor_windows_and_treatments") +local S = core.get_translator("homedecor_windows_and_treatments") homedecor_windows_and_treatments = {} @@ -128,7 +128,7 @@ homedecor.register("curtain_closed", { end, on_dig = unifieddyes.on_dig, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, { name = "homedecor:curtain_open", param2 = node.param2 }) + core.set_node(pos, { name = "homedecor:curtain_open", param2 = node.param2 }) return itemstack end }) @@ -153,7 +153,7 @@ homedecor.register("curtain_open", { end, on_dig = unifieddyes.on_dig, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, { name = "homedecor:curtain_closed", param2 = node.param2 }) + core.set_node(pos, { name = "homedecor:curtain_closed", param2 = node.param2 }) return itemstack end }) @@ -288,8 +288,8 @@ homedecor.register("shutter_colored", { on_dig = unifieddyes.on_dig, }) -minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet") -minetest.register_alias("homedecor:shutter_oak", "homedecor:shutter") +core.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet") +core.register_alias("homedecor:shutter_oak", "homedecor:shutter") -- convert old shutters to param2 coloring @@ -299,7 +299,7 @@ for _, color in ipairs(shutters) do table.insert(homedecor_windows_and_treatments.old_shutter_nodes, "homedecor:shutter_"..color) end -minetest.register_lbm({ +core.register_lbm({ name = ":homedecor:convert_shutters", label = "Convert shutter static nodes to use param2 color", run_at_every_load = false, @@ -321,8 +321,8 @@ minetest.register_lbm({ local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted") local param2 = paletteidx + node.param2 - minetest.set_node(pos, { name = "homedecor:shutter_colored", param2 = param2 }) - local meta = minetest.get_meta(pos) + core.set_node(pos, { name = "homedecor:shutter_colored", param2 = param2 }) + local meta = core.get_meta(pos) meta:set_string("dye", "unifieddyes:"..color) end }) @@ -345,7 +345,7 @@ for _, color in ipairs(curtaincolors) do table.insert(homedecor_windows_and_treatments.old_static_curtain_nodes, "homedecor:curtain_open_"..color) end -minetest.register_lbm({ +core.register_lbm({ name = ":homedecor:convert_curtains", label = "Convert static curtain nodes to use param2 color", run_at_every_load = false, @@ -369,8 +369,8 @@ minetest.register_lbm({ local paletteidx, _ = unifieddyes.getpaletteidx("unifieddyes:"..metadye, "wallmounted") local newparam2 = paletteidx + (node.param2 % 8) - minetest.set_node(pos, { name = newnode, param2 = newparam2 }) - local meta = minetest.get_meta(pos) + core.set_node(pos, { name = newnode, param2 = newparam2 }) + local meta = core.get_meta(pos) meta:set_string("dye", "unifieddyes:"..metadye) end }) @@ -378,7 +378,7 @@ minetest.register_lbm({ -- crafting -minetest.register_craft( { +core.register_craft( { output = "homedecor:shutter 2", recipe = { { "group:stick", "group:stick" }, @@ -398,14 +398,14 @@ unifieddyes.register_color_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "homedecor:shutter_oak", burntime = 30, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:curtain_open 4", recipe = { { homedecor.materials.wool_white, "", ""}, @@ -414,7 +414,7 @@ minetest.register_craft( { }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:curtain_open 4", recipe = { { "cottages:wool", "", ""}, @@ -454,7 +454,7 @@ local mats_craft = { for i in ipairs(mats_craft) do local material = mats_craft[i][1] local ingredient = mats_craft[i][2] - minetest.register_craft( { + core.register_craft( { output = "homedecor:curtainrod_"..material.." 3", recipe = { { ingredient, ingredient, ingredient }, @@ -462,7 +462,7 @@ for i in ipairs(mats_craft) do }) end -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:window_plain 8", recipe = { @@ -474,7 +474,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "homedecor:window_quartered", recipe = { @@ -485,7 +485,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:blinds_thin", recipe = { { "group:stick", "basic_materials:plastic_sheet", "group:stick" }, @@ -494,7 +494,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:blinds_thick", recipe = { { "group:stick", "basic_materials:plastic_sheet", "group:stick" }, @@ -503,7 +503,7 @@ minetest.register_craft({ }, }) -minetest.register_craft( { +core.register_craft( { output = "homedecor:window_flowerbox", recipe = { { "homedecor:roof_tile_terracotta", homedecor.materials.dirt, "homedecor:roof_tile_terracotta" }, @@ -511,7 +511,7 @@ minetest.register_craft( { }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:stained_glass 8", recipe = { {"", "dye:blue", ""}, @@ -520,7 +520,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:stained_glass 3", recipe = { {"", "dye:blue", ""}, @@ -529,7 +529,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:stained_glass 2", recipe = { {"", "dye:blue", ""}, @@ -538,7 +538,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ output = "homedecor:stained_glass 2", recipe = { {"", "dye:blue", ""}, diff --git a/itemframes/init.lua b/itemframes/init.lua index 76fade2a..b9f72a89 100644 --- a/itemframes/init.lua +++ b/itemframes/init.lua @@ -1,9 +1,9 @@ -local S = minetest.get_translator("itemframes") +local S = core.get_translator("itemframes") local tmp = {} -local sd_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil +local sd_disallow = core.get_modpath("screwdriver") and screwdriver.disallow or nil -minetest.register_entity("itemframes:item",{ +core.register_entity("itemframes:item",{ initial_properties = { hp_max = 1, visual = "wielditem", @@ -35,7 +35,7 @@ minetest.register_entity("itemframes:item",{ end if self.texture ~= nil and self.nodename ~= nil then local entity_pos = vector.round(self.object:get_pos()) - local objs = minetest.get_objects_inside_radius(entity_pos, 0.5) + local objs = core.get_objects_inside_radius(entity_pos, 0.5) for _, obj in ipairs(objs) do if obj ~= self.object and obj:get_luaentity() and @@ -44,9 +44,9 @@ minetest.register_entity("itemframes:item",{ obj:get_properties() and obj:get_properties().textures and obj:get_properties().textures[1] == self.texture then - minetest.log("action","[itemframes] Removing extra " .. + core.log("action","[itemframes] Removing extra " .. self.texture .. " found in " .. self.nodename .. " at " .. - minetest.pos_to_string(entity_pos)) + core.pos_to_string(entity_pos)) self.object:remove() break end @@ -71,9 +71,9 @@ facedir[3] = {x = -1, y = 0, z = 0} local remove_item = function(pos, node) local objs = nil if node.name == "itemframes:frame" then - objs = minetest.get_objects_inside_radius(pos, .5) + objs = core.get_objects_inside_radius(pos, .5) elseif node.name == "itemframes:pedestal" then - objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y+1,z=pos.z}, .5) + objs = core.get_objects_inside_radius({x=pos.x,y=pos.y+1,z=pos.z}, .5) end if objs then for _, obj in ipairs(objs) do @@ -86,7 +86,7 @@ end local update_item = function(pos, node) remove_item(pos, node) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if meta:get_string("item") ~= "" then if node.name == "itemframes:frame" then local posad = facedir[node.param2] @@ -99,7 +99,7 @@ local update_item = function(pos, node) end tmp.nodename = node.name tmp.texture = ItemStack(meta:get_string("item")):get_name() - local e = minetest.add_entity(pos,"itemframes:item") + local e = core.add_entity(pos,"itemframes:item") if node.name == "itemframes:frame" then local yaw = math.pi * 2 - node.param2 * math.pi / 2 e:set_yaw(yaw) @@ -108,19 +108,19 @@ local update_item = function(pos, node) end local drop_item = function(pos, node) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if meta:get_string("item") ~= "" then if node.name == "itemframes:frame" then - minetest.add_item(pos, meta:get_string("item")) + core.add_item(pos, meta:get_string("item")) elseif node.name == "itemframes:pedestal" then - minetest.add_item({x=pos.x,y=pos.y+1,z=pos.z}, meta:get_string("item")) + core.add_item({x=pos.x,y=pos.y+1,z=pos.z}, meta:get_string("item")) end meta:set_string("item","") end remove_item(pos, node) end -minetest.register_node("itemframes:frame",{ +core.register_node("itemframes:frame",{ description = S("Item frame"), drawtype = "nodebox", node_box = { @@ -146,16 +146,16 @@ minetest.register_node("itemframes:frame",{ }, on_rotate = sd_disallow or nil, after_place_node = function(pos, placer, itemstack) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:set_string("owner",placer:get_player_name()) meta:set_string("infotext", S("Item frame (owned by @1)", placer:get_player_name())) end, on_rightclick = function(pos, node, clicker, itemstack) if not itemstack then return end - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local name = clicker and clicker:get_player_name() if name == meta:get_string("owner") or - minetest.check_player_privs(name, "protection_bypass") then + core.check_player_privs(name, "protection_bypass") then drop_item(pos,node) local s = itemstack:take_item() meta:set_string("item",s:to_string()) @@ -163,10 +163,10 @@ minetest.register_node("itemframes:frame",{ local description = item_meta:get_string("description") if description == "" then local item_name = s:get_name() - if minetest.registered_items[item_name] - and minetest.registered_items[item_name].description + if core.registered_items[item_name] + and core.registered_items[item_name].description then - description = minetest.registered_items[item_name].description + description = core.registered_items[item_name].description else description = item_name end @@ -177,10 +177,10 @@ minetest.register_node("itemframes:frame",{ return itemstack end, on_punch = function(pos,node,puncher) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local name = puncher and puncher:get_player_name() if name == meta:get_string("owner") or - minetest.check_player_privs(name, "protection_bypass") then + core.check_player_privs(name, "protection_bypass") then drop_item(pos, node) meta:set_string("infotext", S("Item frame (owned by @1)", name)) end @@ -188,13 +188,13 @@ minetest.register_node("itemframes:frame",{ can_dig = function(pos,player) if not player then return end local name = player and player:get_player_name() - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) return name == meta:get_string("owner") or - minetest.check_player_privs(name, "protection_bypass") + core.check_player_privs(name, "protection_bypass") end, on_destruct = function(pos) - local meta = minetest.get_meta(pos) - local node = minetest.get_node(pos) + local meta = core.get_meta(pos) + local node = core.get_node(pos) if meta:get_string("item") ~= "" then drop_item(pos, node) end @@ -202,7 +202,7 @@ minetest.register_node("itemframes:frame",{ }) -minetest.register_node("itemframes:pedestal",{ +core.register_node("itemframes:pedestal",{ description = S("Pedestal"), drawtype = "nodebox", node_box = { @@ -227,16 +227,16 @@ minetest.register_node("itemframes:pedestal",{ }, on_rotate = sd_disallow or nil, after_place_node = function(pos, placer, itemstack) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:set_string("owner",placer:get_player_name()) meta:set_string("infotext", S("Pedestal (owned by @1)", placer:get_player_name())) end, on_rightclick = function(pos, node, clicker, itemstack) if not itemstack then return end - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local name = clicker and clicker:get_player_name() if name == meta:get_string("owner") or - minetest.check_player_privs(name, "protection_bypass") then + core.check_player_privs(name, "protection_bypass") then drop_item(pos,node) local s = itemstack:take_item() meta:set_string("item",s:to_string()) @@ -244,10 +244,10 @@ minetest.register_node("itemframes:pedestal",{ local description = item_meta:get_string("description") if description == "" then local item_name = s:get_name() - if minetest.registered_items[item_name] - and minetest.registered_items[item_name].description + if core.registered_items[item_name] + and core.registered_items[item_name].description then - description = minetest.registered_items[item_name].description + description = core.registered_items[item_name].description else description = item_name end @@ -258,10 +258,10 @@ minetest.register_node("itemframes:pedestal",{ return itemstack end, on_punch = function(pos,node,puncher) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local name = puncher and puncher:get_player_name() if name == meta:get_string("owner") or - minetest.check_player_privs(name, "protection_bypass") then + core.check_player_privs(name, "protection_bypass") then drop_item(pos,node) meta:set_string("infotext", S("Pedestal (owned by @1)", name)) end @@ -269,13 +269,13 @@ minetest.register_node("itemframes:pedestal",{ can_dig = function(pos,player) if not player then return end local name = player and player:get_player_name() - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) return name == meta:get_string("owner") or - minetest.check_player_privs(name, "protection_bypass") + core.check_player_privs(name, "protection_bypass") end, on_destruct = function(pos) - local meta = minetest.get_meta(pos) - local node = minetest.get_node(pos) + local meta = core.get_meta(pos) + local node = core.get_node(pos) if meta:get_string("item") ~= "" then drop_item(pos, node) end @@ -284,26 +284,26 @@ minetest.register_node("itemframes:pedestal",{ -- automatically restore entities lost from frames/pedestals -- due to /clearobjects or similar -minetest.register_lbm({ +core.register_lbm({ label = "Maintain itemframe and pedestal entities", name = "itemframes:maintain_entities", nodenames = {"itemframes:frame", "itemframes:pedestal"}, run_at_every_load = true, action = function(pos1, node1) - minetest.after(0, + core.after(0, function(pos, node) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local itemstring = meta:get_string("item") if itemstring ~= "" then local entity_pos = pos if node.name == "itemframes:pedestal" then entity_pos = {x=pos.x,y=pos.y+1,z=pos.z} end - local objs = minetest.get_objects_inside_radius(entity_pos, 0.5) + local objs = core.get_objects_inside_radius(entity_pos, 0.5) if #objs == 0 then - minetest.log("action","[itemframes] Replacing missing " .. + core.log("action","[itemframes] Replacing missing " .. itemstring .. " in " .. node.name .. " at " .. - minetest.pos_to_string(pos)) + core.pos_to_string(pos)) update_item(pos, node) end end @@ -314,7 +314,7 @@ minetest.register_lbm({ -- crafts -minetest.register_craft({ +core.register_craft({ output = 'itemframes:frame', recipe = { {'group:stick', 'group:stick', 'group:stick'}, @@ -323,7 +323,7 @@ minetest.register_craft({ } }) -minetest.register_craft({ +core.register_craft({ output = 'itemframes:pedestal', recipe = { {homedecor.materials.stone, homedecor.materials.stone, homedecor.materials.stone}, @@ -333,7 +333,7 @@ minetest.register_craft({ }) -- stop mesecon pistons from pushing itemframes and pedestals -if minetest.get_modpath("mesecons_mvps") then +if core.get_modpath("mesecons_mvps") then mesecon.register_mvps_stopper("itemframes:frame") mesecon.register_mvps_stopper("itemframes:pedestal") end diff --git a/lavalamp/README.txt b/lavalamp/README.txt index 832d624f..08f51b03 100644 --- a/lavalamp/README.txt +++ b/lavalamp/README.txt @@ -21,4 +21,4 @@ Recipe: Mod dependencies: wool, bucket See also: -http://minetest.net/ +https://www.luanti.org/ diff --git a/lavalamp/init.lua b/lavalamp/init.lua index d2954922..8e30b45e 100644 --- a/lavalamp/init.lua +++ b/lavalamp/init.lua @@ -1,8 +1,8 @@ -local S = minetest.get_translator("lavalamp") +local S = core.get_translator("lavalamp") lavalamp = {} -minetest.register_node("lavalamp:lavalamp", { +core.register_node("lavalamp:lavalamp", { description = S("Lava Lamp/Light"), drawtype = "mesh", mesh = "lavalamp.obj", @@ -43,12 +43,12 @@ minetest.register_node("lavalamp:lavalamp", { on_dig = unifieddyes.on_dig, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) node.name = "lavalamp:lavalamp_off" - minetest.swap_node(pos, node) + core.swap_node(pos, node) return itemstack end }) -minetest.register_node("lavalamp:lavalamp_off", { +core.register_node("lavalamp:lavalamp_off", { description = S("Lava Lamp/Light (off)"), drawtype = "mesh", mesh = "lavalamp.obj", @@ -74,7 +74,7 @@ minetest.register_node("lavalamp:lavalamp_off", { on_construct = unifieddyes.on_construct, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) node.name = "lavalamp:lavalamp" - minetest.swap_node(pos, node) + core.swap_node(pos, node) return itemstack end, drop = { @@ -84,7 +84,7 @@ minetest.register_node("lavalamp:lavalamp_off", { } }) -minetest.register_craft({ +core.register_craft({ output = "lavalamp:lavalamp", recipe = { {"", homedecor.materials.wool_white, "", }, @@ -121,7 +121,7 @@ for _, color in ipairs(colors) do table.insert(lavalamp.old_static_nodes, "lavalamp:"..color.."_off") end -minetest.register_lbm({ +core.register_lbm({ name = "lavalamp:convert", label = "Convert lava lamps to use param2 color", run_at_every_load = false, @@ -146,8 +146,8 @@ minetest.register_lbm({ local paletteidx, _ = unifieddyes.getpaletteidx("unifieddyes:"..color, "extended") - minetest.set_node(pos, { name = "lavalamp:lavalamp", param2 = paletteidx }) - local meta = minetest.get_meta(pos) + core.set_node(pos, { name = "lavalamp:lavalamp", param2 = paletteidx }) + local meta = core.get_meta(pos) meta:set_string("dye", "unifieddyes:"..color) end