Skip to content

Commit 255031f

Browse files
SmallJokerparamat
SmallJoker
authored and
paramat
committedJul 1, 2018
Replace deprecated function calls
·
5.8.05.0.0
1 parent 0df2753 commit 255031f

File tree

12 files changed

+51
-51
lines changed

12 files changed

+51
-51
lines changed
 

Diff for: ‎mods/beds/functions.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
6969
return
7070
end
7171
if p then
72-
player:setpos(p)
72+
player:set_pos(p)
7373
end
7474

7575
-- physics, eye_offset, etc
@@ -94,7 +94,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
9494
local dir = minetest.facedir_to_dir(param2)
9595
local p = {x = bed_pos.x + dir.x / 2, y = bed_pos.y, z = bed_pos.z + dir.z / 2}
9696
player:set_physics_override(0, 0, 0)
97-
player:setpos(p)
97+
player:set_pos(p)
9898
default.player_attached[name] = true
9999
hud_flags.wielditem = false
100100
default.player_set_animation(player, "lay" , 0)
@@ -139,7 +139,7 @@ end
139139

140140
function beds.on_rightclick(pos, player)
141141
local name = player:get_player_name()
142-
local ppos = player:getpos()
142+
local ppos = player:get_pos()
143143
local tod = minetest.get_timeofday()
144144

145145
if tod > 0.2 and tod < 0.805 then
@@ -194,7 +194,7 @@ if enable_respawn then
194194
local name = player:get_player_name()
195195
local pos = beds.spawn[name]
196196
if pos then
197-
player:setpos(pos)
197+
player:set_pos(pos)
198198
return true
199199
end
200200
end)

Diff for: ‎mods/beds/spawns.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ end
5353
function beds.set_spawns()
5454
for name,_ in pairs(beds.player) do
5555
local player = minetest.get_player_by_name(name)
56-
local p = player:getpos()
56+
local p = player:get_pos()
5757
-- but don't change spawn location if borrowing a bed
5858
if not minetest.is_protected(p, name) then
5959
beds.spawn[name] = p

Diff for: ‎mods/boats/init.lua

+30-30
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ function boat.on_rightclick(self, clicker)
5858
clicker:set_detach()
5959
player_api.player_attached[name] = false
6060
player_api.set_animation(clicker, "stand" , 30)
61-
local pos = clicker:getpos()
61+
local pos = clicker:get_pos()
6262
pos = {x = pos.x, y = pos.y + 0.2, z = pos.z}
6363
minetest.after(0.1, function()
64-
clicker:setpos(pos)
64+
clicker:set_pos(pos)
6565
end)
6666
elseif not self.driver then
6767
local attach = clicker:get_attach()
@@ -79,7 +79,7 @@ function boat.on_rightclick(self, clicker)
7979
minetest.after(0.2, function()
8080
player_api.set_animation(clicker, "sit" , 30)
8181
end)
82-
clicker:set_look_horizontal(self.object:getyaw())
82+
clicker:set_look_horizontal(self.object:get_yaw())
8383
end
8484
end
8585

@@ -116,7 +116,7 @@ function boat.on_punch(self, puncher)
116116
local leftover = inv:add_item("main", "boats:boat")
117117
-- if no room in inventory add a replacement boat to the world
118118
if not leftover:is_empty() then
119-
minetest.add_item(self.object:getpos(), leftover)
119+
minetest.add_item(self.object:get_pos(), leftover)
120120
end
121121
end
122122
-- delay remove to ensure player is detached
@@ -128,46 +128,46 @@ end
128128

129129

130130
function boat.on_step(self, dtime)
131-
self.v = get_v(self.object:getvelocity()) * get_sign(self.v)
131+
self.v = get_v(self.object:get_velocity()) * get_sign(self.v)
132132
if self.driver then
133133
local ctrl = self.driver:get_player_control()
134-
local yaw = self.object:getyaw()
134+
local yaw = self.object:get_yaw()
135135
if ctrl.up then
136136
self.v = self.v + 0.1
137137
elseif ctrl.down then
138138
self.v = self.v - 0.1
139139
end
140140
if ctrl.left then
141141
if self.v < 0 then
142-
self.object:setyaw(yaw - (1 + dtime) * 0.03)
142+
self.object:set_yaw(yaw - (1 + dtime) * 0.03)
143143
else
144-
self.object:setyaw(yaw + (1 + dtime) * 0.03)
144+
self.object:set_yaw(yaw + (1 + dtime) * 0.03)
145145
end
146146
elseif ctrl.right then
147147
if self.v < 0 then
148-
self.object:setyaw(yaw + (1 + dtime) * 0.03)
148+
self.object:set_yaw(yaw + (1 + dtime) * 0.03)
149149
else
150-
self.object:setyaw(yaw - (1 + dtime) * 0.03)
150+
self.object:set_yaw(yaw - (1 + dtime) * 0.03)
151151
end
152152
end
153153
end
154-
local velo = self.object:getvelocity()
154+
local velo = self.object:get_velocity()
155155
if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
156-
self.object:setpos(self.object:getpos())
156+
self.object:set_pos(self.object:get_pos())
157157
return
158158
end
159159
local s = get_sign(self.v)
160160
self.v = self.v - 0.02 * s
161161
if s ~= get_sign(self.v) then
162-
self.object:setvelocity({x = 0, y = 0, z = 0})
162+
self.object:set_velocity({x = 0, y = 0, z = 0})
163163
self.v = 0
164164
return
165165
end
166166
if math.abs(self.v) > 5 then
167167
self.v = 5 * get_sign(self.v)
168168
end
169169

170-
local p = self.object:getpos()
170+
local p = self.object:get_pos()
171171
p.y = p.y - 0.5
172172
local new_velo
173173
local new_acce = {x = 0, y = 0, z = 0}
@@ -179,38 +179,38 @@ function boat.on_step(self, dtime)
179179
else
180180
new_acce = {x = 0, y = -9.8, z = 0}
181181
end
182-
new_velo = get_velocity(self.v, self.object:getyaw(),
183-
self.object:getvelocity().y)
184-
self.object:setpos(self.object:getpos())
182+
new_velo = get_velocity(self.v, self.object:get_yaw(),
183+
self.object:get_velocity().y)
184+
self.object:set_pos(self.object:get_pos())
185185
else
186186
p.y = p.y + 1
187187
if is_water(p) then
188-
local y = self.object:getvelocity().y
188+
local y = self.object:get_velocity().y
189189
if y >= 5 then
190190
y = 5
191191
elseif y < 0 then
192192
new_acce = {x = 0, y = 20, z = 0}
193193
else
194194
new_acce = {x = 0, y = 5, z = 0}
195195
end
196-
new_velo = get_velocity(self.v, self.object:getyaw(), y)
197-
self.object:setpos(self.object:getpos())
196+
new_velo = get_velocity(self.v, self.object:get_yaw(), y)
197+
self.object:set_pos(self.object:get_pos())
198198
else
199199
new_acce = {x = 0, y = 0, z = 0}
200-
if math.abs(self.object:getvelocity().y) < 1 then
201-
local pos = self.object:getpos()
200+
if math.abs(self.object:get_velocity().y) < 1 then
201+
local pos = self.object:get_pos()
202202
pos.y = math.floor(pos.y) + 0.5
203-
self.object:setpos(pos)
204-
new_velo = get_velocity(self.v, self.object:getyaw(), 0)
203+
self.object:set_pos(pos)
204+
new_velo = get_velocity(self.v, self.object:get_yaw(), 0)
205205
else
206-
new_velo = get_velocity(self.v, self.object:getyaw(),
207-
self.object:getvelocity().y)
208-
self.object:setpos(self.object:getpos())
206+
new_velo = get_velocity(self.v, self.object:get_yaw(),
207+
self.object:get_velocity().y)
208+
self.object:set_pos(self.object:get_pos())
209209
end
210210
end
211211
end
212-
self.object:setvelocity(new_velo)
213-
self.object:setacceleration(new_acce)
212+
self.object:set_velocity(new_velo)
213+
self.object:set_acceleration(new_acce)
214214
end
215215

216216

@@ -246,7 +246,7 @@ minetest.register_craftitem("boats:boat", {
246246
boat = minetest.add_entity(pointed_thing.under, "boats:boat")
247247
if boat then
248248
if placer then
249-
boat:setyaw(placer:get_look_horizontal())
249+
boat:set_yaw(placer:get_look_horizontal())
250250
end
251251
local player_name = placer and placer:get_player_name() or ""
252252
if not (creative and creative.is_enabled_for and

Diff for: ‎mods/bones/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ end
159159
local drop = function(pos, itemstack)
160160
local obj = minetest.add_item(pos, itemstack:take_item(itemstack:get_count()))
161161
if obj then
162-
obj:setvelocity({
162+
obj:set_velocity({
163163
x = math.random(-10, 10) / 9,
164164
y = 5,
165165
z = math.random(-10, 10) / 9,

Diff for: ‎mods/bucket/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ minetest.register_craftitem("bucket:bucket_empty", {
148148
if inv:room_for_item("main", {name=liquiddef.itemname}) then
149149
inv:add_item("main", liquiddef.itemname)
150150
else
151-
local pos = user:getpos()
151+
local pos = user:get_pos()
152152
pos.y = math.floor(pos.y + 0.5)
153153
minetest.add_item(pos, liquiddef.itemname)
154154
end

Diff for: ‎mods/default/craftitems.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
121121
if inv:room_for_item("main", new_stack) then
122122
inv:add_item("main", new_stack)
123123
else
124-
minetest.add_item(player:getpos(), new_stack)
124+
minetest.add_item(player:get_pos(), new_stack)
125125
end
126126
else
127127
stack:get_meta():from_table({ fields = data })
@@ -247,7 +247,7 @@ minetest.register_craftitem("default:skeleton_key", {
247247
itemstack = new_stack
248248
else
249249
if inv:add_item("main", new_stack):get_count() > 0 then
250-
minetest.add_item(user:getpos(), new_stack)
250+
minetest.add_item(user:get_pos(), new_stack)
251251
end -- else: added to inventory successfully
252252
end
253253

Diff for: ‎mods/default/item_entity.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ local item = {
1616
burn_up = function(self)
1717
-- disappear in a smoke puff
1818
self.object:remove()
19-
local p = self.object:getpos()
19+
local p = self.object:get_pos()
2020
minetest.sound_play("default_item_smoke", {
2121
pos = p,
2222
max_hear_distance = 8,
@@ -48,7 +48,7 @@ local item = {
4848
if self.ignite_timer > 10 then
4949
self.ignite_timer = 0
5050

51-
local node = minetest.get_node_or_nil(self.object:getpos())
51+
local node = minetest.get_node_or_nil(self.object:get_pos())
5252
if not node then
5353
return
5454
end

Diff for: ‎mods/dungeon_loot/mapgen.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
minetest.set_gen_notify({dungeon = true, temple = true})
22

33
local function noise3d_integer(noise, pos)
4-
return math.abs(math.floor(noise:get3d(pos) * 0x7fffffff))
4+
return math.abs(math.floor(noise:get_3d(pos) * 0x7fffffff))
55
end
66

77
local function random_sample(rand, list, count)

Diff for: ‎mods/fire/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ if flame_sound then
169169
function fire.update_player_sound(player)
170170
local player_name = player:get_player_name()
171171
-- Search for flame nodes in radius around player
172-
local ppos = player:getpos()
172+
local ppos = player:get_pos()
173173
local areamin = vector.subtract(ppos, radius)
174174
local areamax = vector.add(ppos, radius)
175175
local fpos, num = minetest.find_nodes_in_area(

Diff for: ‎mods/sethome/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ minetest.register_chatcommand("sethome", {
8989
func = function(name)
9090
name = name or "" -- fallback to blank name if nil
9191
local player = minetest.get_player_by_name(name)
92-
if player and sethome.set(name, player:getpos()) then
92+
if player and sethome.set(name, player:get_pos()) then
9393
return true, "Home set!"
9494
end
9595
return false, "Player not found!"

Diff for: ‎mods/stairs/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ local function rotate_and_place(itemstack, placer, pointed_thing)
2323
local param2 = 0
2424

2525
if placer then
26-
local placer_pos = placer:getpos()
26+
local placer_pos = placer:get_pos()
2727
if placer_pos then
2828
param2 = minetest.dir_to_facedir(vector.subtract(p1, placer_pos))
2929
end

Diff for: ‎mods/tnt/init.lua

+6-6
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ local function eject_drops(drops, pos, radius)
5858
local obj = minetest.add_item(drop_pos, dropitem)
5959
if obj then
6060
obj:get_luaentity().collect = true
61-
obj:setacceleration({x = 0, y = -10, z = 0})
62-
obj:setvelocity({x = math.random(-3, 3),
61+
obj:set_acceleration({x = 0, y = -10, z = 0})
62+
obj:set_velocity({x = math.random(-3, 3),
6363
y = math.random(0, 10),
6464
z = math.random(-3, 3)})
6565
end
@@ -152,7 +152,7 @@ end
152152
local function entity_physics(pos, radius, drops)
153153
local objs = minetest.get_objects_inside_radius(pos, radius)
154154
for _, obj in pairs(objs) do
155-
local obj_pos = obj:getpos()
155+
local obj_pos = obj:get_pos()
156156
local dist = math.max(1, vector.distance(pos, obj_pos))
157157

158158
local damage = (4 / dist) * radius
@@ -164,7 +164,7 @@ local function entity_physics(pos, radius, drops)
164164
local moveoff = vector.multiply(dir, dist + 1.0)
165165
local newpos = vector.add(pos, moveoff)
166166
newpos = vector.add(newpos, {x = 0, y = 0.2, z = 0})
167-
obj:setpos(newpos)
167+
obj:set_pos(newpos)
168168

169169
obj:set_hp(obj:get_hp() - damage)
170170
else
@@ -179,8 +179,8 @@ local function entity_physics(pos, radius, drops)
179179
end
180180

181181
if do_knockback then
182-
local obj_vel = obj:getvelocity()
183-
obj:setvelocity(calc_velocity(pos, obj_pos,
182+
local obj_vel = obj:get_velocity()
183+
obj:set_velocity(calc_velocity(pos, obj_pos,
184184
obj_vel, radius * 10))
185185
end
186186
if do_damage then

0 commit comments

Comments
 (0)
Please sign in to comment.