Refactoring and fixing wrench registrations

wrench/support.lua → wrench/api.lua

@@ -19,43 +19,6 @@ wrench.META_TYPE_FLOAT = 1
 wrench.META_TYPE_STRING = 2
 wrench.META_TYPE_INT = 3
 
-local STRING, FLOAT  =
-	wrench.META_TYPE_STRING,
-	wrench.META_TYPE_FLOAT
-
-wrench.registered_nodes = {
-	["default:chest"] = {
-		lists = {"main"},
-	},
-	["default:chest_locked"] = {
-		lists = {"main"},
-		metas = {owner = STRING,
-			infotext = STRING},
-		owned = true,
-	},
-	["default:furnace"] = {
-		lists = {"fuel", "src", "dst"},
-		metas = {infotext = STRING,
-			fuel_totaltime = FLOAT,
-			fuel_time = FLOAT,
-			src_totaltime = FLOAT,
-			src_time = FLOAT},
-	},
-	["default:furnace_active"] = {
-		lists = {"fuel", "src", "dst"},
-		metas = {infotext = STRING,
-			fuel_totaltime = FLOAT,
-			fuel_time = FLOAT,
-			src_totaltime = FLOAT,
-			src_time = FLOAT},
-		store_meta_always = true,
-	},
-	["default:sign_wall"] = {
-		metas = {infotext = STRING,
-			text = STRING},
-	},
-}
-
 function wrench:original_name(name)
 	for key, value in pairs(self.registered_nodes) do
 		if name == value.name then
@@ -65,7 +28,11 @@ function wrench:original_name(name)
 end
 
 function wrench:register_node(name, def)
+	assert(type(name) == "string", "wrench:register_node invalid type for name")
+	assert(type(def) == "table", "wrench:register_node invalid type for def")
 	if minetest.registered_nodes[name] then
 	    self.registered_nodes[name] = def
+	else
+		minetest.log("warning", "Attempt to register unknown node for wrench: "..tostring(name))
 	end
 end

wrench/init.lua

@@ -13,12 +13,24 @@ available to survival-mode players.
 
 local LATEST_SERIALIZATION_VERSION = 1
 
-wrench = {}
+wrench = {
+	registered_nodes = {}
+}
 
 local modpath = minetest.get_modpath(minetest.get_current_modname())
-dofile(modpath.."/support.lua")
-dofile(modpath.."/technic.lua")
-dofile(modpath.."/drawers.lua")
+dofile(modpath.."/api.lua")
+
+local function register_mod_nodes(modname)
+	if minetest.get_modpath(modname) then
+		dofile(modpath.."/nodes/"..modname..".lua")
+	end
+end
+
+register_mod_nodes("default")
+register_mod_nodes("technic")
+register_mod_nodes("technic_cnc")
+register_mod_nodes("technic_chests")
+register_mod_nodes("drawers")
 
 -- Boilerplate to support localized strings if intllib mod is installed.
 local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end

wrench/mod.conf

@@ -1,3 +1,2 @@
 name = wrench
-depends = default
-optional_depends = technic, technic_chests, technic_worldgen, intllib, drawers
+optional_depends = technic, technic_chests, technic_worldgen, intllib, drawers, default

wrench/nodes/default.lua

@@ -0,0 +1,52 @@
+
+-- Register nodes from default / minetest_game
+
+wrench:register_node("default:chest", {
+	lists = {"main"},
+})
+
+wrench:register_node("default:chest_locked", {
+	lists = {"main"},
+	metas = {
+		owner = wrench.META_TYPE_STRING,
+		infotext = wrench.META_TYPE_STRING
+	},
+	owned = true,
+})
+
+wrench:register_node("default:furnace", {
+	lists = {"fuel", "src", "dst"},
+	metas = {
+		infotext = wrench.META_TYPE_STRING,
+		fuel_totaltime = wrench.META_TYPE_FLOAT,
+		fuel_time = wrench.META_TYPE_FLOAT,
+		src_totaltime = wrench.META_TYPE_FLOAT,
+		src_time = wrench.META_TYPE_FLOAT
+	},
+})
+
+wrench:register_node("default:furnace_active", {
+	lists = {"fuel", "src", "dst"},
+	metas = {
+		infotext = wrench.META_TYPE_STRING,
+		fuel_totaltime = wrench.META_TYPE_FLOAT,
+		fuel_time = wrench.META_TYPE_FLOAT,
+		src_totaltime = wrench.META_TYPE_FLOAT,
+		src_time = wrench.META_TYPE_FLOAT
+	},
+	store_meta_always = true,
+})
+
+wrench:register_node("default:sign_wall_wood", {
+	metas = {
+		infotext = wrench.META_TYPE_STRING,
+		text = wrench.META_TYPE_STRING
+	},
+})
+
+wrench:register_node("default:sign_wall_steel", {
+	metas = {
+		infotext = wrench.META_TYPE_STRING,
+		text = wrench.META_TYPE_STRING
+	},
+})

wrench/nodes/drawers.lua

@@ -0,0 +1,42 @@
+
+-- Register wrench support for drawers mod nodes
+
+local INT, STRING = wrench.META_TYPE_INT, wrench.META_TYPE_STRING
+
+-- assemble definitions for drawer type 1,2 and 4
+for _, drawer_type in ipairs({1,2,4}) do
+
+	local def = {
+		lists = {"upgrades"},
+		metas = {},
+		after_place = drawers.spawn_visuals
+	}
+
+	for i=1,drawer_type do
+
+		local suffix
+		if drawer_type == 1 then
+		-- no suffix for base type
+		suffix = ""
+		else
+		-- index as suffix
+		suffix = i
+		end
+
+		def.metas["name" .. suffix] = STRING
+		def.metas["count" .. suffix] = INT
+		def.metas["max_count" .. suffix] = INT
+		def.metas["base_stack_max" .. suffix] = INT
+		def.metas["entity_infotext" .. suffix] = STRING
+		def.metas["stack_max_factor" .. suffix] = INT
+		def.metas["meta_itemstack" .. suffix] = INT
+		def.metas["itemstack_wear" .. suffix] = INT
+	end
+
+	wrench:register_node("drawers:wood" .. drawer_type, def)
+	wrench:register_node("drawers:acacia_wood" .. drawer_type, def)
+	wrench:register_node("drawers:aspen_wood" .. drawer_type, def)
+	wrench:register_node("drawers:junglewood" .. drawer_type, def)
+	wrench:register_node("drawers:pine_wood" .. drawer_type, def)
+
+end

wrench/nodes/technic.lua

@@ -0,0 +1,93 @@
+
+-- Register wrench support for technic mod machines and other containers
+
+local machine_invlist = {"src", "dst"}
+local machine_invlist_upgrades = {"src", "dst", "upgrade1", "upgrade2"}
+
+local function register_machine_node(nodename, tier)
+	local lists = tier ~= "LV" and machine_invlist_upgrades or machine_invlist
+	local metas = {
+		infotext = wrench.META_TYPE_STRING,
+		formspec = wrench.META_TYPE_STRING,
+		[tier.."_EU_demand"] = wrench.META_TYPE_INT,
+		[tier.."_EU_input"] = wrench.META_TYPE_INT,
+		tube_time = tier ~= "LV" and wrench.META_TYPE_INT or nil,
+		src_time = wrench.META_TYPE_INT,
+	}
+	wrench:register_node(nodename, {lists = lists, metas = metas})
+end
+
+-- base_machines table row format: name = { extra meta fields }
+local defaults = { tiers = {"LV", "MV", "HV"} }
+local base_machines = {
+	electric_furnace = defaults,
+	grinder = defaults,
+	compressor = defaults,
+	alloy_furnace = {tiers = {"LV", "MV"}},
+	extractor = {tiers = {"LV", "MV"}},
+	centrifuge = {tiers = {"MV"}},
+	freezer = {tiers = {"MV"}},
+}
+
+for name, data in pairs(base_machines) do
+	for _,tier in ipairs(data.tiers) do
+		local nodename = "technic:"..tier:lower().."_"..name
+		register_machine_node(nodename, tier)
+		if minetest.registered_nodes[nodename.."_active"] then
+			register_machine_node(nodename.."_active", tier)
+		end
+	end
+end
+
+---------------------------------------------------------------------
+-- Special nodes
+
+wrench:register_node("technic:coal_alloy_furnace", {
+	lists = {"fuel", "src", "dst"},
+	metas = {
+		infotext = wrench.META_TYPE_STRING,
+		fuel_totaltime = wrench.META_TYPE_FLOAT,
+		fuel_time = wrench.META_TYPE_FLOAT,
+		src_totaltime = wrench.META_TYPE_FLOAT,
+		src_time = wrench.META_TYPE_FLOAT
+	},
+})
+
+wrench:register_node("technic:coal_alloy_furnace_active", {
+	lists = {"fuel", "src", "dst"},
+	metas = {
+		infotext = wrench.META_TYPE_STRING,
+		fuel_totaltime = wrench.META_TYPE_FLOAT,
+		fuel_time = wrench.META_TYPE_FLOAT,
+		src_totaltime = wrench.META_TYPE_FLOAT,
+		src_time = wrench.META_TYPE_FLOAT
+	},
+})
+
+wrench:register_node("technic:tool_workshop", {
+	lists = {"src", "upgrade1", "upgrade2"},
+	metas = {
+		infotext = wrench.META_TYPE_STRING,
+		formspec = wrench.META_TYPE_STRING,
+		MV_EU_demand = wrench.META_TYPE_INT,
+		MV_EU_input = wrench.META_TYPE_INT,
+		tube_time = wrench.META_TYPE_INT
+	},
+})
+
+for tier, _ in pairs(technic.machines) do
+	for i = 0, 8 do
+		wrench:register_node("technic:"..tier:lower().."_battery_box"..i, {
+			lists = tier ~= "LV" and machine_invlist_upgrades or machine_invlist,
+			metas = {
+				infotext = wrench.META_TYPE_STRING,
+				formspec = wrench.META_TYPE_STRING,
+				[tier.."_EU_demand"] = wrench.META_TYPE_INT,
+				[tier.."_EU_supply"] = wrench.META_TYPE_INT,
+				[tier.."_EU_input"] = wrench.META_TYPE_INT,
+				internal_EU_charge = wrench.META_TYPE_INT,
+				last_side_shown = wrench.META_TYPE_INT
+			},
+		})
+	end
+end