From ef52910688351d74c382bb5b14179fc8e06eab75 Mon Sep 17 00:00:00 2001 From: N-Nachtigal Date: Fri, 30 May 2025 01:03:33 +0200 Subject: [PATCH] Fix: Sandwich slices --- mods/ma_pops_furniture/crafts.lua | 1425 ++++++++++++++-------------- mods/ma_pops_furniture/toaster.lua | 83 +- mods/sandwiches/init.lua | 4 +- 3 files changed, 759 insertions(+), 753 deletions(-) diff --git a/mods/ma_pops_furniture/crafts.lua b/mods/ma_pops_furniture/crafts.lua index 70c7a71e..e8733ad8 100644 --- a/mods/ma_pops_furniture/crafts.lua +++ b/mods/ma_pops_furniture/crafts.lua @@ -1,1035 +1,1036 @@ minetest.register_craft({ - output = 'ma_pops_furniture:smoke_detector', + output = "ma_pops_furniture:smoke_detector", recipe = { - {'default:stone','dye:white','default:stone',}, - {'default:stone','default:copper_ingot','default:stone',}, - {'default:stone','dye:red','default:stone',}, - } + { "default:stone", "dye:white", "default:stone" }, + { "default:stone", "default:copper_ingot", "default:stone" }, + { "default:stone", "dye:red", "default:stone" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:br_tile', + output = "ma_pops_furniture:br_tile", recipe = { - {'dye:black','dye:white','dye:black',}, - {'','default:stone_block','',}, - {'dye:black','','dye:black',}, - } + { "dye:black", "dye:white", "dye:black" }, + { "", "default:stone_block", "" }, + { "dye:black", "", "dye:black" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:ceiling_lamp', + output = "ma_pops_furniture:ceiling_lamp", recipe = { - {'', 'default:stone', ''}, - {'default:stone', 'default:meselamp', 'default:stone'}, - {'default:stone', 'default:meselamp', 'default:stone'} - } + { "", "default:stone", "" }, + { "default:stone", "default:meselamp", "default:stone" }, + { "default:stone", "default:meselamp", "default:stone" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:outdoor_lamp', + output = "ma_pops_furniture:outdoor_lamp", recipe = { - {'','','',}, - {'default:stone','default:stone','default:stone',}, - {'default:stone','default:meselamp','default:stone',}, - } + { "", "", "" }, + { "default:stone", "default:stone", "default:stone" }, + { "default:stone", "default:meselamp", "default:stone" }, + }, }) --changed bathroom_faucet to bath_faucet and added craft minetest.register_craft({ - output = 'ma_pops_furniture:bath_faucet', + output = "ma_pops_furniture:bath_faucet", recipe = { - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:steel_ingot','','bucket:bucket_water',}, - {'default:steel_ingot','','',}, - } + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "", "bucket:bucket_water" }, + { "default:steel_ingot", "", "" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:toilet_paper_roll_dispenser', + output = "ma_pops_furniture:toilet_paper_roll_dispenser", recipe = { - {'default:stone','default:stone','default:stone',}, - {'default:paper','bucket:water','default:paper',}, - {'','default:paper','',}, - } + { "default:stone", "default:stone", "default:stone" }, + { "default:paper", "bucket:water", "default:paper" }, + { "", "default:paper", "" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:toilet_close', + output = "ma_pops_furniture:toilet_close", recipe = { - {'','','default:steel_ingot',}, - {'default:steel_ingot','stairs:slab_wood','default:steel_ingot',}, - {'default:steel_ingot','bucket:bucket_water','default:steel_ingot',}, - } + { "", "", "default:steel_ingot" }, + { "default:steel_ingot", "stairs:slab_wood", "default:steel_ingot" }, + { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:br_sink', + output = "ma_pops_furniture:br_sink", recipe = { - {'default:steel_ingot','','default:steel_ingot',}, - {'','default:steel_ingot','',}, - {'','default:steel_ingot','',}, - } + { "default:steel_ingot", "", "default:steel_ingot" }, + { "", "default:steel_ingot", "" }, + { "", "default:steel_ingot", "" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:mirror_closed', + output = "ma_pops_furniture:mirror_closed", recipe = { - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:glass','default:glass','default:glass',}, - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - } + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:glass", "default:glass", "default:glass" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:shower_base', + output = "ma_pops_furniture:shower_base", recipe = { - {'','','',}, - {'','','',}, - {'default:steel_ingot','bucket:bucket_empty','default:steel_ingot',}, - } + { "", "", "" }, + { "", "", "" }, + { "default:steel_ingot", "bucket:bucket_empty", "default:steel_ingot" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:shower_top', + output = "ma_pops_furniture:shower_top", recipe = { - {'','default:steel_ingot','',}, - {'default:steel_ingot','bucket:bucket_water','default:steel_ingot',}, - {'default:steel_ingot','','default:steel_ingot',}, - } + { "", "default:steel_ingot", "" }, + { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, + { "default:steel_ingot", "", "default:steel_ingot" }, + }, }) local night_table = { --name, material, invimg -{'wood'}, -{'aspen_wood'}, -{'junglewood'}, -{'acacia_wood'}, -{'pine_wood'}, -{'cobble'} + { "wood" }, + { "aspen_wood" }, + { "junglewood" }, + { "acacia_wood" }, + { "pine_wood" }, + { "cobble" }, } -for i in ipairs (night_table) do +for i in ipairs(night_table) do local material = night_table[i][1] -minetest.register_craft({ - output = 'ma_pops_furniture:nightstand_'..material, - recipe = { - {'default:'..material, 'default:'..material, 'default:'..material}, - {'default:'..material, 'default:chest', 'default:'..material}, - {'default:'..material, 'default:'..material, 'default:'..material} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:nightstand_" .. material, + recipe = { + { "default:" .. material, "default:" .. material, "default:" .. material }, + { "default:" .. material, "default:chest", "default:" .. material }, + { "default:" .. material, "default:" .. material, "default:" .. material }, + }, + }) end local chair = { --name, material, invimg -{'wood'}, -{'aspen_wood'}, -{'junglewood'}, -{'acacia_wood'}, -{'pine_wood'}, -{'cobble'} + { "wood" }, + { "aspen_wood" }, + { "junglewood" }, + { "acacia_wood" }, + { "pine_wood" }, + { "cobble" }, } -for i in ipairs (chair) do +for i in ipairs(chair) do local material = chair[i][1] -minetest.register_craft({ - output = 'ma_pops_furniture:chair_'..material, - recipe = { - {'default:'..material, '', ''}, - {'default:'..material, 'default:'..material, 'default:'..material}, - {'default:'..material, '', 'default:'..material} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair_" .. material, + recipe = { + { "default:" .. material, "", "" }, + { "default:" .. material, "default:" .. material, "default:" .. material }, + { "default:" .. material, "", "default:" .. material }, + }, + }) end minetest.register_craft({ - output = 'ma_pops_furniture:barrel', + output = "ma_pops_furniture:barrel", recipe = { - {'default:wood','default:wood','default:wood',}, - {'default:wood','default:steel_ingot','default:wood',}, - {'default:wood','default:wood','default:wood',}, - } + { "default:wood", "default:wood", "default:wood" }, + { "default:wood", "default:steel_ingot", "default:wood" }, + { "default:wood", "default:wood", "default:wood" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:dw', + output = "ma_pops_furniture:dw", recipe = { - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:steel_ingot','bucket:bucket_water','default:steel_ingot',}, - {'default:steel_ingot','default:mese_crystal','default:steel_ingot',}, - } + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, + { "default:steel_ingot", "default:mese_crystal", "default:steel_ingot" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:oven', + output = "ma_pops_furniture:oven", recipe = { - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:steel_ingot','default:furnace','default:steel_ingot',}, - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - } + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "default:furnace", "default:steel_ingot" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:oven_overhead', + output = "ma_pops_furniture:oven_overhead", recipe = { - {'default:steel_ingot','default:mese_crystal_fragment','default:steel_ingot',}, - {'','','',}, - {'','','',}, - } + { "default:steel_ingot", "default:mese_crystal_fragment", "default:steel_ingot" }, + { "", "", "" }, + { "", "", "" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:microwave', + output = "ma_pops_furniture:microwave", recipe = { - {'','','',}, - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:steel_ingot','default:furnace','default:steel_ingot',}, - } + { "", "", "" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "default:furnace", "default:steel_ingot" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:coffee_maker', + output = "ma_pops_furniture:coffee_maker", recipe = { - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:steel_ingot','default:copper_ingot','default:steel_ingot',}, - {'','default:glass','',}, - } + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "default:copper_ingot", "default:steel_ingot" }, + { "", "default:glass", "" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:coffee_cup', + output = "ma_pops_furniture:coffee_cup", recipe = { - {'default:glass','dye:blue','default:glass',}, - {'default:glass','dye:blue','default:glass',}, - {'default:glass','default:glass','default:glass',}, - } + { "default:glass", "dye:blue", "default:glass" }, + { "default:glass", "dye:blue", "default:glass" }, + { "default:glass", "default:glass", "default:glass" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:toaster', + output = "ma_pops_furniture:toaster", recipe = { - {'','','',}, - {'default:steel_ingot','default:furnace','default:steel_ingot',}, - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - } + { "", "", "" }, + { "default:steel_ingot", "default:furnace", "default:steel_ingot" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:trash_can', + output = "ma_pops_furniture:trash_can", recipe = { - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:steel_ingot','bucket:bucket_lava','default:steel_ingot',}, - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - } + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "bucket:bucket_lava", "default:steel_ingot" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:kitchen_faucet', + output = "ma_pops_furniture:kitchen_faucet", recipe = { - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:steel_ingot','','default:steel_ingot',}, - {'default:steel_ingot','','',}, - } + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "", "default:steel_ingot" }, + { "default:steel_ingot", "", "" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:cutting_board', + output = "ma_pops_furniture:cutting_board", recipe = { - {'','','',}, - {'','','',}, - {'default:wood','default:wood','',}, - } + { "", "", "" }, + { "", "", "" }, + { "default:wood", "default:wood", "" }, + }, }) local counter_table = { --name, color, colorize(hex or color name:intensity(1-255)) -{'Black', 'black', 'black:225'}, -{'Blue', 'blue', 'blue:150'}, -{'Brown', 'brown', 'brown:100'}, -{'Cyan', 'cyan', 'cyan:150'}, -{'Dark Green', 'dark_green', 'green:200'}, ---{'Dark Grey', 'dark_grey', 'black:200'}, -{'Green', 'green', '#32cd32:150'}, ---{'Grey', 'grey', 'black:150'}, -{'Magenta', 'magenta', 'magenta:200'}, -{'Orange', 'orange', 'orange:150'}, -{'Pink', 'pink', 'pink:150'}, -{'Red', 'red', 'red:150'}, -{'Violet', 'violet', 'violet:150'}, -{'White', 'white', 'white:150'}, -{'Yellow', 'yellow', 'yellow:150'}, + { "Black", "black", "black:225" }, + { "Blue", "blue", "blue:150" }, + { "Brown", "brown", "brown:100" }, + { "Cyan", "cyan", "cyan:150" }, + { "Dark Green", "dark_green", "green:200" }, + --{'Dark Grey', 'dark_grey', 'black:200'}, + { "Green", "green", "#32cd32:150" }, + --{'Grey', 'grey', 'black:150'}, + { "Magenta", "magenta", "magenta:200" }, + { "Orange", "orange", "orange:150" }, + { "Pink", "pink", "pink:150" }, + { "Red", "red", "red:150" }, + { "Violet", "violet", "violet:150" }, + { "White", "white", "white:150" }, + { "Yellow", "yellow", "yellow:150" }, } -for i in ipairs (counter_table) do +for i in ipairs(counter_table) do local name = counter_table[i][1] local color = counter_table[i][2] local hex = counter_table[i][3] -minetest.register_craft({ - output = 'ma_pops_furniture:counter2_'..color, - recipe = { - {'group:wood','group:wood','group:wood',}, - {'group:wood','dye:'..color,'group:wood',}, - {'group:wood','group:wood','group:wood',}, - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:counter2_" .. color, + recipe = { + { "group:wood", "group:wood", "group:wood" }, + { "group:wood", "dye:" .. color, "group:wood" }, + { "group:wood", "group:wood", "group:wood" }, + }, + }) -minetest.register_craft({ - type = "shapeless", - output = 'ma_pops_furniture:counter1_'..color, - recipe = - {'ma_pops_furniture:counter2_'..color} -}) + minetest.register_craft({ + type = "shapeless", + output = "ma_pops_furniture:counter1_" .. color, + recipe = { "ma_pops_furniture:counter2_" .. color }, + }) -minetest.register_craft({ - type = "shapeless", - output = 'ma_pops_furniture:counter3_'..color, - recipe = - {'ma_pops_furniture:counter2_'..color, "default:chest"} -}) + minetest.register_craft({ + type = "shapeless", + output = "ma_pops_furniture:counter3_" .. color, + recipe = { "ma_pops_furniture:counter2_" .. color, "default:chest" }, + }) -minetest.register_craft({ - type = "shapeless", - output = 'ma_pops_furniture:counter_'..color, - recipe = - {'ma_pops_furniture:counter3_'..color} -}) + minetest.register_craft({ + type = "shapeless", + output = "ma_pops_furniture:counter_" .. color, + recipe = { "ma_pops_furniture:counter3_" .. color }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:upcabinet_'..color, - recipe = { - {'group:wood','dye:'..color,'group:wood',}, - {'group:wood','default:chest','group:wood',}, - {'group:wood','group:wood','group:wood',}, - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:upcabinet_" .. color, + recipe = { + { "group:wood", "dye:" .. color, "group:wood" }, + { "group:wood", "default:chest", "group:wood" }, + { "group:wood", "group:wood", "group:wood" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:upcabinet_corner', - recipe = { - {'group:wood','group:wood','group:wood',}, - {'group:wood','group:wood','default:chest',}, - {'group:wood','dye:'..color,'',}, - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:upcabinet_corner", + recipe = { + { "group:wood", "group:wood", "group:wood" }, + { "group:wood", "group:wood", "default:chest" }, + { "group:wood", "dye:" .. color, "" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:sink_'..color, - recipe = { - {'ma_pops_furniture:br_sink','ma_pops_furniture:counter_'..color,}, - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:sink_" .. color, + recipe = { + { "ma_pops_furniture:br_sink", "ma_pops_furniture:counter_" .. color }, + }, + }) end local counter_table = { --name, material -{'Wooden', 'wood'}, -{'Acacia', 'acacia_wood'}, -{'Aspen', 'aspen_wood'}, -{'Jungle', 'junglewood' }, -{'Pine', 'pine_wood'}, + { "Wooden", "wood" }, + { "Acacia", "acacia_wood" }, + { "Aspen", "aspen_wood" }, + { "Jungle", "junglewood" }, + { "Pine", "pine_wood" }, } -for i in ipairs (counter_table) do +for i in ipairs(counter_table) do local name = counter_table[i][1] local material = counter_table[i][2] local hex = counter_table[i][3] -minetest.register_craft({ - output = 'ma_pops_furniture:counter2_'..material, - recipe = { - {'default:'..material,'default:'..material,'default:'..material,}, - {'default:'..material, 'ma_pops_furniture:barrel','default:'..material,}, - {'default:'..material,'default:'..material,'default:'..material,}, - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:counter2_" .. material, + recipe = { + { "default:" .. material, "default:" .. material, "default:" .. material }, + { "default:" .. material, "ma_pops_furniture:barrel", "default:" .. material }, + { "default:" .. material, "default:" .. material, "default:" .. material }, + }, + }) -minetest.register_craft({ - type = "shapeless", - output = 'ma_pops_furniture:counter3_'..material, - recipe = - {'ma_pops_furniture:counter2_'..material, "ma_pops_furniture:barrel"} -}) + minetest.register_craft({ + type = "shapeless", + output = "ma_pops_furniture:counter3_" .. material, + recipe = { "ma_pops_furniture:counter2_" .. material, "ma_pops_furniture:barrel" }, + }) -minetest.register_craft({ - type = "shapeless", - output = 'ma_pops_furniture:counter_'..material, - recipe = - {'ma_pops_furniture:counter3_'..material} -}) + minetest.register_craft({ + type = "shapeless", + output = "ma_pops_furniture:counter_" .. material, + recipe = { "ma_pops_furniture:counter3_" .. material }, + }) -minetest.register_craft({ - type = "shapeless", - output = 'ma_pops_furniture:counter1_'..material, - recipe = - {'ma_pops_furniture:counter2_'..material} -}) + minetest.register_craft({ + type = "shapeless", + output = "ma_pops_furniture:counter1_" .. material, + recipe = { "ma_pops_furniture:counter2_" .. material }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:upcabinet_'..material, - recipe = { - {'default:'..material,'','default:'..material,}, - {'default:'..material,'default:chest','default:'..material,}, - {'default:'..material,'default:'..material,'default:'..material,}, - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:upcabinet_" .. material, + recipe = { + { "default:" .. material, "", "default:" .. material }, + { "default:" .. material, "default:chest", "default:" .. material }, + { "default:" .. material, "default:" .. material, "default:" .. material }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:upcabinet_corner', - recipe = { - {'default:'..material,'default:'..material,'default:'..material,}, - {'default:'..material,'default:'..material,'default:chest',}, - {'default:'..material,'','',}, - } -}) - -minetest.register_craft({ - output = 'ma_pops_furniture:sink_'..material, - recipe = { - {'ma_pops_furniture:br_sink','ma_pops_furniture:counter_'..material,}, - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:upcabinet_corner", + recipe = { + { "default:" .. material, "default:" .. material, "default:" .. material }, + { "default:" .. material, "default:" .. material, "default:chest" }, + { "default:" .. material, "", "" }, + }, + }) + minetest.register_craft({ + output = "ma_pops_furniture:sink_" .. material, + recipe = { + { "ma_pops_furniture:br_sink", "ma_pops_furniture:counter_" .. material }, + }, + }) end local chair2_table = { --color -{'black'}, -{'blue'}, -{'brown'}, -{'cyan'}, -{'dark_green'}, -{'dark_grey'}, -{'green'}, -{'grey'}, -{'magenta'}, -{'orange'}, -{'pink'}, -{'red'}, -{'violet'}, -{'yellow'}, + { "black" }, + { "blue" }, + { "brown" }, + { "cyan" }, + { "dark_green" }, + { "dark_grey" }, + { "green" }, + { "grey" }, + { "magenta" }, + { "orange" }, + { "pink" }, + { "red" }, + { "violet" }, + { "yellow" }, } -for i in ipairs (chair2_table) do +for i in ipairs(chair2_table) do local color = chair2_table[i][1] - -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_'..color, - recipe = { - {'wool:'..color, 'wool:'..color, 'wool:'..color, }, - {'wool:'..color, 'wool:'..color, 'wool:'..color, }, - {'group:wood', '', 'group:wood', }, - } -}) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_'..color, - recipe = { - {'ma_pops_furniture:chair2_white', 'dye:'..color} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_" .. color, + recipe = { + { "wool:" .. color, "wool:" .. color, "wool:" .. color }, + { "wool:" .. color, "wool:" .. color, "wool:" .. color }, + { "group:wood", "", "group:wood" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_white', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:white'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_" .. color, + recipe = { + { "ma_pops_furniture:chair2_white", "dye:" .. color }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_black', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:black'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_white", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:white" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_blue', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:blue'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_black", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:black" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_brown', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:brown'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_blue", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:blue" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_cyan', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:cyan'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_brown", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:brown" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_dark_grey', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:dark_grey'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_cyan", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:cyan" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_grey', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:grey'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_dark_grey", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:dark_grey" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_green', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:green'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_grey", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:grey" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_magenta', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:magenta'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_green", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:green" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_orange', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:orange'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_magenta", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:magenta" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_pink', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:pink'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_orange", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:orange" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_red', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:red'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_pink", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:pink" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_violet', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:violet'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_red", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:red" }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:chair2_yellow', - recipe = { - {'ma_pops_furniture:chair2_'..color, 'dye:yellow'} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:chair2_violet", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:violet" }, + }, + }) + + minetest.register_craft({ + output = "ma_pops_furniture:chair2_yellow", + recipe = { + { "ma_pops_furniture:chair2_" .. color, "dye:yellow" }, + }, + }) end minetest.register_craft({ - output = 'ma_pops_furniture:chair2_white', + output = "ma_pops_furniture:chair2_white", recipe = { - {'wool:white', 'wool:white', 'wool:white', }, - {'wool:white', 'wool:white', 'wool:white', }, - {'group:wood', '', 'group:wood', }, - } + { "wool:white", "wool:white", "wool:white" }, + { "wool:white", "wool:white", "wool:white" }, + { "group:wood", "", "group:wood" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:chair2_rainbow', + output = "ma_pops_furniture:chair2_rainbow", recipe = { - {'wool:black', '', '', }, - {'wool:blue', 'wool:yellow', 'wool:pink', }, - {'default: acacia_tree', '', 'default: acacia_tree', }, - } + { "wool:black", "", "" }, + { "wool:blue", "wool:yellow", "wool:pink" }, + { "default: acacia_tree", "", "default: acacia_tree" }, + }, }) local sofa_table = { --color -{'black'}, -{'blue'}, -{'brown'}, -{'cyan'}, -{'dark_green'}, -{'dark_grey'}, -{'green'}, -{'grey'}, -{'magenta'}, -{'orange'}, -{'pink'}, -{'red'}, -{'violet'}, -{'white'}, -{'yellow'}, + { "black" }, + { "blue" }, + { "brown" }, + { "cyan" }, + { "dark_green" }, + { "dark_grey" }, + { "green" }, + { "grey" }, + { "magenta" }, + { "orange" }, + { "pink" }, + { "red" }, + { "violet" }, + { "white" }, + { "yellow" }, } -for i in ipairs (sofa_table) do +for i in ipairs(sofa_table) do local color = sofa_table[i][1] - -minetest.register_craft({ - output = 'ma_pops_furniture:sofa_'..color, - recipe = { - {'', '', '', }, - {'wool:'..color, 'wool:'..color, 'wool:'..color, }, - {'wool:'..color, 'wool:'..color, 'wool:'..color, }, - } -}) + + minetest.register_craft({ + output = "ma_pops_furniture:sofa_" .. color, + recipe = { + { "", "", "" }, + { "wool:" .. color, "wool:" .. color, "wool:" .. color }, + { "wool:" .. color, "wool:" .. color, "wool:" .. color }, + }, + }) end local sofa_table = { --color -{'black'}, -{'blue'}, -{'brown'}, -{'cyan'}, -{'dark_green'}, -{'dark_grey'}, -{'green'}, -{'grey'}, -{'magenta'}, -{'orange'}, -{'pink'}, -{'red'}, -{'violet'}, -{'yellow'}, + { "black" }, + { "blue" }, + { "brown" }, + { "cyan" }, + { "dark_green" }, + { "dark_grey" }, + { "green" }, + { "grey" }, + { "magenta" }, + { "orange" }, + { "pink" }, + { "red" }, + { "violet" }, + { "yellow" }, } -for i in ipairs (sofa_table) do +for i in ipairs(sofa_table) do local color = sofa_table[i][1] -minetest.register_craft({ - output = 'ma_pops_furniture:sofa_'..color, - recipe = { - {'ma_pops_furniture:sofa_white', 'dye:'..color} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:sofa_" .. color, + recipe = { + { "ma_pops_furniture:sofa_white", "dye:" .. color }, + }, + }) end local fs_table = { -- colors - 'black', 'blue', 'brown', 'cyan', 'dark_green', 'dark_grey', 'green', - 'grey', 'magenta', 'orange', 'pink', 'red', 'violet', 'yellow' + "black", + "blue", + "brown", + "cyan", + "dark_green", + "dark_grey", + "green", + "grey", + "magenta", + "orange", + "pink", + "red", + "violet", + "yellow", } -- Register crafting recipes for creating the initial white curtains minetest.register_craft({ - output = 'ma_pops_furniture:fs_white', - recipe = { - {'wool:white', 'wool:white', 'wool:white'}, - {'group:wood', '', 'group:wood'}, - } + output = "ma_pops_furniture:fs_white", + recipe = { + { "wool:white", "wool:white", "wool:white" }, + { "group:wood", "", "group:wood" }, + }, }) -- Register crafting recipes for creating colored curtains for _, color in ipairs(fs_table) do - minetest.register_craft({ - output = 'ma_pops_furniture:fs_' .. color, - recipe = { - {'wool:' .. color, 'wool:' .. color, 'wool:' .. color}, - {'group:wood', '', 'group:wood'}, - } - }) + minetest.register_craft({ + output = "ma_pops_furniture:fs_" .. color, + recipe = { + { "wool:" .. color, "wool:" .. color, "wool:" .. color }, + { "group:wood", "", "group:wood" }, + }, + }) end -- Register crafting recipes for dyeing curtains for _, color in ipairs(fs_table) do - minetest.register_craft({ - output = 'ma_pops_furniture:fs_' .. color, - recipe = { - {'ma_pops_furniture:fs_white', 'dye:' .. color} - } - }) + minetest.register_craft({ + output = "ma_pops_furniture:fs_" .. color, + recipe = { + { "ma_pops_furniture:fs_white", "dye:" .. color }, + }, + }) end - minetest.register_craft({ - output = 'ma_pops_furniture:fs_rainbow', + output = "ma_pops_furniture:fs_rainbow", recipe = { - {'', '', '', }, - {'wool:blue', 'wool:yellow', 'wool:pink', }, - {'default: acacia_tree', '', 'default: acacia_tree', }, - } + { "", "", "" }, + { "wool:blue", "wool:yellow", "wool:pink" }, + { "default: acacia_tree", "", "default: acacia_tree" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:vcr_off', + output = "ma_pops_furniture:vcr_off", recipe = { - {'','','',}, - {'default:coalblock','default:coalblock','default:coalblock',}, - {'default:coalblock','default:mese_crystal','default:coalblock',}, - } + { "", "", "" }, + { "default:coalblock", "default:coalblock", "default:coalblock" }, + { "default:coalblock", "default:mese_crystal", "default:coalblock" }, + }, }) local unit_table = { --name, material -{'Wood Entertainment Unit', 'wood'}, -{'Acacia Wood Entertainment Unit', 'acacia_wood'}, -{'Aspen Wood Entertainment Unit', 'aspen_wood'}, -{'Pine Wood Entertainment Unit', 'pine_wood'}, -{'Jungle Wood Entertainment Unit', 'junglewood'} + { "Wood Entertainment Unit", "wood" }, + { "Acacia Wood Entertainment Unit", "acacia_wood" }, + { "Aspen Wood Entertainment Unit", "aspen_wood" }, + { "Pine Wood Entertainment Unit", "pine_wood" }, + { "Jungle Wood Entertainment Unit", "junglewood" }, } -for i in ipairs (unit_table) do +for i in ipairs(unit_table) do local name = unit_table[i][1] local material = unit_table[i][2] local invimg = unit_table[i][3] - -minetest.register_craft({ - output = 'ma_pops_furniture:e_u_'..material, - recipe = { - {'default:'..material,'default:'..material,'default:'..material,}, - {'default:'..material,'default:chest','default:'..material,}, - {'default:'..material,'','default:'..material,}, - } -}) + + minetest.register_craft({ + output = "ma_pops_furniture:e_u_" .. material, + recipe = { + { "default:" .. material, "default:" .. material, "default:" .. material }, + { "default:" .. material, "default:chest", "default:" .. material }, + { "default:" .. material, "", "default:" .. material }, + }, + }) end minetest.register_craft({ output = "ma_pops_furniture:trampoline", recipe = { - {"farming:string", "farming:string", "farming:string"}, - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, - {"default:steel_ingot", "", "default:steel_ingot"} - } + { "farming:string", "farming:string", "farming:string" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "", "default:steel_ingot" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:fireplace', + output = "ma_pops_furniture:fireplace", recipe = { - {'default:brick', 'default:brick', 'default:brick'}, - {'default:brick', 'default:furnace', 'default:brick'}, - {'default:brick', 'default:brick', 'default:brick'} - } + { "default:brick", "default:brick", "default:brick" }, + { "default:brick", "default:furnace", "default:brick" }, + { "default:brick", "default:brick", "default:brick" }, + }, }) local lamp_table = { --name, color, colorize(hex or color name:intensity(1-255)) -{'Black', 'black', 'black:225'}, -{'Blue', 'blue', 'blue:225'}, -{'Brown', 'brown', 'brown:225'}, -{'Cyan', 'cyan', 'cyan:200'}, -{'Dark Green', 'dark_green', 'green:225'}, -{'Dark Grey', 'dark_grey', 'black:200'}, -{'Green', 'green', '#32cd32:150'}, -{'Grey', 'grey', 'black:100'}, -{'Magenta', 'magenta', 'magenta:200'}, -{'Orange', 'orange', 'orange:225'}, -{'Pink', 'pink', 'pink:225'}, -{'Red', 'red', 'red:225'}, -{'Violet', 'violet', 'violet:225'}, -{'White', 'white', 'white:1'}, -{'Yellow', 'yellow', 'yellow:225'}, + { "Black", "black", "black:225" }, + { "Blue", "blue", "blue:225" }, + { "Brown", "brown", "brown:225" }, + { "Cyan", "cyan", "cyan:200" }, + { "Dark Green", "dark_green", "green:225" }, + { "Dark Grey", "dark_grey", "black:200" }, + { "Green", "green", "#32cd32:150" }, + { "Grey", "grey", "black:100" }, + { "Magenta", "magenta", "magenta:200" }, + { "Orange", "orange", "orange:225" }, + { "Pink", "pink", "pink:225" }, + { "Red", "red", "red:225" }, + { "Violet", "violet", "violet:225" }, + { "White", "white", "white:1" }, + { "Yellow", "yellow", "yellow:225" }, } -for i in ipairs (lamp_table) do +for i in ipairs(lamp_table) do local name = lamp_table[i][1] local color = lamp_table[i][2] local hex = lamp_table[i][3] - -minetest.register_craft({ - output = 'ma_pops_furniture:lamp_off_'..color, - recipe = { - {'wool:white','wool:white', 'wool:white'}, - {'wool:white', 'default:torch', 'wool:white'}, - {'wool:'..color, 'wool:'..color, 'wool:'..color} - } -}) + + minetest.register_craft({ + output = "ma_pops_furniture:lamp_off_" .. color, + recipe = { + { "wool:white", "wool:white", "wool:white" }, + { "wool:white", "default:torch", "wool:white" }, + { "wool:" .. color, "wool:" .. color, "wool:" .. color }, + }, + }) end local curtain_table = { --name, color, colorize(hex or color name:intensity(1-255)) -{'Black', 'black', 'black:225'}, -{'Blue', 'blue', 'blue:225'}, -{'Brown', 'brown', 'brown:225'}, -{'Cyan', 'cyan', 'cyan:200'}, -{'Dark Green', 'dark_green', 'green:225'}, -{'Dark Grey', 'dark_grey', 'black:200'}, -{'Green', 'green', '#32cd32:150'}, -{'Grey', 'grey', 'black:100'}, -{'Magenta', 'magenta', 'magenta:200'}, -{'Orange', 'orange', 'orange:225'}, -{'Pink', 'pink', 'pink:225'}, -{'Red', 'red', 'red:225'}, -{'Violet', 'violet', 'violet:225'}, -{'White', 'white', 'white:1'}, -{'Yellow', 'yellow', 'yellow:225'}, + { "Black", "black", "black:225" }, + { "Blue", "blue", "blue:225" }, + { "Brown", "brown", "brown:225" }, + { "Cyan", "cyan", "cyan:200" }, + { "Dark Green", "dark_green", "green:225" }, + { "Dark Grey", "dark_grey", "black:200" }, + { "Green", "green", "#32cd32:150" }, + { "Grey", "grey", "black:100" }, + { "Magenta", "magenta", "magenta:200" }, + { "Orange", "orange", "orange:225" }, + { "Pink", "pink", "pink:225" }, + { "Red", "red", "red:225" }, + { "Violet", "violet", "violet:225" }, + { "White", "white", "white:1" }, + { "Yellow", "yellow", "yellow:225" }, } -for i in ipairs (curtain_table) do +for i in ipairs(curtain_table) do local name = curtain_table[i][1] local color = curtain_table[i][2] local hex = curtain_table[i][3] - -minetest.register_craft({ - output = 'ma_pops_furniture:curtains_'..color, - recipe = { - {'default:acacia_tree','default:acacia_tree', 'default:acacia_tree'}, - {'wool:'..color, '', 'wool:'..color}, - {'wool:'..color, '', 'wool:'..color} - } -}) -minetest.register_craft({ - type = "shapeless", - output = 'ma_pops_furniture:curtains_2_tall_'..color, - recipe = - {'ma_pops_furniture:curtains_'..color, 'ma_pops_furniture:curtains_'..color} -}) -end + minetest.register_craft({ + output = "ma_pops_furniture:curtains_" .. color, + recipe = { + { "default:acacia_tree", "default:acacia_tree", "default:acacia_tree" }, + { "wool:" .. color, "", "wool:" .. color }, + { "wool:" .. color, "", "wool:" .. color }, + }, + }) -minetest.register_craft({ - output = 'ma_pops_furniture:blinds', - recipe = { - {'default:stick', 'default:stick', 'default:stick'}, - {'default:stick', 'dye:white', 'default:stick'}, - {'default:stick', 'default:stick', 'default:stick'} - } -}) - -minetest.register_craft({ - output = "ma_pops_furniture:stereo", - recipe = { - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - {"default:steel_ingot", "default:chest", "default:steel_ingot", }, - {"default:stick", "", "default:stick", } - } -}) - -minetest.register_craft({ - output = 'ma_pops_furniture:tv_off', - recipe = { - {'default:tree', 'default:tree', 'default:tree'}, - {'default:tree', 'wool:black', 'default:tree'}, - {'default:tree', 'default:tree', 'default:tree'} - } -}) - -local c_table = { --name, material, invimg -{'wood'}, -{'aspen_wood'}, -{'junglewood'}, -{'acacia_wood'}, -{'pine_wood'}, -{'cobble'} -} - -for i in ipairs (c_table) do - local material = c_table[i][1] - -minetest.register_craft({ - output = 'ma_pops_furniture:c_'..material, - recipe = { - {'', '', ''}, - {'default:'..material, 'default:'..material, 'default:'..material}, - {'default:'..material, '', 'default:'..material} - } -}) + minetest.register_craft({ + type = "shapeless", + output = "ma_pops_furniture:curtains_2_tall_" .. color, + recipe = { "ma_pops_furniture:curtains_" .. color, "ma_pops_furniture:curtains_" .. color }, + }) end minetest.register_craft({ - output = 'ma_pops_furniture:computer', + output = "ma_pops_furniture:blinds", recipe = { - {'default:stone','default:stone','default:stone',}, - {'default:glass','default:mese_crystal','default:stone',}, - {'default:stone','default:copper_lump','default:stone',}, - } + { "default:stick", "default:stick", "default:stick" }, + { "default:stick", "dye:white", "default:stick" }, + { "default:stick", "default:stick", "default:stick" }, + }, +}) + +minetest.register_craft({ + output = "ma_pops_furniture:stereo", + recipe = { + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "default:chest", "default:steel_ingot" }, + { "default:stick", "", "default:stick" }, + }, +}) + +minetest.register_craft({ + output = "ma_pops_furniture:tv_off", + recipe = { + { "default:tree", "default:tree", "default:tree" }, + { "default:tree", "wool:black", "default:tree" }, + { "default:tree", "default:tree", "default:tree" }, + }, +}) + +local c_table = { --name, material, invimg + { "wood" }, + { "aspen_wood" }, + { "junglewood" }, + { "acacia_wood" }, + { "pine_wood" }, + { "cobble" }, +} + +for i in ipairs(c_table) do + local material = c_table[i][1] + + minetest.register_craft({ + output = "ma_pops_furniture:c_" .. material, + recipe = { + { "", "", "" }, + { "default:" .. material, "default:" .. material, "default:" .. material }, + { "default:" .. material, "", "default:" .. material }, + }, + }) +end + +minetest.register_craft({ + output = "ma_pops_furniture:computer", + recipe = { + { "default:stone", "default:stone", "default:stone" }, + { "default:glass", "default:mese_crystal", "default:stone" }, + { "default:stone", "default:copper_lump", "default:stone" }, + }, }) local materials = { -- name - 'wood', - 'aspen_wood', - 'junglewood', - 'acacia_wood', - 'pine_wood', - 'cobble' + "wood", + "aspen_wood", + "junglewood", + "acacia_wood", + "pine_wood", + "cobble", } for _, material in ipairs(materials) do - -- Recipe using specific material slabs - minetest.register_craft({ - output = 'ma_pops_furniture:table_' .. material, - recipe = { - {'stairs:slab_' .. material, 'stairs:slab_' .. material, 'stairs:slab_' .. material}, - {'', 'default:stick', ''}, - {'', 'default:stick', ''} - } - }) + -- Recipe using specific material slabs + minetest.register_craft({ + output = "ma_pops_furniture:table_" .. material, + recipe = { + { "stairs:slab_" .. material, "stairs:slab_" .. material, "stairs:slab_" .. material }, + { "", "default:stick", "" }, + { "", "default:stick", "" }, + }, + }) end -- Optional: A generic recipe for 'wood' material (if needed) minetest.register_craft({ - output = 'ma_pops_furniture:table_wood', - recipe = { - {'stairs:slab_wood', 'stairs:slab_wood', 'stairs:slab_wood'}, - {'', 'default:stick', ''}, - {'', 'default:stick', ''} - } + output = "ma_pops_furniture:table_wood", + recipe = { + { "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" }, + { "", "default:stick", "" }, + { "", "default:stick", "" }, + }, }) - local hedge_table = { --name, material, invimg -{'leaves'}, -{'pine_needles'}, -{'jungleleaves'}, -{'acacia_leaves'}, -{'aspen_leaves'} + { "leaves" }, + { "pine_needles" }, + { "jungleleaves" }, + { "acacia_leaves" }, + { "aspen_leaves" }, } -for i in ipairs (hedge_table) do +for i in ipairs(hedge_table) do local material = hedge_table[i][1] -minetest.register_craft({ - output = 'ma_pops_furniture:hedge_'..material, - recipe = { - {'', '', ''}, - {'default:'..material, 'default:'..material, 'default:'..material}, - {'default:'..material, 'default:'..material, 'default:'..material} - } -}) + minetest.register_craft({ + output = "ma_pops_furniture:hedge_" .. material, + recipe = { + { "", "", "" }, + { "default:" .. material, "default:" .. material, "default:" .. material }, + { "default:" .. material, "default:" .. material, "default:" .. material }, + }, + }) end --added craft minetest.register_craft({ - output = 'ma_pops_furniture:birdbath', + output = "ma_pops_furniture:birdbath", recipe = { - {'default:stone','bucket:bucket_water','default:stone',}, - {'','default:stone','',}, - {'default:stone','default:stone','default:stone',}, - } + { "default:stone", "bucket:bucket_water", "default:stone" }, + { "", "default:stone", "" }, + { "default:stone", "default:stone", "default:stone" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:tile_kitchen', + output = "ma_pops_furniture:tile_kitchen", recipe = { - {'default:stone_block','dye:white','default:stone_block',}, - {'dye:black','default:stone_block','dye:black',}, - {'default:stone_block','dye:white','default:stone_block',}, - } + { "default:stone_block", "dye:white", "default:stone_block" }, + { "dye:black", "default:stone_block", "dye:black" }, + { "default:stone_block", "dye:white", "default:stone_block" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:tile_floor_kitchen', + output = "ma_pops_furniture:tile_floor_kitchen", recipe = { - {'default:stone_block','ma_pops_furniture:hammer',}, - } + { "default:stone_block", "ma_pops_furniture:hammer" }, + }, }) --added craft minetest.register_craft({ - output = 'ma_pops_furniture:doorbell 4', + output = "ma_pops_furniture:doorbell 4", recipe = { - {'','default:stone','',}, - {'','default:mese_crystal','',}, - {'','','',}, - } + { "", "default:stone", "" }, + { "", "default:mese_crystal", "" }, + { "", "", "" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:ac', + output = "ma_pops_furniture:ac", recipe = { - {'default:coral_skeleton','default:coral_skeleton','default:coral_skeleton',}, - {'default:coral_skeleton','ma_pops_furniture:fan_blade','default:coral_skeleton',}, - {'default:coral_skeleton','default:mese_crystal','default:coral_skeleton',}, - } + { "default:coral_skeleton", "default:coral_skeleton", "default:coral_skeleton" }, + { "default:coral_skeleton", "ma_pops_furniture:fan_blade", "default:coral_skeleton" }, + { "default:coral_skeleton", "default:mese_crystal", "default:coral_skeleton" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:fan_off', + output = "ma_pops_furniture:fan_off", recipe = { - {'default:coral_skeleton','default:coral_skeleton','default:coral_skeleton',}, - {'default:coral_skeleton','ma_pops_furniture:fan_blade','default:coral_skeleton',}, - {'default:coral_skeleton','default:coral_skeleton','default:coral_skeleton',}, - } + { "default:coral_skeleton", "default:coral_skeleton", "default:coral_skeleton" }, + { "default:coral_skeleton", "ma_pops_furniture:fan_blade", "default:coral_skeleton" }, + { "default:coral_skeleton", "default:coral_skeleton", "default:coral_skeleton" }, + }, }) minetest.register_craftitem("ma_pops_furniture:fan_blade", { - description = 'Fan Blade', + description = "Fan Blade", inventory_image = "mp_blade.png", }) minetest.register_craft({ - output = 'ma_pops_furniture:fan_blade', + output = "ma_pops_furniture:fan_blade", recipe = { - {'default:coral_skeleton','','default:coral_skeleton',}, - {'','default:coral_skeleton','',}, - {'default:coral_skeleton','','default:coral_skeleton',}, - } + { "default:coral_skeleton", "", "default:coral_skeleton" }, + { "", "default:coral_skeleton", "" }, + { "default:coral_skeleton", "", "default:coral_skeleton" }, + }, }) - +--[[ minetest.register_craftitem("ma_pops_furniture:knife", { - description = 'Knife', + description = "Knife", inventory_image = "mp_knife.png", }) minetest.register_craft({ - output = 'ma_pops_furniture:knife', + output = "ma_pops_furniture:knife", recipe = { - {'default:steel_ingot','','',}, - {'','default:steel_ingot','',}, - {'','','default:stick',}, - } -}) + { "default:steel_ingot", "", "" }, + { "", "default:steel_ingot", "" }, + { "", "", "default:stick" }, + }, +})]]-- --added craft minetest.register_craft({ - output = 'ma_pops_furniture:grill', + output = "ma_pops_furniture:grill", recipe = { - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:steel_ingot','','default:steel_ingot',}, - } + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "", "default:steel_ingot" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:fridge_white', + output = "ma_pops_furniture:fridge_white", recipe = { - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - {'default:steel_ingot','default:snow','default:steel_ingot',}, - {'default:steel_ingot','default:steel_ingot','default:steel_ingot',}, - } + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:steel_ingot", "default:snow", "default:steel_ingot" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, + }, }) --added craft local fridges_list = { - {"black", "Darkened Fridge", color1}, - {"blue", "Blue Fridge", color2}, - {"green", "Green Fridge", color3}, - {"orange", "Orange Fridge", color5}, - {"red", "Red Fridge", color6}, - {"yellow", "Yellow Fridge", color7}, - {"pink", "Pink Fridge", color8} + { "black", "Darkened Fridge", color1 }, + { "blue", "Blue Fridge", color2 }, + { "green", "Green Fridge", color3 }, + { "orange", "Orange Fridge", color5 }, + { "red", "Red Fridge", color6 }, + { "yellow", "Yellow Fridge", color7 }, + { "pink", "Pink Fridge", color8 }, } for i, fridge in ipairs(fridges_list) do - local colour = fridge[1] - local fridgedesc = fridge[2] - local colour2 = fridge[3] - -minetest.register_craft({ - type = "shapeless", - output = 'ma_pops_furniture:fridge_'..colour, - recipe = - {'ma_pops_furniture:fridge_white', 'dye:'..colour} -}) + local colour = fridge[1] + local fridgedesc = fridge[2] + local colour2 = fridge[3] + + minetest.register_craft({ + type = "shapeless", + output = "ma_pops_furniture:fridge_" .. colour, + recipe = { "ma_pops_furniture:fridge_white", "dye:" .. colour }, + }) end --added craft minetest.register_craft({ - output = 'ma_pops_furniture:stone_path_1 5', + output = "ma_pops_furniture:stone_path_1 5", recipe = { - {'default:stone','default:stone',}, - } + { "default:stone", "default:stone" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:hammer', + output = "ma_pops_furniture:hammer", recipe = { - {'','default:steel_ingot', ''}, - {'', 'default:stick', 'default:steel_ingot'}, - {'default:stick', '', ''} - } + { "", "default:steel_ingot", "" }, + { "", "default:stick", "default:steel_ingot" }, + { "default:stick", "", "" }, + }, }) minetest.register_craft({ - output = 'ma_pops_furniture:shears', + output = "ma_pops_furniture:shears", recipe = { - {'','default:steel_ingot', ''}, - {'default:stick', '', 'default:steel_ingot'}, - {'', 'default:stick', ''} - } -}) \ No newline at end of file + { "", "default:steel_ingot", "" }, + { "default:stick", "", "default:steel_ingot" }, + { "", "default:stick", "" }, + }, +}) diff --git a/mods/ma_pops_furniture/toaster.lua b/mods/ma_pops_furniture/toaster.lua index 33b3b582..ab1de327 100644 --- a/mods/ma_pops_furniture/toaster.lua +++ b/mods/ma_pops_furniture/toaster.lua @@ -9,21 +9,21 @@ minetest.register_node("ma_pops_furniture:toaster", { "mp_toas_right.png", "mp_toas_left.png", "mp_toas_back.png", - "mp_toas_front.png" + "mp_toas_front.png", }, walkable = false, - groups = { snappy=3 }, + groups = { snappy = 3 }, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, drawtype = "nodebox", node_box = { - type = "fixed", - fixed = { - {-0.375, -0.5, 0, 0.375, -0.0625, 0.3125}, - {-0.4375, -0.1875, 0.0625, -0.375, -0.125, 0.25}, - }, - }, + type = "fixed", + fixed = { + { -0.375, -0.5, 0, 0.375, -0.0625, 0.3125 }, + { -0.4375, -0.1875, 0.0625, -0.375, -0.125, 0.25 }, + }, + }, }) local function breadslice_on_use(itemstack, user, pointed_thing) @@ -38,10 +38,10 @@ local function breadslice_on_use(itemstack, user, pointed_thing) if node and pos and (node.name == "ma_pops_furniture:toaster") then if minetest.is_protected(pos, pname) then minetest.record_protection_violation(pos, pname) - else - if itemstack:get_count() >= 2 then - itemstack:take_item(2) - minetest.set_node(pos, {name = "ma_pops_furniture:toaster_with_breadslice", param2 = node.param2}) + else + if itemstack:get_count() >= 2 then + itemstack:take_item(2) + minetest.set_node(pos, { name = "ma_pops_furniture:toaster_with_breadslice", param2 = node.param2 }) return itemstack end end @@ -51,13 +51,16 @@ local function breadslice_on_use(itemstack, user, pointed_thing) end if minetest.registered_items["farming:bread_slice"] then - minetest.override_item("farming:bread_slice", {on_use = breadslice_on_use }) + minetest.override_item("farming:bread_slice", { on_use = breadslice_on_use }) minetest.register_alias("ma_pops_furniture:breadslice", "farming:bread_slice") +elseif minetest.registered_items["sandwiches:bread_slice"] then + minetest.override_item("sandwiches:bread_slice", { on_use = breadslice_on_use }) + minetest.register_alias("ma_pops_furniture:breadslice", "sandwiches:bread_slice") else minetest.register_craftitem("ma_pops_furniture:breadslice", { description = S("Slice of Bread"), inventory_image = "mp_breadslice.png", - groups = {flammable = 2}, + groups = { flammable = 2 }, on_use = breadslice_on_use, }) end @@ -69,7 +72,7 @@ else description = S("Toast"), inventory_image = "mp_toast.png", on_use = minetest.item_eat(3), - groups = {flammable = 2}, + groups = { flammable = 2 }, }) end @@ -81,10 +84,10 @@ minetest.register_node("ma_pops_furniture:toaster_with_breadslice", { "mp_toas_right_bread.png", "mp_toas_left_bread.png", "mp_toas_back_bread.png", - "mp_toas_front_bread.png" + "mp_toas_front_bread.png", }, walkable = false, - groups = {not_in_creative_inventory=1}, + groups = { not_in_creative_inventory = 1 }, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, @@ -93,10 +96,10 @@ minetest.register_node("ma_pops_furniture:toaster_with_breadslice", { node_box = { type = "fixed", fixed = { - {-0.375, -0.5, 0, 0.375, -0.0625, 0.3125}, -- NodeBox1 - {-0.25, -0.0625, 0.0625, 0.25, 0.0625, 0.125}, -- NodeBox2 - {-0.25, -0.0625, 0.1875, 0.25, 0.0625, 0.25}, -- NodeBox3 - {-0.4375, -0.1875, 0.0625, -0.375, -0.125, 0.25}, -- NodeBox4 + { -0.375, -0.5, 0, 0.375, -0.0625, 0.3125 }, -- NodeBox1 + { -0.25, -0.0625, 0.0625, 0.25, 0.0625, 0.125 }, -- NodeBox2 + { -0.25, -0.0625, 0.1875, 0.25, 0.0625, 0.25 }, -- NodeBox3 + { -0.4375, -0.1875, 0.0625, -0.375, -0.125, 0.25 }, -- NodeBox4 }, }, on_punch = function(pos, node, clicker, itemstack, pointed_thing) @@ -106,10 +109,10 @@ minetest.register_node("ma_pops_furniture:toaster_with_breadslice", { minetest.sound_play("toaster", { pos = pos, gain = 1.0, - max_hear_distance = 5 + max_hear_distance = 5, }) return itemstack - end + end, }) minetest.register_node("ma_pops_furniture:toaster_toasting_breadslice", { @@ -120,10 +123,10 @@ minetest.register_node("ma_pops_furniture:toaster_toasting_breadslice", { "mp_toas_right_bread.png", "mp_toas_left_toast_side.png", "mp_toas_back_side.png", - "mp_toas_front_side.png" + "mp_toas_front_side.png", }, walkable = false, - groups = {not_in_creative_inventory = 1 }, + groups = { not_in_creative_inventory = 1 }, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, @@ -132,24 +135,24 @@ minetest.register_node("ma_pops_furniture:toaster_toasting_breadslice", { node_box = { type = "fixed", fixed = { - {-0.375, -0.5, 0, 0.375, -0.0625, 0.3125}, -- NodeBox1 - {-0.4375, -0.375, 0.0625, -0.375, -0.3125, 0.25}, -- NodeBox4 + { -0.375, -0.5, 0, 0.375, -0.0625, 0.3125 }, -- NodeBox1 + { -0.4375, -0.375, 0.0625, -0.375, -0.3125, 0.25 }, -- NodeBox4 }, }, }) minetest.register_node("ma_pops_furniture:toaster_with_toast", { description = S("Toaster with Toast"), - tiles = { + tiles = { "mp_toas_top_toast.png", "mp_toas_bottom.png", "mp_toas_right_toast.png", "mp_toas_left_toast.png", "mp_toas_back_toast.png", - "mp_toas_front_toast.png" + "mp_toas_front_toast.png", }, walkable = false, - groups = { snappy=3, not_in_creative_inventory=1 }, + groups = { snappy = 3, not_in_creative_inventory = 1 }, paramtype = "light", paramtype2 = "facedir", is_ground_content = false, @@ -157,21 +160,22 @@ minetest.register_node("ma_pops_furniture:toaster_with_toast", { node_box = { type = "fixed", fixed = { - {-0.375, -0.5, 0, 0.375, -0.0625, 0.3125}, -- NodeBox1 - {-0.25, -0.0625, 0.0625, 0.25, 0.0625, 0.125}, -- NodeBox2 - {-0.25, -0.0625, 0.1875, 0.25, 0.0625, 0.25}, -- NodeBox3 - {-0.4375, -0.1875, 0.0625, -0.375, -0.125, 0.25}, -- NodeBox4 + { -0.375, -0.5, 0, 0.375, -0.0625, 0.3125 }, -- NodeBox1 + { -0.25, -0.0625, 0.0625, 0.25, 0.0625, 0.125 }, -- NodeBox2 + { -0.25, -0.0625, 0.1875, 0.25, 0.0625, 0.25 }, -- NodeBox3 + { -0.4375, -0.1875, 0.0625, -0.375, -0.125, 0.25 }, -- NodeBox4 }, }, - on_punch = function (pos, node, player, pointed_thing) + on_punch = function(pos, node, player, pointed_thing) local inv = player:get_inventory() local left = inv:add_item("main", "ma_pops_furniture:toast 2") if left:is_empty() then - minetest.set_node(pos, {name = "ma_pops_furniture:toaster", param2 = node.param2}) + minetest.set_node(pos, { name = "ma_pops_furniture:toaster", param2 = node.param2 }) end - end + end, }) - + +--[[ --Slice of Bread (only if not farming one used) if not minetest.registered_items["farming:bread_slice"] then minetest.register_craft({ @@ -180,4 +184,5 @@ if not minetest.registered_items["farming:bread_slice"] then recipe = {"farming:bread", "ma_pops_furniture:knife"}, replacements = {{"ma_pops_furniture:knife", "ma_pops_furniture:knife"}}, }) -end \ No newline at end of file +end ]] +-- diff --git a/mods/sandwiches/init.lua b/mods/sandwiches/init.lua index 41f10c72..4c6ccd98 100644 --- a/mods/sandwiches/init.lua +++ b/mods/sandwiches/init.lua @@ -51,8 +51,8 @@ minetest.register_craftitem("sandwiches:bread_slice", { minetest.register_craft({ output = "sandwiches:bread_slice 4", type = "shapeless", - recipe = {"group:food_bread", "group:food_cutting_board", ""}, - replacements = { {"group:food_cutting_board", board }, } + recipe = {"group:food_bread", board, ""}, + replacements = { {board, board }, } }) minetest.register_craftitem("sandwiches:bread_crumbs", {