Skip to content

Commit 6f83f4c

Browse files
author
VanessaE
committedApr 28, 2013
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).
2 parents ac9a05d + 255e363 commit 6f83f4c

File tree

19 files changed

+66
-66
lines changed

19 files changed

+66
-66
lines changed
 

‎mesecons/oldwires.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ minetest.register_node("mesecons:mesecon_on", {
2929
fixed = {-0.5, -0.5, -0.5, 0.5, -0.45, 0.5},
3030
},
3131
groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1},
32-
drop = '"mesecons:mesecon_off" 1',
32+
drop = "mesecons:mesecon_off 1",
3333
light_source = LIGHT_MAX-11,
3434
mesecons = {conductor={
3535
state = mesecon.state.on,

‎mesecons/wires.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,6 @@ end
276276

277277
minetest.register_craft({
278278
type = "cooking",
279-
output = '"mesecons:wire_00000000_off" 16',
279+
output = "mesecons:wire_00000000_off 16",
280280
recipe = "default:mese_crystal",
281281
})

‎mesecons_blinkyplant/init.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
2727
paramtype = "light",
2828
walkable = false,
2929
groups = {dig_immediate=3, not_in_creative_inventory=1, mesecon = 2},
30-
drop='"mesecons_blinkyplant:blinky_plant_off" 1',
30+
drop="mesecons_blinkyplant:blinky_plant_off 1",
3131
light_source = LIGHT_MAX-7,
3232
description = "Blinky Plant",
3333
sounds = default.node_sound_leaves_defaults(),
@@ -41,11 +41,11 @@ minetest.register_node("mesecons_blinkyplant:blinky_plant_on", {
4141
})
4242

4343
minetest.register_craft({
44-
output = '"mesecons_blinkyplant:blinky_plant_off" 1',
44+
output = "mesecons_blinkyplant:blinky_plant_off 1",
4545
recipe = {
46-
{'','"group:mesecon_conductor_craftable"',''},
47-
{'','"group:mesecon_conductor_craftable"',''},
48-
{'"default:sapling"','"default:sapling"','"default:sapling"'},
46+
{"","group:mesecon_conductor_craftable",""},
47+
{"","group:mesecon_conductor_craftable",""},
48+
{"default:sapling","default:sapling","default:sapling"},
4949
}
5050
})
5151

‎mesecons_extrawires/corner.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ minetest.register_node("mesecons_extrawires:corner_off", {
7474
})
7575

7676
minetest.register_craft({
77-
output = '"mesecons_extrawires:corner_off" 3',
77+
output = "mesecons_extrawires:corner_off 3",
7878
recipe = {
7979
{"", "", ""},
8080
{"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", ""},

‎mesecons_extrawires/tjunction.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ minetest.register_node("mesecons_extrawires:tjunction_off", {
7575
})
7676

7777
minetest.register_craft({
78-
output = '"mesecons_extrawires:tjunction_off" 3',
78+
output = "mesecons_extrawires:tjunction_off 3",
7979
recipe = {
8080
{"", "", ""},
8181
{"mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off", "mesecons_insulated:insulated_off"},

‎mesecons_hydroturbine/init.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
3232
minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
3333
drawtype = "nodebox",
3434
tiles = {"jeija_hydro_turbine_on.png"},
35-
drop = '"mesecons_hydroturbine:hydro_turbine_off" 1',
35+
drop = "mesecons_hydroturbine:hydro_turbine_off 1",
3636
groups = {dig_immediate=2,not_in_creative_inventory=1},
3737
description="Water Turbine",
3838
paramtype = "light",
@@ -86,11 +86,11 @@ nodenames = {"mesecons_hydroturbine:hydro_turbine_on"},
8686
})
8787

8888
minetest.register_craft({
89-
output = '"mesecons_hydroturbine:hydro_turbine_off" 2',
89+
output = "mesecons_hydroturbine:hydro_turbine_off 2",
9090
recipe = {
91-
{'','"default:stick"', ''},
92-
{'"default:stick"', '"default:steel_ingot"', '"default:stick"'},
93-
{'','"default:stick"', ''},
91+
{"","default:stick", ""},
92+
{"default:stick", "default:steel_ingot", "default:stick"},
93+
{"","default:stick", ""},
9494
}
9595
})
9696

‎mesecons_insulated/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ minetest.register_node("mesecons_insulated:insulated_off", {
7171
})
7272

7373
minetest.register_craft({
74-
output = '"mesecons_insulated:insulated_off" 3',
74+
output = "mesecons_insulated:insulated_off 3",
7575
recipe = {
7676
{"mesecons_materials:fiber", "mesecons_materials:fiber", "mesecons_materials:fiber"},
7777
{"mesecons:wire_00000000_off", "mesecons:wire_00000000_off", "mesecons:wire_00000000_off"},

‎mesecons_lamp/init.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ minetest.register_node("mesecons_lamp:lamp_on", {
2121
node_box = mesecon_lamp_box,
2222
selection_box = mesecon_lamp_box,
2323
groups = {dig_immediate=3,not_in_creative_inventory=1, mesecon_effector_on = 1},
24-
drop='"mesecons_lamp:lamp_off" 1',
24+
drop="mesecons_lamp:lamp_off 1",
2525
sounds = default.node_sound_glass_defaults(),
2626
mesecons = {effector = {
2727
action_off = function (pos, node)
@@ -52,10 +52,10 @@ minetest.register_node("mesecons_lamp:lamp_off", {
5252
})
5353

5454
minetest.register_craft({
55-
output = '"mesecons_lamp:lamp_off" 1',
55+
output = "mesecons_lamp:lamp_off 1",
5656
recipe = {
57-
{'', '"default:glass"', ''},
58-
{'"group:mesecon_conductor_craftable"', '"default:steel_ingot"', '"group:mesecon_conductor_craftable"'},
59-
{'', '"default:glass"', ''},
57+
{"", "default:glass", ""},
58+
{"group:mesecon_conductor_craftable", "default:steel_ingot", "group:mesecon_conductor_craftable"},
59+
{"", "default:glass", ""},
6060
}
6161
})

‎mesecons_lightstone/init.lua

+15-15
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@ function mesecon:lightstone_add(name, base_item, texture_off, texture_on)
1313
minetest.register_node("mesecons_lightstone:lightstone_" .. name .. "_on", {
1414
tiles = {texture_on},
1515
groups = {cracky=2,not_in_creative_inventory=1, mesecon = 2},
16-
drop = "node mesecons_lightstone:lightstone_" .. name .. "_off 1",
16+
drop = "mesecons_lightstone:lightstone_" .. name .. "_off",
1717
light_source = LIGHT_MAX-2,
1818
sounds = default.node_sound_stone_defaults(),
1919
mesecons = {effector = {
2020
action_off = function (pos, node)
2121
mesecon:swap_node(pos, "mesecons_lightstone:lightstone_" .. name .. "_off")
2222
end
2323
}}
24-
})
24+
})
2525

26-
minetest.register_craft({
27-
output = "node mesecons_lightstone:lightstone_" .. name .. "_off 1",
28-
recipe = {
29-
{'',base_item,''},
30-
{base_item,'default:torch',base_item},
31-
{'','group:mesecon_conductor_craftable',''},
32-
}
33-
})
26+
minetest.register_craft({
27+
output = "mesecons_lightstone:lightstone_" .. name .. "_off",
28+
recipe = {
29+
{"",base_item,""},
30+
{base_item,"default:torch",base_item},
31+
{"","group:mesecon_conductor_craftable",""}
32+
}
33+
})
3434
end
3535

3636

37-
mesecon:lightstone_add("red", "craft default:clay_brick 1", "jeija_lightstone_red_off.png", "jeija_lightstone_red_on.png")
38-
mesecon:lightstone_add("green", "node default:cactus 1", "jeija_lightstone_green_off.png", "jeija_lightstone_green_on.png")
39-
mesecon:lightstone_add("blue", "node mesecons_materials:fiber 1", "jeija_lightstone_blue_off.png", "jeija_lightstone_blue_on.png")
40-
mesecon:lightstone_add("gray", "node default:cobble 1", "jeija_lightstone_gray_off.png", "jeija_lightstone_gray_on.png")
41-
mesecon:lightstone_add("darkgray", "node default:gravel 1", "jeija_lightstone_darkgray_off.png", "jeija_lightstone_darkgray_on.png")
37+
mesecon:lightstone_add("red", "default:clay_brick", "jeija_lightstone_red_off.png", "jeija_lightstone_red_on.png")
38+
mesecon:lightstone_add("green", "default:cactus", "jeija_lightstone_green_off.png", "jeija_lightstone_green_on.png")
39+
mesecon:lightstone_add("blue", "mesecons_materials:fiber", "jeija_lightstone_blue_off.png", "jeija_lightstone_blue_on.png")
40+
mesecon:lightstone_add("gray", "default:cobble", "jeija_lightstone_gray_off.png", "jeija_lightstone_gray_on.png")
41+
mesecon:lightstone_add("darkgray", "default:gravel", "jeija_lightstone_darkgray_off.png", "jeija_lightstone_darkgray_on.png")

‎mesecons_materials/init.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ minetest.register_craftitem("mesecons_materials:fiber", {
1212
})
1313

1414
minetest.register_craft({
15-
output = '"mesecons_materials:glue" 2',
15+
output = "mesecons_materials:glue 2",
1616
type = "cooking",
1717
recipe = "default:sapling",
1818
cooktime = 2
1919
})
2020

2121
minetest.register_craft({
22-
output = '"mesecons_materials:fiber" 6',
22+
output = "mesecons_materials:fiber 6",
2323
type = "cooking",
2424
recipe = "mesecons_materials:glue",
2525
cooktime = 4
@@ -33,9 +33,9 @@ minetest.register_craftitem("mesecons_materials:silicon", {
3333
})
3434

3535
minetest.register_craft({
36-
output = '"mesecons_materials:silicon" 4',
36+
output = "mesecons_materials:silicon 4",
3737
recipe = {
38-
{'"default:sand"', '"default:sand"'},
39-
{'"default:sand"', '"default:steel_ingot"'},
38+
{"default:sand", "default:sand"},
39+
{"default:sand", "default:steel_ingot"},
4040
}
4141
})

‎mesecons_microcontroller/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ minetest.register_node(nodename, {
6666
paramtype = "light",
6767
walkable = true,
6868
groups = groups,
69-
drop = '"mesecons_microcontroller:microcontroller0000" 1',
69+
drop = "mesecons_microcontroller:microcontroller0000 1",
7070
selection_box = {
7171
type = "fixed",
7272
fixed = { -8/16, -8/16, -8/16, 8/16, -5/16, 8/16 },

‎mesecons_movestones/init.lua

+6-6
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ minetest.register_entity("mesecons_movestones:movestone_entity", {
119119
})
120120

121121
minetest.register_craft({
122-
output = '"mesecons_movestones:movestone" 2',
122+
output = "mesecons_movestones:movestone 2",
123123
recipe = {
124-
{'"default:stone"', '"default:stone"', '"default:stone"'},
125-
{'"group:mesecon_conductor_craftable"', '"group:mesecon_conductor_craftable"', '"group:mesecon_conductor_craftable"'},
126-
{'"default:stone"', '"default:stone"', '"default:stone"'},
124+
{"default:stone", "default:stone", "default:stone"},
125+
{"group:mesecon_conductor_craftable", "group:mesecon_conductor_craftable", "group:mesecon_conductor_craftable"},
126+
{"default:stone", "default:stone", "default:stone"},
127127
}
128128
})
129129

@@ -151,9 +151,9 @@ minetest.register_node("mesecons_movestones:sticky_movestone", {
151151
})
152152

153153
minetest.register_craft({
154-
output = '"mesecons_movestones:sticky_movestone" 2',
154+
output = "mesecons_movestones:sticky_movestone 2",
155155
recipe = {
156-
{'"mesecons_materials:glue"', '"mesecons_movestones:movestone"', '"mesecons_materials:glue"'},
156+
{"mesecons_materials:glue", "mesecons_movestones:movestone", "mesecons_materials:glue"},
157157
}
158158
})
159159

‎mesecons_noteblock/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ minetest.register_node("mesecons_noteblock:noteblock", {
2323
})
2424

2525
minetest.register_craft({
26-
output = '"mesecons_noteblock:noteblock" 1',
26+
output = "mesecons_noteblock:noteblock 1",
2727
recipe = {
2828
{"default:wood", "default:wood", "default:wood"},
2929
{"group:mesecon_conductor_craftable", "default:steel_ingot", "group:mesecon_conductor_craftable"},

‎mesecons_pistons/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ mesecon:register_mvps_stopper("mesecons_pistons:piston_down_sticky_on", piston_u
730730

731731
--craft recipes
732732
minetest.register_craft({
733-
output = 'mesecons_pistons:piston_normal_off 2',
733+
output = "mesecons_pistons:piston_normal_off 2",
734734
recipe = {
735735
{"default:wood", "default:wood", "default:wood"},
736736
{"default:cobble", "default:steel_ingot", "default:cobble"},

‎mesecons_powerplant/init.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ minetest.register_node("mesecons_powerplant:power_plant", {
2222
})
2323

2424
minetest.register_craft({
25-
output = '"mesecons_powerplant:power_plant" 1',
25+
output = "mesecons_powerplant:power_plant 1",
2626
recipe = {
27-
{'"group:mesecon_conductor_craftable"'},
28-
{'"group:mesecon_conductor_craftable"'},
29-
{'"default:sapling"'},
27+
{"group:mesecon_conductor_craftable"},
28+
{"group:mesecon_conductor_craftable"},
29+
{"default:sapling"},
3030
}
3131
})

‎mesecons_solarpanel/init.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ minetest.register_node("mesecons_solarpanel:solar_panel_off", {
5959
})
6060

6161
minetest.register_craft({
62-
output = '"mesecons_solarpanel:solar_panel_off" 1',
62+
output = "mesecons_solarpanel:solar_panel_off 1",
6363
recipe = {
64-
{'"mesecons_materials:silicon"', '"mesecons_materials:silicon"'},
65-
{'"mesecons_materials:silicon"', '"mesecons_materials:silicon"'},
64+
{"mesecons_materials:silicon", "mesecons_materials:silicon"},
65+
{"mesecons_materials:silicon", "mesecons_materials:silicon"},
6666
}
6767
})
6868

‎mesecons_switch/init.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ minetest.register_node("mesecons_switch:mesecon_switch_on", {
2020
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"},
2121
paramtype2="facedir",
2222
groups = {dig_immediate=2,not_in_creative_inventory=1},
23-
drop='"mesecons_switch:mesecon_switch_off" 1',
23+
drop="mesecons_switch:mesecon_switch_off 1",
2424
sounds = default.node_sound_stone_defaults(),
2525
mesecons = {receptor = {
2626
state = mesecon.state.on
@@ -33,9 +33,9 @@ minetest.register_node("mesecons_switch:mesecon_switch_on", {
3333
})
3434

3535
minetest.register_craft({
36-
output = '"mesecons_switch:mesecon_switch_off" 2',
36+
output = "mesecons_switch:mesecon_switch_off 2",
3737
recipe = {
38-
{'"default:steel_ingot"', '"default:cobble"', '"default:steel_ingot"'},
39-
{'"group:mesecon_conductor_craftable"','', '"group:mesecon_conductor_craftable"'},
38+
{"default:steel_ingot", "default:cobble", "default:steel_ingot"},
39+
{"group:mesecon_conductor_craftable","", "group:mesecon_conductor_craftable"},
4040
}
4141
})

‎mesecons_torch/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ local torch_get_input_rules = function(node)
3535
end
3636

3737
minetest.register_craft({
38-
output = '"mesecons_torch:mesecon_torch_on" 4',
38+
output = "mesecons_torch:mesecon_torch_on 4",
3939
recipe = {
4040
{"group:mesecon_conductor_craftable"},
4141
{"default:stick"},}

‎mesecons_walllever/init.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ minetest.register_node("mesecons_walllever:wall_lever_on", {
7171
{ -1/16, 0, 4/16, 1/16, 8/16, 6/16 }} -- the lever itself.
7272
},
7373
groups = {dig_immediate = 2, not_in_creative_inventory = 1, mesecon_needs_receiver = 1},
74-
drop = '"mesecons_walllever:wall_lever_off" 1',
74+
drop = "mesecons_walllever:wall_lever_off 1",
7575
description="Lever",
7676
on_punch = function (pos, node)
7777
mesecon:swap_node(pos, "mesecons_walllever:wall_lever_off")
@@ -86,10 +86,10 @@ minetest.register_node("mesecons_walllever:wall_lever_on", {
8686
})
8787

8888
minetest.register_craft({
89-
output = '"mesecons_walllever:wall_lever_off" 2',
89+
output = "mesecons_walllever:wall_lever_off 2",
9090
recipe = {
91-
{'"group:mesecon_conductor_craftable"'},
92-
{'"default:stone"'},
93-
{'"default:stick"'},
91+
{"group:mesecon_conductor_craftable"},
92+
{"default:stone"},
93+
{"default:stick"},
9494
}
9595
})

0 commit comments

Comments
 (0)
Please sign in to comment.