mim
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Fix formatting. Remove plain terracotta.

This commit is contained in:
codiac 2023-08-19 11:36:04 +10:00
parent 2cf5183638
commit 85c1c57e95
1 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,7 @@ local professions = {
{ {
{ { "mcl_fishing:pufferfish_raw", 4, 4 }, E1 }, { { "mcl_fishing:pufferfish_raw", 4, 4 }, E1 },
--Boat cherry? --Boat cherry?
{ { "mcl_boats:boat", 1, 1 }, E1 }, { { "mcl_boats:boat", 1, 1 }, E1 },
{ { "mcl_boats:boat_acacia", 1, 1 }, E1 }, { { "mcl_boats:boat_acacia", 1, 1 }, E1 },
{ { "mcl_boats:boat_spruce", 1, 1 }, E1 }, { { "mcl_boats:boat_spruce", 1, 1 }, E1 },
@ -612,73 +612,71 @@ local professions = {
}, },
}, },
mason = { mason = {
name = N("Mason"), name = N("Mason"),
texture = "mobs_mc_villager_mason.png", texture = "mobs_mc_villager_mason.png",
jobsite = "mcl_stonecutter:stonecutter", jobsite = "mcl_stonecutter:stonecutter",
trades = { trades = {
{ {
{ { "mcl_core:clay_lump", 10, 10 }, E1 }, { { "mcl_core:clay_lump", 10, 10 }, E1 },
{ E1, { "mcl_core:brick", 10, 10 } }, { E1, { "mcl_core:brick", 10, 10 } },
}, },
{ {
{ { "mcl_core:stone", 20, 20 }, E1 }, { { "mcl_core:stone", 20, 20 }, E1 },
{ E1, { "mcl_core:stonebrickcarved", 4, 4 } }, { E1, { "mcl_core:stonebrickcarved", 4, 4 } },
}, },
{ {
{ { "mcl_core:granite", 16, 16 }, E1 }, { { "mcl_core:granite", 16, 16 }, E1 },
{ { "mcl_core:andesite", 16, 16 }, E1 }, { { "mcl_core:andesite", 16, 16 }, E1 },
{ { "mcl_core:diorite", 16, 16 }, E1 }, { { "mcl_core:diorite", 16, 16 }, E1 },
{ E1, { "mcl_core:andesite_smooth", 4, 4 } }, { E1, { "mcl_core:andesite_smooth", 4, 4 } },
{ E1, { "mcl_core:granite_smooth", 4, 4 } }, { E1, { "mcl_core:granite_smooth", 4, 4 } },
{ E1, { "mcl_core:diorite_smooth", 4, 4 } }, { E1, { "mcl_core:diorite_smooth", 4, 4 } },
--FIXME: { E1, { "Dripstone Block", 4, 4 } }, --FIXME: { E1, { "Dripstone Block", 4, 4 } },
}, },
{ {
{ { "mcl_nether:quartz", 12, 12 }, E1 }, { { "mcl_nether:quartz", 12, 12 }, E1 },
--Only Colored Terracotta? { E1, { "mcl_colorblocks:hardened_clay_white", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_grey", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_white", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_silver", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_grey", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_black", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_silver", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_red", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_black", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_yellow", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_red", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_green", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_yellow", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_cyan", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_green", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_blue", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_cyan", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_magenta", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_blue", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_orange", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_magenta", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_brown", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_orange", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_pink", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_brown", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_light_blue", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_pink", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_lime", 1, 1 } },
{ E1, { "mcl_colorblocks:hardened_clay_light_blue", 1, 1 } }, { E1, { "mcl_colorblocks:hardened_clay_purple", 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_white", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_grey", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_grey", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_silver", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_silver", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_black", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_black", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_red", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_red", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_yellow", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_yellow", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_green", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_green", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_cyan", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_cyan", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_blue", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_blue", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_magenta", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_magenta", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_orange", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_orange", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_brown", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_brown", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_pink", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_pink", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_light_blue", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_light_blue", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_lime", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_lime", 1, 1 } },
{ E1, { "mcl_colorblocks:glazed_terracotta_purple", 1, 1 } }, { E1, { "mcl_colorblocks:glazed_terracotta_purple", 1, 1 } },
}, },
{ {
{ E1, { "mcl_nether:quartz_pillar", 1, 1 } }, { E1, { "mcl_nether:quartz_pillar", 1, 1 } },
{ E1, { "mcl_nether:quartz_block", 1, 1 } }, { E1, { "mcl_nether:quartz_block", 1, 1 } },
}, },
}, },
}, },
nitwit = { nitwit = {