From 3800e73eb7e44af235e8f296df7f29f43e0468d0 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 6 Jan 2017 00:24:50 +0100 Subject: [PATCH] Better chest formspec --- mods/craftingpack/crafting/formspecs.lua | 44 ------------------ mods/craftingpack/crafting/init.lua | 2 - .../textures/crafting_inventory_chest.png | Bin 13142 -> 5497 bytes mods/default/nodes.lua | 31 ++++++------ 4 files changed, 15 insertions(+), 62 deletions(-) delete mode 100644 mods/craftingpack/crafting/formspecs.lua diff --git a/mods/craftingpack/crafting/formspecs.lua b/mods/craftingpack/crafting/formspecs.lua deleted file mode 100644 index 924019e64..000000000 --- a/mods/craftingpack/crafting/formspecs.lua +++ /dev/null @@ -1,44 +0,0 @@ -default.chest_formspec = - "size[9,9.75]".. - "background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]".. - default.inventory_header.. - "list[current_name;main;0,0.5;9,4;]".. - "list[current_player;main;0,5.5;9,3;9]".. - "list[current_player;main;0,8.74;9,1;]" - -local chest_inv_size = 4*9 -local chest_inv_vers = 2 - -function default.get_locked_chest_formspec(pos) - local meta = minetest.get_meta(pos) - local inv_v = meta:get_int("chest_inv_ver") - if inv_v and inv_v < chest_inv_vers then - local inv = meta:get_inventory() - inv:set_size("main",chest_inv_size) - meta:set_int("chest_inv_ver",chest_inv_vers) - end - local spos = pos.x .. "," .. pos.y .. "," ..pos.z - local formspec = - "size[9,9.75]".. - "background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]".. - default.inventory_header.. - "list[nodemeta:".. spos .. ";main;0,0.5;9,4;]".. - "list[current_player;main;0,5.5;9,3;9]".. - "list[current_player;main;0,8.74;9,1;]" - return formspec -end - -minetest.register_abm({ - nodenames = {"default:chest"}, - interval = 1, - chance = 1, - action = function(pos, node) - local meta = minetest.get_meta(pos) - local inv_v = meta:get_int("chest_inv_ver") - if inv_v and inv_v < chest_inv_vers then - local inv = meta:get_inventory() - inv:set_size("main",chest_inv_size) - meta:set_int("chest_inv_ver",chest_inv_vers) - end - end -}) diff --git a/mods/craftingpack/crafting/init.lua b/mods/craftingpack/crafting/init.lua index 263c4fe3c..c48703941 100644 --- a/mods/craftingpack/crafting/init.lua +++ b/mods/craftingpack/crafting/init.lua @@ -1,5 +1,3 @@ -dofile(minetest.get_modpath("crafting").."/formspecs.lua") - local show_armor = false if minetest.get_modpath("3d_armor") ~= nil then show_armor = true end diff --git a/mods/craftingpack/crafting/textures/crafting_inventory_chest.png b/mods/craftingpack/crafting/textures/crafting_inventory_chest.png index 5444a005632ebf883d02c9847a8d919b11cf9868..91f317fa468b9beaecf6b8f96d49545befed8b04 100644 GIT binary patch literal 5497 zcmeHL2~ZPf6#fwvZ<em@4CoL4;e7Av55EjT=*|m4Hh=U>_@n=Nnllx2z&l`V z8QloK1~Qhc2?1d6r^v_PUNy5F{%N$`#ch#MtwBFilj(6AMer{Zg$s4T@`$R2>KWS} zE*=?MJJx)=NNP`cWWEqNv+4q-QW!oMeel78G-GSA6OB!v=X6_#s zMQCurY2qKZ*2z+CNaF1~X>ektL(en!8Gdy#L18_E|*ea#Kl$16QfG39;%Fwq> zE;a@Lw96vqmcEJb%D44Vx-r%5qqvlqixUBO{hH|=U}lk45L&m~^_&S*Fxg&wNXWh2 z2LMJ*R?G^43)EWFkzxmx46uYd*7k+Frofx;pn%1I>pp>KfnVW<^N~eFGE9NyIa_P> z?l?yZ#kWbqO--GqWb%9q!&~|Q)-Ai>uDaJP^Oo9qM`f0BMnlg$w$*htqbQ>^s&)LC z{IdJXM<)YhUe!u*VN=_sRH2e7JzxNeBHeKYSKM!97oMWY>T{T?a;{Tu^O)l`0z<%Z zep>R*3&c{E+dR>jOrEUXtIeLq!hACsBTa>Z#arK6lXydMBwH+JKo zNq)8M#>*N?=8GzBp(U%t~vFQ^b|8w(Pl* zxE>RuE3Y*2r{clFM;C7ckqk=@G%N7WVKPiXuW5xT(4-ClFq(A4p3?yukqocAyTLlV z!kl>$Tk2!%O6C8D-kVWq%3%hxJ~xY+Hz_?w3Bip=@U4ee^mMdC z+6*Cm8Nkc3rIC|hD-0uxqu*8`&0zkw-5Vu7`^?KLBnxhxU)>g;NT*W2DBGx2mt}m} zGo(8m`>I}56q(9nW*niBwF_MKs1Db`G%j`z0FeyywWlVJw_Pv%&_(#?x*LUVtXJUl zY6JMd5qYeUZS|{fK9+dz)#R{?)(F1m;MJJVKx@?MZ}(`;K0P>(B19y^`1c<}-Ons) zu1KL!r1^FB_W#4LbxJaMo@Kc-76Mkc0v-Nc^SD3i(xB;019z}{rpbUg#m7enPUr?w- zMM5OQ3J6*Bo_xb_+Hl4wJ#nQk(iI@6u>Z$%WV?{)vtq|ve9a4O-b}te6Hd(2o~3yB zIG}voTcH*eLqhReGa`U{kiLh__CE><<=xDNL@>Nck>ANK@%dxz1Q#9%OhU-l(UA@d zaEO?*mMDerHhjDes~>(y%Jr0K_;l1OaCm2kQk6)CZH%E&G!zcdiFD7M5ZqFTFYN!; zVFjk0GjlBaWN!I`_ZCBFh*3LkVH_8V!DR_?hfD2YDB5P*6*Um?mxi@JYr zHt5&~ODs%=8LA)ZCI63tANDeV0C_YG^hzyFqxvt8f@gRA0Z*NPWG}Yu__33}W>~Br z8OvtdnJ3)22hWie$sVK`_dSi4!DV?{*|7bUS`BFyCdU?wm-t zI--_gH-t1Jo_8L3^y(qT>D*!IiOCedHA!st5%{vTnYtIcbJPk+&|rA}&3kd;+=`WOag=;|<%v1MB(S*{{sJzG+^N|M*M0LRr0R!y literal 13142 zcmeHO4NM#78U83FER6#dNCTPxtGb0w-3o+eag4#ql8&-f$GT067%Qfvo0YY~w}t@5 zf23@-(yn78YlyNlSAsN8N>;Mb)*)b<%%vG6;Yh7u5rU0FsPPD#hk*mz=i7HS;jgG2 zQ?f+eN!TCv`MvkP852*qGdCWDSJmB}DzT@T;#9@Nx zU(#h}Xp&5X7Y3LSCI?HQ_eKDa(uF<*06znR(=og>0BRyFo8b9$-jnHCeG+00`o;_9 z2S{qHk3iA^n0r|hUmXEDk2-%<3;tk9wfAd+@t>ZC1NG0qmo4sNyEAm(EAMaHF9{7_6=B6(;a#0 zYN4yX?#5FZYy9C7LBrVD!^e8VgY)T+j=Dq17IJE=PelJ|@nsm5h%|3Ixp+tzRmy+! zRW1p)Cfw(QyLavh6y#U%hsq2shQSFfKB{EOO`o_GSFH1=^xmBXu9q8oZ9-j(Od$5! z2j{=3v8GkQf7gy7Cjuw5G3-|;vA%E5;U z9^fs}-&>Cx-f&KTz|k{~o^kZ-p3t*nT+Mh_O5plr1XA4bi3-0{B6EnsoOTgu7a_QV zs!%~h+qA@cSH;-n+2+xvkj{{`KGmpd46T;QoKl6qq3K9}+n%t1z;e{dYb>>1B^KnX z_(qdyN+W;IR_Kx}(;-sZUf}7|KH(@UN8`EDhO5*b-0HRdHhN*GOe{4F#)^9U!L?-t z2(Lziw}_`N@T@}GB?xAv2S`|PoJ%9Ji`cye%FB6K?FM_ zerOuhT-t$6PRrg2dWA)}gi(q7-o^=YEc9Vm72nn7BfPID8)-j%n~=ZH|7?sIyRG+(AQ(OTDqZq!P*GRrmO2;^cEjb2Yn=Y6;A~< zu2N`=#Lg>){`E`@xm_>N^P(dBjL31#a?5T>Sjq(Lm3Yu8S;)KQ*3>!Z(J(K{W-`uG zHnSn`FN9J1VQcJh38R2z8-eb?8c)|br{{<$&?(NsczXTVL4Hm!D*||IyflmZ>%K&! zj(HA%z+9^*Y7;Z~MP}btu^G9b?CF^gzo3u3XpIIJvYQVvX*_n!V_u0d* zEoo^t&an67Dwa_nK&zF?(Jj<3T3UOFWdtVo)%H)zbey-rad*zX`r=!9BY8Xl0C54f z7vQdxYX7Sw1J3gHA(Oq#kg7UC(Vr=@B_jCnXY!X60kon)?)sVsYPB)?hK7XThX!@h zPb9j{%XGD3ouibWley9yzNNK}k3T6re?YD~qT0A%A;V$n_k*97>^Pr;^L|{MmDR@C zdk>K1*&U+~vrXF5+Ck!r=JKl2j}_UvP+!yv1A2K3Y1BEU`qm#K8R285-AdRv)p?5j2?{;c zBV~M{r&6|^Dln#XPG4yjCBlGaTJ|_y$){y|a(t2S$0EY(4RDuWWtwp(tNF|w