Merge remote-tracking branch 'upstream/master'

glass.lua

@@ -15,7 +15,7 @@ minetest.register_node("darkage:glass", {
 	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
-	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1},
 	sounds = default.node_sound_glass_defaults(),
 })
 
@@ -28,32 +28,15 @@ minetest.register_craft({
 	}
 })
 
---[[ Round Glass By Semmett9 aka Infinatum ]]
-if minetest.get_modpath("unifieddyes") then
-	minetest.register_node("darkage:milk_glass", {
-		description = "Milky Medieval Glass (Good for colorization)",
-		drawtype = "glasslike",
-		tiles = {"darkage_milk_glass.png"},
-		use_texture_alpha=true,
-		paramtype = "light",
-		paramtype2 = "color",
-		palette = "unifieddyes_palette_extended.png",
-		sunlight_propagates = true,
-		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1, ud_param2_colorable = 1},
-		sounds = default.node_sound_glass_defaults(),
-		after_dig_node = unifieddyes.after_dig_node
-	})
-end
-
 minetest.register_node("darkage:glass_round", {
 	description = "Round Glass",
 	drawtype = "glasslike",
-	tiles = { "darkage_glass_round.png" },
+	tiles = {"darkage_glass_round.png"},
 	paramtype = "light",
 	use_texture_alpha = "clip",
 	sunlight_propagates = true,
 	sounds = default.node_sound_glass_defaults(),
-	groups = {cracky=3,oddly_breakable_by_hand=3, not_cuttable=1},
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1},
 })
 
 minetest.register_craft({
@@ -70,12 +53,12 @@ minetest.register_craft({
 minetest.register_node("darkage:glass_square", {
 	description = "Square Glass",
 	drawtype = "glasslike",
-	tiles = { "darkage_glass_square.png" },
+	tiles = {"darkage_glass_square.png"},
 	paramtype = "light",
 	use_texture_alpha = "clip",
 	sunlight_propagates = true,
 	sounds = default.node_sound_glass_defaults(),
-	groups = {cracky=3,oddly_breakable_by_hand=3, not_cuttable=1},
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1},
 })
 
 minetest.register_craft({
@@ -101,8 +84,8 @@ minetest.register_node("darkage:glow_glass", {
 	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
-	light_source = default.LIGHT_MAX-3,
+	light_source = default.LIGHT_MAX - 3,
-	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1},
 	sounds = default.node_sound_glass_defaults(),
 	inventory_image = minetest.inventorycube("darkage_glow_glass.png")
 })
@@ -132,8 +115,8 @@ minetest.register_node("darkage:glow_glass_round", {
 	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
-	light_source = default.LIGHT_MAX-3,
+	light_source = default.LIGHT_MAX - 3,
-	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1},
 	sounds = default.node_sound_glass_defaults(),
 	inventory_image = minetest.inventorycube("darkage_glow_glass_round.png")
 })
@@ -162,8 +145,8 @@ minetest.register_node("darkage:glow_glass_square", {
 	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
-	light_source = default.LIGHT_MAX-3,
+	light_source = default.LIGHT_MAX - 3,
-	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1},
 	sounds = default.node_sound_glass_defaults(),
 	inventory_image = minetest.inventorycube("darkage_glow_glass_square.png")
 })
@@ -201,23 +184,17 @@ if minetest.get_modpath("unifieddyes") then
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
 		sunlight_propagates = true,
-		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1, ud_param2_colorable = 1},
+		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1, ud_param2_colorable = 1},
 		sounds = default.node_sound_glass_defaults()
 	})
 
-	minetest.register_craft({
-		output = "darkage:milk_glass",
-		type = "shapeless",
-		recipe = {"darkage:glass", "dye:white"}
-	})
-
 	unifieddyes.register_color_craft({
 		output = "darkage:milk_glass",
 		palette = "extended",
 		type = "shapeless",
-        neutral_node = "",
+		neutral_node = "darkage:glass",
 		recipe = {
-                 "darkage:milk_glass",
+			"NEUTRAL_NODE",
 			"MAIN_DYE"
 		}
 	})
@@ -239,23 +216,17 @@ if minetest.get_modpath("unifieddyes") then
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
 		sunlight_propagates = true,
-		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1, ud_param2_colorable = 1},
+		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1, ud_param2_colorable = 1},
 		sounds = default.node_sound_glass_defaults()
 	})
-	-- Craft
-	minetest.register_craft({
-		output = "darkage:milk_glass_round",
-		type = "shapeless",
-		recipe = {"darkage:glass_round", "dye:white"},
-	})
 
 	unifieddyes.register_color_craft({
 		output = "darkage:milk_glass_round",
 		palette = "extended",
 		type = "shapeless",
-        neutral_node = "",
+		neutral_node = "darkage:glass_round",
 		recipe = {
-                 "darkage:milk_glass_round",
+			"NEUTRAL_NODE",
 			"MAIN_DYE"
 		}
 	})
@@ -277,7 +248,7 @@ if minetest.get_modpath("unifieddyes") then
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
 		sunlight_propagates = true,
-		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1, ud_param2_colorable = 1},
+		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1, ud_param2_colorable = 1},
 		sounds = default.node_sound_glass_defaults()
 	})
 
@@ -292,9 +263,9 @@ if minetest.get_modpath("unifieddyes") then
 		output = "darkage:milk_glass_square",
 		palette = "extended",
 		type = "shapeless",
-	neutral_node = "",
+		neutral_node = "darkage:glass_square",
 		recipe = {
-			 "darkage:milk_glass_square",
+			"NEUTRAL_NODE",
 			"MAIN_DYE"
 		}
 	})