diff --git a/mods/ITEMS/mcl_wool/init.lua b/mods/ITEMS/mcl_wool/init.lua index 65cbb8708..e69de29bb 100644 --- a/mods/ITEMS/mcl_wool/init.lua +++ b/mods/ITEMS/mcl_wool/init.lua @@ -1,129 +0,0 @@ -local S = minetest.get_translator(minetest.get_current_modname()) -local mod_doc = minetest.get_modpath("doc") - --- minetest/wool/init.lua - --- Backwards compatibility with jordach's 16-color wool mod -minetest.register_alias("mcl_wool:dark_blue", "wool:blue") -minetest.register_alias("mcl_wool:gold", "wool:yellow") - -local wool = {} --- This uses a trick: you can first define the recipes using all of the base --- colors, and then some recipes using more specific colors for a few non-base --- colors available. When crafting, the last recipes will be checked first. -wool.dyes = { - -- name, texture, wool desc., carpet desc., dye, color_group - {"white", "wool_white", S("White Wool"), S("White Carpet"), nil, "unicolor_white"}, - {"grey", "wool_dark_grey", S("Grey Wool"), S("Grey Carpet"), "dark_grey", "unicolor_darkgrey"}, - {"silver", "wool_grey", S("Light Grey Wool"), S("Light Grey Carpet"), "grey", "unicolor_grey"}, - {"black", "wool_black", S("Black Wool"), S("Black Carpet"), "black", "unicolor_black"}, - {"red", "wool_red", S("Red Wool"), S("Red Carpet"), "red", "unicolor_red"}, - {"yellow", "wool_yellow", S("Yellow Wool"), S("Yellow Carpet"), "yellow", "unicolor_yellow"}, - {"green", "wool_dark_green", S("Green Wool"), S("Green Carpet"), "dark_green", "unicolor_dark_green"}, - {"cyan", "wool_cyan", S("Cyan Wool"), S("Cyan Carpet"), "cyan", "unicolor_cyan"}, - {"blue", "wool_blue", S("Blue Wool"), S("Blue Carpet"), "blue", "unicolor_blue"}, - {"magenta", "wool_magenta", S("Magenta Wool"), S("Magenta Carpet"), "magenta", "unicolor_red_violet"}, - {"orange", "wool_orange", S("Orange Wool"), S("Orange Carpet"), "orange", "unicolor_orange"}, - {"purple", "wool_violet", S("Purple Wool"), S("Purple Carpet"), "violet", "unicolor_violet"}, - {"brown", "wool_brown", S("Brown Wool"), S("Brown Carpet"), "brown", "unicolor_dark_orange"}, - {"pink", "wool_pink", S("Pink Wool"), S("Pink Carpet"), "pink", "unicolor_light_red"}, - {"lime", "mcl_wool_lime", S("Lime Wool"), S("Lime Carpet"), "green", "unicolor_green"}, - {"light_blue", "mcl_wool_light_blue", S("Light Blue Wool"), S("Light Blue Carpet"), "lightblue", "unicolor_light_blue"}, -} -local canonical_color = "white" - -for _, row in ipairs(wool.dyes) do - local name = row[1] - local texture = row[2] - local desc_wool = row[3] - local desc_carpet = row[4] - local dye = row[5] - local color_group = row[6] - local longdesc_wool, longdesc_carpet, create_entry, name_wool, name_carpet - local is_canonical = name == canonical_color - if mod_doc then - if is_canonical then - longdesc_wool = S("Wool is a decorative block which comes in many different colors.") - longdesc_carpet = S("Carpets are thin floor covers which come in many different colors.") - name_wool = S("Wool") - name_carpet = S("Carpet") - else - create_entry = false - end - end - -- Node Definition - minetest.register_node("mcl_wool:"..name, { - description = desc_wool, - _doc_items_create_entry = create_entry, - _doc_items_entry_name = name_wool, - _doc_items_longdesc = longdesc_wool, - stack_max = 64, - is_ground_content = false, - tiles = {texture..".png"}, - groups = {handy=1,shearsy_wool=1, flammable=1,fire_encouragement=30, fire_flammability=60, wool=1,building_block=1,[color_group]=1}, - sounds = mcl_sounds.node_sound_wool_defaults(), - _mcl_hardness = 0.8, - _mcl_blast_resistance = 0.8, - }) - minetest.register_node("mcl_wool:"..name.."_carpet", { - description = desc_carpet, - _doc_items_create_entry = create_entry, - _doc_items_entry_name = name_carpet, - _doc_items_longdesc = longdesc_carpet, - - is_ground_content = false, - tiles = {texture..".png"}, - wield_image = texture..".png", - wield_scale = { x=1, y=1, z=0.5 }, - groups = {handy=1, carpet=1,supported_node=1,flammable=1,fire_encouragement=60, fire_flammability=20, dig_by_water=1,deco_block=1,[color_group]=1}, - sounds = mcl_sounds.node_sound_wool_defaults(), - paramtype = "light", - sunlight_propagates = true, - stack_max = 64, - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-8/16, -8/16, -8/16, 8/16, -7/16, 8/16}, - }, - }, - _mcl_hardness = 0.1, - _mcl_blast_resistance = 0.1, - }) - if mod_doc and not is_canonical then - doc.add_entry_alias("nodes", "mcl_wool:"..canonical_color, "nodes", "mcl_wool:"..name) - doc.add_entry_alias("nodes", "mcl_wool:"..canonical_color.."_carpet", "nodes", "mcl_wool:"..name.."_carpet") - end - if dye then - -- Crafting from dye and white wool - minetest.register_craft({ - type = "shapeless", - output = "mcl_wool:"..name, - recipe = {"mcl_dye:"..dye, "mcl_wool:white"}, - }) - end - minetest.register_craft({ - output = "mcl_wool:"..name.."_carpet 3", - recipe = {{"mcl_wool:"..name, "mcl_wool:"..name}}, - }) -end - -minetest.register_craft({ - output = "mcl_wool:white", - recipe = { - { "mcl_mobitems:string", "mcl_mobitems:string" }, - { "mcl_mobitems:string", "mcl_mobitems:string" }, - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "group:wool", - burntime = 5, -}) -minetest.register_craft({ - type = "fuel", - recipe = "group:carpet", - -- Original value: 3.35 - burntime = 3, -}) diff --git a/mods/blocks/building/ornamental.lua b/mods/blocks/building/ornamental.lua index 1a50749aa..2587c184e 100644 --- a/mods/blocks/building/ornamental.lua +++ b/mods/blocks/building/ornamental.lua @@ -25,6 +25,15 @@ local common_defs = { }, type = "modified" } + }, + wool = { + _mcl_blast_resistance = 0.8, + _mcl_hardness = 0.8, + groups = { + colored_blocks = 1, fire_encouragement = 30, fire_flammability = 60, + fuel = 5, handy = 1, occludes_vibration_signals = 1, shearsy_wool = 1, wool = 1 + }, + sounds = mcl_sounds.node_sound_wool_defaults() } } @@ -36,4 +45,8 @@ for _, color in pairs(voxelibre.colors) do identifier = color.."_glazed_terracotta" voxelibre.register_block(identifier, table.copy(common_defs.glazed_terracotta)) + + identifier = color.."_wool" + + voxelibre.register_block(identifier, table.copy(common_defs.wool)) end diff --git a/textures/building/building_black_wool.png b/textures/building/building_black_wool.png new file mode 100644 index 000000000..6e4576242 Binary files /dev/null and b/textures/building/building_black_wool.png differ diff --git a/textures/building/building_blue_wool.png b/textures/building/building_blue_wool.png new file mode 100644 index 000000000..08889e5f1 Binary files /dev/null and b/textures/building/building_blue_wool.png differ diff --git a/textures/building/building_brown_wool.png b/textures/building/building_brown_wool.png new file mode 100644 index 000000000..b5d14f0d7 Binary files /dev/null and b/textures/building/building_brown_wool.png differ diff --git a/textures/building/building_cyan_wool.png b/textures/building/building_cyan_wool.png new file mode 100644 index 000000000..ca150b835 Binary files /dev/null and b/textures/building/building_cyan_wool.png differ diff --git a/textures/building/building_gray_wool.png b/textures/building/building_gray_wool.png new file mode 100644 index 000000000..4370eb1fb Binary files /dev/null and b/textures/building/building_gray_wool.png differ diff --git a/textures/building/building_green_wool.png b/textures/building/building_green_wool.png new file mode 100644 index 000000000..b6a23464a Binary files /dev/null and b/textures/building/building_green_wool.png differ diff --git a/textures/building/building_light_blue_wool.png b/textures/building/building_light_blue_wool.png new file mode 100644 index 000000000..188523299 Binary files /dev/null and b/textures/building/building_light_blue_wool.png differ diff --git a/textures/building/building_light_gray_wool.png b/textures/building/building_light_gray_wool.png new file mode 100644 index 000000000..3e5ddd116 Binary files /dev/null and b/textures/building/building_light_gray_wool.png differ diff --git a/textures/building/building_lime_wool.png b/textures/building/building_lime_wool.png new file mode 100644 index 000000000..1e02b2233 Binary files /dev/null and b/textures/building/building_lime_wool.png differ diff --git a/textures/building/building_magenta_wool.png b/textures/building/building_magenta_wool.png new file mode 100644 index 000000000..26765caa1 Binary files /dev/null and b/textures/building/building_magenta_wool.png differ diff --git a/textures/building/building_orange_wool.png b/textures/building/building_orange_wool.png new file mode 100644 index 000000000..50dff9abb Binary files /dev/null and b/textures/building/building_orange_wool.png differ diff --git a/textures/building/building_pink_wool.png b/textures/building/building_pink_wool.png new file mode 100644 index 000000000..7510d31d9 Binary files /dev/null and b/textures/building/building_pink_wool.png differ diff --git a/textures/building/building_purple_wool.png b/textures/building/building_purple_wool.png new file mode 100644 index 000000000..42940be0c Binary files /dev/null and b/textures/building/building_purple_wool.png differ diff --git a/textures/building/building_red_wool.png b/textures/building/building_red_wool.png new file mode 100644 index 000000000..d66d13358 Binary files /dev/null and b/textures/building/building_red_wool.png differ diff --git a/textures/building/building_white_wool.png b/textures/building/building_white_wool.png new file mode 100644 index 000000000..b28965bf3 Binary files /dev/null and b/textures/building/building_white_wool.png differ diff --git a/textures/building/building_yellow_wool.png b/textures/building/building_yellow_wool.png new file mode 100644 index 000000000..8a8eef946 Binary files /dev/null and b/textures/building/building_yellow_wool.png differ diff --git a/textures/mcl_wool_light_blue.png b/textures/mcl_wool_light_blue.png deleted file mode 100644 index 010b8a8c2..000000000 Binary files a/textures/mcl_wool_light_blue.png and /dev/null differ diff --git a/textures/mcl_wool_lime.png b/textures/mcl_wool_lime.png deleted file mode 100644 index e9de9a362..000000000 Binary files a/textures/mcl_wool_lime.png and /dev/null differ diff --git a/textures/wool_black.png b/textures/wool_black.png deleted file mode 100644 index 88d2b587e..000000000 Binary files a/textures/wool_black.png and /dev/null differ diff --git a/textures/wool_blue.png b/textures/wool_blue.png deleted file mode 100644 index d8f687f88..000000000 Binary files a/textures/wool_blue.png and /dev/null differ diff --git a/textures/wool_brown.png b/textures/wool_brown.png deleted file mode 100644 index fac3ceffd..000000000 Binary files a/textures/wool_brown.png and /dev/null differ diff --git a/textures/wool_cyan.png b/textures/wool_cyan.png deleted file mode 100644 index 25d3e2f07..000000000 Binary files a/textures/wool_cyan.png and /dev/null differ diff --git a/textures/wool_dark_green.png b/textures/wool_dark_green.png deleted file mode 100644 index 9d17bfdc3..000000000 Binary files a/textures/wool_dark_green.png and /dev/null differ diff --git a/textures/wool_dark_grey.png b/textures/wool_dark_grey.png deleted file mode 100644 index aa0be74be..000000000 Binary files a/textures/wool_dark_grey.png and /dev/null differ diff --git a/textures/wool_grey.png b/textures/wool_grey.png deleted file mode 100644 index e604a9146..000000000 Binary files a/textures/wool_grey.png and /dev/null differ diff --git a/textures/wool_magenta.png b/textures/wool_magenta.png deleted file mode 100644 index f6889b447..000000000 Binary files a/textures/wool_magenta.png and /dev/null differ diff --git a/textures/wool_orange.png b/textures/wool_orange.png deleted file mode 100644 index 45e0059f6..000000000 Binary files a/textures/wool_orange.png and /dev/null differ diff --git a/textures/wool_pink.png b/textures/wool_pink.png deleted file mode 100644 index bd6ae334b..000000000 Binary files a/textures/wool_pink.png and /dev/null differ diff --git a/textures/wool_red.png b/textures/wool_red.png deleted file mode 100644 index 1602f0ea2..000000000 Binary files a/textures/wool_red.png and /dev/null differ diff --git a/textures/wool_violet.png b/textures/wool_violet.png deleted file mode 100644 index 92a20df29..000000000 Binary files a/textures/wool_violet.png and /dev/null differ diff --git a/textures/wool_white.png b/textures/wool_white.png deleted file mode 100644 index c3695550f..000000000 Binary files a/textures/wool_white.png and /dev/null differ diff --git a/textures/wool_yellow.png b/textures/wool_yellow.png deleted file mode 100644 index f736967fe..000000000 Binary files a/textures/wool_yellow.png and /dev/null differ