diff --git a/mods/framedglass/init.lua b/mods/framedglass/init.lua index 101e7b9f..9d7cfbc8 100755 --- a/mods/framedglass/init.lua +++ b/mods/framedglass/init.lua @@ -39,7 +39,7 @@ minetest.register_craft({ minetest.register_node("framedglass:wooden_framed_glass", { description = "Wooden-framed Glass", drawtype = "glasslike_framed_optional", - tiles = {"framedglass_wooden_frame.png","framedglass_glass_face_streaks.png"}, + tiles = {"framedglass_woodenglass_face_streaks_frame.png","framedglass_glass_face_streaks.png"}, paramtype = "light", sunlight_propagates = true, groups = {cracky=3,oddly_breakable_by_hand=3}, @@ -49,7 +49,7 @@ minetest.register_node("framedglass:wooden_framed_glass", { minetest.register_node("framedglass:steel_framed_glass", { description = "Steel-framed Glass", drawtype = "glasslike_framed_optional", - tiles = {"framedglass_steel_frame.png","framedglass_glass_face_streaks.png"}, + tiles = {"framedglass_steelglass_face_streaks_frame.png","framedglass_glass_face_streaks.png"}, paramtype = "light", sunlight_propagates = true, groups = {cracky=3,oddly_breakable_by_hand=3}, @@ -59,7 +59,7 @@ minetest.register_node("framedglass:steel_framed_glass", { minetest.register_node("framedglass:wooden_framed_obsidian_glass", { description = "Wooden-framed Obsidian Glass", drawtype = "glasslike_framed_optional", - tiles = {"framedglass_wooden_frame.png","framedglass_glass_face_clean.png"}, + tiles = {"framedglass_woodenglass_face_clean_frame.png","framedglass_glass_face_clean.png"}, paramtype = "light", sunlight_propagates = true, groups = {cracky=3,oddly_breakable_by_hand=3}, @@ -69,17 +69,17 @@ minetest.register_node("framedglass:wooden_framed_obsidian_glass", { minetest.register_node("framedglass:steel_framed_obsidian_glass", { description = "Steel-framed Obsidian Glass", drawtype = "glasslike_framed_optional", - tiles = {"framedglass_steel_frame.png","framedglass_glass_face_clean.png"}, + tiles = {"framedglass_steelglass_face_clean_frame.png","framedglass_glass_face_clean.png"}, paramtype = "light", sunlight_propagates = true, groups = {cracky=3,oddly_breakable_by_hand=3}, sounds = default.node_sound_glass_defaults(), }) -function add_coloured_framedglass(name, desc, dye, texture) +function add_coloured_framedglass(name, desc, dye) minetest.register_node( "framedglass:steel_framed_obsidian_glass"..name, { description = "Steel-framed "..desc.." Obsidian Glass", - tiles = {"framedglass_steel_frame.png",texture}, + tiles = {"framedglass_".. name.. "glass_frame.png", "framedglass_".. name.. "glass.png"}, drawtype = "glasslike_framed_optional", paramtype = "light", sunlight_propagates = true, @@ -101,18 +101,18 @@ function add_coloured_framedglass(name, desc, dye, texture) end -add_coloured_framedglass ("red","Red","group:basecolor_red","framedglass_redglass.png") -add_coloured_framedglass ("green","Green","group:basecolor_green","framedglass_greenglass.png") -add_coloured_framedglass ("blue","Blue","group:basecolor_blue","framedglass_blueglass.png") -add_coloured_framedglass ("cyan","Cyan","group:basecolor_cyan","framedglass_cyanglass.png") -add_coloured_framedglass ("darkgreen","Dark Green","group:unicolor_dark_green","framedglass_darkgreenglass.png") -add_coloured_framedglass ("violet","Violet","group:excolor_violet","framedglass_violetglass.png") -add_coloured_framedglass ("pink","Pink","group:unicolor_light_red","framedglass_pinkglass.png") -add_coloured_framedglass ("yellow","Yellow","group:basecolor_yellow","framedglass_yellowglass.png") -add_coloured_framedglass ("orange","Orange","group:basecolor_orange","framedglass_orangeglass.png") -add_coloured_framedglass ("brown","Brown","group:unicolor_dark_orange","framedglass_brownglass.png") -add_coloured_framedglass ("white","White","group:basecolor_white","framedglass_whiteglass.png") -add_coloured_framedglass ("grey","Grey","group:basecolor_grey","framedglass_greyglass.png") -add_coloured_framedglass ("darkgrey","Dark Grey","group:excolor_darkgrey","framedglass_darkgreyglass.png") -add_coloured_framedglass ("black","Black","group:basecolor_black","framedglass_blackglass.png") +add_coloured_framedglass ("red","Red","group:basecolor_red") +add_coloured_framedglass ("green","Green","group:basecolor_green") +add_coloured_framedglass ("blue","Blue","group:basecolor_blue") +add_coloured_framedglass ("cyan","Cyan","group:basecolor_cyan") +add_coloured_framedglass ("darkgreen","Dark Green","group:unicolor_dark_green") +add_coloured_framedglass ("violet","Violet","group:excolor_violet") +add_coloured_framedglass ("pink","Pink","group:unicolor_light_red") +add_coloured_framedglass ("yellow","Yellow","group:basecolor_yellow") +add_coloured_framedglass ("orange","Orange","group:basecolor_orange") +add_coloured_framedglass ("brown","Brown","group:unicolor_dark_orange") +add_coloured_framedglass ("white","White","group:basecolor_white") +add_coloured_framedglass ("grey","Grey","group:basecolor_grey") +add_coloured_framedglass ("darkgrey","Dark Grey","group:excolor_darkgrey") +add_coloured_framedglass ("black","Black","group:basecolor_black") diff --git a/mods/framedglass/textures/framedglass_blackglass_frame.png b/mods/framedglass/textures/framedglass_blackglass_frame.png new file mode 100755 index 00000000..a8c8ff67 Binary files /dev/null and b/mods/framedglass/textures/framedglass_blackglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_blueglass_frame.png b/mods/framedglass/textures/framedglass_blueglass_frame.png new file mode 100644 index 00000000..ac24843a Binary files /dev/null and b/mods/framedglass/textures/framedglass_blueglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_brownglass_frame.png b/mods/framedglass/textures/framedglass_brownglass_frame.png new file mode 100755 index 00000000..b9be813a Binary files /dev/null and b/mods/framedglass/textures/framedglass_brownglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_cyanglass_frame.png b/mods/framedglass/textures/framedglass_cyanglass_frame.png new file mode 100755 index 00000000..c8e0b190 Binary files /dev/null and b/mods/framedglass/textures/framedglass_cyanglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_darkgreenglass_frame.png b/mods/framedglass/textures/framedglass_darkgreenglass_frame.png new file mode 100755 index 00000000..ff2c4c01 Binary files /dev/null and b/mods/framedglass/textures/framedglass_darkgreenglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_darkgreyglass_frame.png b/mods/framedglass/textures/framedglass_darkgreyglass_frame.png new file mode 100755 index 00000000..1ec82586 Binary files /dev/null and b/mods/framedglass/textures/framedglass_darkgreyglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_glass_face_clean.png b/mods/framedglass/textures/framedglass_glass_face_clean.png index 385d6d27..4126e551 100755 Binary files a/mods/framedglass/textures/framedglass_glass_face_clean.png and b/mods/framedglass/textures/framedglass_glass_face_clean.png differ diff --git a/mods/framedglass/textures/framedglass_glass_face_streaks.png b/mods/framedglass/textures/framedglass_glass_face_streaks.png index eb169d17..4d8c62c5 100755 Binary files a/mods/framedglass/textures/framedglass_glass_face_streaks.png and b/mods/framedglass/textures/framedglass_glass_face_streaks.png differ diff --git a/mods/framedglass/textures/framedglass_greenglass_frame.png b/mods/framedglass/textures/framedglass_greenglass_frame.png new file mode 100755 index 00000000..136eee38 Binary files /dev/null and b/mods/framedglass/textures/framedglass_greenglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_greyglass_frame.png b/mods/framedglass/textures/framedglass_greyglass_frame.png new file mode 100755 index 00000000..22a4aca7 Binary files /dev/null and b/mods/framedglass/textures/framedglass_greyglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_orangeglass_frame.png b/mods/framedglass/textures/framedglass_orangeglass_frame.png new file mode 100755 index 00000000..be4568e0 Binary files /dev/null and b/mods/framedglass/textures/framedglass_orangeglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_pinkglass_frame.png b/mods/framedglass/textures/framedglass_pinkglass_frame.png new file mode 100755 index 00000000..4e4b5a43 Binary files /dev/null and b/mods/framedglass/textures/framedglass_pinkglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_redglass_frame.png b/mods/framedglass/textures/framedglass_redglass_frame.png new file mode 100755 index 00000000..903bbc4f Binary files /dev/null and b/mods/framedglass/textures/framedglass_redglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_steelglass_face_clean_frame.png b/mods/framedglass/textures/framedglass_steelglass_face_clean_frame.png new file mode 100644 index 00000000..5ef12b51 Binary files /dev/null and b/mods/framedglass/textures/framedglass_steelglass_face_clean_frame.png differ diff --git a/mods/framedglass/textures/framedglass_steelglass_face_streaks_frame.png b/mods/framedglass/textures/framedglass_steelglass_face_streaks_frame.png new file mode 100644 index 00000000..426887d8 Binary files /dev/null and b/mods/framedglass/textures/framedglass_steelglass_face_streaks_frame.png differ diff --git a/mods/framedglass/textures/framedglass_violetglass_frame.png b/mods/framedglass/textures/framedglass_violetglass_frame.png new file mode 100755 index 00000000..e3083f71 Binary files /dev/null and b/mods/framedglass/textures/framedglass_violetglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_whiteglass_frame.png b/mods/framedglass/textures/framedglass_whiteglass_frame.png new file mode 100755 index 00000000..cde6c231 Binary files /dev/null and b/mods/framedglass/textures/framedglass_whiteglass_frame.png differ diff --git a/mods/framedglass/textures/framedglass_woodenglass_face_clean_frame.png b/mods/framedglass/textures/framedglass_woodenglass_face_clean_frame.png new file mode 100644 index 00000000..7bc4d7ea Binary files /dev/null and b/mods/framedglass/textures/framedglass_woodenglass_face_clean_frame.png differ diff --git a/mods/framedglass/textures/framedglass_woodenglass_face_streaks_frame.png b/mods/framedglass/textures/framedglass_woodenglass_face_streaks_frame.png new file mode 100644 index 00000000..374aa3a7 Binary files /dev/null and b/mods/framedglass/textures/framedglass_woodenglass_face_streaks_frame.png differ diff --git a/mods/framedglass/textures/framedglass_yellowglass_frame.png b/mods/framedglass/textures/framedglass_yellowglass_frame.png new file mode 100755 index 00000000..691799af Binary files /dev/null and b/mods/framedglass/textures/framedglass_yellowglass_frame.png differ