From 2bf7ebc2652e5b9187de5a0bbc2e63ddbb7ee4a8 Mon Sep 17 00:00:00 2001
From: kay27 <kay27@bk.ru>
Date: Wed, 16 Feb 2022 03:47:23 +0400
Subject: [PATCH] Preload village schematics and calc proper sizes

---
 mods/MAPGEN/mcl_villages/init.lua             |  38 +++++++++++++++---
 .../mcl_villages/schematics/blacksmith.mts    | Bin 986 -> 1052 bytes
 .../mcl_villages/schematics/butcher.mts       | Bin 813 -> 919 bytes
 .../MAPGEN/mcl_villages/schematics/church.mts | Bin 956 -> 1128 bytes
 mods/MAPGEN/mcl_villages/schematics/farm.mts  | Bin 347 -> 324 bytes
 mods/MAPGEN/mcl_villages/schematics/lamp.mts  | Bin 209 -> 170 bytes
 .../mcl_villages/schematics/large_house.mts   | Bin 1137 -> 1271 bytes
 .../mcl_villages/schematics/library.mts       | Bin 816 -> 892 bytes
 .../mcl_villages/schematics/medium_house.mts  | Bin 760 -> 830 bytes
 .../mcl_villages/schematics/small_house.mts   | Bin 593 -> 617 bytes
 .../MAPGEN/mcl_villages/schematics/tavern.mts | Bin 1005 -> 1138 bytes
 mods/MAPGEN/mcl_villages/schematics/well.mts  | Bin 476 -> 456 bytes
 12 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/mods/MAPGEN/mcl_villages/init.lua b/mods/MAPGEN/mcl_villages/init.lua
index 6009539da..adbb7a0f5 100644
--- a/mods/MAPGEN/mcl_villages/init.lua
+++ b/mods/MAPGEN/mcl_villages/init.lua
@@ -13,7 +13,7 @@ local modpath                    = minetest.get_modpath(modname)
 local S                          = minetest.get_translator(modname)
 local basic_pseudobiome_villages = minetest.settings:get_bool("basic_pseudobiome_villages", true)
 local schem_path                 = modpath .. "/schematics/"
-local schematic_table = {
+--[[local schematic_table = {
 	{name = "large_house",	mts = schem_path.."large_house.mts",	hwidth = 11, hdepth = 12, hheight =  9, hsize = 14, max_num = 0.08 , rplc = basic_pseudobiome_villages },
 	{name = "blacksmith",	mts = schem_path.."blacksmith.mts",	hwidth =  7, hdepth = 11, hheight =  7, hsize = 13, max_num = 0.055, rplc = basic_pseudobiome_villages },
 	{name = "butcher",	mts = schem_path.."butcher.mts",	hwidth = 11, hdepth =  8, hheight = 10, hsize = 14, max_num = 0.03 , rplc = basic_pseudobiome_villages },
@@ -25,7 +25,37 @@ local schematic_table = {
 	{name = "small_house",	mts = schem_path.."small_house.mts",	hwidth =  9, hdepth =  7, hheight =  8, hsize = 13, max_num = 0.7  , rplc = basic_pseudobiome_villages },
 	{name = "tavern",	mts = schem_path.."tavern.mts",		hwidth = 11, hdepth = 10, hheight = 10, hsize = 13, max_num = 0.050, rplc = basic_pseudobiome_villages },
 	{name = "well",		mts = schem_path.."well.mts",		hwidth =  6, hdepth =  8, hheight =  6, hsize = 10, max_num = 0.045, rplc = basic_pseudobiome_villages },
+}]]
+local schematic_table = {
+	{name = "large_house",	mts = schem_path.."large_house.mts",	max_num = 0.08 , rplc = basic_pseudobiome_villages },
+	{name = "blacksmith",	mts = schem_path.."blacksmith.mts",	max_num = 0.055, rplc = basic_pseudobiome_villages },
+	{name = "butcher",	mts = schem_path.."butcher.mts",	max_num = 0.03 , rplc = basic_pseudobiome_villages },
+	{name = "church",	mts = schem_path.."church.mts",		max_num = 0.04 , rplc = basic_pseudobiome_villages },
+	{name = "farm",		mts = schem_path.."farm.mts",		max_num = 0.1  , rplc = basic_pseudobiome_villages },
+	{name = "lamp",		mts = schem_path.."lamp.mts",		max_num = 0.1  , rplc = false                      },
+	{name = "library",	mts = schem_path.."library.mts",	max_num = 0.04 , rplc = basic_pseudobiome_villages },
+	{name = "medium_house",	mts = schem_path.."medium_house.mts",	max_num = 0.08 , rplc = basic_pseudobiome_villages },
+	{name = "small_house",	mts = schem_path.."small_house.mts",	max_num = 0.7  , rplc = basic_pseudobiome_villages },
+	{name = "tavern",	mts = schem_path.."tavern.mts",		max_num = 0.050, rplc = basic_pseudobiome_villages },
+	{name = "well",		mts = schem_path.."well.mts",		max_num = 0.045, rplc = basic_pseudobiome_villages },
 }
+for k, v in pairs(schematic_table) do
+	local schem_lua = minetest.serialize_schematic(
+		v.mts,
+		"lua",
+		{
+			lua_use_comments = false,
+			lua_num_indent_spaces = 0,
+		}
+	):gsub("mcl_core:stonebrickcarved", "mcl_villages:stonebrickcarved") .. " return schematic"
+	v.preloaded_schematic = schem_lua
+	local loaded_schematic = loadstring(schem_lua)()
+	local size = loaded_schematic.size
+	v.hwidth = size.x
+	v.hheight = size.y
+	v.hdepth = size.z
+	v.hsize = math.ceil(math.sqrt((size.x/2)^2 + (size.y/2)^2) * 2 + 1)
+end
 local surface_mat = {
 	["mcl_core:dirt_with_dry_grass"]  = { top = "mcl_core:dirt",    bottom = "mcl_core:stone"        },
 	["mcl_core:dirt_with_grass"]      = { top = "mcl_core:dirt",    bottom = "mcl_core:stone"        },
@@ -322,12 +352,8 @@ local function place_schematics(plan, pr)
 		local pos = built_house.pos
 		local rotation = built_house.rotation
 		local platform_material = built_house.surface_mat
-		local building = built_house.building.mts
 		local replace_wall = built_house.building.rplc
-		local schem_lua = minetest.serialize_schematic(building,
-			"lua",
-			{lua_use_comments = false, lua_num_indent_spaces = 0}).." return schematic"
-		schem_lua = schem_lua:gsub("mcl_core:stonebrickcarved", "mcl_villages:stonebrickcarved")
+		local schem_lua = built_house.building.preloaded_schematic
 		if replace_wall then
 			--Note, block substitution isn't matching node names exactly; so nodes that are to be substituted that have the same prefixes cause bugs.
 			-- Example: Attempting to swap out 'mcl_core:stonebrick'; which has multiple, additional sub-variants: (carved, cracked, mossy). Will currently cause issues, so leaving disabled.
diff --git a/mods/MAPGEN/mcl_villages/schematics/blacksmith.mts b/mods/MAPGEN/mcl_villages/schematics/blacksmith.mts
index d7fb66593dba1636ba133681520ae16721d276b8..09665654a91c13f5ea5f484159ad650954885192 100644
GIT binary patch
delta 576
zcmcb`K8HigHze4XfrWvcfsKK)9t;>{7?=|?ix~KGlXK#e^NUiglJk?2a#ANpFquvc
zVw9dZRi0k}B$t+&mz-K`1*9e~V3MBvmQhYy1g<A1u`DsZIKQ+gIh6q+npBjToE@K(
zlb@VD`3R#XA1_>eNl|L*<QzsjB%$*B{FI4TOegPV(wof1WH33GQJlFX-f&`-G$T-e
zQCBjLK@6n7B)=#*1LzPi9bcZ9lQY?pNxr@!E;+%aaSu<7hrqGP2@@E)7M)u7D%pXt
zhi6RyN02JRwB%%g6al7LOb<Pqj_#0PdGKpVL(!3$C%H-to#rb9%x9VOR>&jGXhNnM
zGqZS?rh@U(2W16@56aa&rnNS<GCuK(W3yWjsj&9X0|AltPZARj39ESb%ruC;DdDhd
zr({LFghj)$4UKnIPbr*IV0&KJ__z12PbQlhTjl~ewFUY!9@;fl^ffmMb4Xr%G>I{b
znVDI5(s{`PIUO>>H*7j=ww_I4xz)8n{84n-g7c0G86R>QcNi#qcDeY7U4^|+{mT2V
zEsQ1{1sZ?;|F@4}^HmLb_P@SEYSoIC+pRfLE&}_l6DQ8)58-@bbmj2ZMhSs~RT`~I
z?z_Ae7=9ISo~W7fTf%@*nA!0_%PO|{d~R%M8wz`PjxePqxTP*oJMhY8LiL0@N6z%5
iC@VKxaPd!Re88lkHPbM}$UsoA&cXEz55xPgm3sjLWZZfH

delta 531
zcmbQkaf`j)Hze4XfrWvcfrEj&9ts%b7$kC&bK;Zpi&CvpGK)&$%QH(d;?s)~i;EeU
z6Elk#cu}Mo_~G2-{G_CuR3!P5qSRCd5x9I(QD$;>d{Rz+ayElRMM2_ZM<%g}Rq_f5
z1IzRCQy2t58q!kpl2ePVz|`b^MpH)p$q`JtQfX-nVj$^~{G#Lxpgfq4FHg+LnHVQC
zS&2z}ax|kFkd~gz%c#L9GciGoH6_0^DQEIWM#IVTndF!l#3wIc5})WSGx4FAIM^tV
z=3=YjlKi|>hyyJrA7<3AubA^T<gHMXf`E;psqXJ9OV+2qy=v{y;;g>e@%Q6*3pO9x
zRHVVca`8z@%bWt%jn0dOQr>(Gygy^lmW5x|UhUv1y76F6RPNQQ8Yh)J;%+_je3lh^
zZK_4>MV87ESF80Llhk)QFU$J>&0@MtX@GTEPRNrt@f|jYea@CP8BeJ=f8|FJS7qkZ
ze__8qX9?W+W1~>X<Q{Ju&uOkwo4r^or%5Gpe#Wi(&oh3V&$VrReBE?+@}f}w3Zc--
ztupJLuX%nt`(TqK!@`4Z(kmWU@3&F@^4I)Cah=&0z16>;ofAHH^7AZ>?e8b|^Z)qs
Q>U;CXzI>f~-O^UC0EnC4S^xk5

diff --git a/mods/MAPGEN/mcl_villages/schematics/butcher.mts b/mods/MAPGEN/mcl_villages/schematics/butcher.mts
index 251033b1ec0a3e7bf299f833ab1ffd90e35c18b3..03353de105ded131339bf1d97b4c8dafc59d077b 100644
GIT binary patch
delta 589
zcmZ3>Hl5wgHze4XfrWvafrEjq9ts%57?=|?ix~KGlXK#e^NUiglJk?2a#9&2-~uU`
zMJ4g&nI#$V=|zdf#giv7nof*RocxGUTr4Tx5J_iFVoFMC5rfR+ct%mq_>}xokU63g
z?~6{X&;u%$mXQRRnOTyWn^u&Vn_6rIV#b5n40@A=8FeM|7{owIO7e@6Gl247I=(zH
zCui~>M#YKy6eh<pich>JQ(qC6oN$CmQX=Bvgo%y3Jd%<U5<4Ul7*tL%i=?MGFfg*E
zY~?6aWJ@#<NpfIY#1oUCajJn!VG)l7qcXFwh*At+k-iVJ^o6H94wG*N_&i8_!2bEB
z#E%I_9J3s1Lbe{_QA*J0Nn#S8a@@5=gW1H#(Tj8U^vR5~t0gz=5`Pk9SI_oq=XA+8
z!eRw84#lu6ycu|i@tIQGnngT3O&*VywCbzu3vix0<wNU^$;`TE6yC9PE?Umc#>Thi
z;pu}7y0!%d6XwYo6yH%em;bfkK*JdpSM?d^8PcyB8!YHDQV=m{xS`?6d~?HphlVBF
z<jyAe6g$2$bWseuaPQ8qs+@PJ4*VQ-Df|~t?NzYu;9y^(vBct@#0Dm}kU+IVt6W@M
zBsdsmEKHasxk@6>#DhVLBZwiji+O6NP^Ml4cZmFoIn5c$H)GOvlyZnM3r%KxBq#HX
zsrBP7@fYS|D_9fM?j+362xwpx<kL}UVP;+-;mWBk^YIu9i$V3#BS!+ZFfc@}U(5gi
DdZpKQ

delta 439
zcmbQvzLrhGHze4XfrWvafs28o9u649C+bMcF(+mgG4SRl=fo%H7o}RIWEPb$@WZ(i
zOEf0_)tx+nQDX85Muo}$8D*FlL?<zcGBM~+PGr<INlRmp1S!reNzF|wO3Y0ywgNHZ
z!E6RmkW_IA(1v2G;+(`JAUi)Vb>eaPiS8y7=SWZ1Vw9e|f>EI!VP8&SN=j-`#hkaH
z-9k+Y0yZs1@)x;Z7XSV_!Mx+DM%d#D>nd~Ydz%g^I2c{f3Q%Ea5O#3TF?gd=RhD1<
zHD_gHv$Mgqg-ub5xNfjTb*jx;np9kAELdfn|2E}r*PHKJ4_C|&>VJDYV6JSIh3A!t
z?FRdkCe977&&z+l#Qd|#7q_Lm|9>f)_&xi9@6+fDr#I-FRC=LSy|}wldfn_#M;32Q
znAZFKNx_;=$0pzVap?87w#_L=|2G^Li_ZDDRl?G{PW0l<us!leC1$IuZvOc^((#SQ
zlT*8Q?262~5qy|&wj-~)*8VGZ-L8C4$zR0$(OWw`!ckzkTUx!R(2tVoB1&g+ES?7+
M{d7$DuE&0704w^yP5=M^

diff --git a/mods/MAPGEN/mcl_villages/schematics/church.mts b/mods/MAPGEN/mcl_villages/schematics/church.mts
index dbf022cb46fb8c0aa61641990501163485c017c6..a4fab89520789929aa1f82103c3fb268beb7d24f 100644
GIT binary patch
delta 755
zcmV<P0u24U2j~bfO;l4&00aOH01W^Pe}8{}e}8{}e}8{}e*hN%17T@$01s_rY+qw<
za%DPWZ(?F>Wsy8T1b1(5WRs2oCXwYO78Pw{Y+rY8Z)`euXlZn1Ut?i%aAkCnkSCK}
z0T`3P0WgubB$FZn7Ly<X85sZ=cyM8EWpg@kVQyt#ZDD6+ZggQ^W^7@T2mwZu@c|fr
zcwS?mA7El&#;}Z;fr()_0!9W*2=OOA8BPXN$jE@ugDe9w10=)Dz=dHC7c`Xl82Hg3
zAJjC$G9ZNz-KctCF$I!CHw~8_WLF^cpvO5M1L4rY9iq$(Yz!dG&H#b1aO1*AT8I!u
zmm(~~&mfGVNrVCBYJLV$6d6$l7AT*8AHxN>W%zLFAuNMo4FmN;lo=Sdv<gvlcjFEn
zMx3F;NJdx_js;RflnES4#H3Lc1`xy+qTCE1NLd<1cQ@|P5yBa6LJYV7C9yy_L_uX7
zECd;V;mN|linAPLVBi2lP>x3pQDl2qP(l=0h6Buj`G*I?al8aW2QzQu4maF?GGaKx
zS`4QP7;)->rE5qi!s-kNZ!|=yAEKkV9+DJs*K?%idXRd2Z6xHnezazSgznI2Jqe&B
z1;Jt5dcxfb7;WJ*;;GRY=m17iFO<~atgnaZK(J^ZCG~Isw2L@SeLb=|;tgPc*nr<2
zco-1v9ESS;AOLa)NY8&LsK?-cK-B#Qhi*Lz2SpEx3vimoKtqS(_5u|hiW-XysL@Dd
zh!W>e2FgN|M28Yi2Smmx$x%OC9SRJHdi*(yRw2s3fTwh!Y8tH{_*_5m#S^ZoU|<S-
z2GYU6RH0-zl#yYG03?Sp50sOc8OXPq4diI3C-4M18?xVs<X{E|B@U%tIB;>hnt=h`
z=TvhjioxV0YBp4VQ<yJsI|n5Np>W9a0)-C6?HqDs@TDClv?)HSMLlkZ5}B0Q@T-G3
llxbjQDDh<`bY~Bl;)$qu84LwJQ4U3<3?{nOOaRh<JO#})Fuwo*

delta 578
zcmaFCv4`EpHze4XfrWvWfuDh|9u+W1GDzem=fo%H7o}RIWEPdgmuHq_#HSY}78f%x
zCuSB+G_)55i8JuSl_lpVCFP_}ysAFgg;8bV1pUdI7+tt{;nEYo%SuXA6eQ-Q7F&VH
z_}s+w)Vz|!__UnFl8Gg16HoF^7GX4y5Jy&%UzC`ao(fhnxt>vcavh^&eZ`!&5uIht
z3IZ+}HnYq!XUEmwj$be2yJK4P!Rd1=EfeN#*q!X)#L>aFQ!=}tQE1uMjT^U@<ZgT1
zqRzZtPlhLFj@RmdJ#O#zYxR`ein#m6$DghBug$FJnfqo>QT;w4`^@JRS7WLkyn0gB
zI5GX7)w!4{ezPAhsA<z+uAKNQK7VFC-xC#0^`d>6uQE1VQrECLz3YJ6x~EO`t`D=5
z+={KYw{lMjzjnOUc=^dz^K*Oj4xHK@d~xQZIk#I=@0RXP_>@r8*t@wl!e(!QoT>Pe
z3RiKLxFtUJrhm1w*Csx_z4E}n8J|RB1-{#tB=YM$=n}CyFQqN??%YDJwdXyu?N<Kt
z_*=jK#}cib4B8c0-Gz+*4{Ds1im9mhrzpU|!qn)XAP{<}D6T^0hM%u>;{+ycaaNXT
z0wLCW&%TW8$x@b5^zc-aEYw_a_0%*cW-}YXxlRfX93*de_?;7Tws_!>ELFH5q*wED
q?-ZGgN9QAbbCjpVPt=MG*&Fcv+OyW*wQk>MITf<~VfL&|?*;&du=@`H

diff --git a/mods/MAPGEN/mcl_villages/schematics/farm.mts b/mods/MAPGEN/mcl_villages/schematics/farm.mts
index 9094c8681fcde6d5c441593224154176330b7372..e47f6e22f4dd4875a5b3abe920b08e9fa23f7bf8 100644
GIT binary patch
delta 214
zcmcc3bc9L7Hze4XfrWvcfsKK^9t;>bC)$fntkmTf$W6|PPfN{9PA#?qQWF>3)-wo#
z#7gpuk~4sUV7ekMIl-k-hlk_9p@#YFliCycRBB}$gl9_3keDIqprRbmHnox0W0T<q
zqX+COzAappn&MzOxmPW16SHnA`|O_cOP}nRJh!W^y;WV>HBITbP3WV&a$E=2ty=HC
zG~lU%4Vyvhv(8`t6$1E0*UBqLX}#wBJ-5*yfkm5f;)9UGXU;IVux#NKo!U~v|J9nI
INIBRa01d}caR2}S

delta 262
zcmX@YbepN(Hze4XfrWvSfrEj)9ts$^86<L(bK;Zpi&CvpGK)&$%QH(d;?s)~i;Ed}
zQDhjH6ElmD#7c@%QyBz6O43sEl2ePVz!ZZZNTejcC^-Wt1g058z=|g7t53|Zs;-#x
zc5*LQg91;Be)!FrmvMVD>xEmFD7EaFd|O~5e?3FVL`LSWoFla!i+^pB%(XXOVY<t{
z_rQY7pL>#|Cv7Vgj+nIcS=mWz)jegJ{NcwRtHdr?)!fd%N~+@9_s>UvhJ4xoY*{?l
c_a*;>w04Ur*~_hX`+3@=-%$(;TmDA_07bKG(EtDd

diff --git a/mods/MAPGEN/mcl_villages/schematics/lamp.mts b/mods/MAPGEN/mcl_villages/schematics/lamp.mts
index c8d907ebad7a6bbd63574e62b695f22ba428e4b6..4d2d1a350553d2c23044298327b0a732395ac20e 100644
GIT binary patch
delta 135
zcmcb}xQfx)Hze4XfrWvYft7)|9t1#)#LOZFf!ySr__Wl#<kVs-FvTDa5=qI=FDkYw
zDM~B=vEuU!Qu8L}>R87mA7Gm?fkpCQ4$H|S2hK1|N>5BsSRuY@ft(Msr@^ZA>(f`b
cUyAC_>fzuDpW`^CQP9(c=Lj2vl^M%J0Hnt+FaQ7m

delta 152
zcmZ3*c#+Y`Hze4XfrWvYfsKKs9t;@R86<L(bK;Zpi&CvpGK)&$%QH(d;?s)~i;EeU
z6Elk#cu}M$YDozSfJD+#^O94Gt-#boXB~?<$q5Y1ZhHh+W^6cRuy_UI%)?C26g|?|
l!Zv7`shC!rS-D&&;Q+tO1=b^yE)V%ym<$CN8A_T}G60_MGZFv*

diff --git a/mods/MAPGEN/mcl_villages/schematics/large_house.mts b/mods/MAPGEN/mcl_villages/schematics/large_house.mts
index 36be603f448f4473c9db7904518f25ab78a5a459..1a55c32d9c6be792dc5394d85641746c47a1bc3d 100644
GIT binary patch
delta 750
zcmey!@txDvHze4XfrWvafrEjo9ts#_8JH6@ix~KGlXK#e^NUiglJk?2a#9(@K?21k
zK)GToFa?waNld=MC?h6{Az7ZEpE7Z~JVXY_$+1c=N=?m+Pfjc<NG+NCmB~Or0Hi4`
zH7_}}*a}2VPGl6D%+DmwoD^?3c_X9DWCvz$CI*Fx0n&0gIhm!o3=$OuiFrW9ATmBL
zv81#p5okb8;^b9K(u{hOk1^>o=1t~fGM|{mGuePqYH}cx45P?oLm-~VD8i^VF+gf^
z2NUn)O^njqC8ar;1@Yw>nI)+}t28Elu&=L(OFqCKArY}bLm=%zvV_Hf6AgTdd5NhB
z&P{80I0Ea~>Q?Y12DV7P$WmOU(4DkuYT5+Hrb`Lx4~q1qBgDk^<pg{`l+j_aOM}_K
z&PBq&)p6EI!Ksd%-jWLpeRyu%J<YpyYBwW`<N_O~MM^vh9ECF_Li#N(uyj<r9;kcf
z?pg2khbM^V#J)s_hYySOjhT(FycMvu(Rg;q$(>`hhL70nYDtbA;ghu9J#9O#wW*)8
z^HI@yjb@DtHg6tkJ5H*Wl=!eTUT;C<8=%pgj*M&pIb4ShOGJvObi9dU+tI&M;=|7A
z{aNo?r=-2%k>Q!+@=P)2o$5Unr<da8KlrYF>S3(sKM)uHfiI)B@y(rIRTli6Cmq;U
zv@<S<%Q8A?_T65h;ZJz~krt`r0sSd@AAJ^N8XTT5<Aj}?>G%Kj2J;y+Wbg2PRS<SK
z6c9LrYXy_l?9&alHI9oE*sm&E3OzadpF{p(xjyr{ir?}4rqdY(`Cj-;&<(hq;1jXO
z@PgLdg=&?rqMvey6uY`eu&E{-d8(Dd8IxmU*ObL*>f-Um{ESgrhh198+Z$(HixiX<
zUwar%7g;WBAl@GMh~s~!adN2hrky=4O$_sy+}12S=U|x7#K5E9)oB>O&cJZOJH`<J
DgM1&e

delta 651
zcmey)`H{oiHze4XfrWvafs28s9u64f86<L(bK;Zpi&CvpGK)&$%QH(d;?s)~i;EeU
z6Elk@CP+-4#3ViWKO+yL!elu{smbw-?DD)QdKmcO+~oYEq@2`=<?@me6$OcTsl`?x
zGCnV{q_ik8Cq6AFv1IanCWpyfOwto|B~^t$8p{)Na*C}WI^zu)1VCbGsd>pj&0uP>
z1CtiW4Qfd_rK$1xMadbNDGZWuD~n6=^HP(FGLy5D6N}1HQzkPq%1mZr6rcQnQGW7T
zCLUQSuqFBVIaWED=@}*QU}J!43sOrM)IeTRDk;s$EC8CEn3tZ)APQHWUX+@e7Y|lB
zxsFkqQGfC*MqQ?~w25mBK<=r}uSl&-jZaC;EUv7W^LE-zp(X<!*XRJogR+5zKSS&9
zURosLajQw^)R%khPHHBW1_B(6uIdlXa`=jEUroCC!X$KC<ypzwi_#{(7mVMe?#i5Y
zSz}-GiSXxoo*I=mC1=mKxBR&#Le^l`QDp_L=dTtgu3W!C@itdt^z+~OJMLdCslV6}
zJty~b>2c%DcRJQPu3X*lhCRXB;PiQ2w$-vz%Vm=mOKnRj*k&5xD}MBb-x-P9JI&3$
z{+@RCBlq?d(>|SBH&yPE|9&HB)0El0ht$*#wB9*!_k(xC#+mO8cy8C9ZCID~{V{v`
z_muxT=Y@fQm!fe(!O@R5WK9IktavYNOg8@eG|&93i1>~N`+Qdgs_?!1o#lIFmDHli
h+_K*SdS4ZUa=yKB>y)6;nrSM3%P#Ma%lNWL2mrP94k`cu

diff --git a/mods/MAPGEN/mcl_villages/schematics/library.mts b/mods/MAPGEN/mcl_villages/schematics/library.mts
index b47e0b4138f53fbb43aa1887249002d9c1082149..2986a71625064e764e7d60cfeef3eacca8dba011 100644
GIT binary patch
delta 587
zcmdnM_J>W^Hze4XfrWvGft`V?9s(GI8JH6@ix~KGlXK#e^NUiglJk?2a#9%-C+9Ls
zPflf25fO$<6_@1ar6v_+CTCAR#VEta3zsO*&rg}$!DujXq4;DyMsd-kctZvOkZf9N
zUUF)&6_}d*lu>=+F9V4Zprjy3vLwGKIRhvQrWy1mp4Mf|n^>h*UlEt=z}~|n(4lwk
z&;hm<9iAiI+(sNm3Bmobb9xz>40RF&n4H*j-lZ_kI@h6i?$`m&mYj$qj!rWkH6=`K
zl6Y0v>FjgB#Jz*@iN2!HozA<qJI=^klov6}cIn!%Zs>YkrmoMd->h))W0TCh4JMq6
zBPA3*f^2H<aS#({K2ksT#iN>nLPs`<6qeU5JK9?rcUwp^tF=@(bTBe1emr;N08fdi
zhObg`hxJW~8<G|c6NG(~9?k7-l-FXK<k}%TU&>L-QnFxanW9QPr_*J1V`goEq;hrf
zz8en@EBa-Z8yO{(t8<5a|6sI%r@^|jzuYfDtKn&$+?0yvjmH#p57!Hen7sJeA?R(F
z<gE2P(%_Q4N(+z_tt))=NzltOo}XpIjU_E-1LDs+@D{IlD)(!4Fh4sF&y)=lO|A>4
zo~zejaC5M2ijD8riR<T0*!8*IR^`sCmC0&1OtfZqN^MiwIeAlsV;}bpWr-JTGiFG%
z@g^iLTpey8z5c_76qOeOh4OE-0!)=Yb4Z_bm@?Djn~?BVi!)0!ZgyPOpT)4S$J-A8
Dr&!?_

delta 534
zcmeyvwt=nQHze4XfrWvGfs=u!9tIdh86<L(bK;Zpi&CvpGK)&$%QH(d;?s)~i;EeU
z6Elk#cu}Mo_~G2-{G_CuR0d(VKygWaUTRWNW^y)?rt<v!6b3$^n#uba6}1^eL8^;O
zfCd*^fvI?~0s)Y4T54W$YOxiVV$h%5!>G%YmNwai(SSKA-f-dv3D%N$Lk7i(0n!sa
zR3@(07ZL<%D#<TO&H(BH(-RwHCd)CZ)mO}UJDs1uNkQPKAmiFM`=jNzufLa>!BNik
zu+8$`?K@Q_{qk}VJ%U>Q?rht!?eE^8+viv(CkRf^-cYZ%_3q5@2dX<*Zakf|hHZE0
z(n8a<J*)lw?k<0Iy-}_E`JvbACZE0=Z*slw!7cV8*#oDG3XkMZTgk3xShlytWs}?W
zt)Cyys9$|C)qYi4ac9MXpFhmk30uETPuX>)RR0avy5FmJt}>tNQ~ZD3YoV&`VaKdi
ztdEfpWnX12@jR<zm%CEDwD{LO8!qo?xZC)A<&LD^8`}Jx<+n|?%b8rfGw1G%+Po<z
zb}IIM*Pna)^UU*q&-HHj{>iP*-FEXPAgG%7{Li(cm9He#mP{5{nQox{#$U}c<+Wh&
cY6bUc>r+oG7iG?N-CCZoR`(_A*T@N30RI{7F#rGn

diff --git a/mods/MAPGEN/mcl_villages/schematics/medium_house.mts b/mods/MAPGEN/mcl_villages/schematics/medium_house.mts
index 43ce2391b9d1952596c3ec5028d0d66dd7105926..85ef0f9031a47eb81c48356da3c63a7ab12e92d1 100644
GIT binary patch
delta 543
zcmeytx{s~iHze4XfrWvCft`V?9s(Fd8JH6@ix~KGlXK#e^NUiglJk?2a#9(DKmz57
zIXT5pk$6J}agbPX2~d5p6_^6*04tV+>n<+I&r3}z%1q8qPAn=*O<~}LOO-GerKV0?
zVZetFD$mbPnZzhEc^;$P#0DuKCC*$DZ#dbB(OFUg*{+<#q<E0p_>%mB$=?_?CSKR9
zuZT-tAi`m=!0FI4Ln8$R4^wSsrb9n$cx(~^efBXhZ>nQlz!b*Dr;&0r%W_w3PeN!8
z&l`tW1vTXuadu|4c!n2zi5qrsTu7TxE5kD<!A?EIo|*XwtHJG!x7jZ-8O~=vYsV*I
zcfxK4gEI3GI|=z^lbB`91muJ*Y$7Bg4wx|4U&vjP@$B%Ant<<zd>*oYc6{jBReL7m
zo1sC0<JMy5v(H;UtxT2|X3nZ8GFot4y!7zo#>P)ylsNbp6^$-)ul>x-?Aq|<Pv7-j
zRT>8ZSOn7(4mckEdhkgiTf&O}|Nqz5+Fp?1=v~RLa;PDNe^pgm)r@`r1K4J?Wi@23
zX1AJbQ|oK+`Qpo8Rj+OxcPQL(#hHogtjwH`4hj<=_LR3ZGWYcSc$1cra6tXM$A!B#
nHXdFQo!`|W<YR0*7!UtAdmvA~^Bqg1W8jVp7FLYfsdu;m1Mb&y

delta 422
zcmdnT_Jg(FHze4XfrWvCfs=u!9tIf186<L(bK;Zpi&CvpGK)&$%QH(d;?s)~i;EeU
z6Elk-(#0h}X0cUqPGVAgd47IMd`W%*122k327Wj<IX@{WClyJ)q$o9YvLK^0A3_Vr
zl!;9SlTR~hOgtbWECkYAo|uzUYz5IBZ#XeRX0kh@(?kcki8n1L>o7`BUd*UoUoq$H
z)K0!;1)er;=}pY#`RjLw%U=`9R?X|K$XQsQ^k?Z5e@hmDg=t|~a=Kq^&v&hS6lokP
z*{1p9koLRM)%%Z?c^i3Fyn4;HZC}!3?W23XEq-_5ZRhbO=l2@+0>@t3J<U9(-?Cky
zvWeg3ZB46Ao9+9@niC&C2>omkcK_1ttM8&UD*TRI{;>RkCAS=__^CZXt+$uhES;fm
z{<&sp#QE}){)yK<U-?~|`TXIcf8yt5EQ@-?=KlS6eBrL;()q0?US6O5Pi>C$mA(7>
Y9+`7p`pC1USv9EcxqQF)F2}8Y03u+yPXGV_

diff --git a/mods/MAPGEN/mcl_villages/schematics/small_house.mts b/mods/MAPGEN/mcl_villages/schematics/small_house.mts
index d7b62529cb804c5fa99a9a99a8677c4f5cc46b9f..d09fbfe00ae358153475021d2d828a1689d93dac 100644
GIT binary patch
delta 373
zcmcb}@{&c=Hze4XfrWt`1nVJyL13bT_+&Fi1>xe7#LS{%D=-zGoS&4GlR9yZ{NzAJ
z{fQsMCtk9gSRgjJfl*S6K`=KtC%z=VC^;jw*a}QDh=PPr3@FdfPnj&sC{bS#mz<E0
zz~Yo<aMD5OK^hPyGfZsRVrX<g!9$gsS(}+%V6%Zk#T=d(o;f@Qa@x$=A$`&w#zr5Q
zzHVa5Wn7ucx>;~r;o+Gp%r-b3RWwnb!oG0g(;bb^991M2ni(`5W=>?b@8b3O5a6`6
zQM8|zW2(UQrXOo~j{I!wZJgV9tEMiY<#%H%qu@0jo*k7FDjuk4$w{1Gxx-`QFxQ5s
zL*nVNtRP#C2OF4I%Y+C>hsO5{uu4brD_sov_y51VMhyS5R|iEpqT}rwq!b((3f0T(
zA9S-UxU9Htefk2m1Shkei4#tqabP{OB+7pco15E;muIF_Oz8Y{fsw)gOUhyZ^-Pa!

delta 406
zcmaFKa*?IpHze4XfrWt+2-)jlfI)~sA~!iFJ~_WA)hZ>ks3g8Tvm_%vy(qD`n1L5X
zhJiUTvxtEoE|#31l$4XoAPy2JE&<9FTY)K{SzrkfWQm+awxsy-{QQ*3_KXq}6XYg7
z5}$a)QbiD?rX;^8IU}{$3QRMIp=wKtpQx%nv01Ag>`a(FIf)R{fO-om=DZDg%h#;H
zqf^pzuJ+fF>aVdgEbQ*^FrBQcn67=}$}<&LC5J{kq09*fo4a>)vDxg}vA4Z^g;BeV
z<rbBarkn|qFL-XQaBGrkw!O?c>A>P0&%b!TlJ(k@RndKY&#^P_iyt(qx9$nbE2@Yt
zd{Mq%rp`!h)vMCB@~S^qC7%^*oRnFYdau~RWX55M``M>6GhAeZ*<H<l?@V^L6l2@1
iziIW7tX&_MEX%kYuySW)al7WUfBvx_ncPmx9|iz(#HytL

diff --git a/mods/MAPGEN/mcl_villages/schematics/tavern.mts b/mods/MAPGEN/mcl_villages/schematics/tavern.mts
index 5eae8ae237646505300fbfebea88c59d98e4ede9..f6f3a5979c2a0f2aefe19df5445cb7c9932c72ed 100644
GIT binary patch
delta 820
zcmaFM{)t1@Hze4XfrWvafs28o9u62J8JH6@iza$1PF})j!6-R#qp*H*Vo_OY3WI2F
za!!142~f7!3QWb9=jW#|2!MpsQuC5ii><)a#Pwp61DM1on=(n8^MWLk^NUigN{Uib
z8H7RHtkUe%r2GmiC=D?nIU}{Wq}U2fG3ZTBVbo>JoBWDVZgMD-*u*TUiPudhD>4e#
z3xNzMPt3^yD$P$y%1MnkgBXe;W@yA94N{2V*!cX?lGGvwKDevWa}tY-E8>zF7~R-P
zID}H2gj16a=xd!&;JDrx&>bss)9%kRqXi6VY(b35%)%n|hu*aOn8BMPz|YJ+;Th{L
z=_8^oQhF>RqG<`uT}DcsPG6KfO6-)IB|^4xFmIZ}!EDqpvqS2Yf#@TL**6zN%wd#2
z@YK9)h1!JsHy+eIX71){tUc3kG=G5r<4&I$je>ca%9He29xhr@mwe!%dB=anx)#mE
z<OvK;0X-fD8x~gf*7NEeI&<JqgZ(`Ti5(C19=jLmJB6^ghRk4ml$^LGOHx9h?y=h^
zLnWCBu7ZijPaJ4Sk+a+1Si|#CkK4v}laWG^gh!vSoLr1Yo<PC@o_Ix-=vGMw0o!{w
zCi(~*Nn+ZxTXMpcpl9YaAK8jotglr#?{G{B_}R;=I`xs?<TnYWGW8jm?2{f_Y*?nD
zR<TF%IIBj<jfa)NBAU;BJXo|v%eyU8Hh`a*hbJV#DS62}Ms|gqqyPW^KiJi9?k9h0
zb4*(=XR*Nvy%h&nTw8RbErltj(Du%@UsWo%Hy9P(4&(onS8E$~d%~Hc=TcTI-=C`x
z?|fMN(2|w+J+}7FXz8%sbinavmAr`Tgbi$Js%&hRf;g2jC(P96c*?+bh+(CudsQ>v
z_K!Xvnx@TUj9GDrC;iAecCDV+X%ibY7&b9wN&DC?^V`4?$E-N%%!x3eG6p`;Gc2-x
xC(Km7E4^8;EZ2u+@m#NMi5oj+HlA4F%Io%K){FxUGaEx3w#qOt*gdNb001J2L|^~_

delta 670
zcmeyw@s{1wHze4XfrWvaftP`+9vLu5Gf3nn=fo%H7o}RIWEPdgmuHq_#HSY}78f%x
zCuSBg@S;dhlvSKOi&1LgMDfW2jH0T-aLMA5{JhkpqRixM1_7{OMrv_Mu~jmVn!Jh8
ze6j$OsIwqQq9nfvBxnVu8Kgl%#U((Cimkv@e0hF;N_>84Noo<qptRJyWT0{|#h^dg
zf>Bo}EscQ>ZgF}J(5Vw`E%^`*Eh$P(ot(xfCkplz!ez;cMP;ce6VDk>u4k047Xlek
zo|uyZbY*^0Qch~TS;d^UVVy<I3Ib0rZQFQcNp98Oocg^D4ct15%&w-i-Ics}eADsC
z-2x#Qp^Kv;7VT<RUlk~rxTwL*>-nP3f7?ut+`qj+d5u$<MW*j>2f3@CPcG{HS{9J8
zTxZVPj=uYMjz2s2`Q{=chtvtW-*f-eU*94ZnzH=(+#4_7dc+pKzG><EVZp^~b>)&}
zQvF^>oKNvRIq`MdlQkjfHQWAAXxb+cdHx)CrS2J7uX{D~#3wxLIK}W*pv*1$1fNSG
zkeGY2FJkLIgS;7!jv0QI+xYpRdtH;wex>zNwheo%7aLmJp7M*ZZ_7J*?$XZ5*UB7M
zPpCIPdd@Wbnt=88O;y60_Y&LYvfr<7O;>-m{rd~^6R%3xcNf`Se4Sh1RKF@@Wzf=7
zyq?d_>=I9W@j9&VYv=j)Yp&;Gm|leBzk9SnO;hfdckJb)BMT?%bH(Z@CI|9;eqQ2m
rRAl>)_aza9d2yO^ixhN@t@_!{pX4@eqp|n5s29Iau<GAsyDSd?7GW(9

diff --git a/mods/MAPGEN/mcl_villages/schematics/well.mts b/mods/MAPGEN/mcl_villages/schematics/well.mts
index 6ea47fea435da769b2144cac8b0dfcfa9fb1a15c..8b543dbf42b4114f77bab854e8bda38bfdcea62e 100644
GIT binary patch
literal 456
zcmeYb3HD`RVPIomWnilZ0R~<M=ETe*2I<`7ocQ7rAhXyCOaVFhd8tW7naSA<{2<BX
z{GwE=<ou+hoKyxSJgSq65|gu2Qy9cRYRVIHazF;cjEc8p5QZCu5M~g^s@TwoK@_gK
zJh3FTD84wqv?w_hhvCLJ#LaMs8!(7~jE8wUCow6$JU>5$K?0j-d`W&mMO-oiV;Y+q
z+b0HLW|pRsVuKA#it0BM^kh`bnOTes42%zaX?l~En!xT9wx{nw+5<+XyaiHjTwja~
z6n4*KeUoOUboUIyw%KPktXhBk@$O$$6HNFv$?-@m*!2HDGw-VQ2@0`4QYAmkI&+}m
kdMM8mW;c&rNesud#GDg0y?OKG#(^U((c%o3{uxFB0D@?)dH?_b

delta 275
zcmX@Xe23Z0Hze4XfrWvMft`V)9s(Hn86<L(bK;Zpi&CvpGK)&$%QH(d;?s)~i;EeU
z6Elk#lqO0^vnLlNCTFLnOq7t5=S5M@zz^pp=O-oQq)xmqE@sRi3>Pgf$<IqoD#}dG
zo_ODV;zn^siOGVDA}sMG`2|3w%$5w|6Ca9}7#dZ~c{}MfSAzmitAF&?O{cZLzw(`U
z!eRG@1@d#7l`QPaZZyo*QkI{|VwQ02;=G$KzvqiBdUt5|`8#@6=a=-ptQO_T(ky#o
zu*%z~u5o7Ce5Y?e1HYBH<rpb{j*Y6D$t52UA#zPQT>I&kPkkM4BDCu#uDl8Wx9Dy4