Merge pull request #100 from RealBadAngel/master

Update crafting recipes - pretty much all of Mesecons recipes still used an old, now deprecated syntax substantially of the form 'node "default:xxxx" 2'  (with two pairs of quotes).  All such recipes have been changed to use the current method, i.e. "default:xxxx 2" (with one pair of quotes encompassing the whole itemstack).
This commit is contained in:
VanessaE 2013-04-28 04:18:37 -07:00
commit 6f83f4cf1e
19 changed files with 66 additions and 66 deletions

View File

@ -29,7 +29,7 @@ minetest.register_node("mesecons:mesecon_on", {
fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
}, },
groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1}, groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1},
drop = '"mesecons:mesecon_off" 1', drop = "mesecons:mesecon_off 1",
light_source = LIGHT_MAX-11, light_source = LIGHT_MAX-11,
mesecons = {conductor={ mesecons = {conductor={
state = mesecon.state.on, state = mesecon.state.on,

View File

@ -276,6 +276,6 @@ end
minetest.register_craft({ minetest.register_craft({
type = "cooking", type = "cooking",
output = '"mesecons:wire_00000000_off" 16', output = "mesecons:wire_00000000_off 16",
recipe = "default:mese_crystal", recipe = "default:mese_crystal",
}) })

View File

@ -27,7 +27,7 @@ minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
paramtype = "light", paramtype = "light",
walkable = false, walkable = false,
groups = {dig_immediate=3, not_in_creative_inventory=1, mesecon = 2}, groups = {dig_immediate=3, not_in_creative_inventory=1, mesecon = 2},
drop='"mesecons_blinkyplant:blinky_plant_off" 1', drop="mesecons_blinkyplant:blinky_plant_off 1",
light_source = LIGHT_MAX-7, light_source = LIGHT_MAX-7,
description = "Blinky Plant", description = "Blinky Plant",
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
@ -41,11 +41,11 @@ minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_blinkyplant:blinky_plant_off" 1', output = "mesecons_blinkyplant:blinky_plant_off 1",
recipe = { recipe = {
{'','"group:mesecon_conductor_craftable"',''}, {"","group:mesecon_conductor_craftable",""},
{'','"group:mesecon_conductor_craftable"',''}, {"","group:mesecon_conductor_craftable",""},
{'"default:sapling"','"default:sapling"','"default:sapling"'}, {"default:sapling","default:sapling","default:sapling"},
} }
}) })

View File

@ -74,7 +74,7 @@ minetest.register_node("mesecons_extrawires:corner_off", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_extrawires:corner_off" 3', output = "mesecons_extrawires:corner_off 3",
recipe = { recipe = {
{"", "", ""}, {"", "", ""},
{"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", ""}, {"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", ""},

View File

@ -75,7 +75,7 @@ minetest.register_node("mesecons_extrawires:tjunction_off", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_extrawires:tjunction_off" 3', output = "mesecons_extrawires:tjunction_off 3",
recipe = { recipe = {
{"", "", ""}, {"", "", ""},
{"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off"}, {"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off"},

View File

@ -32,7 +32,7 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", { minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
drawtype = "nodebox", drawtype = "nodebox",
tiles = {"jeija_hydro_turbine_on.png"}, tiles = {"jeija_hydro_turbine_on.png"},
drop = '"mesecons_hydroturbine:hydro_turbine_off" 1', drop = "mesecons_hydroturbine:hydro_turbine_off 1",
groups = {dig_immediate=2,not_in_creative_inventory=1}, groups = {dig_immediate=2,not_in_creative_inventory=1},
description="Water Turbine", description="Water Turbine",
paramtype = "light", paramtype = "light",
@ -86,11 +86,11 @@ nodenames = {"mesecons_hydroturbine:hydro_turbine_on"},
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_hydroturbine:hydro_turbine_off" 2', output = "mesecons_hydroturbine:hydro_turbine_off 2",
recipe = { recipe = {
{'','"default:stick"', ''}, {"","default:stick", ""},
{'"default:stick"', '"default:steel_ingot"', '"default:stick"'}, {"default:stick", "default:steel_ingot", "default:stick"},
{'','"default:stick"', ''}, {"","default:stick", ""},
} }
}) })

View File

@ -71,7 +71,7 @@ minetest.register_node("mesecons_insulated:insulated_off", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_insulated:insulated_off" 3', output = "mesecons_insulated:insulated_off 3",
recipe = { recipe = {
{"mesecons_materials:fiber", "mesecons_materials:fiber", "mesecons_materials:fiber"}, {"mesecons_materials:fiber", "mesecons_materials:fiber", "mesecons_materials:fiber"},
{"mesecons:wire_00000000_off", "mesecons:wire_00000000_off", "mesecons:wire_00000000_off"}, {"mesecons:wire_00000000_off", "mesecons:wire_00000000_off", "mesecons:wire_00000000_off"},

View File

@ -21,7 +21,7 @@ minetest.register_node("mesecons_lamp:lamp_on", {
node_box = mesecon_lamp_box, node_box = mesecon_lamp_box,
selection_box = mesecon_lamp_box, selection_box = mesecon_lamp_box,
groups = {dig_immediate=3,not_in_creative_inventory=1, mesecon_effector_on = 1}, groups = {dig_immediate=3,not_in_creative_inventory=1, mesecon_effector_on = 1},
drop='"mesecons_lamp:lamp_off" 1', drop="mesecons_lamp:lamp_off 1",
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
mesecons = {effector = { mesecons = {effector = {
action_off = function (pos, node) action_off = function (pos, node)
@ -52,10 +52,10 @@ minetest.register_node("mesecons_lamp:lamp_off", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_lamp:lamp_off" 1', output = "mesecons_lamp:lamp_off 1",
recipe = { recipe = {
{'', '"default:glass"', ''}, {"", "default:glass", ""},
{'"group:mesecon_conductor_craftable"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'}, {"group:mesecon_conductor_craftable", "default:steel_ingot", "group:mesecon_conductor_craftable"},
{'', '"default:glass"', ''}, {"", "default:glass", ""},
} }
}) })

View File

@ -13,7 +13,7 @@ function mesecon:lightstone_add(name, base_item, texture_off, texture_on)
minetest.register_node("mesecons_lightstone:lightstone_" .. name .. "_on", { minetest.register_node("mesecons_lightstone:lightstone_" .. name .. "_on", {
tiles = {texture_on}, tiles = {texture_on},
groups = {cracky=2,not_in_creative_inventory=1, mesecon = 2}, groups = {cracky=2,not_in_creative_inventory=1, mesecon = 2},
drop = "node mesecons_lightstone:lightstone_" .. name .. "_off 1", drop = "mesecons_lightstone:lightstone_" .. name .. "_off",
light_source = LIGHT_MAX-2, light_source = LIGHT_MAX-2,
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults(),
mesecons = {effector = { mesecons = {effector = {
@ -24,18 +24,18 @@ function mesecon:lightstone_add(name, base_item, texture_off, texture_on)
}) })
minetest.register_craft({ minetest.register_craft({
output = "node mesecons_lightstone:lightstone_" .. name .. "_off 1", output = "mesecons_lightstone:lightstone_" .. name .. "_off",
recipe = { recipe = {
{'',base_item,''}, {"",base_item,""},
{base_item,'default:torch',base_item}, {base_item,"default:torch",base_item},
{'','group:mesecon_conductor_craftable',''}, {"","group:mesecon_conductor_craftable",""}
} }
}) })
end end
mesecon:lightstone_add("red", "craft default:clay_brick 1", "jeija_lightstone_red_off.png", "jeija_lightstone_red_on.png") mesecon:lightstone_add("red", "default:clay_brick", "jeija_lightstone_red_off.png", "jeija_lightstone_red_on.png")
mesecon:lightstone_add("green", "node default:cactus 1", "jeija_lightstone_green_off.png", "jeija_lightstone_green_on.png") mesecon:lightstone_add("green", "default:cactus", "jeija_lightstone_green_off.png", "jeija_lightstone_green_on.png")
mesecon:lightstone_add("blue", "node mesecons_materials:fiber 1", "jeija_lightstone_blue_off.png", "jeija_lightstone_blue_on.png") mesecon:lightstone_add("blue", "mesecons_materials:fiber", "jeija_lightstone_blue_off.png", "jeija_lightstone_blue_on.png")
mesecon:lightstone_add("gray", "node default:cobble 1", "jeija_lightstone_gray_off.png", "jeija_lightstone_gray_on.png") mesecon:lightstone_add("gray", "default:cobble", "jeija_lightstone_gray_off.png", "jeija_lightstone_gray_on.png")
mesecon:lightstone_add("darkgray", "node default:gravel 1", "jeija_lightstone_darkgray_off.png", "jeija_lightstone_darkgray_on.png") mesecon:lightstone_add("darkgray", "default:gravel", "jeija_lightstone_darkgray_off.png", "jeija_lightstone_darkgray_on.png")

View File

@ -12,14 +12,14 @@ minetest.register_craftitem("mesecons_materials:fiber", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_materials:glue" 2', output = "mesecons_materials:glue 2",
type = "cooking", type = "cooking",
recipe = "default:sapling", recipe = "default:sapling",
cooktime = 2 cooktime = 2
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_materials:fiber" 6', output = "mesecons_materials:fiber 6",
type = "cooking", type = "cooking",
recipe = "mesecons_materials:glue", recipe = "mesecons_materials:glue",
cooktime = 4 cooktime = 4
@ -33,9 +33,9 @@ minetest.register_craftitem("mesecons_materials:silicon", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_materials:silicon" 4', output = "mesecons_materials:silicon 4",
recipe = { recipe = {
{'"default:sand"', '"default:sand"'}, {"default:sand", "default:sand"},
{'"default:sand"', '"default:steel_ingot"'}, {"default:sand", "default:steel_ingot"},
} }
}) })

View File

@ -66,7 +66,7 @@ minetest.register_node(nodename, {
paramtype = "light", paramtype = "light",
walkable = true, walkable = true,
groups = groups, groups = groups,
drop = '"mesecons_microcontroller:microcontroller0000" 1', drop = "mesecons_microcontroller:microcontroller0000 1",
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = { -8/16, -8/16, -8/16, 8/16, -5/16, 8/16 }, fixed = { -8/16, -8/16, -8/16, 8/16, -5/16, 8/16 },

View File

@ -119,11 +119,11 @@ minetest.register_entity("mesecons_movestones:movestone_entity", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_movestones:movestone" 2', output = "mesecons_movestones:movestone 2",
recipe = { recipe = {
{'"default:stone"', '"default:stone"', '"default:stone"'}, {"default:stone", "default:stone", "default:stone"},
{'"group:mesecon_conductor_craftable"', '"group:mesecon_conductor_craftable"', '"group:mesecon_conductor_craftable"'}, {"group:mesecon_conductor_craftable", "group:mesecon_conductor_craftable", "group:mesecon_conductor_craftable"},
{'"default:stone"', '"default:stone"', '"default:stone"'}, {"default:stone", "default:stone", "default:stone"},
} }
}) })
@ -151,9 +151,9 @@ minetest.register_node("mesecons_movestones:sticky_movestone", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_movestones:sticky_movestone" 2', output = "mesecons_movestones:sticky_movestone 2",
recipe = { recipe = {
{'"mesecons_materials:glue"', '"mesecons_movestones:movestone"', '"mesecons_materials:glue"'}, {"mesecons_materials:glue", "mesecons_movestones:movestone", "mesecons_materials:glue"},
} }
}) })

View File

@ -23,7 +23,7 @@ minetest.register_node("mesecons_noteblock:noteblock", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_noteblock:noteblock" 1', output = "mesecons_noteblock:noteblock 1",
recipe = { recipe = {
{"default:wood", "default:wood", "default:wood"}, {"default:wood", "default:wood", "default:wood"},
{"group:mesecon_conductor_craftable", "default:steel_ingot", "group:mesecon_conductor_craftable"}, {"group:mesecon_conductor_craftable", "default:steel_ingot", "group:mesecon_conductor_craftable"},

View File

@ -730,7 +730,7 @@ mesecon:register_mvps_stopper("mesecons_pistons:piston_down_sticky_on", piston_u
--craft recipes --craft recipes
minetest.register_craft({ minetest.register_craft({
output = 'mesecons_pistons:piston_normal_off 2', output = "mesecons_pistons:piston_normal_off 2",
recipe = { recipe = {
{"default:wood", "default:wood", "default:wood"}, {"default:wood", "default:wood", "default:wood"},
{"default:cobble", "default:steel_ingot", "default:cobble"}, {"default:cobble", "default:steel_ingot", "default:cobble"},

View File

@ -22,10 +22,10 @@ minetest.register_node("mesecons_powerplant:power_plant", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_powerplant:power_plant" 1', output = "mesecons_powerplant:power_plant 1",
recipe = { recipe = {
{'"group:mesecon_conductor_craftable"'}, {"group:mesecon_conductor_craftable"},
{'"group:mesecon_conductor_craftable"'}, {"group:mesecon_conductor_craftable"},
{'"default:sapling"'}, {"default:sapling"},
} }
}) })

View File

@ -59,10 +59,10 @@ minetest.register_node("mesecons_solarpanel:solar_panel_off", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_solarpanel:solar_panel_off" 1', output = "mesecons_solarpanel:solar_panel_off 1",
recipe = { recipe = {
{'"mesecons_materials:silicon"', '"mesecons_materials:silicon"'}, {"mesecons_materials:silicon", "mesecons_materials:silicon"},
{'"mesecons_materials:silicon"', '"mesecons_materials:silicon"'}, {"mesecons_materials:silicon", "mesecons_materials:silicon"},
} }
}) })

View File

@ -20,7 +20,7 @@ minetest.register_node("mesecons_switch:mesecon_switch_on", {
tiles = {"jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_on.png"}, tiles = {"jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_on.png"},
paramtype2="facedir", paramtype2="facedir",
groups = {dig_immediate=2,not_in_creative_inventory=1}, groups = {dig_immediate=2,not_in_creative_inventory=1},
drop='"mesecons_switch:mesecon_switch_off" 1', drop="mesecons_switch:mesecon_switch_off 1",
sounds = default.node_sound_stone_defaults(), sounds = default.node_sound_stone_defaults(),
mesecons = {receptor = { mesecons = {receptor = {
state = mesecon.state.on state = mesecon.state.on
@ -33,9 +33,9 @@ minetest.register_node("mesecons_switch:mesecon_switch_on", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_switch:mesecon_switch_off" 2', output = "mesecons_switch:mesecon_switch_off 2",
recipe = { recipe = {
{'"default:steel_ingot"', '"default:cobble"', '"default:steel_ingot"'}, {"default:steel_ingot", "default:cobble", "default:steel_ingot"},
{'"group:mesecon_conductor_craftable"','', '"group:mesecon_conductor_craftable"'}, {"group:mesecon_conductor_craftable","", "group:mesecon_conductor_craftable"},
} }
}) })

View File

@ -35,7 +35,7 @@ local torch_get_input_rules = function(node)
end end
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_torch:mesecon_torch_on" 4', output = "mesecons_torch:mesecon_torch_on 4",
recipe = { recipe = {
{"group:mesecon_conductor_craftable"}, {"group:mesecon_conductor_craftable"},
{"default:stick"},} {"default:stick"},}

View File

@ -71,7 +71,7 @@ minetest.register_node("mesecons_walllever:wall_lever_on", {
{ -1/16, 0, 4/16, 1/16, 8/16, 6/16 }} -- the lever itself. { -1/16, 0, 4/16, 1/16, 8/16, 6/16 }} -- the lever itself.
}, },
groups = {dig_immediate = 2, not_in_creative_inventory = 1, mesecon_needs_receiver = 1}, groups = {dig_immediate = 2, not_in_creative_inventory = 1, mesecon_needs_receiver = 1},
drop = '"mesecons_walllever:wall_lever_off" 1', drop = "mesecons_walllever:wall_lever_off 1",
description="Lever", description="Lever",
on_punch = function (pos, node) on_punch = function (pos, node)
mesecon:swap_node(pos, "mesecons_walllever:wall_lever_off") mesecon:swap_node(pos, "mesecons_walllever:wall_lever_off")
@ -86,10 +86,10 @@ minetest.register_node("mesecons_walllever:wall_lever_on", {
}) })
minetest.register_craft({ minetest.register_craft({
output = '"mesecons_walllever:wall_lever_off" 2', output = "mesecons_walllever:wall_lever_off 2",
recipe = { recipe = {
{'"group:mesecon_conductor_craftable"'}, {"group:mesecon_conductor_craftable"},
{'"default:stone"'}, {"default:stone"},
{'"default:stick"'}, {"default:stick"},
} }
}) })