diff --git a/crafting-guide/flowerpot_green.png b/crafting-guide/flowerpot_green.png index 748a2fb1..1c771019 100644 Binary files a/crafting-guide/flowerpot_green.png and b/crafting-guide/flowerpot_green.png differ diff --git a/crafting-guide/folding-door-mahogany.png b/crafting-guide/folding-door-mahogany.png index a7924bfd..4afec6f0 100644 Binary files a/crafting-guide/folding-door-mahogany.png and b/crafting-guide/folding-door-mahogany.png differ diff --git a/crafting-guide/nightstand-mahogany-one-drawer.png b/crafting-guide/nightstand-mahogany-one-drawer.png index a4c71bae..aae01a05 100644 Binary files a/crafting-guide/nightstand-mahogany-one-drawer.png and b/crafting-guide/nightstand-mahogany-one-drawer.png differ diff --git a/crafting-guide/nightstand-mahogany-two-drawers.png b/crafting-guide/nightstand-mahogany-two-drawers.png index 74d8d515..341a2954 100644 Binary files a/crafting-guide/nightstand-mahogany-two-drawers.png and b/crafting-guide/nightstand-mahogany-two-drawers.png differ diff --git a/crafting-guide/shutter-black.png b/crafting-guide/shutter-black.png index 12b6955a..c6a12af6 100644 Binary files a/crafting-guide/shutter-black.png and b/crafting-guide/shutter-black.png differ diff --git a/crafting-guide/shutter-dark-grey.png b/crafting-guide/shutter-dark-grey.png index a58c06ee..753f8b99 100644 Binary files a/crafting-guide/shutter-dark-grey.png and b/crafting-guide/shutter-dark-grey.png differ diff --git a/crafting-guide/shutter-green.png b/crafting-guide/shutter-green.png index a3c70856..1a0a5398 100644 Binary files a/crafting-guide/shutter-green.png and b/crafting-guide/shutter-green.png differ diff --git a/crafting-guide/shutter-grey.png b/crafting-guide/shutter-grey.png index 56912144..82045a95 100644 Binary files a/crafting-guide/shutter-grey.png and b/crafting-guide/shutter-grey.png differ diff --git a/crafting-guide/shutter-light-blue.png b/crafting-guide/shutter-light-blue.png index 361fd5a7..5edc4e49 100644 Binary files a/crafting-guide/shutter-light-blue.png and b/crafting-guide/shutter-light-blue.png differ diff --git a/crafting-guide/shutter-mahogany.png b/crafting-guide/shutter-mahogany.png index 8dad6711..f4941311 100644 Binary files a/crafting-guide/shutter-mahogany.png and b/crafting-guide/shutter-mahogany.png differ diff --git a/crafting-guide/shutter-purple.png b/crafting-guide/shutter-purple.png index 331de9cb..e0cb39bf 100644 Binary files a/crafting-guide/shutter-purple.png and b/crafting-guide/shutter-purple.png differ diff --git a/crafting-guide/shutter-red.png b/crafting-guide/shutter-red.png index c65c73fb..4536fcb0 100644 Binary files a/crafting-guide/shutter-red.png and b/crafting-guide/shutter-red.png differ diff --git a/crafting-guide/shutter-white.png b/crafting-guide/shutter-white.png index 14e9fdfc..d8c580eb 100644 Binary files a/crafting-guide/shutter-white.png and b/crafting-guide/shutter-white.png differ diff --git a/crafting-guide/shutter-yellow.png b/crafting-guide/shutter-yellow.png index 237dc9ce..e19c1635 100644 Binary files a/crafting-guide/shutter-yellow.png and b/crafting-guide/shutter-yellow.png differ diff --git a/crafts.lua b/crafts.lua index 16b03195..7733e7e3 100644 --- a/crafts.lua +++ b/crafts.lua @@ -58,10 +58,12 @@ minetest.register_craft({ minetest.register_craft( { output = 'homedecor:flower_pot_green', recipe = { - { 'unifieddyes:green', '', '' }, + { 'unifieddyes:dark_green', '', '' }, { 'homedecor:plastic_sheeting', 'default:dirt', 'homedecor:plastic_sheeting' }, { 'homedecor:plastic_sheeting', 'homedecor:plastic_sheeting', 'homedecor:plastic_sheeting' }, }, + replacements = { {'unifieddyes:dark_green', 'unifieddyes:empty_bottle'}, }, + }) minetest.register_craft( { @@ -71,6 +73,11 @@ minetest.register_craft( { { 'homedecor:plastic_sheeting', 'default:dirt', 'homedecor:plastic_sheeting' }, { 'homedecor:plastic_sheeting', 'homedecor:plastic_sheeting', 'homedecor:plastic_sheeting' }, }, + replacements = { + {'unifieddyes:black', 'unifieddyes:empty_bottle'}, + {'unifieddyes:black', 'unifieddyes:empty_bottle'}, + {'unifieddyes:black', 'unifieddyes:empty_bottle'} + } }) -- @@ -152,6 +159,10 @@ minetest.register_craft( { { 'default:sand', 'unifieddyes:black', 'default:sand' }, { 'homedecor:plastic_sheeting', 'homedecor:plastic_sheeting', 'homedecor:plastic_sheeting' }, }, + replacements = { + {'unifieddyes:black', 'unifieddyes:empty_bottle'}, + {'unifieddyes:black', 'unifieddyes:empty_bottle'}, + } }) -- @@ -272,10 +283,10 @@ minetest.register_craft( { type = 'shapeless', output = 'homedecor:shutter_black', recipe = { - 'unifieddyes:black', 'unifieddyes:black', 'homedecor:shutter_oak' }, + replacements = { {'unifieddyes:black', 'unifieddyes:empty_bottle'}, }, }) minetest.register_craft({ @@ -290,9 +301,10 @@ minetest.register_craft( { type = 'shapeless', output = 'homedecor:shutter_dark_grey', recipe = { - 'unifieddyes:black', + 'unifieddyes:darkgrey_paint', 'homedecor:shutter_oak' }, + replacements = { {'unifieddyes:darkgrey_paint', 'bucket:bucket_empty'}, }, }) minetest.register_craft({ @@ -308,11 +320,10 @@ minetest.register_craft( { type = 'shapeless', output = 'homedecor:shutter_grey', recipe = { - 'unifieddyes:black', - 'unifieddyes:white_paint', + 'unifieddyes:grey_paint', 'homedecor:shutter_oak' }, - replacements = { {'unifieddyes:white_paint', 'bucket:bucket_empty'}, }, + replacements = { {'unifieddyes:grey_paint', 'bucket:bucket_empty'}, }, }) minetest.register_craft({ @@ -328,8 +339,9 @@ minetest.register_craft( { output = 'homedecor:shutter_forest_green', recipe = { 'homedecor:shutter_oak', - 'unifieddyes:green', + 'unifieddyes:dark_green', }, + replacements = { {'unifieddyes:dark_green', 'unifieddyes:empty_bottle'}, }, }) minetest.register_craft({ @@ -443,9 +455,9 @@ minetest.register_craft( { output = 'homedecor:nightstand_mahogany_one_drawer', recipe = { 'homedecor:nightstand_oak_one_drawer', - 'unifieddyes:black', - 'unifieddyes:red', + 'unifieddyes:dark_orange', }, + replacements = { {'unifieddyes:dark_orange', 'unifieddyes:empty_bottle'}, }, }) minetest.register_craft({ @@ -459,9 +471,9 @@ minetest.register_craft( { output = 'homedecor:nightstand_mahogany_two_drawers', recipe = { 'homedecor:nightstand_oak_two_drawers', - 'unifieddyes:black', - 'unifieddyes:red', + 'unifieddyes:dark_orange', }, + replacements = { {'unifieddyes:dark_orange', 'unifieddyes:empty_bottle'}, }, }) minetest.register_craft({ @@ -530,11 +542,13 @@ minetest.register_craft( { output = 'homedecor:dresser_mahogany', recipe = { 'homedecor:dresser_oak', - 'unifieddyes:red', - 'unifieddyes:red', - 'unifieddyes:black', - 'unifieddyes:black' + 'unifieddyes:dark_orange', + 'unifieddyes:dark_orange', }, + replacements = { + {'unifieddyes:dark_orange', 'unifieddyes:empty_bottle'}, + {'unifieddyes:dark_orange', 'unifieddyes:empty_bottle'} + }, }) minetest.register_craft({ @@ -623,7 +637,6 @@ end if ( minetest.get_modpath("wool") ) ~= nil then - minetest.register_craft( { type = 'shapeless', output = 'homedecor:rug_small 8', @@ -664,9 +677,9 @@ minetest.register_craft( { output = 'homedecor:shutter_mahogany', recipe = { 'homedecor:shutter_oak', - 'unifieddyes:red', - 'unifieddyes:black' + 'unifieddyes:dark_orange', }, + replacements = { {'unifieddyes:dark_orange', 'unifieddyes:empty_bottle'}, }, }) minetest.register_craft({ @@ -682,6 +695,7 @@ minetest.register_craft( { 'homedecor:shutter_oak', 'unifieddyes:violet', }, + replacements = { {'unifieddyes:violet', 'unifieddyes:empty_bottle'}, }, }) minetest.register_craft({ @@ -697,6 +711,7 @@ minetest.register_craft( { 'homedecor:shutter_oak', 'unifieddyes:red', }, + replacements = { {'unifieddyes:red', 'unifieddyes:empty_bottle'}, }, }) minetest.register_craft({ @@ -712,6 +727,7 @@ minetest.register_craft( { 'homedecor:shutter_oak', 'unifieddyes:yellow', }, + replacements = { {'unifieddyes:yellow', 'unifieddyes:empty_bottle'}, }, }) minetest.register_craft({ @@ -725,10 +741,9 @@ minetest.register_craft( { output = 'homedecor:shutter_light_blue', recipe = { 'homedecor:shutter_oak', - 'unifieddyes:white_paint', - 'unifieddyes:blue', + 'unifieddyes:light_blue', }, - replacements = { {'unifieddyes:white_paint', 'bucket:bucket_empty'}, }, + replacements = { {'unifieddyes:light_blue', 'unifieddyes:empty_bottle'}, }, }) minetest.register_craft({ diff --git a/foldingdoors_mahogany.lua b/foldingdoors_mahogany.lua index 3da86c4b..9497598c 100644 --- a/foldingdoors_mahogany.lua +++ b/foldingdoors_mahogany.lua @@ -414,7 +414,7 @@ minetest.register_craft({ }) --- You only need flowers to get the red dye necessary to actually +-- You only need flowers and coal to get the dark orange necessary to actually -- craft a mahogany door (either one), but not to /give or use one. if ( minetest.get_modpath("flowers") ) ~= nil then @@ -424,9 +424,9 @@ if ( minetest.get_modpath("flowers") ) ~= nil then output = 'homedecor:folding_door_mahogany', recipe = { 'homedecor:folding_door_oak', - 'unifieddyes:black', - 'unifieddyes:red', + 'unifieddyes:dark_orange', }, + replacements = { {'unifieddyes:dark_orange', 'unifieddyes:empty_bottle'}, }, }) minetest.register_craft( { @@ -434,9 +434,9 @@ if ( minetest.get_modpath("flowers") ) ~= nil then output = 'homedecor:folding_door_mahogany_right', recipe = { 'homedecor:folding_door_oak_right', - 'unifieddyes:black', - 'unifieddyes:red', + 'unifieddyes:dark_orange', }, + replacements = { {'unifieddyes:dark_orange', 'unifieddyes:empty_bottle'}, }, }) end