From 438c0877f6ed03a25211ce70e2edd26b01703a8c Mon Sep 17 00:00:00 2001
From: KaylebJay <44441970+KaylebJay@users.noreply.github.com>
Date: Wed, 24 Jun 2020 21:12:25 +0200
Subject: [PATCH] Add external machine registration support (#557)
---
technic/machines/register/machine_base.lua | 40 +++++++++++++++++++++-------------------
1 files 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
--
Gitblit v1.8.0