From bace4f5f206fa4cf8dd7d50a2eccac2357be1772 Mon Sep 17 00:00:00 2001 From: AFCMS Date: Sat, 10 Apr 2021 02:04:31 +0200 Subject: [PATCH] support many (!) mods to new API --- mods/CORE/controls/init.lua | 46 +++++++------- mods/CORE/controls/mod.conf | 1 + mods/CORE/mcl_util/API.md | 24 ++++++++ mods/CORE/mcl_util/playerstep.lua | 16 +++-- mods/CORE/walkover/init.lua | 30 +++++++++ mods/CORE/walkover/mod.conf | 1 + mods/ENVIRONMENT/mcl_void_damage/init.lua | 63 ++++++++++--------- mods/HELP/doc/doc_items/init.lua | 22 ++++--- mods/HELP/doc/doc_items/mod.conf | 2 +- mods/HUD/mcl_hbarmor/init.lua | 29 ++++++++- mods/HUD/mcl_hbarmor/mod.conf | 2 +- mods/HUD/show_wielded_item/init.lua | 74 ++++++++++++----------- mods/ITEMS/mcl_bows/bow.lua | 12 ++-- mods/ITEMS/mcl_bows/mod.conf | 2 +- mods/ITEMS/mcl_clock/init.lua | 41 +++++++------ mods/ITEMS/mcl_clock/mod.conf | 2 +- mods/ITEMS/mcl_compass/init.lua | 37 +++++++----- mods/ITEMS/mcl_compass/mod.conf | 2 +- mods/ITEMS/mcl_fire/init.lua | 20 +++++- mods/ITEMS/mcl_fire/mod.conf | 2 +- mods/ITEMS/mcl_maps/init.lua | 20 +++--- mods/ITEMS/mcl_maps/mod.conf | 2 +- mods/PLAYER/mcl_hunger/init.lua | 48 +++++++++++++++ mods/PLAYER/mcl_hunger/mod.conf | 2 +- mods/PLAYER/mcl_player/init.lua | 12 ++-- mods/PLAYER/mcl_player/mod.conf | 1 + mods/PLAYER/mcl_playerinfo/init.lua | 30 ++++++--- mods/PLAYER/mcl_playerinfo/mod.conf | 2 +- mods/PLAYER/wieldview/init.lua | 11 +++- mods/PLAYER/wieldview/mod.conf | 2 +- 30 files changed, 369 insertions(+), 189 deletions(-) create mode 100644 mods/CORE/mcl_util/API.md diff --git a/mods/CORE/controls/init.lua b/mods/CORE/controls/init.lua index 2ceb7e902..4bc3b4311 100644 --- a/mods/CORE/controls/init.lua +++ b/mods/CORE/controls/init.lua @@ -44,32 +44,32 @@ minetest.register_on_leaveplayer(function(player) controls.players[name] = nil end) -minetest.register_globalstep(function(dtime) - for _, player in pairs(get_connected_players()) do +mcl_util.register_player_globalstep({ + execute = function(player, dtime) local player_name = player:get_player_name() local player_controls = player:get_player_control() if controls.players[player_name] then - for cname, cbool in pairs(player_controls) do - if known_controls[cname] == true then - --Press a key - if cbool==true and controls.players[player_name][cname][1]==false then - for _, func in pairs(controls.registered_on_press) do - func(player, cname) + for cname, cbool in pairs(player_controls) do + if known_controls[cname] == true then + --Press a key + if cbool==true and controls.players[player_name][cname][1]==false then + for _, func in pairs(controls.registered_on_press) do + func(player, cname) + end + controls.players[player_name][cname] = {true, clock()} + elseif cbool==true and controls.players[player_name][cname][1]==true then + for _, func in pairs(controls.registered_on_hold) do + func(player, cname, clock()-controls.players[player_name][cname][2]) + end + --Release a key + elseif cbool==false and controls.players[player_name][cname][1]==true then + for _, func in pairs(controls.registered_on_release) do + func(player, cname, clock()-controls.players[player_name][cname][2]) + end + controls.players[player_name][cname] = {false} + end end - controls.players[player_name][cname] = {true, clock()} - elseif cbool==true and controls.players[player_name][cname][1]==true then - for _, func in pairs(controls.registered_on_hold) do - func(player, cname, clock()-controls.players[player_name][cname][2]) - end - --Release a key - elseif cbool==false and controls.players[player_name][cname][1]==true then - for _, func in pairs(controls.registered_on_release) do - func(player, cname, clock()-controls.players[player_name][cname][2]) - end - controls.players[player_name][cname] = {false} end end - end - end - end -end) + end, +}) \ No newline at end of file diff --git a/mods/CORE/controls/mod.conf b/mods/CORE/controls/mod.conf index 83ebb2e25..c637a300b 100644 --- a/mods/CORE/controls/mod.conf +++ b/mods/CORE/controls/mod.conf @@ -1,4 +1,5 @@ name = controls author = Arcelmi +depends = mcl_util description = Controls framework by Arcelmi diff --git a/mods/CORE/mcl_util/API.md b/mods/CORE/mcl_util/API.md new file mode 100644 index 000000000..440ef0e1e --- /dev/null +++ b/mods/CORE/mcl_util/API.md @@ -0,0 +1,24 @@ +# mcl_util + +Provide utility functions for mcl2 + +## mcl_util.register_player_globalstep(def) +Used to register a player globalstep. +Use this insteed of global step if you need to execute action on all players to avoid calling the same functions multiple time. + +``` +mcl_util.register_player_globalstep({ + can_execute = function(dtime) + return true --return false if you want to skip "execute" function + end, + execute = function(player, dtime) + --do some cool stuff + --will be executed for every player at each server step + end, + after_execute = function(dtime) + end, +}) +``` + +## mcl_util.registered_player_globalstep +Table containing all registered player globalstep. \ No newline at end of file diff --git a/mods/CORE/mcl_util/playerstep.lua b/mods/CORE/mcl_util/playerstep.lua index 71dcd1544..6a4a99ad4 100644 --- a/mods/CORE/mcl_util/playerstep.lua +++ b/mods/CORE/mcl_util/playerstep.lua @@ -3,16 +3,22 @@ local get_connected_players = minetest.get_connected_players mcl_util.registered_player_globalstep = {} local registered_player_globalstep = mcl_util.registered_player_globalstep -function mcl_util.register_player_globalstep(func) - table.insert(mcl_util.registered_player_globalstep, func) +function mcl_util.register_player_globalstep(def) + if not def.can_execute then def.can_execute = function() return true end end + table.insert(mcl_util.registered_player_globalstep, {can_execute=def.can_execute, func=def.execute}) end minetest.register_on_mods_loaded(function() minetest.register_globalstep(function(dtime) local players = get_connected_players() - for _,func in pairs(registered_player_globalstep) do - for _,player in pairs(players) do - func(player, dtime) + for i = 1, #registered_player_globalstep do + if registered_player_globalstep[i].can_execute and registered_player_globalstep[i].can_execute(dtime) then + for p = 1, #players do + registered_player_globalstep[i].func(players[p], dtime) + end + if registered_player_globalstep[i].after_execute then + registered_player_globalstep[i].after_execute(dtime) + end end end end) diff --git a/mods/CORE/walkover/init.lua b/mods/CORE/walkover/init.lua index 220157c8b..e57abb8c9 100644 --- a/mods/CORE/walkover/init.lua +++ b/mods/CORE/walkover/init.lua @@ -52,3 +52,33 @@ minetest.register_globalstep(function(dtime) timer = 0 end end) + +--[[mcl_util.register_player_globalstep({ + can_execute = function(dtime) + timer = timer + dtime; + if timer >= 0.3 then + return true + else + return false + end + end, + execute = function(player, dtime) + local pp = player:get_pos() + pp.y = ceil(pp.y) + local loc = vector_add(pp, {x=0,y=-1,z=0}) + if loc ~= nil then + local nodeiamon = get_node(loc) + if nodeiamon ~= nil then + if on_walk[nodeiamon.name] then + on_walk[nodeiamon.name](loc, nodeiamon, player) + end + for i = 1, #registered_globals do + registered_globals[i](loc, nodeiamon, player) + end + end + end + end, + after_execute = function(dtime) + timer = 0 + end, +})]] diff --git a/mods/CORE/walkover/mod.conf b/mods/CORE/walkover/mod.conf index 837d81365..342ffd4ec 100644 --- a/mods/CORE/walkover/mod.conf +++ b/mods/CORE/walkover/mod.conf @@ -1,4 +1,5 @@ name = walkover author = lordfingle +depends = mcl_util description = Some mode developers have shown an interest in having an `on_walk_over` event. This is useful for pressure-plates and the like. diff --git a/mods/ENVIRONMENT/mcl_void_damage/init.lua b/mods/ENVIRONMENT/mcl_void_damage/init.lua index ee40ed702..53e051cc8 100644 --- a/mods/ENVIRONMENT/mcl_void_damage/init.lua +++ b/mods/ENVIRONMENT/mcl_void_damage/init.lua @@ -7,7 +7,6 @@ local is_in_void = mcl_worlds.is_in_void local get_spawn_pos = mcl_spawn.get_player_spawn_pos local death_msg = mcl_death_messages.player_damage local send_chat = minetest.chat_send_player -local get_connected = minetest.get_connected_players local voidtimer = 0 local VOID_DAMAGE_FREQ = 0.5 @@ -54,37 +53,37 @@ minetest.register_on_mods_loaded(function() end) -- Hurt players or teleport them back to spawn if they are too deep in the void -minetest.register_globalstep(function(dtime) - voidtimer = voidtimer + dtime - if voidtimer > VOID_DAMAGE_FREQ then - voidtimer = 0 - local enable_damage = minetest.settings:get_bool("enable_damage") - local players = get_connected() - for p=1, #players do - local player = players[p] - local pos = player:get_pos() - local void, void_deadly = is_in_void(pos) - if void_deadly then - local immortal_val = player:get_armor_groups().immortal - local is_immortal = false - if immortal_val and immortal_val > 0 then - is_immortal = true - end - if is_immortal or not enable_damage then - -- If damage is disabled, we can't kill players. - -- So we just teleport the player back to spawn. - local spawn = get_spawn_pos(player) - player:set_pos(spawn) - dim_change(player, pos_to_dim(spawn)) - send_chat(player:get_player_name(), S("The void is off-limits to you!")) - elseif enable_damage and not is_immortal then - -- Damage enabled, not immortal: Deal void damage (4 HP / 0.5 seconds) - if player:get_hp() > 0 then - death_msg(player, S("@1 fell into the endless void.", player:get_player_name())) - player:set_hp(player:get_hp() - VOID_DAMAGE) - end +mcl_util.register_player_globalstep({ + can_execute = function(dtime) + voidtimer = voidtimer + dtime + if voidtimer > VOID_DAMAGE_FREQ then + voidtimer = 0 + return true + end + end, + execute = function(player, dtime) + local pos = player:get_pos() + local void, void_deadly = is_in_void(pos) + if void_deadly then + local immortal_val = player:get_armor_groups().immortal + local is_immortal = false + if immortal_val and immortal_val > 0 then + is_immortal = true + end + if is_immortal or not enable_damage then + -- If damage is disabled, we can't kill players. + -- So we just teleport the player back to spawn. + local spawn = get_spawn_pos(player) + player:set_pos(spawn) + dim_change(player, pos_to_dim(spawn)) + send_chat(player:get_player_name(), S("The void is off-limits to you!")) + elseif enable_damage and not is_immortal then + -- Damage enabled, not immortal: Deal void damage (4 HP / 0.5 seconds) + if player:get_hp() > 0 then + death_msg(player, S("@1 fell into the endless void.", player:get_player_name())) + player:set_hp(player:get_hp() - VOID_DAMAGE) end end end - end -end) + end, +}) \ No newline at end of file diff --git a/mods/HELP/doc/doc_items/init.lua b/mods/HELP/doc/doc_items/init.lua index b0be3e12d..d742f97bc 100644 --- a/mods/HELP/doc/doc_items/init.lua +++ b/mods/HELP/doc/doc_items/init.lua @@ -1,6 +1,8 @@ local S = minetest.get_translator("doc_items") local N = function(s) return s end +local math = math + doc.sub.items = {} -- Template texts @@ -1397,16 +1399,18 @@ TODO: If possible, try to replace this functionality by updating the revealed it soon the player obtained a new item (probably needs new Minetest callbacks). ]] local checktime = 8 local timer = 0 -minetest.register_globalstep(function(dtime) - timer = timer + dtime - if timer > checktime then - local players = minetest.get_connected_players() - for p=1, #players do - reveal_items_in_inventory(players[p]) - end +mcl_util.register_player_globalstep({ + can_execute = function(dtime) + timer = timer + dtime + if timer > checktime then return true end + end, + execute = function(player, dtime) + reveal_items_in_inventory(player) + end, + after_execute = function(dtime) timer = math.fmod(timer, checktime) - end -end) + end, +}) minetest.register_on_mods_loaded(gather_descs) diff --git a/mods/HELP/doc/doc_items/mod.conf b/mods/HELP/doc/doc_items/mod.conf index 65d6e8366..7ed87843f 100644 --- a/mods/HELP/doc/doc_items/mod.conf +++ b/mods/HELP/doc/doc_items/mod.conf @@ -1,4 +1,4 @@ name = doc_items author = Wuzzy description = Adds automatically generated help texts for items. -depends = doc +depends = doc, mcl_util diff --git a/mods/HUD/mcl_hbarmor/init.lua b/mods/HUD/mcl_hbarmor/init.lua index 89b2db7a8..7a8c6b386 100644 --- a/mods/HUD/mcl_hbarmor/init.lua +++ b/mods/HUD/mcl_hbarmor/init.lua @@ -112,7 +112,7 @@ end) local main_timer = 0 local timer = 0 -minetest.register_globalstep(function(dtime) +--[[minetest.register_globalstep(function(dtime) main_timer = main_timer + dtime timer = timer + dtime if main_timer > mcl_hbarmor.tick or timer > 4 then @@ -132,4 +132,29 @@ minetest.register_globalstep(function(dtime) end end if timer > 4 then timer = 0 end -end) +end)]] + +mcl_util.register_player_globalstep({ + can_execute = function(dtime) + main_timer = main_timer + dtime + timer = timer + dtime + if main_timer > mcl_hbarmor.tick or timer > 4 then + if minetest.settings:get_bool("enable_damage") then + if main_timer > mcl_hbarmor.tick then main_timer = 0 end + return true + end + end + if timer > 4 then timer = 0 end + end, + execute = function(player, dtime) + local name = player:get_player_name() + if mcl_hbarmor.player_active[name] == true then + local ret = mcl_hbarmor.get_armor(player) + if ret == false then + minetest.log("error", "[mcl_hbarmor] Call to mcl_hbarmor.get_armor in globalstep returned with false!") + end + -- update all hud elements + update_hud(player) + end + end, +}) diff --git a/mods/HUD/mcl_hbarmor/mod.conf b/mods/HUD/mcl_hbarmor/mod.conf index 258395875..44c3549af 100644 --- a/mods/HUD/mcl_hbarmor/mod.conf +++ b/mods/HUD/mcl_hbarmor/mod.conf @@ -1,4 +1,4 @@ name = mcl_hbarmor author = BlockMen description = Adds a HUD bar displaying the current damage of the player's armor. -depends = hudbars, mcl_armor +depends = hudbars, mcl_armor, mcl_util diff --git a/mods/HUD/show_wielded_item/init.lua b/mods/HUD/show_wielded_item/init.lua index 11f01ea91..7e2d078e3 100644 --- a/mods/HUD/show_wielded_item/init.lua +++ b/mods/HUD/show_wielded_item/init.lua @@ -64,43 +64,45 @@ minetest.register_on_leaveplayer(function(player) wieldindex[name] = nil end) -mcl_util.register_player_globalstep(function(player, dtime) - local player_name = player:get_player_name() - local wstack = player:get_wielded_item() - local wname = wstack:get_name() - local windex = player:get_wield_index() - if dtimes[player_name] and dtimes[player_name] < dlimit then - dtimes[player_name] = dtimes[player_name] + dtime - if dtimes[player_name] > dlimit and huds[player_name] then - player:hud_change(huds[player_name], 'text', "") +mcl_util.register_player_globalstep({ + execute = function(player, dtime) + local player_name = player:get_player_name() + local wstack = player:get_wielded_item() + local wname = wstack:get_name() + local windex = player:get_wield_index() + if dtimes[player_name] and dtimes[player_name] < dlimit then + dtimes[player_name] = dtimes[player_name] + dtime + if dtimes[player_name] > dlimit and huds[player_name] then + player:hud_change(huds[player_name], 'text', "") + end end - end - -- Update HUD when wielded item or wielded index changed - if wname ~= wield[player_name] or windex ~= wieldindex[player_name] then - wieldindex[player_name] = windex - wield[player_name] = wname - dtimes[player_name] = 0 - if huds[player_name] then - local def = minetest.registered_items[wname] - local meta = wstack:get_meta() - --[[ Get description. Order of preference: - * description from metadata - * description from item definition - * itemstring ]] - local desc = meta:get_string("description") - if (desc == nil or desc == "") and def then - desc = def.description + -- Update HUD when wielded item or wielded index changed + if wname ~= wield[player_name] or windex ~= wieldindex[player_name] then + wieldindex[player_name] = windex + wield[player_name] = wname + dtimes[player_name] = 0 + if huds[player_name] then + local def = minetest.registered_items[wname] + local meta = wstack:get_meta() + --[[ Get description. Order of preference: + * description from metadata + * description from item definition + * itemstring ]] + local desc = meta:get_string("description") + if (desc == nil or desc == "") and def then + desc = def.description + end + if desc == nil or desc == "" then + desc = wname + end + -- Cut off item description after first newline + local firstnewline = string.find(desc, "\n") + if firstnewline then + desc = string.sub(desc, 1, firstnewline-1) + end + player:hud_change(huds[player_name], 'text', desc) end - if desc == nil or desc == "" then - desc = wname - end - -- Cut off item description after first newline - local firstnewline = string.find(desc, "\n") - if firstnewline then - desc = string.sub(desc, 1, firstnewline-1) - end - player:hud_change(huds[player_name], 'text', desc) end - end -end) + end, +}) diff --git a/mods/ITEMS/mcl_bows/bow.lua b/mods/ITEMS/mcl_bows/bow.lua index 45912384e..1d551aa20 100644 --- a/mods/ITEMS/mcl_bows/bow.lua +++ b/mods/ITEMS/mcl_bows/bow.lua @@ -340,17 +340,15 @@ controls.register_on_hold(function(player, key, time) end end) -minetest.register_globalstep(function(dtime) - for _, player in pairs(minetest.get_connected_players()) do +mcl_util.register_player_globalstep({ + execute = function(player, dtime) local name = player:get_player_name() local wielditem = player:get_wielded_item() - local wieldindex = player:get_wield_index() - local controls = player:get_player_control() - if type(bow_load[name]) == "number" and ((wielditem:get_name()~="mcl_bows:bow_0" and wielditem:get_name()~="mcl_bows:bow_1" and wielditem:get_name()~="mcl_bows:bow_2" and wielditem:get_name()~="mcl_bows:bow_0_enchanted" and wielditem:get_name()~="mcl_bows:bow_1_enchanted" and wielditem:get_name()~="mcl_bows:bow_2_enchanted") or wieldindex ~= bow_index[name]) then + if type(bow_load[name]) == "number" and ((wielditem:get_name()~="mcl_bows:bow_0" and wielditem:get_name()~="mcl_bows:bow_1" and wielditem:get_name()~="mcl_bows:bow_2" and wielditem:get_name()~="mcl_bows:bow_0_enchanted" and wielditem:get_name()~="mcl_bows:bow_1_enchanted" and wielditem:get_name()~="mcl_bows:bow_2_enchanted") or player:get_wield_index() ~= bow_index[name]) then reset_bow_state(player, true) end - end -end) + end, +}) minetest.register_on_joinplayer(function(player) reset_bows(player) diff --git a/mods/ITEMS/mcl_bows/mod.conf b/mods/ITEMS/mcl_bows/mod.conf index 79ae42436..e9f025a94 100644 --- a/mods/ITEMS/mcl_bows/mod.conf +++ b/mods/ITEMS/mcl_bows/mod.conf @@ -1,6 +1,6 @@ name = mcl_bows author = Arcelmi description = This mod adds bows and arrows for MineClone 2. -depends = controls, mcl_particles, mcl_enchanting, mcl_init +depends = controls, mcl_particles, mcl_enchanting, mcl_init, mcl_util optional_depends = awards, mcl_achievements, mcl_core, mcl_mobitems, playerphysics, doc, doc_identifier, mesecons_button diff --git a/mods/ITEMS/mcl_clock/init.lua b/mods/ITEMS/mcl_clock/init.lua index d53d75076..313e28a0e 100644 --- a/mods/ITEMS/mcl_clock/init.lua +++ b/mods/ITEMS/mcl_clock/init.lua @@ -76,25 +76,26 @@ end -- This timer makes sure the clocks get updated from time to time regardless of time_speed, -- just in case some clocks in the world go wrong local force_clock_update_timer = 0 +local now -minetest.register_globalstep(function(dtime) - local now = watch.get_clock_frame() - force_clock_update_timer = force_clock_update_timer + dtime - random_timer = random_timer + dtime - -- This causes the random spinning of the clock - if random_timer >= random_timer_trigger then - random_frame = (random_frame + math.random(-4, 4)) % clock_frames - random_timer = 0 - end - - if watch.old_time == now and force_clock_update_timer < 60 then - return - end - force_clock_update_timer = 0 - - watch.old_time = now - - for p, player in pairs(minetest.get_connected_players()) do +mcl_util.register_player_globalstep({ + can_execute = function(dtime) + now = watch.get_clock_frame() + force_clock_update_timer = force_clock_update_timer + dtime + random_timer = random_timer + dtime + -- This causes the random spinning of the clock + if random_timer >= random_timer_trigger then + random_frame = (random_frame + math.random(-4, 4)) % clock_frames + random_timer = 0 + end + if watch.old_time == now and force_clock_update_timer < 60 then + return + end + force_clock_update_timer = 0 + watch.old_time = now + return true + end, + execute = function(player, dtime) for s, stack in pairs(player:get_inventory():get_list("main")) do local dim = mcl_worlds.pos_to_dimension(player:get_pos()) local frame @@ -111,8 +112,8 @@ minetest.register_globalstep(function(dtime) player:get_inventory():set_stack("main", s, "mcl_clock:clock_"..frame.." "..count) end end - end -end) + end, +}) -- Immediately set correct clock time after crafting minetest.register_on_craft(function(itemstack) diff --git a/mods/ITEMS/mcl_clock/mod.conf b/mods/ITEMS/mcl_clock/mod.conf index e358ff29a..378ff4c9a 100644 --- a/mods/ITEMS/mcl_clock/mod.conf +++ b/mods/ITEMS/mcl_clock/mod.conf @@ -1,4 +1,4 @@ name = mcl_clock description = A fantasy clock item roughly shows the time of day. -depends = mcl_init, mcl_worlds, mesecons +depends = mcl_init, mcl_worlds, mesecons, mcl_util optional_depends = doc diff --git a/mods/ITEMS/mcl_compass/init.lua b/mods/ITEMS/mcl_compass/init.lua index f15459303..d2cf17513 100644 --- a/mods/ITEMS/mcl_compass/init.lua +++ b/mods/ITEMS/mcl_compass/init.lua @@ -12,22 +12,27 @@ local random_timer_trigger = 0.5 -- random compass spinning tick in seconds. Inc local random_frame = math.random(0, compass_frames-1) -minetest.register_globalstep(function(dtime) - random_timer = random_timer + dtime +local math = math - if random_timer >= random_timer_trigger then - random_frame = (random_frame + math.random(-1, 1)) % compass_frames - random_timer = 0 - end - for i,player in pairs(minetest.get_connected_players()) do - local function has_compass(player) - for _,stack in pairs(player:get_inventory():get_list("main")) do - if minetest.get_item_group(stack:get_name(), "compass") ~= 0 then - return true - end - end - return false +local function has_compass(player) + for _,stack in pairs(player:get_inventory():get_list("main")) do + if minetest.get_item_group(stack:get_name(), "compass") ~= 0 then + return true end + end + return false +end + +mcl_util.register_player_globalstep({ + can_execute = function(dtime) + random_timer = random_timer + dtime + if random_timer >= random_timer_trigger then + random_frame = (random_frame + math.random(-1, 1)) % compass_frames + random_timer = 0 + end + return true + end, + execute = function(player, dtime) if has_compass(player) then local pos = player:get_pos() local dim = mcl_worlds.pos_to_dimension(pos) @@ -61,8 +66,8 @@ minetest.register_globalstep(function(dtime) end end end - end -end) + end, +}) local images = {} for frame = 0, compass_frames-1 do diff --git a/mods/ITEMS/mcl_compass/mod.conf b/mods/ITEMS/mcl_compass/mod.conf index 41266222b..8da1bd833 100644 --- a/mods/ITEMS/mcl_compass/mod.conf +++ b/mods/ITEMS/mcl_compass/mod.conf @@ -1,4 +1,4 @@ name = mcl_compass description = A compass item which points towards the world origin. -depends = mcl_core, mcl_worlds, mesecons +depends = mcl_core, mcl_worlds, mesecons, mcl_util optional_depends = doc diff --git a/mods/ITEMS/mcl_fire/init.lua b/mods/ITEMS/mcl_fire/init.lua index 95d76c45d..6f63b60c6 100644 --- a/mods/ITEMS/mcl_fire/init.lua +++ b/mods/ITEMS/mcl_fire/init.lua @@ -19,7 +19,7 @@ local find_nodes_in_area = minetest.find_nodes_in_area local find_node_near = minetest.find_node_near local get_item_group = minetest.get_item_group -local get_connected_players = minetest.get_connected_players +--local get_connected_players = minetest.get_connected_players local vector = vector local math = math @@ -463,7 +463,7 @@ if flame_sound then -- Cycle for updating players sounds - minetest.register_globalstep(function(dtime) + --[[minetest.register_globalstep(function(dtime) timer = timer + dtime if timer < cycle then return @@ -474,7 +474,21 @@ if flame_sound then for n = 1, #players do mcl_fire.update_player_sound(players[n]) end - end) + end)]] + + mcl_util.register_player_globalstep({ + can_execute = function(dtime) + timer = timer + dtime + if timer < cycle then + return false + end + timer = 0 + return true + end, + execute = function(player, dtime) + mcl_fire.update_player_sound(player) + end, + }) -- Stop sound and clear handle on player leave diff --git a/mods/ITEMS/mcl_fire/mod.conf b/mods/ITEMS/mcl_fire/mod.conf index da94d9278..4a1d52ee2 100644 --- a/mods/ITEMS/mcl_fire/mod.conf +++ b/mods/ITEMS/mcl_fire/mod.conf @@ -1,3 +1,3 @@ name = mcl_fire -depends = mcl_core, mcl_worlds, mcl_sounds, mcl_particles +depends = mcl_core, mcl_worlds, mcl_sounds, mcl_particles, mcl_util optional_depends = mcl_portals \ No newline at end of file diff --git a/mods/ITEMS/mcl_maps/init.lua b/mods/ITEMS/mcl_maps/init.lua index 58a0a3a15..f996d9dd6 100644 --- a/mods/ITEMS/mcl_maps/init.lua +++ b/mods/ITEMS/mcl_maps/init.lua @@ -97,14 +97,16 @@ end) local updatetimer = 0 if not minetest.is_creative_enabled("") then - minetest.register_globalstep(function(dtime) - updatetimer = updatetimer + dtime - if updatetimer > 0.1 then - local players = minetest.get_connected_players() - for i=1, #players do - update_minimap(players[i]) - end + mcl_util.register_player_globalstep({ + can_execute = function(dtime) + updatetimer = updatetimer + dtime + if updatetimer > 0.1 then return true else return false end + end, + execute = function(player, dtime) + update_minimap(player) + end, + after_execute = function(dtime) updatetimer = updatetimer - dtime - end - end) + end, + }) end diff --git a/mods/ITEMS/mcl_maps/mod.conf b/mods/ITEMS/mcl_maps/mod.conf index 5615dc2be..df3b19378 100644 --- a/mods/ITEMS/mcl_maps/mod.conf +++ b/mods/ITEMS/mcl_maps/mod.conf @@ -1,2 +1,2 @@ name = mcl_maps -depends = mcl_wip +depends = mcl_wip, mcl_util diff --git a/mods/PLAYER/mcl_hunger/init.lua b/mods/PLAYER/mcl_hunger/init.lua index b640dfdc9..4373d33a6 100644 --- a/mods/PLAYER/mcl_hunger/init.lua +++ b/mods/PLAYER/mcl_hunger/init.lua @@ -181,6 +181,54 @@ minetest.register_globalstep(function(dtime) end end) +--[[mcl_util.register_player_globalstep({ + can_execute = function(dtime) + main_timer = main_timer + dtime + timer = timer + dtime + if main_timer > mcl_hunger.HUD_TICK or timer > 0.5 then + if main_timer > mcl_hunger.HUD_TICK then main_timer = 0 end + return true + end + end, + execute = function(player, dtime) + local name = player:get_player_name() + local h = tonumber(mcl_hunger.get_hunger(player)) + local hp = player:get_hp() + if timer > 0.5 then + -- Slow health regeneration, and hunger damage (every 4s). + -- Regeneration rate based on tutorial video . + -- Minecraft Wiki seems to be wrong in claiming that full hunger gives 0.5s regen rate. + if timerMult == 0 then + if h >= 18 and hp > 0 and hp < 20 then + -- +1 HP, +exhaustion + player:set_hp(hp+1) + mcl_hunger.exhaust(name, mcl_hunger.EXHAUST_REGEN) + mcl_hunger.update_exhaustion_hud(player, mcl_hunger.get_exhaustion(player)) + elseif h == 0 then + -- Damage hungry player down to 1 HP + -- TODO: Allow starvation at higher difficulty levels + if hp-1 > 0 then + if mod_death_messages then + mcl_death_messages.player_damage(player, S("@1 starved to death.", name)) + end + player:set_hp(hp-1) + end + end + end + + end + end, + after_execute = function(dtime) + if timer > 0.5 then + timer = 0 + timerMult = timerMult + 1 + if timerMult > 7 then + timerMult = 0 + end + end + end, +})]] + --[[ IF HUNGER IS NOT ENABLED ]] else diff --git a/mods/PLAYER/mcl_hunger/mod.conf b/mods/PLAYER/mcl_hunger/mod.conf index 7795da7a2..80dfd145d 100644 --- a/mods/PLAYER/mcl_hunger/mod.conf +++ b/mods/PLAYER/mcl_hunger/mod.conf @@ -1,5 +1,5 @@ name = mcl_hunger author = BlockMen description = Adds a simple hunger meachanic with satiation, food poisoning and different healing. -depends = hudbars +depends = hudbars, mcl_util optional_depends = mcl_death_messages diff --git a/mods/PLAYER/mcl_player/init.lua b/mods/PLAYER/mcl_player/init.lua index 210e2d19f..3b406dd76 100644 --- a/mods/PLAYER/mcl_player/init.lua +++ b/mods/PLAYER/mcl_player/init.lua @@ -147,8 +147,8 @@ local player_set_animation = mcl_player.player_set_animation local player_attached = mcl_player.player_attached -- Check each player and apply animations -minetest.register_globalstep(function(dtime) - for _, player in pairs(minetest.get_connected_players()) do +mcl_util.register_player_globalstep({ + execute = function(player, dtime) local name = player:get_player_name() local model_name = player_model[name] local model = model_name and models[model_name] @@ -166,9 +166,7 @@ minetest.register_globalstep(function(dtime) if controls.sneak then animation_speed_mod = animation_speed_mod / 2 end - - - + -- ask if player is swiming local head_in_water = minetest.get_item_group(mcl_playerinfo[name].node_head, "water") ~= 0 -- ask if player is sprinting @@ -217,8 +215,8 @@ minetest.register_globalstep(function(dtime) player_set_animation(player, "sneak_stand", animation_speed_mod) end end - end -end) + end, +}) -- Don't change HP if the player falls in the water or through End Portal: minetest.register_on_player_hpchange(function(player, hp_change, reason) diff --git a/mods/PLAYER/mcl_player/mod.conf b/mods/PLAYER/mcl_player/mod.conf index 97ccce8e6..eec13ff4a 100644 --- a/mods/PLAYER/mcl_player/mod.conf +++ b/mods/PLAYER/mcl_player/mod.conf @@ -1,3 +1,4 @@ name = mcl_player author = celeron55 +depends = mcl_util description = Adds the 3D player model, taken from Minetest Game 0.4.16. diff --git a/mods/PLAYER/mcl_playerinfo/init.lua b/mods/PLAYER/mcl_playerinfo/init.lua index 5086f3195..ec59a4463 100644 --- a/mods/PLAYER/mcl_playerinfo/init.lua +++ b/mods/PLAYER/mcl_playerinfo/init.lua @@ -39,37 +39,51 @@ local get_player_nodes = function(player_pos) end minetest.register_globalstep(function(dtime) - time = time + dtime - -- Run the rest of the code every 0.5 seconds if time < 0.5 then return end - -- reset time for next check -- FIXME: Make sure a regular check interval applies time = 0 - -- check players for _,player in pairs(minetest.get_connected_players()) do -- who am I? local name = player:get_player_name() - -- where am I? local pos = player:get_pos() - -- what is around me? local node_stand, node_stand_below, node_head, node_feet = get_player_nodes(pos) mcl_playerinfo[name].node_stand = node_stand mcl_playerinfo[name].node_stand_below = node_stand_below mcl_playerinfo[name].node_head = node_head mcl_playerinfo[name].node_feet = node_feet - end - end) +--[[mcl_util.register_player_globalstep({ + can_execute = function(dtime) + time = time + dtime + if time < 0.5 then + return false + end + -- reset time for next check + -- FIXME: Make sure a regular check interval applies + time = 0 + return true + end, + execute = function(player, dtime) + local name = player:get_player_name() + local pos = player:get_pos() + local node_stand, node_stand_below, node_head, node_feet = get_player_nodes(pos) + mcl_playerinfo[name].node_stand = node_stand + mcl_playerinfo[name].node_stand_below = node_stand_below + mcl_playerinfo[name].node_head = node_head + mcl_playerinfo[name].node_feet = node_feet + end, +})]] + -- set to blank on join (for 3rd party mods) minetest.register_on_joinplayer(function(player) local name = player:get_player_name() diff --git a/mods/PLAYER/mcl_playerinfo/mod.conf b/mods/PLAYER/mcl_playerinfo/mod.conf index 9f2b0c4a5..a453f7788 100644 --- a/mods/PLAYER/mcl_playerinfo/mod.conf +++ b/mods/PLAYER/mcl_playerinfo/mod.conf @@ -1,4 +1,4 @@ name = mcl_playerinfo author = TenPlus1 description = This is a helper mod for other mod to query the nodes around the player. -depends = mcl_init, mcl_core, mcl_particles, mcl_death_messages +depends = mcl_init, mcl_core, mcl_particles, mcl_death_messages, mcl_util diff --git a/mods/PLAYER/wieldview/init.lua b/mods/PLAYER/wieldview/init.lua index 7a349f2f3..09b0482f9 100644 --- a/mods/PLAYER/wieldview/init.lua +++ b/mods/PLAYER/wieldview/init.lua @@ -81,11 +81,18 @@ minetest.register_on_joinplayer(function(player) end, player) end) -minetest.register_globalstep(function() +--[[minetest.register_globalstep(function() for _,player in pairs(minetest.get_connected_players()) do wieldview:update_wielded_item(player) end -end) +end)]] + +mcl_util.register_player_globalstep({ + can_execute = function(dtime) return true end, + execute = function(player, dtime) + wieldview:update_wielded_item(player) + end, +}) minetest.register_entity("wieldview:wieldnode", { initial_properties = { diff --git a/mods/PLAYER/wieldview/mod.conf b/mods/PLAYER/wieldview/mod.conf index 4cd2a6935..b519d66e9 100644 --- a/mods/PLAYER/wieldview/mod.conf +++ b/mods/PLAYER/wieldview/mod.conf @@ -1,5 +1,5 @@ name = wieldview author = stujones11 description = Makes hand wielded items visible to other players. -depends = mcl_armor +depends = mcl_armor, mcl_util