From 89f9037b900dc1174bc49c5736fe25473ba2c724 Mon Sep 17 00:00:00 2001
From: unknown <24964441+wsor4035@users.noreply.github.com>
Date: Sun, 1 May 2022 19:22:22 -0400
Subject: [PATCH] add hd tables

---
 homedecor_tables/coffeetable.lua |  6 +++--
 homedecor_tables/endtable.lua    |  6 +++--
 homedecor_tables/misc.lua        | 42 +++++++++++++++++++-------------
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/homedecor_tables/coffeetable.lua b/homedecor_tables/coffeetable.lua
index fd9fc649..1fed2e55 100644
--- a/homedecor_tables/coffeetable.lua
+++ b/homedecor_tables/coffeetable.lua
@@ -59,7 +59,9 @@ minetest.register_node(":lrfurn:coffeetable", {
 	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
-	sounds = default.node_sound_wood_defaults(),
+	_sound_def = {
+		key = "node_sound_wood_defaults",
+	},
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -108,7 +110,7 @@ minetest.register_craft({
 	output = "lrfurn:coffeetable",
 	recipe = {
 		{"", "", "", },
-		{"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood", },
+		{homedecor.materials.slab_wood, homedecor.materials.slab_wood, homedecor.materials.slab_wood, },
 		{"group:stick", "", "group:stick", }
 	}
 })
diff --git a/homedecor_tables/endtable.lua b/homedecor_tables/endtable.lua
index 61af7ece..8d96613f 100644
--- a/homedecor_tables/endtable.lua
+++ b/homedecor_tables/endtable.lua
@@ -17,7 +17,9 @@ minetest.register_node(":lrfurn:endtable", {
 	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
-	sounds = default.node_sound_wood_defaults(),
+	_sound_def = {
+		key = "node_sound_wood_defaults",
+	},
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -43,7 +45,7 @@ minetest.register_craft({
 	output = "lrfurn:endtable",
 	recipe = {
 		{"", "", "", },
-		{"stairs:slab_wood", "stairs:slab_wood", "", },
+		{homedecor.materials.slab_wood, homedecor.materials.slab_wood, "", },
 		{"group:stick", "group:stick", "", }
 	}
 })
diff --git a/homedecor_tables/misc.lua b/homedecor_tables/misc.lua
index fa618f89..193fc1d1 100644
--- a/homedecor_tables/misc.lua
+++ b/homedecor_tables/misc.lua
@@ -35,8 +35,10 @@ for _, t in ipairs(leg_materials) do
 		wield_image = "homedecor_table_legs_"..name..".png",
 		walkable = false,
 		use_texture_alpha = "blend",
-		groups = {snappy=3},
-		sounds = default.node_sound_wood_defaults(),
+		groups = {snappy=3, dig_tree=2},
+		_sound_def = {
+			key = "node_sound_wood_defaults",
+		},
 		selection_box = {
 			type = "fixed",
 			fixed = { -0.37, -0.5, -0.37, 0.37, 0.5, 0.37 }
@@ -59,9 +61,9 @@ for i, mat in ipairs(tabletop_materials) do
 	local s
 
 	if m == "glass" then
-		s = default.node_sound_glass_defaults()
+		s = "node_sound_glass_defaults"
 	else
-		s = default.node_sound_wood_defaults()
+		s = "node_sound_wood_defaults"
 	end
 
 	for _, shape in ipairs(table_shapes) do
@@ -78,8 +80,10 @@ for i, mat in ipairs(tabletop_materials) do
 			},
 			wield_image = 'homedecor_'..m..'_table_'..shape..'_inv.png',
 			use_texture_alpha = "blend",
-			groups = { snappy = 3 },
-			sounds = s,
+			groups = { snappy = 3, dig_tree=2 },
+			_sound_def = {
+				key = s,
+			},
 			selection_box = tables_cbox,
 			collision_box = tables_cbox,
 			on_place = function(itemstack, placer, pointed_thing)
@@ -114,8 +118,10 @@ for i, mat in ipairs(tabletop_materials) do
 					"homedecor_table_legs_"..leg_mat..".png",
 				},
 				use_texture_alpha = "blend",
-				groups = { snappy = 3 },
-				sounds = s,
+				groups = { snappy = 3, dig_tree=2 },
+				_sound_def = {
+					key = s
+				},
 			})
 		end
 	end
@@ -156,7 +162,9 @@ for _, t in ipairs(table_colors) do
 			},
 		},
 		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
-		sounds = default.node_sound_wood_defaults(),
+		_sound_def = {
+			key = "node_sound_wood_defaults",
+		},
 	})
 end
 
@@ -165,9 +173,9 @@ end
 minetest.register_craft( {
         output = "homedecor:glass_table_small_round_b 15",
         recipe = {
-                { "", "default:glass", "" },
-                { "default:glass", "default:glass", "default:glass" },
-                { "", "default:glass", "" },
+			{ "", homedecor.materials.glass_block, "" },
+			{ homedecor.materials.glass_block, homedecor.materials.glass_block, homedecor.materials.glass_block },
+			{ "", homedecor.materials.glass_block, "" },
         },
 })
 
@@ -232,9 +240,9 @@ minetest.register_craft({
 minetest.register_craft( {
         output = "homedecor:table_legs_wrought_iron 3",
         recipe = {
-                { "", "default:iron_lump", "" },
-                { "", "default:iron_lump", "" },
-                { "default:iron_lump", "default:iron_lump", "default:iron_lump" },
+                { "", homedecor.materials.iron_lump, "" },
+                { "", homedecor.materials.iron_lump, "" },
+                { homedecor.materials.iron_lump, homedecor.materials.iron_lump, homedecor.materials.iron_lump },
         },
 })
 
@@ -290,7 +298,7 @@ minetest.register_craft({
 	output = "homedecor:table_mahogany",
 	recipe = {
 		"homedecor:table",
-		"dye:brown",
+		homedecor.materials.dye_brown,
 	},
 })
 
@@ -308,7 +316,7 @@ minetest.register_craft({
 	output = "homedecor:table_white",
 	recipe = {
 		"homedecor:table",
-		"dye:white",
+		homedecor.materials.dye_white,
 	},
 })