diff --git a/mods/base_mobs/api.lua b/mods/base_mobs/api.lua index 6066d8b..e719a13 100644 --- a/mods/base_mobs/api.lua +++ b/mods/base_mobs/api.lua @@ -41,17 +41,17 @@ function base_mobs:register_mob(name, def) old_y = nil, set_velocity = function(self, v) - local yaw = self.object:getyaw() + local yaw = self.object:get_yaw() if self.drawtype == "side" then yaw = yaw + (math.pi/2) end local x = math.sin(yaw) * -v local z = math.cos(yaw) * v - self.object:setvelocity({x = x, y = self.object:getvelocity().y, z = z}) + self.object:set_velocity({x = x, y = self.object:get_velocity().y, z = z}) end, get_velocity = function(self) - local v = self.object:getvelocity() + local v = self.object:get_velocity() return (v.x^2 + v.z^2) ^ (0.5) end, @@ -97,7 +97,7 @@ function base_mobs:register_mob(name, def) on_step = function(self, dtime) self.lifetimer = self.lifetimer - dtime - local my_pos = self.object:getpos() + local my_pos = self.object:get_pos() if self.lifetimer <= 0 and not self.tamed then local player_count = 0 for _,obj in ipairs(minetest.get_objects_inside_radius(my_pos, 12)) do @@ -111,12 +111,12 @@ function base_mobs:register_mob(name, def) end end - local vel = self.object:getvelocity() + local vel = self.object:get_velocity() local node = minetest.get_node(my_pos).name local real_speed = self:get_speed(self.state) --[[local accel = {x = 0, y = 0, z = 0} if vel.y > 0.1 then - local yaw = self.object:getyaw() + local yaw = self.object:get_yaw() if self.drawtype == "side" then yaw = yaw + (math.pi/2) end @@ -130,7 +130,7 @@ function base_mobs:register_mob(name, def) else accel.y = -10 end - self.object:setacceleration(accel) + self.object:set_acceleration(accel) if real_speed == 0 then self:set_animation("walk") end @@ -146,7 +146,7 @@ function base_mobs:register_mob(name, def) -- Jump if self:get_velocity() < real_speed - 0.05 and vel.y == 0 then vel.y = 6.5 - self.object:setvelocity(vel) + self.object:set_velocity(vel) else self:set_velocity(real_speed) end @@ -204,7 +204,7 @@ function base_mobs:register_mob(name, def) local p, vec, dist = false, false, false if self.aggressive and not self.to_player then for _,player in ipairs(minetest.get_connected_players()) do - p = player:getpos() + p = player:get_pos() vec = vector.subtract(p, my_pos) dist = (vec.x^2 + vec.y^2 + vec.z^2) ^ 0.5 @@ -217,7 +217,7 @@ function base_mobs:register_mob(name, def) if self.follow ~= "" and not self.to_player then for _,player in ipairs(minetest.get_connected_players()) do - p = player:getpos() + p = player:get_pos() vec = vector.subtract(p, my_pos) dist = (vec.x^2 + vec.y^2 + vec.z^2) ^ 0.5 @@ -239,7 +239,7 @@ function base_mobs:register_mob(name, def) if self.to_player then if not dist then - p = self.to_player:getpos() + p = self.to_player:get_pos() if not p then self.to_player = nil self:set_animation("stand") @@ -280,7 +280,7 @@ function base_mobs:register_mob(name, def) if p.x > my_pos.x then yaw = yaw + math.pi end - self.object:setyaw(yaw) + self.object:set_yaw(yaw) if self.aggressive then self:set_animation("run") @@ -300,7 +300,7 @@ function base_mobs:register_mob(name, def) if r == 10 or (r == 11 and other_state == "walk") then self:set_animation(other_state) elseif r <= 4 then - self.object:setyaw(self.object:getyaw() + (math.random(-90, 90) / 180 * math.pi)) + self.object:set_yaw(self.object:get_yaw() + (math.random(-90, 90) / 180 * math.pi)) end end end, @@ -310,9 +310,9 @@ function base_mobs:register_mob(name, def) self.aggressive = true end self.object:set_armor_groups({fleshy = self.armor}) - self.object:setacceleration({x = 0, y = -10, z = 0}) + self.object:set_acceleration({x = 0, y = -10, z = 0}) self:set_animation("stand") - self.object:setyaw(math.random(360) / 180 * math.pi) + self.object:set_yaw(math.random(360) / 180 * math.pi) self.lifetimer = self.lifetimer - dtime_s if staticdata then local tmp = minetest.deserialize(staticdata) @@ -348,7 +348,7 @@ function base_mobs:register_mob(name, def) end local stack = nil minetest.sound_play("player_death", {object = self.object, gain = 0.4}) - minetest.sound_play("hit_death", {pos = hitter:getpos(), gain = 0.4}) + minetest.sound_play("hit_death", {pos = hitter:get_pos(), gain = 0.4}) for _,drop in ipairs(self.drops) do if math.random(drop.chance) == 1 then stack = ItemStack(drop.name.." "..math.random(drop.min, drop.max)) @@ -361,20 +361,20 @@ function base_mobs:register_mob(name, def) hitter:get_inventory():add_item("main", stack) return end - local pos = self.object:getpos() + local pos = self.object:get_pos() pos.y = pos.y + 0.4 minetest.add_item(pos, stack) end - local vel = self.object:getvelocity() + local vel = self.object:get_velocity() if vel.y == 0 and (self.state == "stand" or self.state == "walk") then vel.y = 4 - self.object:setvelocity(vel) + self.object:set_velocity(vel) self:set_animation("walk") end minetest.sound_play("player_damage", {object = self.object, gain = 0.25}) - minetest.sound_play("hit", {pos = hitter:getpos(), gain = 0.4}) + minetest.sound_play("hit", {pos = hitter:get_pos(), gain = 0.4}) if self.type == "defensive" then if is_player then diff --git a/mods/bones/init.lua b/mods/bones/init.lua index f8b66cf..8a9824f 100644 --- a/mods/bones/init.lua +++ b/mods/bones/init.lua @@ -106,11 +106,11 @@ local death_messages = { } minetest.register_on_dieplayer(function(player) - if minetest.setting_getbool("creative_mode") then + if minetest.settings:get_bool("creative_mode") then return end - local pos = vector.round(player:getpos()) + local pos = vector.round(player:get_pos()) pos.y = pos.y - 1 local spawnPos = minetest.setting_get_pos("static_spawnpoint") diff --git a/mods/bucket/init.lua b/mods/bucket/init.lua index b767154..c150087 100644 --- a/mods/bucket/init.lua +++ b/mods/bucket/init.lua @@ -125,7 +125,7 @@ minetest.register_craftitem("bucket:bucket_empty", { if inv:room_for_item("main", giving_back) then inv:add_item("main", giving_back) else - local pos = user:getpos() + local pos = user:get_pos() pos.y = math.floor(pos.y + 0.5) minetest.add_item(pos, giving_back) end diff --git a/mods/default/init.lua b/mods/default/init.lua index 44a588f..41c2e4c 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -38,7 +38,7 @@ dofile(modpath.."/tools.lua") dofile(modpath.."/craftitems.lua") dofile(modpath.."/crafting.lua") dofile(modpath.."/mapgen.lua") -if not minetest.setting_getbool("disable_player_model") then +if not minetest.settings:get_bool("disable_player_model") then dofile(modpath.."/player.lua") end dofile(modpath.."/trees.lua") diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index a439622..297a8ed 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -349,7 +349,7 @@ minetest.register_on_generated(function(minp, maxp, seed) local rand = PseudoRandom(seed % 8000) for z = minp.z + 2, maxp.z - 2, 4 do for x = minp.x + 2, maxp.x - 2, 4 do - local papyrus_amount = math.floor(n_papyrus:get2d({x=x, y=z}) * 6 - 2) + local papyrus_amount = math.floor(n_papyrus:get_2d({x=x, y=z}) * 6 - 2) for i = 1, papyrus_amount do local p_pos = { x = rand:next(x - 2, x + 2), @@ -363,7 +363,7 @@ minetest.register_on_generated(function(minp, maxp, seed) end end - local cactus_amount = math.floor(n_cactus:get2d({x=x, y=z}) * 3) + local cactus_amount = math.floor(n_cactus:get_2d({x=x, y=z}) * 3) for i = 1, cactus_amount do local p_pos = { x = rand:next(x - 2, x + 2), diff --git a/mods/doors/init.lua b/mods/doors/init.lua index 1804968..0dcc91f 100644 --- a/mods/doors/init.lua +++ b/mods/doors/init.lua @@ -108,7 +108,7 @@ function doors.register_door(name, def) meta:set_string("infotext", "Owned by "..pn) end - if not minetest.setting_getbool("creative_mode") then + if not minetest.settings:get_bool("creative_mode") then itemstack:take_item() end return itemstack diff --git a/mods/flowers/mapgen.lua b/mods/flowers/mapgen.lua index 0ecb01d..0a5a7a0 100644 --- a/mods/flowers/mapgen.lua +++ b/mods/flowers/mapgen.lua @@ -17,7 +17,7 @@ minetest.register_on_generated(function(minp, maxp, seed) local rand = PseudoRandom(seed % 8000) for z = minp.z + 2, maxp.z - 2, 8 do for x = minp.x + 2, maxp.x - 2, 8 do - local flower_amount = math.floor(n_flower:get2d({x=x, y=z}) * 6 - 4) + local flower_amount = math.floor(n_flower:get_2d({x=x, y=z}) * 6 - 4) for i = 1, flower_amount do local p_pos = { x = rand:next(x - 2, x + 2), diff --git a/mods/give_initial_stuff/init.lua b/mods/give_initial_stuff/init.lua index 6279ad9..f66a241 100644 --- a/mods/give_initial_stuff/init.lua +++ b/mods/give_initial_stuff/init.lua @@ -1,4 +1,4 @@ -if minetest.setting_getbool("give_initial_stuff") then +if minetest.settings:get_bool("give_initial_stuff") then minetest.register_on_newplayer(function(player) local inv = player:get_inventory() inv:add_item("main", "default:pick_stone") diff --git a/mods/item_drop/init.lua b/mods/item_drop/init.lua index 2529e84..275617b 100644 --- a/mods/item_drop/init.lua +++ b/mods/item_drop/init.lua @@ -8,7 +8,7 @@ minetest.register_globalstep(function(dtime) for _,player in ipairs(minetest.get_connected_players()) do if player:get_hp() > 0 and not player:get_player_control().LMB then - local pos = player:getpos() + local pos = player:get_pos() local inv = nil local sound = false pos.y = pos.y + 0.5 @@ -62,7 +62,7 @@ function minetest.item_drop(itemstack, dropper, pos) local obj = minetest.add_item({x=pos.x+dir.x, y=pos.y+1.5+dir.y, z=pos.z+dir.z}, drop) if obj then dir = {x=dir.x*2, y=dir.y*2+1, z=dir.z*2} - obj:setvelocity(dir) + obj:set_velocity(dir) elseif item_name ~= "" then if not minetest.registered_items[item_name] then itemstack = ItemStack("") diff --git a/mods/more_tools/init.lua b/mods/more_tools/init.lua index 7290982..06c7da7 100644 --- a/mods/more_tools/init.lua +++ b/mods/more_tools/init.lua @@ -4,12 +4,12 @@ mtools = {} local modpath = minetest.get_modpath("more_tools") -- Enable or disable those tools in minetest.conf in this game folder -if minetest.setting_getbool("mtools_remove_everything") then +if minetest.settings:get_bool("mtools_remove_everything") then -- A tool which removes every node dofile(modpath.."/remove_everything.lua") end -if minetest.setting_getbool("mtools_craft_recipe_checker") then +if minetest.settings:get_bool("mtools_craft_recipe_checker") then -- Craft recipe checker by rubenwardy dofile(modpath.."/craft_recipe_checker.lua") end diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua index 5e6df62..a3bfc87 100644 --- a/mods/screwdriver/init.lua +++ b/mods/screwdriver/init.lua @@ -80,7 +80,7 @@ screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses) minetest.swap_node(pos, node) end - if not minetest.setting_getbool("creative_mode") then + if not minetest.settings:get_bool("creative_mode") then itemstack:add_wear(65535 / ((uses or 200) - 1)) end diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index a945e64..258ab97 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -30,7 +30,7 @@ function stairs.register_stair(subname, recipeitem, groups, images, description, local p1 = pointed_thing.above local param2 = 0 - local placer_pos = placer:getpos() + local placer_pos = placer:get_pos() if placer_pos then local dir = { x = p1.x - placer_pos.x, diff --git a/mods/wrench/init.lua b/mods/wrench/init.lua index aee80c2..2945104 100644 --- a/mods/wrench/init.lua +++ b/mods/wrench/init.lua @@ -15,9 +15,8 @@ local LATEST_SERIALIZATION_VERSION = 1 -- Boilerplate to support localized strings if intllib mod is installed. S = 1 -intllib = intllib or false -if intllib then - S = intllib.Getter() +if minetest.global_exists("intllib") then + S = intllib.make_gettext_pair() else S = function(s) return s end end