From 438c0877f6ed03a25211ce70e2edd26b01703a8c Mon Sep 17 00:00:00 2001 From: KaylebJay <44441970+KaylebJay@users.noreply.github.com> Date: Wed, 24 Jun 2020 13:12:25 -0600 Subject: [PATCH 1/3] Add external machine registration support (#557) New 'technic.register_base_machine' definition table value: 'modname' (defaults to current run mod) --- technic/machines/register/machine_base.lua | 40 ++++++++++++---------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/technic/machines/register/machine_base.lua b/technic/machines/register/machine_base.lua index 2965ba5..ea3faa9 100644 --- a/technic/machines/register/machine_base.lua +++ b/technic/machines/register/machine_base.lua @@ -38,6 +38,8 @@ function technic.register_base_machine(data) local machine_desc = data.machine_desc local tier = data.tier local ltier = string.lower(tier) + + data.modname = data.modname or minetest.get_current_modname() local groups = {cracky = 2, technic_machine = 1, ["technic_"..ltier] = 1} if data.tube then @@ -82,7 +84,7 @@ function technic.register_base_machine(data) local eu_input = meta:get_int(tier.."_EU_input") local machine_desc_tier = machine_desc:format(tier) - local machine_node = "technic:"..ltier.."_"..machine_name + local machine_node = data.modname..":"..ltier.."_"..machine_name local machine_demand = data.demand -- Setup meta data if it does not exist. @@ -157,15 +159,15 @@ function technic.register_base_machine(data) tentry = "" end - minetest.register_node("technic:"..ltier.."_"..machine_name, { + minetest.register_node(data.modname..":"..ltier.."_"..machine_name, { description = machine_desc:format(tier), tiles = { - "technic_"..ltier.."_"..machine_name.."_top.png"..tentry, - "technic_"..ltier.."_"..machine_name.."_bottom.png"..tentry, - "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, - "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, - "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, - "technic_"..ltier.."_"..machine_name.."_front.png" + data.modname.."_"..ltier.."_"..machine_name.."_top.png"..tentry, + data.modname.."_"..ltier.."_"..machine_name.."_bottom.png"..tentry, + data.modname.."_"..ltier.."_"..machine_name.."_side.png"..tentry, + data.modname.."_"..ltier.."_"..machine_name.."_side.png"..tentry, + data.modname.."_"..ltier.."_"..machine_name.."_side.png"..tentry, + data.modname.."_"..ltier.."_"..machine_name.."_front.png" }, paramtype2 = "facedir", groups = groups, @@ -227,18 +229,18 @@ function technic.register_base_machine(data) end, }) - minetest.register_node("technic:"..ltier.."_"..machine_name.."_active",{ + minetest.register_node(data.modname..":"..ltier.."_"..machine_name.."_active",{ description = machine_desc:format(tier), tiles = { - "technic_"..ltier.."_"..machine_name.."_top.png"..tentry, - "technic_"..ltier.."_"..machine_name.."_bottom.png"..tentry, - "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, - "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, - "technic_"..ltier.."_"..machine_name.."_side.png"..tentry, - "technic_"..ltier.."_"..machine_name.."_front_active.png" + data.modname.."_"..ltier.."_"..machine_name.."_top.png"..tentry, + data.modname.."_"..ltier.."_"..machine_name.."_bottom.png"..tentry, + data.modname.."_"..ltier.."_"..machine_name.."_side.png"..tentry, + data.modname.."_"..ltier.."_"..machine_name.."_side.png"..tentry, + data.modname.."_"..ltier.."_"..machine_name.."_side.png"..tentry, + data.modname.."_"..ltier.."_"..machine_name.."_front_active.png" }, paramtype2 = "facedir", - drop = "technic:"..ltier.."_"..machine_name, + drop = data.modname..":"..ltier.."_"..machine_name, groups = active_groups, connect_sides = data.connect_sides or connect_default, legacy_facedir_simple = true, @@ -249,7 +251,7 @@ function technic.register_base_machine(data) allow_metadata_inventory_take = technic.machine_inventory_take, allow_metadata_inventory_move = technic.machine_inventory_move, technic_run = run, - technic_disabled_machine_name = "technic:"..ltier.."_"..machine_name, + technic_disabled_machine_name = data.modname..":"..ltier.."_"..machine_name, on_receive_fields = function(pos, formname, fields, sender) local node = minetest.get_node(pos) if not pipeworks.may_configure(pos, sender) then return end @@ -271,8 +273,8 @@ function technic.register_base_machine(data) end, }) - technic.register_machine(tier, "technic:"..ltier.."_"..machine_name, technic.receiver) - technic.register_machine(tier, "technic:"..ltier.."_"..machine_name.."_active", technic.receiver) + technic.register_machine(tier, data.modname..":"..ltier.."_"..machine_name, technic.receiver) + technic.register_machine(tier, data.modname..":"..ltier.."_"..machine_name.."_active", technic.receiver) end -- End registration From 6154a04c00d7650664b78e2bca37631ae3778411 Mon Sep 17 00:00:00 2001 From: David Leal Date: Wed, 24 Jun 2020 14:14:04 -0500 Subject: [PATCH 2/3] Remove node_ownership support, cleanup (#560) --- .github/workflows/check-release.yml | 2 +- technic/machines/MV/lighting.lua | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index fb2ee39..cb26421 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -8,4 +8,4 @@ jobs: - name: lint uses: Roang-zero1/factorio-mod-luacheck@master with: - luacheckrc_url: https://raw.githubusercontent.com/minetest-mods/technic/master/.luacheckrc + luacheckrc_url: "" diff --git a/technic/machines/MV/lighting.lua b/technic/machines/MV/lighting.lua index 2254ecf..f7c9124 100644 --- a/technic/machines/MV/lighting.lua +++ b/technic/machines/MV/lighting.lua @@ -14,20 +14,7 @@ end function technic_homedecor_node_is_owned(pos, placer) local ownername = false - if type(IsPlayerNodeOwner) == "function" then -- node_ownership mod - if HasOwner(pos, placer) then - if not IsPlayerNodeOwner(pos, placer:get_player_name()) then - if type(getLastOwner) == "function" then -- ...is an old version - ownername = getLastOwner(pos) - elseif type(GetNodeOwnerName) == "function" then -- ...is a recent version - ownername = GetNodeOwnerName(pos) - else - ownername = S("someone") - end - end - end - - elseif type(isprotect) == "function" then -- glomie's protection mod + if type(isprotect) == "function" then -- glomie's protection mod if not isprotect(5, pos, placer) then ownername = S("someone") end From 00618d13b5b17c7fd93f097397410dee5905ccd1 Mon Sep 17 00:00:00 2001 From: KaylebJay <44441970+KaylebJay@users.noreply.github.com> Date: Sat, 27 Jun 2020 09:29:50 -0600 Subject: [PATCH 3/3] Drill and laser: call node-specific on_dig (#556) This properly digs nodes that have a custom on_dig function specified. For normal nodes, the behaviour is kept the same. --- technic/tools/mining_drill.lua | 6 ++++-- technic/tools/mining_lasers.lua | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua index e54e73d..09ebdf9 100644 --- a/technic/tools/mining_drill.lua +++ b/technic/tools/mining_drill.lua @@ -51,13 +51,15 @@ local function drill_dig_it0 (pos,player) minetest.record_protection_violation(pos, player:get_player_name()) return end - local node=minetest.get_node(pos) + 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 - minetest.node_dig(pos,node,player) + local def = minetest.registered_nodes[node.name] + if not def then return end + def.on_dig(pos, node, player) end local function drill_dig_it1 (player) diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua index 208b719..e4dd178 100644 --- a/technic/tools/mining_lasers.lua +++ b/technic/tools/mining_lasers.lua @@ -46,7 +46,7 @@ local function laser_node(pos, node, player) }) return end - minetest.node_dig(pos, node, player) + def.on_dig(pos, node, player) end local keep_node = {air = true}