Add unicolor groups to wool and carpet

This commit is contained in:
Wuzzy 2019-12-11 19:54:58 +01:00
parent febcb96bb0
commit 506e039fc5

View file

@ -13,21 +13,21 @@ local wool = {}
-- colors available. When crafting, the last recipes will be checked first. -- colors available. When crafting, the last recipes will be checked first.
wool.dyes = { wool.dyes = {
-- name, texture, wool desc., carpet desc., dye, color_group -- name, texture, wool desc., carpet desc., dye, color_group
{"white", "wool_white", S("White Wool"), S("White Carpet"), nil, "basecolor_white"}, {"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"}, {"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", "basecolor_grey"}, {"silver", "wool_grey", S("Light Grey Wool"), S("Light Grey Carpet"), "grey", "unicolor_grey"},
{"black", "wool_black", S("Black Wool"), S("Black Carpet"), "black", "basecolor_black"}, {"black", "wool_black", S("Black Wool"), S("Black Carpet"), "black", "unicolor_black"},
{"red", "wool_red", S("Red Wool"), S("Red Carpet"), "red", "basecolor_red"}, {"red", "wool_red", S("Red Wool"), S("Red Carpet"), "red", "unicolor_red"},
{"yellow", "wool_yellow", S("Yellow Wool"), S("Yellow Carpet"), "yellow", "basecolor_yellow"}, {"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"}, {"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", "basecolor_cyan"}, {"cyan", "wool_cyan", S("Cyan Wool"), S("Cyan Carpet"), "cyan", "unicolor_cyan"},
{"blue", "wool_blue", S("Blue Wool"), S("Blue Carpet"), "blue", "basecolor_blue"}, {"blue", "wool_blue", S("Blue Wool"), S("Blue Carpet"), "blue", "unicolor_blue"},
{"magenta", "wool_magenta", S("Magenta Wool"), S("Magenta Carpet"), "magenta", "basecolor_magenta"}, {"magenta", "wool_magenta", S("Magenta Wool"), S("Magenta Carpet"), "magenta", "unicolor_red_violet"},
{"orange", "wool_orange", S("Orange Wool"), S("Orange Carpet"), "orange", "excolor_orange"}, {"orange", "wool_orange", S("Orange Wool"), S("Orange Carpet"), "orange", "unicolor_orange"},
{"purple", "wool_violet", S("Purple Wool"), S("Purple Carpet"), "violet", "excolor_violet"}, {"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"}, {"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"}, {"pink", "wool_pink", S("Pink Wool"), S("Pink Carpet"), "pink", "unicolor_light_red"},
{"lime", "mcl_wool_lime", S("Lime Wool"), S("Lime Carpet"), "green", "basecolor_green"}, {"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"}, {"light_blue", "mcl_wool_light_blue", S("Light Blue Wool"), S("Light Blue Carpet"), "lightblue", "unicolor_light_blue"},
} }
local canonical_color = "white" local canonical_color = "white"
@ -60,7 +60,7 @@ for _, row in ipairs(wool.dyes) do
stack_max = 64, stack_max = 64,
is_ground_content = false, is_ground_content = false,
tiles = {texture..".png"}, tiles = {texture..".png"},
groups = {handy=1,shearsy_wool=1, flammable=1,wool=1,building_block=1}, groups = {handy=1,shearsy_wool=1, flammable=1,wool=1,building_block=1,[color_group]=1},
sounds = mcl_sounds.node_sound_wool_defaults(), sounds = mcl_sounds.node_sound_wool_defaults(),
_mcl_hardness = 0.8, _mcl_hardness = 0.8,
_mcl_blast_resistance = 4, _mcl_blast_resistance = 4,
@ -76,7 +76,7 @@ for _, row in ipairs(wool.dyes) do
tiles = {texture..".png"}, tiles = {texture..".png"},
wield_image = texture..".png", wield_image = texture..".png",
wield_scale = { x=1, y=1, z=0.5 }, wield_scale = { x=1, y=1, z=0.5 },
groups = {handy=1, carpet=1,attached_node=1,dig_by_water=1,deco_block=1}, groups = {handy=1, carpet=1,attached_node=1,dig_by_water=1,deco_block=1,[color_group]=1},
sounds = mcl_sounds.node_sound_wool_defaults(), sounds = mcl_sounds.node_sound_wool_defaults(),
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,