Reload/VoxeLibre
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import villager trade changes by Alessandra_Lozoya

Browse Source
This commit is contained in:
codiac 2023-07-25 13:44:28 +10:00
parent 86b5648442
commit 2cf5183638
1 changed files with 263 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

390
mods/ENTITIES/mobs_mc/villager.lua
View File

@ -101,28 +101,32 @@ local professions = {
jobsite = "mcl_composters:composter",
trades = {
{
{ { "mcl_farming:wheat_item", 18, 22, }, E1 },
{ { "mcl_farming:potato_item", 15, 19, }, E1 },
{ { "mcl_farming:carrot_item", 15, 19, }, E1 },
{ E1, { "mcl_farming:bread", 2, 4 } },
{ { "mcl_farming:wheat_item", 20, 20, }, E1 },
{ { "mcl_farming:potato_item", 26, 26, }, E1 },
{ { "mcl_farming:carrot_item", 22, 22, }, E1 },
{ { "mcl_farming:beetroot_item", 15, 15 }, E1 },
{ E1, { "mcl_farming:bread", 6, 6 } },
},
{
{ { "mcl_farming:pumpkin", 6, 7 }, E1 },
{ E1, { "mcl_farming:pumpkin_pie", 2, 3} },
{ E1, { "mcl_core:apple", 2, 3} },
{ { "mcl_farming:pumpkin", 6, 6 }, E1 },
{ E1, { "mcl_farming:pumpkin_pie", 4, 4 } },
{ E1, { "mcl_core:apple", 4, 4 } },
},
{
{ { "mcl_farming:melon", 7, 12 }, E1 },
{ E1, {"mcl_farming:cookie", 5, 7 }, },
{ { "mcl_farming:melon", 4, 4 }, E1 },
{ { "mcl_core:emerald", 3, 3 }, {"mcl_farming:cookie", 18, 18 }, },
},
{
{ E1, { "mcl_cake:cake", 1, 1 } },
{ E1, { "mcl_mushrooms:mushroom_stew", 6, 10 } }, --FIXME: expert level farmer is supposed to sell sus stews.
},
{
{ E1, { "mcl_farming:carrot_item_gold", 3, 10 } },
{ E1, { "mcl_potions:speckled_melon", 1, 4 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_farming:carrot_item_gold", 3, 3 } },
{ { "mcl_core:emerald", 4, 4 }, { "mcl_potions:speckled_melon", 3, 3 } },
TRADE_V6_BIRCH_SAPLING,
TRADE_V6_DARK_OAK_SAPLING,
TRADE_V6_ACACIA_SAPLING,
@ -135,31 +139,36 @@ local professions = {
jobsite = "mcl_barrels:barrel_closed",
trades = {
{
{ { "mcl_fishing:fish_raw", 6, 6, "mcl_core:emerald", 1, 1 },{ "mcl_fishing:fish_cooked", 6, 6 } },
{ { "mcl_mobitems:string", 15, 20 }, E1 },
{ { "mcl_core:coal_lump", 10, 15 }, E1 },
-- FIXME missing: bucket of cod + fish should be cod.
{ { "mcl_mobitems:string", 20, 20 }, E1 },
{ { "mcl_core:coal_lump", 10, 10 }, E1 },
{ { "mcl_core:emerald", 1, 1, "mcl_fishing:fish_raw", 6, 6 }, { "mcl_fishing:fish_cooked", 6, 6 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_buckets:bucket_cod", 1, 1 } },
},
{
{ { "mcl_fishing:fish_raw", 6, 15,}, E1 },
{ { "mcl_fishing:salmon_raw", 6, 6, "mcl_core:emerald", 1, 1 },{ "mcl_fishing:salmon_cooked", 6, 6 } },
{ { "mcl_core:emerald", 1, 2 },{"mcl_campfires:campfire_lit",1,1} },
},
{
{ { "mcl_fishing:salmon_raw", 6, 13,}, E1 },
{ { "mcl_core:emerald", 7, 22 }, { "mcl_fishing:fishing_rod_enchanted", 1, 1} },
},
{
{ { "mcl_fishing:clownfish_raw", 6, 6,}, E1 },
},
{
{ { "mcl_fishing:pufferfish_raw", 4, 4,}, E1 },
{ { "mcl_boats:boat", 1, 1,}, E1 },
{ { "mcl_boats:boat_acacia", 1, 1,}, E1 },
{ { "mcl_boats:boat_spruce", 1, 1,}, E1 },
{ { "mcl_boats:boat_dark_oak", 1, 1,}, E1 },
{ { "mcl_boats:boat_birch", 1, 1,}, E1 },
{
{ { "mcl_fishing:fish_raw", 15, 15 }, E1 },
{ { "mcl_core:emerald", 1, 1, "mcl_fishing:salmon_raw", 6, 6 }, { "mcl_fishing:salmon_cooked", 6, 6 } },
{ { "mcl_core:emerald", 2, 2 }, {"mcl_campfires:campfire_lit", 1, 1 } },
},
{
{ { "mcl_fishing:salmon_raw", 13, 13 }, E1 },
{ { "mcl_core:emerald", 8, 22 }, { "mcl_fishing:fishing_rod_enchanted", 1, 1 } },
},
{
{ { "mcl_fishing:clownfish_raw", 6, 6 }, E1 },
},
{
{ { "mcl_fishing:pufferfish_raw", 4, 4 }, E1 },
--Boat cherry?
{ { "mcl_boats:boat", 1, 1 }, E1 },
{ { "mcl_boats:boat_acacia", 1, 1 }, E1 },
{ { "mcl_boats:boat_spruce", 1, 1 }, E1 },
{ { "mcl_boats:boat_dark_oak", 1, 1 }, E1 },
{ { "mcl_boats:boat_birch", 1, 1 }, E1 },
},
},
},
@ -169,25 +178,28 @@ local professions = {
jobsite = "mcl_fletching_table:fletching_table",
trades = {
{
{ { "mcl_mobitems:string", 15, 20 }, E1 },
{ E1, { "mcl_bows:arrow", 8, 12 } },
{ { "mcl_core:gravel", 10, 10, "mcl_core:emerald", 1, 1 }, { "mcl_core:flint", 6, 10 } },
{ { "mcl_core:stick", 32, 32 }, E1 },
{ E1, { "mcl_bows:arrow", 16, 16 } },
{ { "mcl_core:emerald", 1, 1, "mcl_core:gravel", 10, 10 }, { "mcl_core:flint", 10, 10 } },
},
{
{ { "mcl_core:flint", 26, 26 }, E1 },
{ { "mcl_core:emerald", 2, 3 }, { "mcl_bows:bow", 1, 1 } },
{ { "mcl_core:emerald", 2, 2 }, { "mcl_bows:bow", 1, 1 } },
},
{
{ { "mcl_mobitems:string", 14, 14 }, E1 },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_bows:crossbow", 1, 1 } },
},
{
{ { "mcl_mobitems:string", 24, 24 }, E1 },
{ { "mcl_mobitems:feather", 24, 24 }, E1 },
{ { "mcl_core:emerald", 7, 21 } , { "mcl_bows:bow_enchanted", 1, 1 } },
},
{
--FIXME: supposed to be tripwire hook{ { "tripwirehook", 24, 24 }, E1 },
--FIXME: supposed to be tripwire hook{ { "tripwirehook", 8, 8 }, E1 },
{ { "mcl_core:emerald", 8, 22 } , { "mcl_bows:crossbow_enchanted", 1, 1 } },
{ { "mcl_core:emerald", 2, 2, "mcl_bows:arrow", 5, 5 }, { "mcl_potions:healing_arrow", 5, 5 } },
{ { "mcl_core:emerald", 2, 2, "mcl_bows:arrow", 5, 5 }, { "mcl_potions:harming_arrow", 5, 5 } },
@ -209,27 +221,108 @@ local professions = {
jobsite = "mcl_loom:loom",
trades = {
{
{ { "mcl_wool:white", 16, 22 }, E1 },
{ { "mcl_core:emerald", 3, 4 }, { "mcl_tools:shears", 1, 1 } },
{ { "mcl_wool:white", 18, 18 }, E1 },
{ { "mcl_wool:brown", 18, 18 }, E1 },
{ { "mcl_wool:black", 18, 18 }, E1 },
{ { "mcl_wool:grey", 18, 18 }, E1 },
{ { "mcl_core:emerald", 2, 2 }, { "mcl_tools:shears", 1, 1 } },
},
{
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:white", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:grey", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:silver", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:black", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:yellow", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:orange", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:red", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:magenta", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:purple", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:blue", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:cyan", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:lime", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:green", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:pink", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:light_blue", 1, 1 } },
{ { "mcl_core:emerald", 1, 2 }, { "mcl_wool:brown", 1, 1 } },
{ { "mcl_dye:black", 12, 12 }, E1 },
{ { "mcl_dye:dark_grey", 12, 12 }, E1 },
{ { "mcl_dye:green", 12, 12 }, E1 },
{ { "mcl_dye:lightblue", 12, 12 }, E1 },
{ { "mcl_dye:white", 12, 12 }, E1 },
{ E1, { "mcl_wool:white", 1, 1 } },
{ E1, { "mcl_wool:grey", 1, 1 } },
{ E1, { "mcl_wool:silver", 1, 1 } },
{ E1, { "mcl_wool:black", 1, 1 } },
{ E1, { "mcl_wool:yellow", 1, 1 } },
{ E1, { "mcl_wool:orange", 1, 1 } },
{ E1, { "mcl_wool:red", 1, 1 } },
{ E1, { "mcl_wool:magenta", 1, 1 } },
{ E1, { "mcl_wool:purple", 1, 1 } },
{ E1, { "mcl_wool:blue", 1, 1 } },
{ E1, { "mcl_wool:cyan", 1, 1 } },
{ E1, { "mcl_wool:lime", 1, 1 } },
{ E1, { "mcl_wool:green", 1, 1 } },
{ E1, { "mcl_wool:pink", 1, 1 } },
{ E1, { "mcl_wool:light_blue", 1, 1 } },
{ E1, { "mcl_wool:brown", 1, 1 } },
{ E1, { "mcl_wool:white_carpet", 4, 4 } },
{ E1, { "mcl_wool:grey_carpet", 4, 4 } },
{ E1, { "mcl_wool:silver_carpet", 4, 4 } },
{ E1, { "mcl_wool:black_carpet", 4, 4 } },
{ E1, { "mcl_wool:yellow_carpet", 4, 4 } },
{ E1, { "mcl_wool:orange_carpet", 4, 4 } },
{ E1, { "mcl_wool:red_carpet", 4, 4 } },
{ E1, { "mcl_wool:magenta_carpet", 4, 4 } },
{ E1, { "mcl_wool:purple_carpet", 4, 4 } },
{ E1, { "mcl_wool:blue_carpet", 4, 4 } },
{ E1, { "mcl_wool:cyan_carpet", 4, 4 } },
{ E1, { "mcl_wool:lime_carpet", 4, 4 } },
{ E1, { "mcl_wool:green_carpet", 4, 4 } },
{ E1, { "mcl_wool:pink_carpet", 4, 4 } },
{ E1, { "mcl_wool:light_blue_carpet", 4, 4 } },
{ E1, { "mcl_wool:brown_carpet", 4, 4 } },
},
{
{ { "mcl_dye:red", 12, 12 }, E1 },
{ { "mcl_dye:grey", 12, 12 }, E1 },
{ { "mcl_dye:pink", 12, 12 }, E1 },
{ { "mcl_dye:yellow", 12, 12 }, E1 },
{ { "mcl_dye:orange", 12, 12 }, E1 },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_red_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_blue_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_cyan_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_grey_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_silver_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_black_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_yellow_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_green_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_magenta_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_orange_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_purple_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_brown_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_pink_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_lime_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_light_blue_bottom", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_beds:bed_white_bottom", 1, 1 } },
},
{
{ { "mcl_dye:dark_green", 12, 12 }, E1 },
{ { "mcl_dye:brown", 12, 12 }, E1 },
{ { "mcl_dye:blue", 12, 12 }, E1 },
{ { "mcl_dye:violet", 12, 12 }, E1 },
{ { "mcl_dye:cyan", 12, 12 }, E1 },
{ { "mcl_dye:magenta", 12, 12 }, E1 },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_white", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_grey", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_silver", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_black", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_red", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_yellow", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_green", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_cyan", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_blue", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_magenta", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_orange", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_purple", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_brown", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_pink", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_lime", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_light_blue", 1, 1 } },
},
{
{ { "mcl_core:emerald", 2, 2 }, { "mcl_paintings:painting", 3, 3 } },
},
},
},
@ -239,28 +332,28 @@ local professions = {
jobsite = "mcl_lectern:lectern",
trades = {
{
{ { "mcl_core:paper", 24, 36 }, E1 },
{ { "mcl_books:book", 8, 10 }, E1 },
{ { "mcl_core:emerald", 9, 9 }, { "mcl_books:bookshelf", 1 ,1 }},
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 }},
{ { "mcl_core:paper", 24, 24 }, E1 },
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 } },
{ { "mcl_core:emerald", 9, 9 }, { "mcl_books:bookshelf", 1 ,1 } },
},
{
{ { "mcl_books:written_book", 2, 2 }, E1 },
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 }},
{ { "mcl_books:book", 4, 4 }, E1 },
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 } },
{ E1, { "mcl_lanterns:lantern_floor", 1, 1 } },
},
{
{ { "mcl_dye:black", 5, 5 }, E1 },
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 }},
{ { "mcl_mobitems:ink_sac", 5, 5 }, E1 },
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 } },
{ E1, { "mcl_core:glass", 4, 4 } },
},
{
{ E1, { "mcl_books:writable_book", 1, 1 } },
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 }},
{ { "mcl_core:emerald", 4, 4 }, { "mcl_compass:compass", 1 ,1 }},
{ { "mcl_books:writable_book", 1, 1 }, E1 },
{ { "mcl_core:emerald", 5, 64, "mcl_books:book", 1, 1 }, { "mcl_enchanting:book_enchanted", 1 ,1 } },
{ { "mcl_core:emerald", 5, 5 }, { "mcl_clock:clock", 1, 1 } },
{ { "mcl_core:emerald", 4, 4 }, { "mcl_compass:compass", 1 ,1 } },
},
{
@ -275,38 +368,43 @@ local professions = {
trades = {
{
{ { "mcl_core:paper", 24, 24 }, E1 },
{ { "mcl_core:emerald", 7, 7}, { "mcl_maps:empty_map", 1, 1 } },
{ { "mcl_core:emerald", 7, 7 }, { "mcl_maps:empty_map", 1, 1 } },
},
{
-- compass subject to special checks
{ { "xpanes:pane_natural_flat", 11, 11 }, E1 },
--{ { "mcl_core:emerald", 13, 13, "mcl_compass:compass", 1, 1 }, { "FIXME:ocean explorer map" 1, 1} },
--{ { "mcl_core:emerald", 13, 13, "mcl_compass:compass", 1, 1 }, { "FIXME:ocean explorer map" 1, 1 } },
},
{
{ { "mcl_compass:compass", 1, 1 }, E1 },
--{ { "mcl_core:emerald", 13, 13, "mcl_compass:compass", 1, 1 }, { "FIXME:woodland explorer map" 1, 1} },
--{ { "mcl_core:emerald", 14, 14, "mcl_compass:compass", 1, 1 }, { "FIXME:woodland explorer map" 1, 1 } },
},
{
{ { "mcl_core:emerald", 7, 7}, { "mcl_itemframes:item_frame", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_white", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_grey", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_silver", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_black", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_red", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_green", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_cyan", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_blue", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_magenta", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_orange", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_purple", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_brown", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_pink", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_lime", 1, 1 }},
{ { "mcl_core:emerald", 7, 7}, { "mcl_banners:banner_item_light_blue", 1, 1 }},
},
{
--{ { "mcl_core:emerald", 8, 8}, { "FIXME: globe banner pattern", 1, 1 } },
{ { "mcl_core:emerald", 7, 7 }, { "mcl_itemframes:item_frame", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_white", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_grey", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_silver", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_black", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_red", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_yellow", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_green", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_cyan", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_blue", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_magenta", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_orange", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_purple", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_brown", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_pink", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_lime", 1, 1 } },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_banners:banner_item_light_blue", 1, 1 } },
},
{
--{ { "mcl_core:emerald", 8, 8 }, { "FIXME: globe banner pattern", 1, 1 } },
},
-- TODO: special maps
},
@ -330,6 +428,7 @@ local professions = {
{ { "mcl_core:emerald", 3, 3 }, { "mcl_armor:leggings_chain", 1, 1 } },
{ { "mcl_core:emerald", 1, 1 }, { "mcl_armor:boots_chain", 1, 1 } },
},
{
{ { "mcl_buckets:bucket_lava", 1, 1 }, E1 },
{ { "mcl_core:diamond", 1, 1 }, E1 },
@ -342,6 +441,7 @@ local professions = {
{ { "mcl_core:emerald", 19, 33 }, { "mcl_armor:leggings_diamond_enchanted", 1, 1 } },
{ { "mcl_core:emerald", 13, 27 }, { "mcl_armor:boots_diamond_enchanted", 1, 1 } },
},
{
{ { "mcl_core:emerald", 13, 27 }, { "mcl_armor:helmet_diamond_enchanted", 1, 1 } },
{ { "mcl_core:emerald", 21, 35 }, { "mcl_armor:chestplate_diamond_enchanted", 1, 1 } },
@ -354,26 +454,31 @@ local professions = {
jobsite = "mcl_cauldrons:cauldron",
trades = {
{
{ { "mcl_mobitems:leather", 9, 12 }, E1 },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_armor:leggings_leather", 2, 4 } },
{ { "mcl_core:emerald", 7, 7 }, { "mcl_armor:chestplate_leather", 2, 4 } },
{ { "mcl_mobitems:leather", 6, 6 }, E1 },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_armor:leggings_leather", 1, 1 } },
{ { "mcl_core:emerald", 7, 7 }, { "mcl_armor:chestplate_leather", 1, 1 } },
},
{
{ { "mcl_core:flint", 26, 26 }, E1 },
{ { "mcl_core:emerald", 5, 5 }, { "mcl_armor:helmet_leather", 2, 4 } },
{ { "mcl_core:emerald", 4, 4 }, { "mcl_armor:boots_leather", 2, 4 } },
{ { "mcl_core:emerald", 5, 5 }, { "mcl_armor:helmet_leather", 1, 1 } },
{ { "mcl_core:emerald", 4, 4 }, { "mcl_armor:boots_leather", 1, 1 } },
},
{
{ { "mcl_mobitems:rabbit_hide", 9, 9 }, E1 },
{ { "mcl_core:emerald", 7, 7 }, { "mcl_armor:chestplate_leather", 1, 1 } },
},
{
--{ { "FIXME: scute", 4, 4 }, E1 },
{ { "mcl_core:emerald", 8, 10 }, { "mcl_mobitems:saddle", 1, 1 } },
--FIXME: { { "mcl_core:emerald", 6, 6 }, { "mcl_mobitems:leather_horse_armor", 1, 1 } },
},
{
{ { "mcl_core:emerald", 6, 6 }, { "mcl_mobitems:saddle", 1, 1 } },
{ { "mcl_core:emerald", 5, 5 }, { "mcl_armor:helmet_leather", 2, 4 } },
{ { "mcl_core:emerald", 5, 5 }, { "mcl_armor:helmet_leather", 1, 1 } },
},
},
},
@ -383,8 +488,8 @@ local professions = {
jobsite = "mcl_smoker:smoker",
trades = {
{
{ { "mcl_mobitems:beef", 14, 14 }, E1 },
{ { "mcl_mobitems:chicken", 7, 7 }, E1 },
{ { "mcl_mobitems:chicken", 14, 14 }, E1 },
{ { "mcl_mobitems:porkchop", 7, 7 }, E1 },
{ { "mcl_mobitems:rabbit", 4, 4 }, E1 },
{ E1, { "mcl_mobitems:rabbit_stew", 1, 1 } },
},
@ -394,16 +499,15 @@ local professions = {
{ E1, { "mcl_mobitems:cooked_porkchop", 5, 5 } },
{ E1, { "mcl_mobitems:cooked_chicken", 8, 8 } },
},
{
{ { "mcl_mobitems:mutton", 7, 7 }, E1 },
{ { "mcl_mobitems:beef", 10, 10 }, E1 },
},
{
{ { "mcl_mobitems:mutton", 7, 7 }, E1 },
{ { "mcl_mobitems:beef", 10, 10 }, E1 },
},
{
--{ { "FIXME: Sweet Berries", 10, 10 }, E1 },
{ { "mcl_ocean:dried_kelp_block", 10, 10 }, E1 },
{ { "mcl_farming:sweet_berry", 10, 10 }, E1 },
},
},
},
@ -422,11 +526,13 @@ local professions = {
{ { "mcl_core:iron_ingot", 4, 4 }, E1 },
{ { "mcl_core:emerald", 36, 36 }, { "mcl_bells:bell", 1, 1 } },
},
{
{ { "mcl_core:flint", 7, 9 }, E1 },
{ { "mcl_core:flint", 24, 24 }, E1 },
},
{
{ { "mcl_core:diamond", 7, 9 }, E1 },
{ { "mcl_core:diamond", 1, 1 }, E1 },
{ { "mcl_core:emerald", 17, 31 }, { "mcl_tools:axe_diamond_enchanted", 1, 1 } },
},
@ -452,6 +558,7 @@ local professions = {
{ { "mcl_core:iron_ingot", 4, 4 }, E1 },
{ { "mcl_core:emerald", 36, 36 }, { "mcl_bells:bell", 1, 1 } },
},
{
{ { "mcl_core:flint", 30, 30 }, E1 },
{ { "mcl_core:emerald", 6, 20 }, { "mcl_tools:axe_iron_enchanted", 1, 1 } },
@ -459,11 +566,13 @@ local professions = {
{ { "mcl_core:emerald", 8, 22 }, { "mcl_tools:pick_iron_enchanted", 1, 1 } },
{ { "mcl_core:emerald", 4, 4 }, { "mcl_farming:hoe_diamond", 1, 1 } },
},
{
{ { "mcl_core:diamond", 1, 1 }, E1 },
{ { "mcl_core:emerald", 17, 31 }, { "mcl_tools:axe_diamond_enchanted", 1, 1 } },
{ { "mcl_core:emerald", 10, 24 }, { "mcl_tools:shovel_diamond_enchanted", 1, 1 } },
},
{
{ { "mcl_core:emerald", 18, 32 }, { "mcl_tools:pick_diamond_enchanted", 1, 1 } },
},
@ -478,23 +587,27 @@ local professions = {
{ { "mcl_mobitems:rotten_flesh", 32, 32 }, E1 },
{ E1, { "mesecons:redstone", 2, 2 } },
},
{
{ { "mcl_core:gold_ingot", 3, 3 }, E1 },
{ E1, { "mcl_core:lapis", 1, 1 } },
},
{
{ { "mcl_mobitems:rabbit_foot", 2, 2 }, E1 },
{ E1, { "mcl_nether:glowstone", 4, 4 } },
{ { "mcl_core:emerald", 4, 4 }, { "mcl_nether:glowstone", 1, 1 } },
},
{
--{ { "FIXME: scute", 4, 4 }, E1 },
{ { "mcl_potions:glass_bottle", 9, 9 }, E1 },
{ { "mcl_core:emerald", 5, 5 }, { "mcl_throwing:ender_pearl", 1, 1 } },
TRADE_V6_RED_SANDSTONE,
},
{
{ { "mcl_nether:nether_wart_item", 22, 22 }, E1 },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_experience:bottle", 1, 1 } },
{ { "mcl_nether:nether_wart_item", 22, 22 }, E1 },
{ { "mcl_core:emerald", 3, 3 }, { "mcl_experience:bottle", 1, 1 } },
},
},
},
@ -507,38 +620,61 @@ local professions = {
{ { "mcl_core:clay_lump", 10, 10 }, E1 },
{ E1, { "mcl_core:brick", 10, 10 } },
},
{
{
{ { "mcl_core:stone", 20, 20 }, E1 },
{ E1, { "mcl_core:stonebrickcarved", 4, 4 } },
},
{
{ { "mcl_core:granite", 16, 16 }, E1 },
{ { "mcl_core:andesite", 16, 16 }, E1 },
{ { "mcl_core:diorite", 16, 16 }, E1 },
{ E1, { "mcl_core:granite_smooth", 4, 4 } },
{ E1, { "mcl_core:andesite_smooth", 4, 4 } },
{ E1, { "mcl_core:granite_smooth", 4, 4 } },
{ E1, { "mcl_core:diorite_smooth", 4, 4 } },
--FIXME: { E1, { "Dripstone Block", 4, 4 } },
},
{
{ { "mcl_nether:quartz", 12, 12 }, E1 },
{ E1, { "mcl_colorblocks:hardened_clay", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_white", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_grey", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_silver", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_black", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_red", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_yellow", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_green", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_cyan", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_blue", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_magenta", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_orange", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_brown", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_pink", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_light_blue", 1, 1} },
{ E1, { "mcl_colorblocks:hardened_clay_lime", 1, 1} },
--Only Colored Terracotta?
{ E1, { "mcl_colorblocks:hardened_clay", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_white", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_grey", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_silver", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_black", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_red", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_yellow", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_green", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_cyan", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_blue", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_magenta", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_orange", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_brown", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_pink", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_light_blue", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_lime", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_purple", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_white", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_grey", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_silver", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_black", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_red", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_yellow", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_green", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_cyan", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_blue", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_magenta", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_orange", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_brown", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_pink", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_light_blue", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_lime", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_purple", 1, 1 } },
},
{
{ E1, { "mcl_nether:quartz_pillar", 1, 1 } },
{ E1, { "mcl_nether:quartz_block", 1, 1 } },