making formspecs more systematic and upgradable

1 files changed, 52 insertions, 44 deletions

diff --git a/nodes/node_storage.lua b/nodes/node_storage.lua
index 826aa20..56d19aa 100644
--- a/nodes/node_storage.lua
+++ b/nodes/node_storage.lua
@@ -2,12 +2,27 @@
 local MP = minetest.get_modpath(minetest.get_current_modname())
 local S, NS = dofile(MP.."/intllib.lua")
 
+
+local inventory_formspec = 
+	"size[8,9.3]" ..
+	default.gui_bg ..
+	default.gui_bg_img ..
+	default.gui_slots ..
+	"label[0,0;" .. S("Inventory items") .. "]" ..
+	"list[current_name;main;0,0.6;8,4;]" ..
+	"list[current_player;main;0,5.15;8,1;]" ..
+	"list[current_player;main;0,6.38;8,3;8]" ..
+	"listring[current_name;main]" ..
+	"listring[current_player;main]" ..
+	default.get_hotbar_bg(0,5.15)
+
 -- Storage buffer. Builder nodes draw from this inventory and digger nodes deposit into it.
 -- Note that inventories are digtron group 2.
 minetest.register_node("digtron:inventory", {
 	description = S("Digtron Inventory Storage"),
 	_doc_items_longdesc = digtron.doc.inventory_longdesc,
     _doc_items_usagehelp = digtron.doc.inventory_usagehelp,
+	_digtron_formspec = inventory_formspec,
 	groups = {cracky = 3, oddly_breakable_by_hand=3, digtron = 2, tubedevice = 1, tubedevice_receiver = 1},
 	drop = "digtron:inventory",
 	sounds = digtron.metal_sounds,
@@ -26,19 +41,7 @@ minetest.register_node("digtron:inventory", {
 
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
-		meta:set_string("formspec", 
-			"size[8,9.3]" ..
-			default.gui_bg ..
-			default.gui_bg_img ..
-			default.gui_slots ..
-			"label[0,0;" .. S("Inventory items") .. "]" ..
-			"list[current_name;main;0,0.6;8,4;]" ..
-			"list[current_player;main;0,5.15;8,1;]" ..
-			"list[current_player;main;0,6.38;8,3;8]" ..
-			"listring[current_name;main]" ..
-			"listring[current_player;main]" ..
-			default.get_hotbar_bg(0,5.15)
-		)
+		meta:set_string("formspec", inventory_formspec)
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
 	end,
@@ -48,7 +51,7 @@ minetest.register_node("digtron:inventory", {
 		local inv = meta:get_inventory()
 		return inv:is_empty("main")
 	end,
-	
+		
 	-- Pipeworks compatibility
 	----------------------------------------------------------------
 
@@ -71,12 +74,26 @@ minetest.register_node("digtron:inventory", {
 	after_dig_node = (function() if minetest.get_modpath("pipeworks") then return pipeworks.after_dig end end)()
 })
 
+local fuelstore_formspec = 
+	"size[8,9.3]" ..
+	default.gui_bg ..
+	default.gui_bg_img ..
+	default.gui_slots ..
+	"label[0,0;" .. S("Fuel items") .. "]" ..
+	"list[current_name;fuel;0,0.6;8,4;]" ..
+	"list[current_player;main;0,5.15;8,1;]" ..
+	"list[current_player;main;0,6.38;8,3;8]" ..
+	"listring[current_name;fuel]" ..
+	"listring[current_player;main]" ..
+	default.get_hotbar_bg(0,5.15)
+
 -- Fuel storage. Controller node draws fuel from here.
 -- Note that fuel stores are digtron group 5.
 minetest.register_node("digtron:fuelstore", {
 	description = S("Digtron Fuel Storage"),
 	_doc_items_longdesc = digtron.doc.fuelstore_longdesc,
     _doc_items_usagehelp = digtron.doc.fuelstore_usagehelp,
+	_digtron_formspec = fuelstore_formspec,
 	groups = {cracky = 3,  oddly_breakable_by_hand=3, digtron = 5, tubedevice = 1, tubedevice_receiver = 1},
 	drop = "digtron:fuelstore",
 	sounds = digtron.metal_sounds,
@@ -95,19 +112,7 @@ minetest.register_node("digtron:fuelstore", {
 
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
-		meta:set_string("formspec", 
-			"size[8,9.3]" ..
-			default.gui_bg ..
-			default.gui_bg_img ..
-			default.gui_slots ..
-			"label[0,0;" .. S("Fuel items") .. "]" ..
-			"list[current_name;fuel;0,0.6;8,4;]" ..
-			"list[current_player;main;0,5.15;8,1;]" ..
-			"list[current_player;main;0,6.38;8,3;8]" ..
-			"listring[current_name;fuel]" ..
-			"listring[current_player;main]" ..
-			default.get_hotbar_bg(0,5.15)
-		)
+		meta:set_string("formspec", fuelstore_formspec)
 		local inv = meta:get_inventory()
 		inv:set_size("fuel", 8*4)
 	end,
@@ -129,7 +134,7 @@ minetest.register_node("digtron:fuelstore", {
 		local inv = meta:get_inventory()
 		return inv:is_empty("fuel")
 	end,
-	
+		
 	-- Pipeworks compatibility
 	----------------------------------------------------------------
 
@@ -158,11 +163,28 @@ minetest.register_node("digtron:fuelstore", {
 	after_dig_node = (function() if minetest.get_modpath("pipeworks")then return pipeworks.after_dig end end)()
 })
 
+local combined_storage_formspec =
+	"size[8,9.9]" ..
+	default.gui_bg ..
+	default.gui_bg_img ..
+	default.gui_slots ..
+	"label[0,0;" .. S("Inventory items") .. "]" ..
+	"list[current_name;main;0,0.6;8,3;]" ..
+	"label[0,3.5;" .. S("Fuel items") .. "]" ..
+	"list[current_name;fuel;0,4.1;8,1;]" ..
+	"list[current_player;main;0,5.75;8,1;]" ..
+	"list[current_player;main;0,6.98;8,3;8]" ..
+	"listring[current_name;main]" ..
+	"listring[current_player;main]" ..
+	default.get_hotbar_bg(0,5.75)
+
+
 -- Combined storage. Group 6 has both an inventory and a fuel store
 minetest.register_node("digtron:combined_storage", {
 	description = S("Digtron Combined Storage"),
 	_doc_items_longdesc = digtron.doc.combined_storage_longdesc,
     _doc_items_usagehelp = digtron.doc.combined_storage_usagehelp,
+	_digtron_formspec = combined_storage_formspec,
 	groups = {cracky = 3,  oddly_breakable_by_hand=3, digtron = 6, tubedevice = 1, tubedevice_receiver = 1},
 	drop = "digtron:combined_storage",
 	sounds = digtron.metal_sounds,
@@ -179,21 +201,7 @@ minetest.register_node("digtron:combined_storage", {
 		},
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
-		meta:set_string("formspec", 
-			"size[8,9.9]" ..
-			default.gui_bg ..
-			default.gui_bg_img ..
-			default.gui_slots ..
-			"label[0,0;" .. S("Inventory items") .. "]" ..
-			"list[current_name;main;0,0.6;8,3;]" ..
-			"label[0,3.5;" .. S("Fuel items") .. "]" ..
-			"list[current_name;fuel;0,4.1;8,1;]" ..
-			"list[current_player;main;0,5.75;8,1;]" ..
-			"list[current_player;main;0,6.98;8,3;8]" ..
-			"listring[current_name;main]" ..
-			"listring[current_player;main]" ..
-			default.get_hotbar_bg(0,5.75)
-		)
+		meta:set_string("formspec", combined_storage_formspec)
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*3)
 		inv:set_size("fuel", 8*1)
@@ -230,7 +238,7 @@ minetest.register_node("digtron:combined_storage", {
 		local inv = meta:get_inventory()
 		return inv:is_empty("fuel") and inv:is_empty("main")
 	end,
-	
+		
 	-- Pipeworks compatibility
 	----------------------------------------------------------------
 	tube = (function() if minetest.get_modpath("pipeworks") then return {