Replace deprecated functions with newer ones (#510)

Use mod.conf
This commit is contained in:
David Leal 2019-09-14 05:55:41 -05:00 committed by SmallJoker
parent e66bb281a4
commit d5df30c3ff
16 changed files with 40 additions and 24 deletions

3
concrete/mod.conf Normal file

@ -0,0 +1,3 @@
name = concrete
depends = default
optional_depends = basic_materials, intllib, moreblocks

3
extranodes/mod.conf Normal file

@ -0,0 +1,3 @@
name = extranodes
depends = default, technic_worldgen, basic_materials, concrete
optional_depends = unifieddyes, intllib, moreblocks, steel, streetsmod

1
modpack.conf Normal file

@ -0,0 +1 @@
name = technic

@ -1 +0,0 @@

@ -91,8 +91,8 @@ end
technic.tube_inject_item = pipeworks.tube_inject_item or function(pos, start_pos, velocity, item) technic.tube_inject_item = pipeworks.tube_inject_item or function(pos, start_pos, velocity, item)
local tubed = pipeworks.tube_item(vector.new(pos), item) local tubed = pipeworks.tube_item(vector.new(pos), item)
tubed:get_luaentity().start_pos = vector.new(start_pos) tubed:get_luaentity().start_pos = vector.new(start_pos)
tubed:setvelocity(velocity) tubed:set_velocity(velocity)
tubed:setacceleration(vector.new(0, 0, 0)) tubed:set_acceleration(vector.new(0, 0, 0))
end end
@ -221,4 +221,3 @@ function technic.trace_node_ray_fat(pos, dir, range)
return p return p
end, vector.round(pos) end, vector.round(pos)
end end

@ -155,7 +155,7 @@ local function move_nodes_vect(poslist, vect, must_not_move, owner)
end end
for _, obj in ipairs(objects) do for _, obj in ipairs(objects) do
obj:setpos(vector.add(obj:getpos(), vect)) obj:set_pos(vector.add(obj:get_pos(), vect))
end end
for _, n in ipairs(nodelist) do for _, n in ipairs(nodelist) do
@ -276,7 +276,7 @@ for zp = 0, 1 do
end, end,
on_punch = function(pos, node, puncher) on_punch = function(pos, node, puncher)
local ppos = puncher:getpos() local ppos = puncher:get_pos()
local pvect = puncher:get_look_dir() local pvect = puncher:get_look_dir()
local pface = get_face(pos, ppos, pvect) local pface = get_face(pos, ppos, pvect)
@ -431,14 +431,14 @@ minetest.register_entity("technic:frame_entity", {
end, end,
dig = function(self) dig = function(self)
minetest.handle_node_drops(self.object:getpos(), { ItemStack("technic:frame_111111") }, self.last_puncher) minetest.handle_node_drops(self.object:get_pos(), { ItemStack("technic:frame_111111") }, self.last_puncher)
local pos = vector.round(self.object:getpos()) local pos = vector.round(self.object:get_pos())
frames_pos[pos_to_string(pos)] = nil frames_pos[pos_to_string(pos)] = nil
self.object:remove() self.object:remove()
end, end,
on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir) on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir)
local pos = self.object:getpos() local pos = self.object:get_pos()
if self.damage_object == nil then if self.damage_object == nil then
self.damage_object = minetest.add_entity(pos, "technic:damage_entity") self.damage_object = minetest.add_entity(pos, "technic:damage_entity")
self.damage_object:get_luaentity().remaining_time = 0.25 self.damage_object:get_luaentity().remaining_time = 0.25
@ -450,7 +450,7 @@ minetest.register_entity("technic:frame_entity", {
end end
self.last_puncher = puncher self.last_puncher = puncher
local ppos = puncher:getpos() local ppos = puncher:get_pos()
local pvect = puncher:get_look_dir() local pvect = puncher:get_look_dir()
local pface = get_face(pos, ppos, pvect) local pface = get_face(pos, ppos, pvect)
if pface == nil then return end if pface == nil then return end
@ -468,8 +468,8 @@ minetest.register_entity("technic:frame_entity", {
end, end,
on_rightclick = function(self, clicker) on_rightclick = function(self, clicker)
local pos = self.object:getpos() local pos = self.object:get_pos()
local ppos = clicker:getpos() local ppos = clicker:get_pos()
local pvect = clicker:get_look_dir() local pvect = clicker:get_look_dir()
local pface = get_face(pos, ppos, pvect) local pface = get_face(pos, ppos, pvect)
@ -547,7 +547,7 @@ mesecon.register_on_mvps_move(function(moved_nodes)
local entity = obj:get_luaentity() local entity = obj:get_luaentity()
if entity and (entity.name == "technic:frame_entity" or if entity and (entity.name == "technic:frame_entity" or
entity.name == "technic:damage_entity") then entity.name == "technic:damage_entity") then
obj:setpos(t.pos) obj:set_pos(t.pos)
end end
end end
end end

3
technic/mod.conf Normal file

@ -0,0 +1,3 @@
name = technic
depends = default, pipeworks, technic_worldgen, basic_materials
optional_depends = bucket, screwdriver, mesecons, mesecons_mvps, digilines, digiline_remote, intllib, unified_inventory, vector_extras, dye

@ -309,7 +309,7 @@ local function calculate_object_center(object)
end end
local function dmg_object(pos, object, strength) local function dmg_object(pos, object, strength)
local obj_pos = vector.add(object:getpos(), calculate_object_center(object)) local obj_pos = vector.add(object:get_pos(), calculate_object_center(object))
local mul local mul
if armor_enabled or entity_damage then if armor_enabled or entity_damage then
-- we need to check may the object be damaged even if armor is disabled -- we need to check may the object be damaged even if armor is disabled
@ -513,4 +513,3 @@ if griefing then
end, end,
}) })
end end

@ -55,7 +55,7 @@ end
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
local player_name = player:get_player_name() local player_name = player:get_player_name()
local pos = player:getpos() local pos = player:get_pos()
local rounded_pos = vector.round(pos) local rounded_pos = vector.round(pos)
rounded_pos.y = rounded_pos.y + 1 rounded_pos.y = rounded_pos.y + 1
player_positions[player_name] = rounded_pos player_positions[player_name] = rounded_pos
@ -77,7 +77,7 @@ minetest.register_globalstep(function(dtime)
for i, player in pairs(minetest.get_connected_players()) do for i, player in pairs(minetest.get_connected_players()) do
local player_name = player:get_player_name() local player_name = player:get_player_name()
local flashlight_weared = check_for_flashlight(player) local flashlight_weared = check_for_flashlight(player)
local pos = player:getpos() local pos = player:get_pos()
local rounded_pos = vector.round(pos) local rounded_pos = vector.round(pos)
rounded_pos.y = rounded_pos.y + 1 rounded_pos.y = rounded_pos.y + 1
local old_pos = player_positions[player_name] local old_pos = player_positions[player_name]
@ -113,7 +113,7 @@ minetest.register_node("technic:light", {
drawtype = "glasslike", drawtype = "glasslike",
tiles = {"technic_light.png"}, tiles = {"technic_light.png"},
paramtype = "light", paramtype = "light",
groups = {not_in_creative_inventory=1}, groups = {not_in_creative_inventory = 1},
drop = "", drop = "",
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,

@ -59,7 +59,7 @@ local function can_keep_node(name)
end end
local function laser_shoot(player, range, particle_texture, sound) local function laser_shoot(player, range, particle_texture, sound)
local player_pos = player:getpos() local player_pos = player:get_pos()
local player_name = player:get_player_name() local player_name = player:get_player_name()
local dir = player:get_look_dir() local dir = player:get_look_dir()

@ -48,7 +48,7 @@ minetest.register_tool("technic:prospector", {
end end
if math.random() < 0.02 then found = not found end if math.random() < 0.02 then found = not found end
minetest.chat_send_player(user:get_player_name(), minetest.registered_nodes[toolmeta.target].description.." is "..(found and "present" or "absent").." in "..look_diameter.."x"..look_diameter.."x"..toolmeta.look_depth.." region") minetest.chat_send_player(user:get_player_name(), minetest.registered_nodes[toolmeta.target].description.." is "..(found and "present" or "absent").." in "..look_diameter.."x"..look_diameter.."x"..toolmeta.look_depth.." region")
minetest.sound_play("technic_prospector_"..(found and "hit" or "miss"), { pos = vector.add(user:getpos(), { x = 0, y = 1, z = 0 }), gain = 1.0, max_hear_distance = 10 }) minetest.sound_play("technic_prospector_"..(found and "hit" or "miss"), { pos = vector.add(user:get_pos(), { x = 0, y = 1, z = 0 }), gain = 1.0, max_hear_distance = 10 })
return toolstack return toolstack
end, end,
on_place = function(toolstack, user, pointed_thing) on_place = function(toolstack, user, pointed_thing)

@ -24,7 +24,7 @@ minetest.register_tool("technic:vacuum", {
gain = 0.4, gain = 0.4,
}) })
end end
local pos = user:getpos() local pos = user:get_pos()
local inv = user:get_inventory() local inv = user:get_inventory()
for _, object in ipairs(minetest.get_objects_inside_radius(pos, vacuum_range)) do for _, object in ipairs(minetest.get_objects_inside_radius(pos, vacuum_range)) do
local luaentity = object:get_luaentity() local luaentity = object:get_luaentity()

@ -1,3 +1,3 @@
name=technic_chests name = technic_chests
depends=default,basic_materials depends = default, basic_materials
optional_depends=moreblocks,moreores,pipeworks,intllib,tubelib optional_depends = moreblocks, moreores, pipeworks, intllib, tubelib

3
technic_cnc/mod.conf Normal file

@ -0,0 +1,3 @@
name = technic_cnc
depends = default, basic_materials
optional_depends = technic

@ -0,0 +1,3 @@
name = technic_worldgen
depends = default, basic_materials
optional_depends = intllib, mg, doors, farming, glooptest, mesecons_doors, vessels

3
wrench/mod.conf Normal file

@ -0,0 +1,3 @@
name = wrench
depends = default
optional_depends = technic, technic_chests, technic_worldgen, intllib