diff --git a/mods/ITEMS/mcl_colorblocks/init.lua b/mods/ITEMS/mcl_colorblocks/init.lua index 416adf8dc..7de2162ab 100644 --- a/mods/ITEMS/mcl_colorblocks/init.lua +++ b/mods/ITEMS/mcl_colorblocks/init.lua @@ -4,22 +4,22 @@ local doc_mod = minetest.get_modpath("doc") local block = {} block.dyes = { - { "white", S("White Terracotta"), S("White Glazed Terracotta"), "white" }, - { "grey", S("Grey Terracotta"), S("Grey Glazed Terracotta"), "dark_grey" }, - { "silver", S("Light Grey Terracotta"), S("Light Grey Glazed Terracotta"), "grey" }, - { "black", S("Black Terracotta"), S("Black Glazed Terracotta"), "black" }, - { "red", S("Red Terracotta"), S("Red Glazed Terracotta"), "red" }, - { "yellow", S("Yellow Terracotta"), S("Yellow Glazed Terracotta"), "yellow" }, - { "green", S("Green Terracotta"), S("Green Glazed Terracotta"), "dark_green"}, - { "cyan", S("Cyan Terracotta"), S("Cyan Glazed Terracotta"), "cyan" }, - { "blue", S("Blue Terracotta"), S("Blue Glazed Terracotta"), "blue" }, - { "magenta", S("Magenta Terracotta"), S("Magenta Glazed Terracotta"), "magenta" }, - { "orange", S("Orange Terracotta"), S("Orange Glazed Terracotta"), "orange" }, - { "purple", S("Purple Terracotta"), S("Purple Glazed Terracotta"), "violet" }, - { "brown", S("Brown Terracotta"), S("Brown Glazed Terracotta"), "brown" }, - { "pink", S("Pink Terracotta"), S("Pink Glazed Terracotta"), "pink" }, - { "lime", S("Lime Terracotta"), S("Lime Glazed Terracotta"), "green" }, - { "light_blue", S("Light Blue Terracotta"), S("Light Blue Glazed Terracotta"), "lightblue" }, + { "white", S("White Terracotta"), "white" }, + { "grey", S("Grey Terracotta"), "dark_grey" }, + { "silver", S("Light Grey Terracotta"), "grey" }, + { "black", S("Black Terracotta"), "black" }, + { "red", S("Red Terracotta"), "red" }, + { "yellow", S("Yellow Terracotta"), "yellow" }, + { "green", S("Green Terracotta"), "dark_green"}, + { "cyan", S("Cyan Terracotta"), "cyan" }, + { "blue", S("Blue Terracotta"), "blue" }, + { "magenta", S("Magenta Terracotta"), "magenta" }, + { "orange", S("Orange Terracotta"), "orange" }, + { "purple", S("Purple Terracotta"), "violet" }, + { "brown", S("Brown Terracotta"), "brown" }, + { "pink", S("Pink Terracotta"), "pink" }, + { "lime", S("Lime Terracotta"), "green" }, + { "light_blue", S("Light Blue Terracotta"), "lightblue" }, } local canonical_color = "yellow" @@ -44,19 +44,13 @@ minetest.register_craft({ cooktime = 10, }) -local on_rotate -if minetest.get_modpath("screwdriver") then - on_rotate = screwdriver.rotate_simple -end - for _, row in ipairs(block.dyes) do local name = row[1] local is_canonical = name == canonical_color local sdesc_hc = row[2] - local sdesc_gt = row[3] - local ldesc_hc, ldesc_gt + local ldesc_hc local create_entry - local ename_hc, ename_gt + local ename_hc if is_canonical then ldesc_hc = hc_desc ldesc_gt = gt_desc @@ -80,27 +74,8 @@ for _, row in ipairs(block.dyes) do _mcl_hardness = 1.25, }) - local tex = "mcl_colorblocks_glazed_terracotta_"..name..".png" - local texes = { tex, tex, tex.."^[transformR180", tex, tex.."^[transformR270", tex.."^[transformR90" } - minetest.register_node("mcl_colorblocks:glazed_terracotta_"..name, { - description = sdesc_gt, - _doc_items_longdesc = ldesc_gt, - _doc_items_create_entry = create_entry, - _doc_items_entry_name = ename_gt, - tiles = texes, - groups = {handy=1,pickaxey=1, glazed_terracotta=1,building_block=1, material_stone=1}, - paramtype2 = "facedir", - stack_max = 64, - is_ground_content = false, - sounds = mcl_sounds.node_sound_stone_defaults(), - _mcl_blast_resistance = 4.2, - _mcl_hardness = 1.4, - on_rotate = on_rotate, - }) - if not is_canonical and doc_mod then doc.add_entry_alias("nodes", "mcl_colorblocks:hardened_clay_"..canonical_color, "nodes", "mcl_colorblocks:hardened_clay_"..name) - doc.add_entry_alias("nodes", "mcl_colorblocks:glazed_terracotta_"..canonical_color, "nodes", "mcl_colorblocks:glazed_terracotta_"..name) end -- Crafting recipes @@ -113,11 +88,5 @@ for _, row in ipairs(block.dyes) do {"mcl_colorblocks:hardened_clay", "mcl_colorblocks:hardened_clay", "mcl_colorblocks:hardened_clay"}, }, }) - minetest.register_craft({ - type = "cooking", - output = "mcl_colorblocks:glazed_terracotta_"..name, - recipe = "mcl_colorblocks:hardened_clay_"..name, - cooktime = 10, - }) end end diff --git a/textures/mcl_colorblocks_glazed_terracotta_black.png b/textures/mcl_colorblocks_glazed_terracotta_black.png deleted file mode 100644 index 04eab4393..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_black.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_blue.png b/textures/mcl_colorblocks_glazed_terracotta_blue.png deleted file mode 100644 index 52b66b6db..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_blue.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_brown.png b/textures/mcl_colorblocks_glazed_terracotta_brown.png deleted file mode 100644 index 4adcb671a..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_brown.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_cyan.png b/textures/mcl_colorblocks_glazed_terracotta_cyan.png deleted file mode 100644 index e2c832bc0..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_cyan.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_green.png b/textures/mcl_colorblocks_glazed_terracotta_green.png deleted file mode 100644 index 61b7440a5..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_green.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_grey.png b/textures/mcl_colorblocks_glazed_terracotta_grey.png deleted file mode 100644 index 2f3813ada..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_grey.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_light_blue.png b/textures/mcl_colorblocks_glazed_terracotta_light_blue.png deleted file mode 100644 index 079cfdd66..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_light_blue.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_lime.png b/textures/mcl_colorblocks_glazed_terracotta_lime.png deleted file mode 100644 index 0cc61b37b..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_lime.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_magenta.png b/textures/mcl_colorblocks_glazed_terracotta_magenta.png deleted file mode 100644 index 9f193f201..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_magenta.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_orange.png b/textures/mcl_colorblocks_glazed_terracotta_orange.png deleted file mode 100644 index 1892d825f..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_orange.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_black.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_black.png deleted file mode 100644 index 452bc39bd..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_black.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_blue.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_blue.png deleted file mode 100644 index 9de2e2200..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_blue.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_brown.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_brown.png deleted file mode 100644 index d4df11cf9..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_brown.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_cyan.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_cyan.png deleted file mode 100644 index 47f8bb367..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_cyan.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_green.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_green.png deleted file mode 100644 index 232a77416..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_green.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_grey.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_grey.png deleted file mode 100644 index 8dcf1f987..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_grey.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_light_blue.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_light_blue.png deleted file mode 100644 index eff4344e0..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_light_blue.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_lime.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_lime.png deleted file mode 100644 index d4bab81c2..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_lime.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_magenta.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_magenta.png deleted file mode 100644 index 4c9228120..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_magenta.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_orange.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_orange.png deleted file mode 100644 index 4289f0856..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_orange.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_pink.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_pink.png deleted file mode 100644 index 8e6f6cfa9..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_pink.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_purple.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_purple.png deleted file mode 100644 index 3af4b4adc..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_purple.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_red.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_red.png deleted file mode 100644 index b2b39aa0d..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_red.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_silver.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_silver.png deleted file mode 100644 index c10b29a28..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_silver.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_white.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_white.png deleted file mode 100644 index 92247711e..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_white.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_yellow.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_side_yellow.png deleted file mode 100644 index a43acb01d..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_side_yellow.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_black.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_black.png deleted file mode 100644 index 9dbc97d5f..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_black.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_blue.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_blue.png deleted file mode 100644 index 230c1ab97..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_blue.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_brown.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_brown.png deleted file mode 100644 index 586be7499..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_brown.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_cyan.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_cyan.png deleted file mode 100644 index 1da77f75f..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_cyan.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_green.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_green.png deleted file mode 100644 index bd88f8192..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_green.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_grey.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_grey.png deleted file mode 100644 index 4a505edd8..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_grey.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_light_blue.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_light_blue.png deleted file mode 100644 index 9fa80bc27..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_light_blue.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_lime.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_lime.png deleted file mode 100644 index fde7b2b79..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_lime.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_magenta.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_magenta.png deleted file mode 100644 index 9e42f9169..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_magenta.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_orange.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_orange.png deleted file mode 100644 index 12c78b38c..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_orange.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_pink.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_pink.png deleted file mode 100644 index 792f5c6b2..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_pink.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_purple.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_purple.png deleted file mode 100644 index be323dc85..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_purple.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_red.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_red.png deleted file mode 100644 index 8ef07d159..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_red.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_silver.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_silver.png deleted file mode 100644 index 24814be79..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_silver.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_white.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_white.png deleted file mode 100644 index e86c4cd99..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_white.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_yellow.png b/textures/mcl_colorblocks_glazed_terracotta_pillar_top_yellow.png deleted file mode 100644 index f1311ef2b..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pillar_top_yellow.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_pink.png b/textures/mcl_colorblocks_glazed_terracotta_pink.png deleted file mode 100644 index 76264befa..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_pink.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_purple.png b/textures/mcl_colorblocks_glazed_terracotta_purple.png deleted file mode 100644 index 6912cd635..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_purple.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_red.png b/textures/mcl_colorblocks_glazed_terracotta_red.png deleted file mode 100644 index 5f2fa718b..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_red.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_silver.png b/textures/mcl_colorblocks_glazed_terracotta_silver.png deleted file mode 100644 index 4dabc5cfe..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_silver.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_white.png b/textures/mcl_colorblocks_glazed_terracotta_white.png deleted file mode 100644 index 65757aabf..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_white.png and /dev/null differ diff --git a/textures/mcl_colorblocks_glazed_terracotta_yellow.png b/textures/mcl_colorblocks_glazed_terracotta_yellow.png deleted file mode 100644 index db5a3aa9c..000000000 Binary files a/textures/mcl_colorblocks_glazed_terracotta_yellow.png and /dev/null differ