Wrench support extend

.luacheckrc

@@ -1,16 +1,19 @@
 unused_args = false
 allow_defined_top = true
-max_line_length = 999
 
 globals = {
-    "technic", "minetest",
+	"minetest",
 }
 
 read_globals = {
-    string = {fields = {"split", "trim"}},
-    table = {fields = {"copy", "getn"}},
+	string = {fields = {"split"}},
+	table = {fields = {"copy"}},
 
-    "intllib", "ItemStack", "drawers",
-}
+	-- Minetest
+	"ItemStack",
 
-files["init.lua"].ignore = { "name", "stack" }
+	-- Mods
+	"drawers",
+	"intllib",
+	"xdecor",
+}

README.md

@@ -1,2 +1,87 @@
 ![](https://github.com/mt-mods/wrench/workflows/luacheck/badge.svg)
 [![License](https://img.shields.io/badge/license-LGPLv2.0%2B-purple.svg)](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.en.html)
+
+<!--
+[![ContentDB](https://content.minetest.net/packages/mt-mods/wrench/shields/downloads/)](https://content.minetest.net/packages/mt-mods/wrench/)
+-->
+
+# Wrench
+
+<img src="textures/technic_wrench.png"/>
+
+The wrench tool allows you to left-click on nodes with inventories to pick them up.
+
+This mod is a fork from wrench/ in https://github.com/mt-mods/technic
+
+# Supported Mods and Nodes
+
+* https://github.com/minetest/minetest_game
+  - bones:bones
+  - default:chest
+  - default:chest_locked
+  - default:furnace
+  - default:sign_wall_wood
+  - default:sign_wall_steel
+* https://github.com/HybridDog/connected_chests
+* https://github.com/minetest-mods/digtron
+  - digtron:battery_holder
+  - digtron:inventory
+  - digtron:fuelstore
+  - digtron:combined_storage
+* https://github.com/minetest-mods/drawers
+  - drawers:wood
+  - drawers:acacia_wood
+  - drawers:aspen_wood
+  - drawers:junglewood
+  - drawers:pine_wood
+* https://github.com/minetest-mods/more_chests
+  - more_chests:cobble
+  - more_chests:dropbox
+  - more_chests:fridge
+  - more_chests:big_fridge
+  - more_chests:shared
+  - more_chests:secret
+  - more_chests:toolbox_*
+* https://github.com/mt-mods/pipeworks
+  - pipeworks:autocrafter
+  - pipeworks:deployer_*
+  - pipeworks:dispenser_*
+  - pipeworks:nodebreaker_*
+* https://github.com/mt-mods/technic
+* https://github.com/minetest-mods/xdecor
+  - xdecor:cabinet
+  - xdecor:cabinet_half
+  - xdecor:empty_shelf
+  - xdecor:multishelf
+  - xdecor:cauldron_*
+  - xdecor:enchantment_table
+  - xdecor:itemframe
+  - xdecor:mailbox
+
+# Settings in `minetest.conf`
+```ini
+# Allows the wrench to be crafted if either the 'technic' or 'default' mod is installed.
+wrench.enable_crafting = true
+```
+
+# Contributors (originally technic modpack)
+
+* kpoppel
+* Nekogloop
+* Nore/Ekdohibs
+* ShadowNinja
+* VanessaE
+* BuckarooBanzay
+* OgelGames
+* int-ua
+* S-S-X
+* H-V-Smacker
+* groxxda
+* SwissalpS
+* And many others...
+
+# License (originally technic modpack)
+
+Unless otherwise stated, all components of this modpack are licensed under the
+LGPL, V2 or later.  See also the individual mod folders for their
+secondary/alternate licenses, if any.

functions.lua

@@ -78,6 +78,16 @@ function wrench.pickup_node(pos, player)
 			data.metas[name] = meta:get_int(name)
 		end
 	end
+	if def.timer then
+		local timer = minetest.get_node_timer(pos)
+		local timeout = timer:get_timeout()
+		if timeout then
+			data.timer = {
+				timeout = timeout,
+				elapsed = timer:get_elapsed()
+			}
+		end
+	end
 	local stack = ItemStack(node.name)
 	local item_meta = stack:get_meta()
 	item_meta:set_string("data", minetest.serialize(data))
@@ -121,6 +131,14 @@ function wrench.restore_node(pos, player, stack)
 			meta:set_string(name, value)
 		end
 	end
+	if data.timer then
+		local timer = minetest.get_node_timer(pos)
+		if data.timer.timeout == 0 then
+			timer:stop()
+		else
+			timer:set(data.timer.timeout, data.timer.elapsed)
+		end
+	end
 	if def.after_place then
 		def.after_place(pos, player, stack)
 	end

init.lua

@@ -43,12 +43,17 @@ function wrench.blacklist_item(name)
 end
 
 local mods = {
+	"bones",
+	"connected_chests",
 	"default",
 	"digtron",
 	"drawers",
+	"more_chests",
+	"pipeworks",
 	"technic",
 	"technic_chests",
 	"technic_cnc",
+	"xdecor",
 }
 
 for _, modname in pairs(mods) do

mod.conf

@@ -1,2 +1,14 @@
 name = wrench
-optional_depends = technic, technic_chests, technic_worldgen, intllib, drawers, default, digtron
+optional_depends = """
+	bones,
+	connected_chests,
+	default,
+	digtron,
+	drawers,
+	intllib,
+	pipeworks,
+	technic,
+	technic_chests,
+	technic_worldgen,
+	xdecor,
+"""

nodes/bones.lua

@@ -0,0 +1,13 @@
+
+-- Register wrench support for bones
+
+wrench.register_node("bones:bones", {
+	lists = {"main"},
+	metas = {
+			owner = wrench.META_TYPE_STRING,
+			infotext = wrench.META_TYPE_STRING,
+			formspec = wrench.META_TYPE_STRING,
+			time = wrench.META_TYPE_INT,
+	},
+	owned = true,
+})

nodes/connected_chests.lua

@@ -0,0 +1,28 @@
+
+-- Register wrench support for connected_chests
+
+wrench.register_node("default:chest_connected_left", {
+	lists = {"main"},
+})
+
+wrench.register_node("default:chest_connected_right", {
+	lists = {"main"},
+})
+
+wrench.register_node("default:chest_locked_connected_left", {
+	lists = {"main"},
+	metas = {
+			owner = wrench.META_TYPE_STRING,
+			infotext = wrench.META_TYPE_STRING
+	},
+	owned = true,
+})
+
+wrench.register_node("default:chest_locked_connected_right", {
+	lists = {"main"},
+	metas = {
+			owner = wrench.META_TYPE_STRING,
+			infotext = wrench.META_TYPE_STRING
+	},
+	owned = true,
+})

nodes/more_chests.lua

@@ -0,0 +1,40 @@
+
+-- Register wrench support for more_chests
+
+local basic_chests = {
+	"more_chests:cobble",
+	"more_chests:dropbox",
+	"more_chests:fridge",
+	"more_chests:big_fridge",
+	"more_chests:secret",
+	"more_chests:toolbox_acacia",
+	"more_chests:toolbox_aspen",
+	"more_chests:toolbox_jungle",
+	"more_chests:toolbox_pine",
+	"more_chests:toolbox_steel",
+	"more_chests:toolbox_wood",
+}
+
+for _,chest in pairs(basic_chests) do
+	wrench.register_node(chest, {
+		lists = {"main"},
+		metas = {
+			owner = wrench.META_TYPE_STRING,
+			infotext = wrench.META_TYPE_STRING,
+		},
+		owned = true,
+	})
+end
+
+-- Shared Chest
+
+wrench.register_node("more_chests:shared", {
+	lists = {"main"},
+	metas = {
+		owner = wrench.META_TYPE_STRING,
+		infotext = wrench.META_TYPE_STRING,
+		formspec = wrench.META_TYPE_STRING,
+		shared = wrench.META_TYPE_STRING,
+	},
+	owned = true,
+})

nodes/pipeworks.lua

@@ -0,0 +1,38 @@
+
+-- Register wrench support for pipeworks
+
+wrench.register_node("pipeworks:autocrafter", {
+	lists = {"src", "dst", "recipe", "output"},
+	metas = {
+		enabled = wrench.META_TYPE_INT,
+		channel = wrench.META_TYPE_STRING,
+		infotext = wrench.META_TYPE_STRING,
+		formspec = wrench.META_TYPE_STRING,
+	},
+	description = function(pos, meta, node, player)
+		return meta:get_string("infotext")
+	end,
+	timer = true,
+})
+
+local wielder_data = {
+	lists = {"main"},
+	metas = {
+		owner = wrench.META_TYPE_STRING,
+		infotext = wrench.META_TYPE_STRING,
+		formspec = wrench.META_TYPE_STRING,
+	},
+}
+
+-- TODO: convert *_on to *_off nodes before pickpup?
+
+wrench.register_node("pipeworks:deployer_off", wielder_data)
+wrench.register_node("pipeworks:deployer_on", wielder_data)
+
+wrench.register_node("pipeworks:dispenser_off", wielder_data)
+wrench.register_node("pipeworks:dispenser_on", wielder_data)
+
+table.insert(wielder_data.lists, "pick")
+table.insert(wielder_data.lists, "ghost_pick")
+wrench.register_node("pipeworks:nodebreaker_off", wielder_data)
+wrench.register_node("pipeworks:nodebreaker_on", wielder_data)

nodes/technic.lua

@@ -17,8 +17,8 @@ local function register_machine_node(nodename, tier)
 	wrench.register_node(nodename, {lists = lists, metas = metas})
 end
 
--- base_machines table row format: name = { extra meta fields }
-local defaults = { tiers = {"LV", "MV", "HV"} }
+-- base_machines table row format: name = {extra meta fields}
+local defaults = {tiers = {"LV", "MV", "HV"}}
 local base_machines = {
 	electric_furnace = defaults,
 	grinder = defaults,
@@ -91,3 +91,16 @@ for _, tier in pairs({"LV", "MV", "HV"}) do
 		})
 	end
 end
+
+-- Other machines
+
+wrench.register_node("technic:injector", {
+	lists = {"main"},
+	metas = {
+		splitstacks = wrench.META_TYPE_INT,
+		mode = wrench.META_TYPE_STRING,
+		infotext = wrench.META_TYPE_STRING,
+		formspec = wrench.META_TYPE_STRING,
+	},
+	timer = true,
+})

nodes/technic_chests.lua

@@ -75,21 +75,21 @@ end
 -- Register extra nodes with color marking for gold chest
 
 local chest_mark_colors = {
-	'_black',
-	'_blue',
-	'_brown',
-	'_cyan',
-	'_dark_green',
-	'_dark_grey',
-	'_green',
-	'_grey',
-	'_magenta',
-	'_orange',
-	'_pink',
-	'_red',
-	'_violet',
-	'_white',
-	'_yellow',
+	"_black",
+	"_blue",
+	"_brown",
+	"_cyan",
+	"_dark_green",
+	"_dark_grey",
+	"_green",
+	"_grey",
+	"_magenta",
+	"_orange",
+	"_pink",
+	"_red",
+	"_violet",
+	"_white",
+	"_yellow",
 }
 
 for i = 1, 15 do