Fix CNC upgrade method (#222)

Fixes #190
mt-mods · Oct 20, 2021 · b2f456d · b2f456d
1 parent 3867b49
commit b2f456d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/technic_cnc/api.lua b/technic_cnc/api.lua
@@ -224,19 +224,25 @@ function technic_cnc.register_cnc_machine(nodename, def)
 
 	-- UPGRADE OLD CNC MACHINES
 	local function upgrade_machine(meta)
-		local product = meta:get("cnc_product")
-		if product then
+		local oldmeta = meta:get("technic_power_machine")
+		if oldmeta then
+			local product = meta:get("cnc_product")
+			-- Remove old metadata fields
 			meta:set_string("cnc_product", "")
 			meta:set_string("cnc_multiplier", "")
-			local program_raw = product:match("[%w_]+:[%w_]+_technic_cnc_([%w_]+)")
-			if program_raw then
-				local double = "_double"
-				local size = program_raw:sub(-#double) == double and 1 or 2
-				local program = size == 1 and program_raw:sub(1, #program_raw - #double) or program_raw
-				meta:set_string("program", program)
-				meta:set_int("size", size)
+			meta:set_string("technic_power_machine", "")
+			if product then
+				-- Only executed for active machines, old inactive machines do not have cnc_product set
+				local program_raw = product:match("[%w_]+:[%w_]+_technic_cnc_([%w_]+)")
+				if program_raw then
+					local double = "_double"
+					local size = program_raw:sub(-#double) == double and 1 or 2
+					local program = size == 1 and program_raw:sub(1, #program_raw - #double) or program_raw
+					meta:set_string("program", program)
+					meta:set_int("size", size)
+				end
+				meta:set_string("formspec", get_formspec(nodename, def, meta))
 			end
-			meta:set_string("formspec", get_formspec(nodename, def, meta))
 		end
 	end
 

diff --git a/technic_cnc/spec/interaction_spec.lua b/technic_cnc/spec/interaction_spec.lua
@@ -126,13 +126,15 @@ describe("CNC formspec interaction", function()
 	end)
 
 	it("updates old machines", function()
-		do -- Verify starting point
+		do -- Verify starting point and set meta value that is used to look for old machine
 			local meta = minetest.get_meta({x=98,y=98,z=98})
 			assert.equals("default:stone_technic_cnc_element_t", meta:get("cnc_product"))
+			meta:set_float("technic_power_machine", 1)
 		end
-		do -- Verify starting point
+		do -- Verify starting point and set meta value that is used to look for old machine
 			local meta = minetest.get_meta({x=99,y=99,z=99})
 			assert.equals("default:stone_technic_cnc_element_t_double", meta:get("cnc_product"))
+			meta:set_float("technic_power_machine", 1)
 		end
 
 		nodedef.on_receive_fields({x=98,y=98,z=98}, "", { quit = true, channel = "Sam" }, Sam)