Athemis/MineClone2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace getpos() with get_pos()

Browse source
This commit is contained in:
Wuzzy 2019-02-01 06:33:07 +01:00
parent 1f1361d179
commit e789801662
58 changed files with 105 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mods/ENTITIES/drippingwater/init.lua
View file

@ -25,7 +25,7 @@ minetest.register_entity("drippingwater:drop_water", {
on_step = function(self, dtime)
local k = math.random(1,222)
local ownpos = self.object:getpos()
local ownpos = self.object:get_pos()
if k==1 then
self.object:setacceleration({x=0, y=-5, z=0})
@ -63,7 +63,7 @@ minetest.register_entity("drippingwater:drop_lava", {
on_step = function(self, dtime)
local k = math.random(1,222)
local ownpos = self.object:getpos()
local ownpos = self.object:get_pos()
if k==1 then
self.object:setacceleration({x=0, y=-5, z=0})

16
mods/ENTITIES/mcl_boats/init.lua
View file

@ -67,7 +67,7 @@ function boat.on_rightclick(self, clicker)
clicker:set_properties({visual_size = {x=1, y=1}})
mcl_player.player_attached[name] = false
mcl_player.player_set_animation(clicker, "stand" , 30)
local pos = clicker:getpos()
local pos = clicker:get_pos()
pos = {x = pos.x, y = pos.y + 0.2, z = pos.z}
clicker:setpos(pos)
elseif not self._driver then
@ -131,7 +131,7 @@ function boat.on_punch(self, puncher)
self._removed = true
-- Drop boat as item on the ground after punching
if not minetest.settings:get_bool("creative_mode") then
minetest.add_item(self.object:getpos(), self._itemstring)
minetest.add_item(self.object:get_pos(), self._itemstring)
end
self.object:remove()
end
@ -189,7 +189,7 @@ function boat.on_step(self, dtime)
end
local velo = self.object:getvelocity()
if self._v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
self.object:setpos(self.object:getpos())
self.object:setpos(self.object:get_pos())
return
end
local s = get_sign(self._v)
@ -203,7 +203,7 @@ function boat.on_step(self, dtime)
self._v = 5 * get_sign(self._v)
end
local p = self.object:getpos()
local p = self.object:get_pos()
p.y = p.y - boat_y_offset
local new_velo
local new_acce = {x = 0, y = 0, z = 0}
@ -217,7 +217,7 @@ function boat.on_step(self, dtime)
end
new_velo = get_velocity(self._v, self.object:getyaw(),
self.object:getvelocity().y)
self.object:setpos(self.object:getpos())
self.object:setpos(self.object:get_pos())
else
p.y = p.y + 1
if is_water(p) then
@ -230,18 +230,18 @@ function boat.on_step(self, dtime)
new_acce = {x = 0, y = 5, z = 0}
end
new_velo = get_velocity(self._v, self.object:getyaw(), y)
self.object:setpos(self.object:getpos())
self.object:setpos(self.object:get_pos())
else
new_acce = {x = 0, y = 0, z = 0}
if math.abs(self.object:getvelocity().y) < 1 then
local pos = self.object:getpos()
local pos = self.object:get_pos()
pos.y = math.floor(pos.y) + boat_y_offset
self.object:setpos(pos)
new_velo = get_velocity(self._v, self.object:getyaw(), 0)
else
new_velo = get_velocity(self._v, self.object:getyaw(),
self.object:getvelocity().y)
self.object:setpos(self.object:getpos())
self.object:setpos(self.object:get_pos())
end
end
end

12
mods/ENTITIES/mcl_item_entity/init.lua
View file

@ -55,7 +55,7 @@ end
minetest.register_globalstep(function(dtime)
for _,player in ipairs(minetest.get_connected_players()) do
if player:get_hp() > 0 or not minetest.settings:get_bool("enable_damage") then
local pos = player:getpos()
local pos = player:get_pos()
local inv = player:get_inventory()
local checkpos = {x=pos.x,y=pos.y + item_drop_settings.player_collect_height,z=pos.z}
@ -67,7 +67,7 @@ minetest.register_globalstep(function(dtime)
if object:get_luaentity()._magnet_timer >= 0 and object:get_luaentity()._magnet_timer < item_drop_settings.magnet_time and inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
-- Collection
if vector.distance(checkpos, object:getpos()) <= item_drop_settings.radius_collect and not object:get_luaentity()._removed then
if vector.distance(checkpos, object:get_pos()) <= item_drop_settings.radius_collect and not object:get_luaentity()._removed then
-- Ignore if itemstring is not set yet
if object:get_luaentity().itemstring ~= "" then
inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
@ -95,7 +95,7 @@ minetest.register_globalstep(function(dtime)
-- Move object to player
disable_physics(object, object:get_luaentity())
local opos = object:getpos()
local opos = object:get_pos()
local vec = vector.subtract(checkpos, opos)
vec = vector.add(opos, vector.divide(vec, 2))
object:moveto(vec)
@ -503,12 +503,12 @@ core.register_entity(":__builtin:item", {
-- Delete corrupted item entities. The itemstring MUST be non-empty on its first step,
-- otherwise there might have some data corruption.
if self.itemstring == "" then
minetest.log("warning", "Item entity with empty itemstring found at "..minetest.pos_to_string(self.object:getpos()).. "! Deleting it now.")
minetest.log("warning", "Item entity with empty itemstring found at "..minetest.pos_to_string(self.object:get_pos()).. "! Deleting it now.")
self._removed = true
self.object:remove()
end
local p = self.object:getpos()
local p = self.object:get_pos()
local node = core.get_node_or_nil(p)
local in_unloaded = (node == nil)
@ -530,7 +530,7 @@ core.register_entity(":__builtin:item", {
if (def and def.groups and (def.groups.lava or def.groups.destroys_items == 1)) then
-- Special effect for lava
if def.groups.lava then
minetest.sound_play("builtin_item_lava", {pos = self.object:getpos(), gain = 0.5})
minetest.sound_play("builtin_item_lava", {pos = self.object:get_pos(), gain = 0.5})
end
self._removed = true
self.object:remove()

12
mods/ENTITIES/mcl_minecarts/init.lua
View file

@ -41,7 +41,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick)
end
function cart:on_punch(puncher, time_from_last_punch, tool_capabilities, direction)
local pos = self.object:getpos()
local pos = self.object:get_pos()
if not self._railtype then
local node = minetest.get_node(vector.floor(pos)).name
self._railtype = minetest.get_item_group(node, "connect_to_raillike")
@ -83,7 +83,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick)
-- Drop items and remove cart entity
if not minetest.settings:get_bool("creative_mode") then
for d=1, #drop do
minetest.add_item(self.object:getpos(), drop[d])
minetest.add_item(self.object:get_pos(), drop[d])
end
end
@ -124,7 +124,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick)
local pos, rou_pos, node
-- Drop minecart if it isn't on a rail anymore
if self._last_float_check >= mcl_minecarts.check_float_time then
pos = self.object:getpos()
pos = self.object:get_pos()
rou_pos = vector.round(pos)
node = minetest.get_node(rou_pos)
local g = minetest.get_item_group(node.name, "connect_to_raillike")
@ -145,7 +145,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick)
-- Drop items and remove cart entity
if not minetest.settings:get_bool("creative_mode") then
for d=1, #drop do
minetest.add_item(self.object:getpos(), drop[d])
minetest.add_item(self.object:get_pos(), drop[d])
end
end
@ -165,7 +165,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick)
local dir, last_switch = nil, nil
if not pos then
pos = self.object:getpos()
pos = self.object:get_pos()
end
if self._old_pos and not self._punched then
local flo_pos = vector.floor(pos)
@ -485,7 +485,7 @@ register_minecart(
clicker:set_eye_offset({x=0, y=0, z=0},{x=0, y=0, z=0})
elseif not self._driver then
self._driver = player_name
self._start_pos = self.object:getpos()
self._start_pos = self.object:get_pos()
mcl_player.player_attached[player_name] = true
clicker:set_attach(self.object, "", {x=0, y=8.25, z=-2}, {x=0, y=0, z=0})
mcl_player.player_attached[name] = true

2
mods/ENTITIES/mcl_mobs/api.txt
View file

@ -710,7 +710,7 @@ mobs:register_mob("mob_horse:horse", {
if inv:room_for_item("main", "mobs:saddle") then
inv:add_item("main", "mobs:saddle")
else
minetest.add_item(clicker.getpos(), "mobs:saddle")
minetest.add_item(clicker.get_pos(), "mobs:saddle")
end
-- attach player to horse

8
mods/ENTITIES/mobs_mc/2_throwing.lua
View file

@ -52,7 +52,7 @@ local THROWING_ARROW_ENTITY={
--ARROW CODE
THROWING_ARROW_ENTITY.on_step = function(self, dtime)
self.timer=self.timer+dtime
local pos = self.object:getpos()
local pos = self.object:get_pos()
local node = minetest.get_node(pos)
minetest.add_particle({
@ -113,7 +113,7 @@ local throwing_shoot_arrow = function(itemstack, player)
if not minetest.settings:get_bool("creative_mode") then
player:get_inventory():remove_item("main", arrow[1])
end
local playerpos = player:getpos()
local playerpos = player:get_pos()
local obj = minetest.add_entity({x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, arrow[2]) --mc
local dir = player:get_look_dir()
obj:setvelocity({x=dir.x*22, y=dir.y*22, z=dir.z*22})
@ -247,7 +247,7 @@ if c("egg") then
-- shoot egg
local mobs_shoot_egg = function (item, player, pointed_thing)
local playerpos = player:getpos()
local playerpos = player:get_pos()
minetest.sound_play("default_place_node_hard", {
pos = playerpos,
@ -337,7 +337,7 @@ if c("snowball") then
-- shoot snowball
local mobs_shoot_snowball = function (item, player, pointed_thing)
local playerpos = player:getpos()
local playerpos = player:get_pos()
local obj = minetest.add_entity({
x = playerpos.x,

4
mods/ENTITIES/mobs_mc/3_shared.lua
View file

@ -32,13 +32,13 @@ mobs_mc.make_owner_teleport_function = function(dist, teleport_check_interval)
self._teleport_timer = self._teleport_timer - dtime
if self._teleport_timer <= 0 then
self._teleport_timer = teleport_check_interval
local mob_pos = self.object:getpos()
local mob_pos = self.object:get_pos()
local owner = minetest.get_player_by_name(self.owner)
if not owner then
-- No owner found, no teleportation
return
end
local owner_pos = owner:getpos()
local owner_pos = owner:get_pos()
local dist_from_owner = vector.distance(owner_pos, mob_pos)
if dist_from_owner > dist then
-- Check for nodes below air in a 5×1×5 area around the owner position

2
mods/ENTITIES/mobs_mc/chicken.lua
View file

@ -80,7 +80,7 @@ mobs:register_mob("mobs_mc:chicken", {
return
end
local pos = self.object:getpos()
local pos = self.object:get_pos()
minetest.add_item(pos, mobs_mc.items.egg)

8
mods/ENTITIES/mobs_mc/cow+mooshroom.lua
View file

@ -61,7 +61,7 @@ local cow_def = {
if inv:room_for_item("main", {name=mobs_mc.items.milk}) then
clicker:get_inventory():add_item("main", mobs_mc.items.milk)
else
local pos = self.object:getpos()
local pos = self.object:get_pos()
pos.y = pos.y + 0.5
minetest.add_item(pos, {name = mobs_mc.items.milk})
end
@ -91,7 +91,7 @@ mooshroom_def.on_rightclick = function(self, clicker)
local item = clicker:get_wielded_item()
-- Use shears to get mushrooms and turn mooshroom into cow
if item:get_name() == mobs_mc.items.shears then
local pos = self.object:getpos()
local pos = self.object:get_pos()
minetest.sound_play("shears", {pos = pos})
minetest.add_item({x=pos.x, y=pos.y+1.4, z=pos.z}, mobs_mc.items.mushroom_red .. " 5")
@ -112,7 +112,7 @@ mooshroom_def.on_rightclick = function(self, clicker)
if inv:room_for_item("main", {name=mobs_mc.items.milk}) then
clicker:get_inventory():add_item("main", mobs_mc.items.milk)
else
local pos = self.object:getpos()
local pos = self.object:get_pos()
pos.y = pos.y + 0.5
minetest.add_item(pos, {name = mobs_mc.items.milk})
end
@ -124,7 +124,7 @@ mooshroom_def.on_rightclick = function(self, clicker)
if inv:room_for_item("main", {name=mobs_mc.items.mushroom_stew}) then
clicker:get_inventory():add_item("main", mobs_mc.items.mushroom_stew)
else
local pos = self.object:getpos()
local pos = self.object:get_pos()
pos.y = pos.y + 0.5
minetest.add_item(pos, {name = mobs_mc.items.mushroom_stew})
end

6
mods/ENTITIES/mobs_mc/creeper.lua
View file

@ -62,19 +62,19 @@ mobs:register_mob("mobs_mc:creeper", {
item:add_wear(1000)
-- Tool break sound
if item:get_count() == 0 and wdef.sound and wdef.sound.breaks then
minetest.sound_play(wdef.sound.breaks, {pos = clicker:getpos(), gain = 0.5})
minetest.sound_play(wdef.sound.breaks, {pos = clicker:get_pos(), gain = 0.5})
end
clicker:set_wielded_item(item)
end
self._forced_explosion_countdown_timer = self.explosion_timer
minetest.sound_play(self.sounds.attack, {pos = self.object:getpos(), gain = 1, max_hear_distance = 16})
minetest.sound_play(self.sounds.attack, {pos = self.object:get_pos(), gain = 1, max_hear_distance = 16})
end
end,
do_custom = function(self, dtime)
if self._forced_explosion_countdown_timer ~= nil then
self._forced_explosion_countdown_timer = self._forced_explosion_countdown_timer - dtime
if self._forced_explosion_countdown_timer <= 0 then
mobs:explosion(self.object:getpos(), self.explosion_radius, 0, 1, self.sounds.explode)
mobs:explosion(self.object:get_pos(), self.explosion_radius, 0, 1, self.sounds.explode)
self.object:remove()
end
end

6
mods/ENTITIES/mobs_mc/ender_dragon.lua
View file

@ -110,7 +110,7 @@ mobs:register_arrow("mobs_mc:roar_of_the_dragon2", {
on_step = function(self, dtime)
local pos = self.object:getpos()
local pos = self.object:get_pos()
local n = minetest.get_node(pos).name
@ -158,7 +158,7 @@ mobs:register_arrow(":mobs_mc:fireball2", {
-- direct hit, no fire... just plenty of pain
hit_player = function(self, player)
minetest.sound_play("tnt_explode", {pos = player:getpos(), gain = 1.5, max_hear_distance = 2*64})
minetest.sound_play("tnt_explode", {pos = player:get_pos(), gain = 1.5, max_hear_distance = 2*64})
player:punch(self.object, 1.0, {
full_punch_interval = 0.5,
damage_groups = {fleshy = 6},
@ -167,7 +167,7 @@ mobs:register_arrow(":mobs_mc:fireball2", {
end,
hit_mob = function(self, mob)
minetest.sound_play("tnt_explode", {pos = mob:getpos(), gain = 1.5, max_hear_distance = 2*64})
minetest.sound_play("tnt_explode", {pos = mob:get_pos(), gain = 1.5, max_hear_distance = 2*64})
mob:punch(self.object, 1.0, {
full_punch_interval = 0.5,
damage_groups = {fleshy = 12},

6
mods/ENTITIES/mobs_mc/enderman.lua
View file

@ -217,7 +217,7 @@ mobs:register_mob("mobs_mc:enderman", {
-- Take random node
self._take_place_timer = 0
self._next_take_place_time = math.random(place_frequency_min, place_frequency_max)
local pos = self.object:getpos()
local pos = self.object:get_pos()
local takable_nodes = minetest.find_nodes_in_area({x=pos.x-2, y=pos.y-1, z=pos.z-2}, {x=pos.x+2, y=pos.y+1, z=pos.z+2}, mobs_mc.enderman_takable)
if #takable_nodes >= 1 then
local r = pr:next(1, #takable_nodes)
@ -268,7 +268,7 @@ mobs:register_mob("mobs_mc:enderman", {
-- Place taken node
self._take_place_timer = 0
self._next_take_place_time = math.random(take_frequency_min, take_frequency_max)
local pos = self.object:getpos()
local pos = self.object:get_pos()
local yaw = self.object:get_yaw()
-- Place node at looking direction
local place_pos = vector.subtract(pos, minetest.facedir_to_dir(minetest.dir_to_facedir(minetest.yaw_to_dir(yaw))))
@ -291,7 +291,7 @@ mobs:register_mob("mobs_mc:enderman", {
-- TODO: Teleport enderman on damage, etc.
_do_teleport = function(self)
-- Attempt to randomly teleport enderman
local pos = self.object:getpos()
local pos = self.object:get_pos()
-- Find all solid nodes below air in a 65×65×65 cuboid centered on the enderman
local nodes = minetest.find_nodes_in_area_under_air(vector.subtract(pos, 32), vector.add(pos, 32), {"group:solid", "group:cracky", "group:crumbly"})
local telepos

2
mods/ENTITIES/mobs_mc/ocelot.lua
View file

@ -85,7 +85,7 @@ local ocelot = {
-- 1/3 chance of getting tamed
if pr:next(1, 3) == 1 then
local yaw = self.object:get_yaw()
local cat = minetest.add_entity(self.object:getpos(), "mobs_mc:cat")
local cat = minetest.add_entity(self.object:get_pos(), "mobs_mc:cat")
cat:set_yaw(yaw)
local ent = cat:get_luaentity()
ent.owner = clicker:get_player_name()

2
mods/ENTITIES/mobs_mc/pig.lua
View file

@ -153,7 +153,7 @@ mobs:register_mob("mobs_mc:pig", {
-- Break carrot on a stick
local def = wielditem:get_definition()
if def.sounds and def.sounds.breaks then
minetest.sound_play(def.sounds.breaks, {pos = clicker:getpos(), max_hear_distance = 8, gain = 0.5})
minetest.sound_play(def.sounds.breaks, {pos = clicker:get_pos(), max_hear_distance = 8, gain = 0.5})
end
wielditem = {name = mobs_mc.items.fishing_rod, count = 1}
else

2
mods/ENTITIES/mobs_mc/sheep.lua
View file

@ -156,7 +156,7 @@ mobs:register_mob("mobs_mc:sheep", {
if item:get_name() == mobs_mc.items.shears and not self.gotten and not self.child then
self.gotten = true
local pos = self.object:getpos()
local pos = self.object:get_pos()
minetest.sound_play("shears", {pos = pos})
pos.y = pos.y + 0.5
if not self.color then

4
mods/ENTITIES/mobs_mc/snowman.lua
View file

@ -85,7 +85,7 @@ mobs:register_mob("mobs_mc:snowman", {
self._snowtimer = self._snowtimer + dtime
if self.health > 0 and self._snowtimer > snow_trail_frequency then
self._snowtimer = 0
local pos = self.object:getpos()
local pos = self.object:get_pos()
local below = {x=pos.x, y=pos.y-1, z=pos.z}
local def = minetest.registered_nodes[minetest.get_node(pos).name]
-- Node at snow golem's position must be replacable
@ -110,7 +110,7 @@ mobs:register_mob("mobs_mc:snowman", {
textures = gotten_texture,
})
local pos = self.object:getpos()
local pos = self.object:get_pos()
minetest.sound_play("shears", {pos = pos})
-- Wear out

2
mods/ENTITIES/mobs_mc/villager_evoker.lua
View file

@ -38,7 +38,7 @@ mobs:register_mob("mobs_mc:evoker", {
-- Summon vexes
custom_attack = function(self, to_attack)
local r = pr:next(2,4)
local basepos = self.object:getpos()
local basepos = self.object:get_pos()
basepos.y = basepos.y + 1
for i=1, r do
local spawnpos = vector.add(basepos, minetest.yaw_to_dir(pr:next(0,360)))

2
mods/ENTITIES/mobs_mc/wither.lua
View file

@ -84,7 +84,7 @@ mobs:register_arrow("mobs_mc:roar_of_the_dragon", {
on_step = function(self, dtime)
local pos = self.object:getpos()
local pos = self.object:get_pos()
local n = minetest.get_node(pos).name

2
mods/ENTITIES/mobs_mc/wolf.lua
View file

@ -65,7 +65,7 @@ local wolf = {
-- 1/3 chance of getting tamed
if pr:next(1, 3) == 1 then
local yaw = self.object:get_yaw()
dog = minetest.add_entity(self.object:getpos(), "mobs_mc:dog")
dog = minetest.add_entity(self.object:get_pos(), "mobs_mc:dog")
dog:set_yaw(yaw)
ent = dog:get_luaentity()
ent.owner = clicker:get_player_name()