From d5ff69d1d9efd683d852562af6cfddac5ac69879 Mon Sep 17 00:00:00 2001 From: Gábriel <38207624+gabriel1379@users.noreply.github.com> Date: Mon, 25 Mar 2024 19:45:57 +0100 Subject: [PATCH] Add Everness sandstone compressor recipes (#634) --- technic/tools/mining_drill.lua | 56 +++++++++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua index 5f07c23..0fe7135 100644 --- a/technic/tools/mining_drill.lua +++ b/technic/tools/mining_drill.lua @@ -46,20 +46,27 @@ {S("3x3 nodes.")}, } -local function drill_dig_it0 (pos,player) +local function drill_dig_it0(pos, player) if minetest.is_protected(pos, player:get_player_name()) then minetest.record_protection_violation(pos, player:get_player_name()) return end local node = minetest.get_node(pos) - if node.name == "air" or node.name == "ignore" then return end - if node.name == "default:lava_source" then return end - if node.name == "default:lava_flowing" then return end - if node.name == "default:water_source" then minetest.remove_node(pos) return end - if node.name == "default:water_flowing" then minetest.remove_node(pos) return end - local def = minetest.registered_nodes[node.name] - if not def then return end - def.on_dig(pos, node, player) + local ndef = minetest.registered_nodes[node.name] + if not ndef or ndef.drawtype == "airlike" then + -- Covers "air", "ignore", unknown nodes and more. + return + end + local groups = ndef and ndef.groups or {} + + if groups.lava then + return + end + if groups.water then + minetest.remove_node(pos) + return + end + ndef.on_dig(pos, node, player) end local function drill_dig_it1 (player) @@ -241,54 +248,53 @@ local function mining_drill_mkX_setmode(user, itemstack, drill_type, max_modes) local player_name = user:get_player_name() - local meta = minetest.deserialize(itemstack:get_metadata()) or {} + local meta = technic.get_stack_meta(itemstack) - if not meta["mode"] then + if not meta:contains("mode") then minetest.chat_send_player(player_name, S("Use while sneaking to change Mining Drill Mk%d modes."):format(drill_type)) end - local mode = (meta["mode"] or 0) + 1 + local mode = meta:get_int("mode") + 1 if mode > max_modes then mode = 1 end minetest.chat_send_player(player_name, S("Mining Drill Mk%d Mode %d"):format(2, mode).. ": "..mining_drill_mode_text[mode][1]) itemstack:set_name(("technic:mining_drill_mk%d_%s"):format(drill_type, mode)) - meta["mode"] = mode - itemstack:set_metadata(minetest.serialize(meta)) + meta:set_int("mode", mode) return itemstack end local function mining_drill_mkX_handler(itemstack, user, pointed_thing, drill_type, max_modes) local keys = user:get_player_control() - local meta = minetest.deserialize(itemstack:get_metadata()) or {} + local meta = technic.get_stack_meta(itemstack) -- Mode switching (if possible) if max_modes > 1 then - if not meta.mode or keys.sneak then + if not meta:contains("mode") or keys.sneak then return mining_drill_mkX_setmode(user, itemstack, drill_type, max_modes) end end if pointed_thing.type ~= "node" or not pos_is_pointable(pointed_thing.under) then return end - if not meta.charge then - return - end + + local charge = meta:get_int("technic:charge") + local mode = meta:contains("mode") and meta:get_int("mode") or 1 -- Check whether the tool has enough charge - local charge_to_take = cost_to_use(drill_type, meta.mode or 1) - if meta.charge < charge_to_take then + local charge_to_take = cost_to_use(drill_type, mode) + if charge < charge_to_take then return end -- Do the actual shoorting action local pos = minetest.get_pointed_thing_position(pointed_thing, false) - drill_dig_it(pos, user, meta.mode) + drill_dig_it(pos, user, mode) if not technic.creative_mode then - meta.charge = meta.charge - charge_to_take - itemstack:set_metadata(minetest.serialize(meta)) - technic.set_RE_wear(itemstack, meta.charge, max_charge[drill_type]) + charge = charge - charge_to_take + meta:set_int("technic:charge", charge) + technic.set_RE_wear(itemstack, charge, max_charge[drill_type]) end return itemstack end -- Gitblit v1.8.0