update digistuff and homedecor

2 files changed, 16 insertions, 7 deletions

diff --git a/digistuff/switches.lua b/digistuff/switches.lua
index d45c38b..e313781 100644
--- a/digistuff/switches.lua
+++ b/digistuff/switches.lua
@@ -222,7 +222,7 @@ minetest.register_node("digistuff:wall_knob", {
 				meta:set_int("min",math.floor(tonumber(fields.min)))
 				meta:set_int("max",math.floor(tonumber(fields.max)))
 				meta:set_int("value",math.floor(tonumber(fields.min)))
-				meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn up or right-click to turn down",math.floor(tonumber(fields.min))))
+				meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn down or right-click to turn up",math.floor(tonumber(fields.min))))
 				meta:set_string("formspec","")
 				minetest.swap_node(pos, {name = "digistuff:wall_knob_configured", param2=minetest.get_node(pos).param2})
 			else
@@ -264,24 +264,24 @@ minetest.register_node("digistuff:wall_knob_configured", {
 	drop = "digistuff:wall_knob",
 	after_place_node = digistuff.place_receiver,
 	after_destruct = digistuff.remove_receiver,
-	on_punch = function(pos,node,player)
+	on_rightclick = function(pos,node,player)
 		local meta = minetest.get_meta(pos)
 		local max = meta:get_int("max")
 		local value = meta:get_int("value")
 		local full = player:get_player_control().aux1
 		value = full and max or math.min(max,value+1)
 		meta:set_int("value",value)
-		meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn up or right-click to turn down",math.floor(tonumber(value))))
+		meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn down or right-click to turn up",math.floor(tonumber(value))))
 		digiline:receptor_send(pos,digistuff.button_get_rules(node),meta:get_string("channel"),value)
 	end,
-	on_rightclick = function(pos,node,player)
+	on_punch = function(pos,node,player)
 		local meta = minetest.get_meta(pos)
 		local min = meta:get_int("min")
 		local value = meta:get_int("value")
 		local full = player:get_player_control().aux1
 		value = full and min or math.max(min,value-1)
 		meta:set_int("value",value)
-		meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn up or right-click to turn down",math.floor(tonumber(value))))
+		meta:set_string("infotext",string.format("Current setting: %d\nLeft-click to turn down or right-click to turn up",math.floor(tonumber(value))))
 		digiline:receptor_send(pos,digistuff.button_get_rules(node),meta:get_string("channel"),value)
 	end,
 	sounds = default and default.node_sound_stone_defaults(),
diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua
index d16efb3..d065a8f 100644
--- a/homedecor_doors_and_gates/init.lua
+++ b/homedecor_doors_and_gates/init.lua
@@ -730,8 +730,17 @@ minetest.register_alias("doors:bedroom_b",                      "doors:homedecor
 
 -- flip old homedecor doors around, since they use minetest_game doors API now
 
+old_doors[#old_doors + 1] = "homedecor:door_wood_glass_left"
+old_doors[#old_doors + 1] = "homedecor:door_wood_glass_right"
+
+old_doors[#old_doors + 1] = "homedecor:door_woodglass2_left"
+old_doors[#old_doors + 1] = "homedecor:door_woodglass2_right"
+
+old_doors[#old_doors + 1] = "homedecor:door_bedroom_left"
+old_doors[#old_doors + 1] = "homedecor:door_bedroom_right"
+
 minetest.register_lbm({
-	name = ":homedecor:convert_doors",
+	name = ":homedecor:convert_doors_2",
 	label = "Convert Homedecor doors to mtg doors API",
 	nodenames = old_doors,
 	run_at_every_load = false,
@@ -740,7 +749,7 @@ minetest.register_lbm({
 		local newparam2 = (node.param2 + 2) % 4
 		local e = string.find(node.name, "_", -7)
 		local dir = string.sub(node.name, e+1)
-		local newname = "doors:"..string.sub(node.name, 16, e-1)
+		local newname = "doors:homedecor_"..string.sub(node.name, 16, e-1)
 		if dir == "right" then
 			minetest.set_node(pos, {name = newname.."_a", param2 = newparam2 })
 		else