From 0d56ef1a9055f9f3b937f3cd566562d4aa1b349f Mon Sep 17 00:00:00 2001 From: cora Date: Thu, 19 May 2022 16:16:44 +0200 Subject: [PATCH] add jobsites to villagegen schematics --- mods/ENTITIES/mobs_mc/villager.lua | 4 ++-- .../mcl_villages/schematics/blacksmith.mts | Bin 986 -> 988 bytes .../mcl_villages/schematics/butcher.mts | Bin 813 -> 804 bytes .../MAPGEN/mcl_villages/schematics/church.mts | Bin 956 -> 949 bytes mods/MAPGEN/mcl_villages/schematics/farm.mts | Bin 347 -> 379 bytes mods/MAPGEN/mcl_villages/schematics/lamp.mts | Bin 209 -> 176 bytes .../mcl_villages/schematics/large_house.mts | Bin 1137 -> 1179 bytes .../mcl_villages/schematics/library.mts | Bin 816 -> 802 bytes .../mcl_villages/schematics/medium_house.mts | Bin 760 -> 801 bytes .../mcl_villages/schematics/small_house.mts | Bin 593 -> 572 bytes .../MAPGEN/mcl_villages/schematics/tavern.mts | Bin 1005 -> 1003 bytes mods/MAPGEN/mcl_villages/schematics/well.mts | Bin 476 -> 444 bytes 12 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index 0e3236a84..035bb3d71 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -242,7 +242,7 @@ local professions = { "mobs_mc_villager_librarian.png", "mobs_mc_villager_librarian.png", }, - jobsite = "mcl_villages:stonebrickcarved", --FIXME: lectern + jobsite = "mcl_books:bookshelf", --FIXME: lectern trades = { { { { "mcl_core:paper", 24, 36 }, E1 }, @@ -431,7 +431,7 @@ local professions = { "mobs_mc_villager_smith.png", "mobs_mc_villager_smith.png", }, - jobsite = "mcl_villages:stonebrickcarved", --FIXME: grindstone + jobsite = "mcl_furnaces:furnace", --FIXME: grindstone trades = { { { { "mcl_core:coal_lump", 15, 15 }, E1 }, diff --git a/mods/MAPGEN/mcl_villages/schematics/blacksmith.mts b/mods/MAPGEN/mcl_villages/schematics/blacksmith.mts index d7fb66593dba1636ba133681520ae16721d276b8..dab65afa47314919237e6abc50d80bd51d3690dd 100644 GIT binary patch delta 330 zcmcb`eusU6xG-;Sa!!15eo?AbN@h_B19M_#(MFdxMvKI}vdo-fD=@_%09KTdT3k|W zl?+jGT3nO8 zn|*d);>m6$v;bbo@%z(s^#4>lQzG z8app#<+aq=!%sZiZ|n~U`UO0k z(Yk8=#OHpwFY8k+)-yKd+W04YJ^DGc!1Yq3bZD}$%E@0YxBqGOC%1lmZM!>hQD}LE zKxlQfawlpC5`JCI(X%B7WAF}%kw_z??1jzYV&2%ikeTqI)CTqB$X%C&Qori WKl8r#&mfHaYgqJA* delta 328 zcmcb^ev5sAxUNKQa!!15eo?AbN@h_>e0gR`MtpivVsSA8b7E!@122m7My)nR>Ew*m z;*w%3FvTDOl20ow%1ca6Ewe@%Q6* z3pO9xRHVVca`8z@%bWt%jn0dOQr>(Gygy^lmW5x|UhUv1y76F6RPNQQ8Yh)J;%+_j ze3lh^ZK_4>MV87ESF80Llhk)QFU$J>&0@MtX@GTEPRNrt@f|jYea@CP8BeJ=f8_^P zW#-hpe__8qX9?W+W1~>X;ofAHH^7AZ>?e8b| U^Z)qs>U;CXzI>f~-O^UC047A8Gynhq diff --git a/mods/MAPGEN/mcl_villages/schematics/butcher.mts b/mods/MAPGEN/mcl_villages/schematics/butcher.mts index 251033b1ec0a3e7bf299f833ab1ffd90e35c18b3..1786599dcc23fbdd8d08d351c9eeb6b9eb1ff2df 100644 GIT binary patch delta 340 zcmZ3>wuEhhq%d!8a!!15eo?AbN@h_B19M_#(L}d1k`gGw@#UE%8S&{wiN(c}1sPL> z1VOUJx%t_tMOF}M@+8K2^&y;mhZF>2__nq`a{aioF7_1fQmN{U%Oz^NW^2APxWq7l zHH!7~0ZAo=K8Y1ctKZ#O6Lwen>L-D8@mCl)d)aazZ^>VGE-?OZ4tIj@a*SpzpYTnG7>t6j9OTGNHUheEB zt@EomW*xkFBj@I>=gW*cpXlrezFfX(cUZdc&77oX#nJC$KfRse`e|q4;kNk;pX>b; zpR}8|KJKWceEL!?Pu@=PiTU!MF7tdibgq{rPbEmbKzXKK&e<(;=0+N`=Qtd`b~7@R i>&otn6aO!nE4=8r?m?k4bEl4lX_p_dZqwYycn<(zjG%}B delta 332 zcmV-S0ki(32CW8=87&xXV{BhzZ*pZiWNC7AUw3JAXkTY?VRLf;17T@$01a(pY+qw< za%DPXX>xRtEXCilV1T92VZ1wbz*E~lZOGGe^rYTf*=q)gfbt|3+Z$F^^iA+ z)hJfucsqJGE8eogAV4zEDo`WVc|Ut)4)cWG{CI&*Yk zZe(9DFffzA0e*j0!yphOP)V$|(R%)^zix_2VL_TT~~ z%;;lFZ|mCBquYg@g@aeQ(sE3$Jl9~G0H?9l>Wy{rV}|R%7Gj&iaviEtc)3o$+j-Ag@5Hjctznc zDYN;VtKk9_l?`#>C}?wG7A)%mtUP%YlR3`$UD(#$bQjoiv}cE>C&9hpf*S8kUaZPV z$@JCG--^~6R^Gh|?2j#9*#&w3Ywf~}F5rr!C?uHMced5q@52ANQ~gl-Kk-gg zaRFBFsjYmh3w4P9VD#X^&GQR^Kp+qZ1OkER5{~DE+kxw;=}I7_z}iItfn@~6&u?pb z4x@NNBL+DsWFsvFy;{Xm7{Ep#l2eHM4IC%~8`;UZVu%MEXi6gul$Cx3FjDe7pj(kCc7%eufu zuH}M%Md52=Msqv2g$tBd*2jf2r^$sk&b%(b%DYq1nc|$=g=O7!yI}HQa)FJreONrb za2_=md+&Y?=J&q!-N zss2d)zxbpoxqkpFcxsDr0sp}$%^F;Ic>W;}2m}IwKp+rR!g5}C9N11xJAse_D;EU> zmJn1sz0K)ajA|nqAxKFf8F4A7)ykGa12#MnokAesKpEIbPR?+~l12$BjGUC&V5{ru`R%F)&cXKr;@XU#d{Ji-0*JWwCY8qc0PFU~kH9WRZ*ukN3 zUx1+Rg~q3Wp$iYa)K-4|@TX^g=M0ly8;@A7xc6JkA!x~r*^`!+M5L{i&pFqxTzW86 zy6!{4)u#Dd?BnnFzy1Gca{RCO?Bn_qZyuJ?SSDn~mi%XDquq1Oj_@2`XL4b4bCDJ{5)o}_WbddoAifqJv zNTd3)8Ero^s5QDjjliJO^NeB}lD2gdSdyjYcF8*>yml!MSI6TdU7)IihYzY6c=q@6 i#rah9zviZ23iqV{QYyO^B0nCe?emtB`&s~@g#TMxTT(0l diff --git a/mods/MAPGEN/mcl_villages/schematics/lamp.mts b/mods/MAPGEN/mcl_villages/schematics/lamp.mts index c8d907ebad7a6bbd63574e62b695f22ba428e4b6..8da0e83557a435ab483c56f74ba72ad80e6fbd60 100644 GIT binary patch delta 90 zcmcb}xPei_Hze4XfrWvYfsKKs9t?mi-rVGz_~iVeRI8NCq7nw?#LS|JPVt)CrPO## p&m_n-r6eUVu1-=tH>XOAk?oHIORU2jN0E098UoCM4B3}dVga5v8%_WK delta 123 zcmdnMc#+Y`Hze4XfrWvYfsKKs9t;@R86BF>Q!%YLvvRpm!U2Al3#>;ZT^{na OFc}IkGL$r{WB>q>hADIa diff --git a/mods/MAPGEN/mcl_villages/schematics/large_house.mts b/mods/MAPGEN/mcl_villages/schematics/large_house.mts index 36be603f448f4473c9db7904518f25ab78a5a459..3939a2c4342ea3895e8a89c67851b6dcfa0354ee 100644 GIT binary patch delta 398 zcmey!F`ILOxPSr!Z*Fo)Ax$^J}k z>gr(SiA5#(=|zbJ8I|!RiAg!BR>^20lP5Fnt`EH_)MUWJ)83#kkAq8Y{;T!T(Nh+^ zJZNilw^rlqlAAiR91L99VmXh`s{QG;df@lY?fmUW?K=0F=Py3)%ItJ^#SW&^)1T`p zKH2f+?Ckh^GW%DDN%!u1Bq(&W`0B+C*TQdHxb5{oSMT+D&HGuaGF(oU%`Uoo=}dT@ z%k>4z6^T(Idzo%tZ6{~+drslvGz9aJ=r^~%B+C7hR`HUUhYRc~aPb)j$ zz|RZc%B`PPc$eJ`}lw>XGo_F>5+`3sS`7AQ-s%1@6(CS;bd)BgmYSS$&4q;Ez ie_WKi@`7=yd8AYFR=*9BCRZ<&+{kM?F3hhtza0Q<8oW6G delta 358 zcmV-s0h#`r3GoP!7aJb{7;R&0Ut@1_WjbVOa&%vJX>@2`XL4b4bCD-z4h?N%Y+qw< za%DPXX>xS2jH>~YO#(!dx&pa>me~@5FbqXoPyxXmQE~ZIf8Ele6iC{FEXwrWhe9Sa zIWQ0i0YxX_Hf#=aJ?fI#=rmQfdCeKyqGplr5nr+=MFVEjD87TpSLZHCD0$f#o1Z^9 z`K(wSFq*|9APVQ|qhYD9up!$DVO!_>Z@AypbkT@goNe=U$1}6sh_69^sjGnO2Vgre z%g-$as~weh9b%&zwq$U&HCRm-#n?{F7~8owHud|K-SG>zsFw21u9Y6rProu7HDsHO z!X_rbh1|&9@JoQPneQ+R+kee~u4eb+2WR(W|GA!4R#sM4N+B~~aK-W19W)U(It|jX zWBuiBH_a3mxZu7`s!=2*4(a=9P1LFyqLT|9_E3%La8(KI*xJewGOU&){dUv8UTE~9 E68cQ3&Hw-a diff --git a/mods/MAPGEN/mcl_villages/schematics/library.mts b/mods/MAPGEN/mcl_villages/schematics/library.mts index b47e0b4138f53fbb43aa1887249002d9c1082149..521ee9fb60fcd3fb459bd09bced589d811a84366 100644 GIT binary patch delta 337 zcmV-X0j~bA2BHR#7!wU`V{BhzZ*pZiWNC7A00UuZa*;(`7Zz<}Y+qwxb!=pEZ*Frs zV_|h{WO8qAv7m1Oe^!eQgCGn zLvu+(TUP>*Dni%Da2*WYmFLK*xeg?kLb|y?6iC+>$VjQl7@~9U$=iM4lZBrbm&@lNl|=Ip*9J$(bn{mbk2ddBszzA@)s-Ynk<2?+@aE!aN4cSyPP3YG)F(kmE+ j`|~0BDI2dj7hV}V^LsCXkW!5FnpNJBUVFj^%b1Rg8pESV delta 351 zcmV-l0igb(2CxQ@7%doWV{BhzZ*pZiWNC7AUw3JAXkTY?VRLf;17T@$01a(pY+qw< za%DPXX>xRtD_pUkZUKLn4-bMM5XBJzt?a*BAGfdGX=n&{2H}P|-rL-IG>;!1Sd0-W z{@k{>w*9?Q+s*}(U=ffjuzxPK-I-V5CAb9G<&vxhyLF{;HLZ-RPfp#Z>eqoLi|4}Y zu9M5%Uo_W_;Mxar9l*s%CSEc%b?CH?9*q z>t|%T)O9cH3ak@jmR>nH0uUr@v2dX<5=W2+$M^O?{6&W*75@k(6{AV-$3Wyq%$18YUKcVMk8=>_#!kZO7DuaE!$ diff --git a/mods/MAPGEN/mcl_villages/schematics/medium_house.mts b/mods/MAPGEN/mcl_villages/schematics/medium_house.mts index 43ce2391b9d1952596c3ec5028d0d66dd7105926..fa859ac4840297477d37598a40a5f6338049c2b2 100644 GIT binary patch delta 320 zcmeytx{z&xn1BQWZ*FoJt?i+{gf`dX+^ zbqjCArM8(zEOxE&XJwe-lKA}D#4|5#dY`AaetJ`sEqkuWB<@kIZ&+l7RK$(PLSfsI z=ij{%FzwsQY#-@I7ZVJmSCzLU?kcZ1c0NDy+JVZLGMmR$jXI}x%RPQMAvyc*XNmRu zmu-K2x$onf&gk?9=MNSq*f8~lR4(FszW!6moBElD{%f1m>wUOcvoC4aS(EwR>%W^k zzt7+OD=swDbhg^-zxk=#550W%%+n#^d-t^c6AV2MKdx=5S5lDoPm<4>_}TjZ4!MaF Hw@2`XL4b4bCD(>4h?N%Y+qw< za%DPXX>xRtMM|-%P63l00xEx%i4KDx42BCEvIBQ-ue(I z7s|X+h1;Y&rI;@_^L(XP&v$f>k=FCn`+aHW;iCQ*&m1{&j24~!{>P!ZryFmD$m!Rc e{wACo)V;rs;x`J?@eHhkB~pIpACDKhLA6eg5{H8T diff --git a/mods/MAPGEN/mcl_villages/schematics/small_house.mts b/mods/MAPGEN/mcl_villages/schematics/small_house.mts index d7b62529cb804c5fa99a9a99a8677c4f5cc46b9f..a3789504eedee18849ec211439fa09659c898b5f 100644 GIT binary patch delta 202 zcmV;*05$*71iS>07_l-R0S*mqV{Bh+Z*OfnY;SLElTZOne^c!a!ypI*%4FSlpLnl6 z;<^rTThpq^e)KM&5+o-Mgxszd0M6LJfrZn`=#(5;Uud~4=-?q+h6rCpF?qT zI2U=&Vc%p9ENhWrP(L^Yi+=Wf!-nPfFxYKD`9CT^H(FKHDTp`~tFF)^Yiese0N5iP EzZOSY#{d8T delta 223 zcmV<503iRo1knVL7#SFCV{BhzZ*pZiWNC7AUw3JAXkTY?VRLh_7a#$XMgdEIRP7Ff zAPg*YjLv=f#C!E!m^eP%3*k~4B4ngf*ON8(*=^iqqyhvOX?j;vTAsX*SyBe?{naRCxyIja(G*D=y$&y zeljMi>UD;9di>QH=5r{?9Ijvk^tE6hW Z@ua3`(@?3oS#yUemi|v&@d8H6AH!8qXXyX{ diff --git a/mods/MAPGEN/mcl_villages/schematics/tavern.mts b/mods/MAPGEN/mcl_villages/schematics/tavern.mts index 5eae8ae237646505300fbfebea88c59d98e4ede9..c26c14dbccb6acadb9f4838d01dcb900aba03a74 100644 GIT binary patch delta 444 zcmV;t0Ym=n2kQrr91{&~V{BhzZ*pZiWNC7A00UuZaZHIP!0kMVmTsu^GsPeKE(1u^l=tf6wbu$w?wVP=wE`gox z01pN&UB8O3Qvj+64}EqpN9}0Ic3MrwJNFGa8Vix>?0mC*V(oBtfIN>V!wyv*S`qAY zwwN7^(zci#K9U_dY5&o(2WCzIJ7<`AL3#cJUJbfJd4E?{Lw0JC9lw4GotvGZwbQTd zNLHcVik)ZftR{ABXVo^6Ibp7-iss~@&tD1bg#6Zk{-Uh5A8;z?8$HfWR{obIOO`BI z-bf;M)~ARdUtbm1-1xF-+vt&>06sJt`*E0(l=S`eUGrqbW>DT0I$c7+Q%J}I4aAS%YB^+!(xS2FCqee5^ZB_Uw2__Y;!teZ(?F>WnVUUob6VLa)Tfc<uqpCf2vfe zQl-ibN#@MD7h&k@R&n)-&xh7U&s+lNRB!I$uqG)U`b%BYV#J}7FA7~QA!AVv^XGIx o#T2*r?{rvkZeA&!av&_ms`-ZxVn&v+GfVbb==;b8FWm;yAGi(P`~Uy| diff --git a/mods/MAPGEN/mcl_villages/schematics/well.mts b/mods/MAPGEN/mcl_villages/schematics/well.mts index 6ea47fea435da769b2144cac8b0dfcfa9fb1a15c..ff8785fdee376e75739005a4b668afb4ea646271 100644 GIT binary patch delta 136 zcmV;30C)e~1H1!}6c7#o4Q*p=Ut@1_WjbVOa&(a|N0Ei+YGYtP0*q9G=w>o8FjLt~ z7AOSCurja#Av>7OfrI3PLfmFD!OaA@m5qT52-)zuh?9XE2=ST8Oan7f{mujSJ1>QP q2l1Jy9!FGx^`n5QfME~-a6(}QVs>IxvJ+HE3SeTQo>>5$W2s%hEjWY# delta 178 zcmdnPe2000h!Q`8L~e3Ud~$wKs#Qv6QAvDxW=TeTdQoC=F#~gAW)XwZM1SdtZmN8| zD9R>gy(oA)=`~k_0#B=d^wv$MwZFgeop{1w_l5=XbDNbc?86TA@9d9DE>nE