7YrU53?Lm3Cms(d9}g%Y5h@}QEG82(CKNR(6g4s$
zLo^#iHXKDgAW)M`z?4kFl}*E!PsNx|$C^*cm{7)I=AQqZ1L&7V`xpi|MIQ`4YS(4kb)p;XhNRMewX)}mF@qgBLcR@kRj+ND?5p;^zOSK~w&!b(@tXbirUeBXmYSDq+ZdjTH>u*8y<)vWJrC`#gV9=yt(4}F|uUzD%VbG>w(Xm|Tree{w
zTqh{-@LrMy}Z85w%NVCy}rG_
zzP`S{zrVo1z|gte!NI}Qx#P~i*vZMs+`#S1%F4~n&C$=%)6dk=(b3q`+S=ILPF|^e
z00001VoOIv0Eh)0NB{r;32;bRa{vGf6951U69E94oEQKA00(qQO+^Rc0uK~38Mr{_
z?EnA+0!c(cR5;6pllgnpL>R|M)FL2=f=Julg*{@j#OaK|v0=B66j&%rsdbk^p|!=T
z9Nu6770L~w+^2Y;atM@5*$|jAI!u;&)bn5B-SzRe?L(gY@V@VS-fzB7@(n6V5eVsf
zzVC^^=e|->2p&kzxm3y%NR)@7sJM~^DFyJ-6Qw0UJjns@6z6a*d|xOz$U#fO4LVBt
ziX#rIfr6?q7=U5`y_8;{B=@E8l|Z0XC<%guDDXgVu2c~;;M_0%01BW55@5g&RLKqO
zD-Z;u@C*+Wz}!<1i88|5E)|3y$yuE<`YIV>+3nx$|`tv#awoKby@qQf5eZ+jM|qkwzNMB-^lMBoG*j
zx9Mr3RpWR^L<`kK!loX!@}$+tWYUg~LQ!3_34J|GjkML;=+0_PyU}ElL?@>^v}$+{
zHI#%i7(e4oai~l39bIpmR%>n7sx>&ZC~7lz7+}fL<jxmPwEMDh5^3wI%39I_ceCLzo6
z){k4?Xzs~%u71Do3-EC4{7>++D39|%6{Y77{qfiDyI)v#J
zK~#9!y_Wh>;X**(gR2$dYjUAYd%)V9OX3Bug+F%}l@Uy;XJ2
z**kw!-Rj#tJ)@Z(iRx9W`*!!Oszl4Jp5#NG=pSyqdw-#-`E?guq_^F3%d3D_0?z}!-^`w2W{3z)
z)6g^xbzM`B8|tPa=Zr5rXm>N&xSg3{y3GSQ9&^qe0looz(#$^dmdmbO0eJ7nZYVdZbzpSY43uRg23r}!if6VdCzxw)phxXrj
zvwPhI7wJ=CfZOi5<=MbL0AglNL@={{acUXOMpHG6M-wL1n4B|a)-TF*W8oswdw{Ca
z?d&G65FD6+$gEf3oMT~OfwC-_pPyI2iI;a?^va8`{?unbDgW*jzqsR&2*~$Ah^qy1k0C%iEpU^er>J+O7)Cb<5b#(j?u
zozXUBhS_VO6d^ENm}l?OUY>r=_wtOhpTXXxz0_63+WKlRv0YC5i}&Aovpne`U}8m#
zkpl+~usGPoo;`bb&e=bRK27<@(5fbgaIxsdM0V_|50nCghH8}BDj2t|4koEC8!{Lx;J^eZCUfj*;
zd(LPRH_GDTB9qAkRc#57_l&DCAq2el8@YeWu{d00QcrL==I7@b&d)Pn4w*D#oOli$
zImD=0XKro|=iKad6tViESG@kwFMR2~0*Ftl0TiWa8U)9nEOE{;nM{~WCY-VNOv+GV
z0mBM&pFC(O;ylPxhA3{Y)3
zLz5bE&J?aJLN1o>`21&nbvQS?5mHGfd%m3TG_=P{Ir(}Q+-t>Ms^J!;(?cr}d{NpIZ
z7>O|wb_FyWYHi-nnus})QlgFxYvY=_uBoc(D0eT4;%J<44n*+YgCiR0<@tAQnMsq&nw7sXl_mA)Sqp!U9g+KX)Q%-}to~
zX?H$pLTPh*PkfFM=Kwk9qt2uWhwB&XoNJA-1&gNSYsy4bl_SfCSzcXcG+t+Yye^L(
zcqD!2vG08T5AXW)Gf&w7RaF(MtE+p>3~_CWnx(igw;oZ~bz2W~UXYWLRX64KCp!An
z*oDNVlxWu8C)S%X$#^_wb#;}dX?o*_5W=_``-i{%@c+2+4?auVVx(zWpqfQ}!J(Fqs{f0!y-raSgb*+>QXMI6Guu?vKAVULyLT-y
z*;}!)yt=8VvTU4o`rfp9WbHSu`@l8tK9SPd9U}v1IVg^7Ds0S{o10^4_nx+3F(a#z
zQfiAFg@lo_5pyPIBU}4g(e8Cd%}_H8`tM1VWEoAJ$7SmmJ`KHTCYbK_U@%}|aoBsN
znUORB_{H6eHrze@_dCu4^#IfAwUX%GeW6QDoC4Fr?@j4203S9jAmxc&(F(vGU@?1
zHc95^=kwy?;%lyb|2yA(+8L+mrLVh8Ps#uf|Iefg3xh`&UowwbjYhC6tUn&nNhA~=
z873xciSc@-8b@MOViIB$vIcAx480*mo8J|XuEb5=qt20iYpLK2?~F8zXk(PSjlrOp
zMk67F-qpp#6m=qE-g}vPOc$DNFc|#vGtN5W>`;aSKyxeuY>Sll{{8Ko`^;bbv9)hk
zKePM!M!jsLRZl$Z86B=5d&rJ@J<*Iasm{d4$YUjqj64ynnms*M3tBm}5_Ig*u|p>w
z9SOSDo^b`zx+71F91ZWKEiN&9*hrC+YC`^}-S?+mEAO%>7o?oPf%l%m7X%-~dFPzC
zN8a#rzx<~=VuCnweMC6;*^MBu>GdV(vkS0Q!gblQIx>4}B
zR_xeN$Xb?|fvm3Q8_q)>w^0%oK`_El@E$C5=wB5q|BZcFUl`vT3jeQxSD~QMNJXMa
z4Rc`*U-;hwetSoH0AQky>Y#AwUXP7hS2R^DL2Q&9ja(bCQc?xEX+y=bv~^l+f7U2a
zd$bm)98?aggi+B7R9=iYFg}^G1
zQ;t1jG_wpW?Z5Npy*o94^uUuG<8Kw@WruiaIlBk~gn=Ld#0%!F-F2rMTA~(UJ&o`1Hlgj7aXW#@^=IBqjTt}cw84o?&<&RGy#4b@Ty8`
z5;V$oby+vq(@P#7Meo^vKoozSUhJAze|WYBJ-JMtS~mBGcJ=%E4Cw+hvf7l(VqI@zJ?Av|Qt
z_f2WGYF|h_5BT$w*8|WDkj3!UY1B!vR8arZ9FyfmY7=zcaHj>rLXF=gR8=I^hBcsB
zAWK*3wrSD&dINmn@xf6HeJgpFP!0-;G>1JjWc6%(pkgvS_
zD!cXr*L)iIPdR5|j;N}1So6a>13{3j0_8N1JM&0WLQ14bCLPJd5NXsw6G+)8hKk!I
z;H};1;1LsC_IU4cCFGHiRvmF15Ooa7Ici@p@B@4(k<`^8^@ia@FpLJVF(!89<$b&C
zCSYI7uPmslh)KlrLpwDTu895eNofm>dTq
zH<}x%)%MMfQ}K1`u=fxg1V`|K6W^D?n4nXY*yQ*HB-Fol+xgo`V2=U;?ZOpxz|xKk
zpsH?bSzF9hgerze?(${s+1l|$*4Z!XGQhOl2Jq9&vCUKIhTN{55!iR@dA6modY`y9
z8)VB^LV&p)8NkdA8=9s)!C4~+ilF4F0HO+d{KX#?TGCZ_xISgt6F;Z{^T6kh@o!)4
zy|XRCtm6nLZvf{-FmWOxdQ|tuk-9dQp{N+j$@M7RmY#s4?JBt~3e=`9^2YBE9OJTo
zIjb9V*K|8FfT+VzOH;vNOV`F|rLf#}d!_{EWDo0lfl9Y)V%s)O`cN~YDCfSh?X?s&
zZKVw791_qjU7mavh}!fu`Bp2ruA$kVZX*P=bMLLFC0iDh%_vZ?j8g}WZ2_>A)N`v4
zBj(*eB->XxK80;D$wZ$>EoCRNLdK30f7!_0g?6hTJ2xHYp)p0eTI`6w&f
z7H`UCcr$DU`@?n}V>4WrF`S5xIUZ<#AGdS6e>HuN7mpV&z;|{Af+D7!ZyzOdTi!ea
zU?&~|+I`K2lj|}|f3K;~+Ktdm@1HGW=;{o#Z0%?4ntGL@hBs98k9TAM?}C|b++@}*
zw`PNua&l6^;AR!$8EIqcwfConNT7yX@uSXo^rWCP8x6OGxw4RnNM{xLQ*J}>%gF#W3HSd%=8I!&S05r`ODY+!XFLZ@&`Y=)dD}!saQUQfC~=i++DZbbIV|7
zAwU=f+_D$3*=5Q2K|zYQ$Qv|>A11I!PemK3dZ3jpf0EuNZ9^L{gY
zwdeI)Q`)Si(9ZyFc?z4(2?CZ9DYso=?}9n;>cvmI`2MDEx$MgLf4=yomjTa~P8xT?
zW#`;iUVZL`hdXifc0CR^W|Qyx_%q
z5&8P7&%N-zo9_68>=*?9@56VrSx$sTt9G|%<9&-q%$CYq4Y2i$R`+;uEMT0bzkckt
zZGJ8P+O02J-}ig3%R5-upJvrX~2Yv*XT*~Y1%{Q2vD=9j+Q@v9vVNO1k2DOU`$jauWe^#52Nuj39^7X75~1HVy`ZVY5T`sRzTxb2i@gl5V*mo;@vZS&-(
zcHV$0rJEyk%s9uQA1&*}2#K
z?lta7Gk}u*rU+$-maTVZ=e93-rJ!_kZRSV~DaSsCZ{-BjaG8$T6mE_p3@QBpnfU;P
zbyH|5M;N9J-r+Vh$Q*Ms9*-HVuV3`mH(m9>cx_@Qmx_;by#57moj>RF=Zv#i4mjVH
zqZF=e2NyMgWeQhrFguGh-BedsRkASHwb`*qEe7}jgZE8K_yXq~F|{?ulwz-q
zR#-p#L5khV@N7fNL}N9nN>o)v&iT?C-u|AC?o60D#_^jk`;grDSJzFz{aGO`DGx5-
zJ3!o+*z!cnn@N%xopjP^d2ZXAPOnktNYaKXjcHP|kr{9d%f(IUu}P7&BkO79(25;A
zaFDf?wRhg|_V;{r-`lPTJ2AjYFG|ELFk%FO=P?C(=2W(r}0t@Xg?2vg?R5hy1G
ze&*vZPCSL1V-V(g0k#Y!NWm}+`ww5tg(2RA2M*qENBo0Ye2?PyRE(RkuhRHy+49fc
z_~9GB$tfJi#Q-xCRs9Rv&-Iz$Y|02zs)%VFv$$;yKh+OJgp_NlG^S1!b*d=b9NvXZ
z)nGR1X|bU=lz?L#*KGIjtkL1eS8rWjJ-q+$F50VCa4%u6G_`C^W2TWPYKV|Bi5>AtK&pOgo|JGqN}$)
z)046I6E?s#cV9aG&GSAe3oO1Acn{#stWgt7CInyfqQ<6rf156^;Yc$&!c_9!(hiG;
z3h+hm{SPd>)@7cexGPg`C6^51vwxa$(#_tG1dfb)RM=8J`wcYm&dqDzTx
zS~*UOC=($#$FST(;R2-}WJNW&V8Itdfq?28UipNh9bx
z?z&`}@K=G`-*@k?Uyv;q!1XiNbDN5%sTgV*@4^NT=*C4dtP1YaW_JF*ThDt5@F2ib
zz4#q@z}Dl6mt60M<)U1B&l?lKmFIu>=Mp*xJQv8C;}5Fk2s{gr5a#wQ7Q6n|yKukv
xgTJ;M|L(us@tVHf{l3?H&hNYRyv%p$`2Y2sS0lNZ3b6nH002ovPDHLkV1nT){Wkyr
literal 0
HcmV?d00001
diff --git a/patches/subgame/mods/homedecor_modpack/homedecor/LICENSE b/patches/subgame/mods/homedecor_modpack/homedecor/LICENSE
new file mode 100644
index 0000000..0a3df5e
--- /dev/null
+++ b/patches/subgame/mods/homedecor_modpack/homedecor/LICENSE
@@ -0,0 +1,199 @@
+For the Lua code: LGPL 3.0 or higher
+For all models, all textures, and all sounds: CC-by-SA 3.0 or higher
+For everything else: WTFPL
+
+Exceptions to the above:
+
+Fancy mesh fire model and texture by NathanS (CC-0).
+
+===============================================================================
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+===============================================================================
+
+This work is licensed under the Creative Commons Attribution-ShareAlike
+4.0 International License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to
+Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+
+===============================================================================
+
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
+
diff --git a/patches/subgame/mods/homedecor_modpack/homedecor/crafts.lua b/patches/subgame/mods/homedecor_modpack/homedecor/crafts.lua
index 5f445f3..a339240 100644
--- a/patches/subgame/mods/homedecor_modpack/homedecor/crafts.lua
+++ b/patches/subgame/mods/homedecor_modpack/homedecor/crafts.lua
@@ -537,218 +537,21 @@ minetest.register_craft({
recipe = "homedecor:skylight_frosted",
})
--- Various colors of shutters
-
minetest.register_craft( {
- output = "homedecor:shutter_oak 2",
- recipe = {
+ output = "homedecor:shutter 2",
+ recipe = {
{ "group:stick", "group:stick" },
{ "group:stick", "group:stick" },
{ "group:stick", "group:stick" },
- },
-})
-
-minetest.register_craft({
- type = "fuel",
- recipe = "homedecor:shutter_oak",
- burntime = 30,
-})
-
---
-
-minetest.register_craft( {
- type = "shapeless",
- output = "homedecor:shutter_black 4",
- recipe = {
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "dye:black"
- },
-})
-
-minetest.register_craft({
- type = "fuel",
- recipe = "homedecor:shutter_black",
- burntime = 30,
-})
-
---
-
-minetest.register_craft( {
- type = "shapeless",
- output = "homedecor:shutter_dark_grey 4",
- recipe = {
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "dye:dark_grey"
- },
-})
-
-minetest.register_craft({
- type = "fuel",
- recipe = "homedecor:shutter_dark_grey",
- burntime = 30,
-})
-
---
-
-minetest.register_craft( {
- type = "shapeless",
- output = "homedecor:shutter_grey 4",
- recipe = {
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "dye:grey"
- },
-})
-
-minetest.register_craft({
- type = "fuel",
- recipe = "homedecor:shutter_grey",
- burntime = 30,
-})
-
---
-
-minetest.register_craft( {
- type = "shapeless",
- output = "homedecor:shutter_white 4",
- recipe = {
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "dye:white"
- },
-})
-
-minetest.register_craft({
- type = "fuel",
- recipe = "homedecor:shutter_white",
- burntime = 30,
-})
-
---
-
-minetest.register_craft( {
- type = "shapeless",
- output = "homedecor:shutter_mahogany 4",
- recipe = {
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "dye:brown"
},
})
-minetest.register_craft({
- type = "fuel",
- recipe = "homedecor:shutter_mahogany",
- burntime = 30,
-})
-minetest.register_craft( {
- type = "shapeless",
- output = "homedecor:shutter_red 4",
- recipe = {
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "dye:red"
- },
-})
-
-minetest.register_craft({
- type = "fuel",
- recipe = "homedecor:shutter_red",
- burntime = 30,
-})
-
-minetest.register_craft( {
- type = "shapeless",
- output = "homedecor:shutter_yellow 4",
- recipe = {
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "dye:yellow"
- },
-})
-
-minetest.register_craft({
- type = "fuel",
- recipe = "homedecor:shutter_yellow",
- burntime = 30,
-})
-
---
-
-minetest.register_craft( {
- type = "shapeless",
- output = "homedecor:shutter_forest_green 4",
- recipe = {
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "dye:dark_green"
- },
-})
-
minetest.register_craft({
type = "fuel",
- recipe = "homedecor:shutter_forest_green",
+ recipe = "homedecor:shutter_oak",
burntime = 30,
})
---
-
-minetest.register_craft( {
- type = "shapeless",
- output = "homedecor:shutter_light_blue 4",
- recipe = {
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "unifieddyes:light_blue"
- },
-})
-
-minetest.register_craft({
- type = "fuel",
- recipe = "homedecor:shutter_light_blue",
- burntime = 30,
-})
-
-minetest.register_craft( {
- type = "shapeless",
- output = "homedecor:shutter_violet 4",
- recipe = {
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "homedecor:shutter_oak",
- "dye:violet"
- },
-})
-
-minetest.register_craft({
- type = "fuel",
- recipe = "homedecor:shutter_violet",
- burntime = 30,
-})
-
---
-
minetest.register_craft( {
output = "homedecor:drawer_small",
recipe = {
@@ -1495,15 +1298,7 @@ minetest.register_craft( {
-- other types of fences
minetest.register_craft( {
- output = "homedecor:fence_wrought_iron_2 2",
- recipe = {
- { "homedecor:pole_wrought_iron", "default:iron_lump" },
- { "homedecor:pole_wrought_iron", "default:iron_lump" },
- },
-})
-
-minetest.register_craft( {
- output = "homedecor:fence_wrought_iron_2 2",
+ output = "homedecor:fence_wrought_iron_2 4",
recipe = {
{ "homedecor:pole_wrought_iron", "default:iron_lump" },
{ "homedecor:pole_wrought_iron", "default:iron_lump" },
@@ -2424,30 +2219,29 @@ minetest.register_craft( {
-- bathroom/kitchen tiles
-local color_pairings = {
- { "grey", "white", "1" },
- { "dark_grey", "white", "2" },
- { "black", "white", "3" },
- { "black", "dark_grey", "4" },
- { "red", "white", "red" },
- { "green", "white", "green" },
- { "blue", "white", "blue" },
- { "yellow", "white", "yellow" },
- { "brown", "white", "tan" }
-}
+minetest.register_craft( {
+ output = "homedecor:bathroom_tiles_light 4",
+ recipe = {
+ { "group:marble", "group:marble", "" },
+ { "group:marble", "group:marble", "dye:white" }
+ },
+})
-for i in ipairs(color_pairings) do
- local dye1 = color_pairings[i][1]
- local dye2 = color_pairings[i][2]
- local result = color_pairings[i][3]
- minetest.register_craft( {
- output = "homedecor:tiles_"..result.." 2",
- recipe = {
- { "group:marble", "dye:"..dye1 },
- { "group:marble", "dye:"..dye2 }
- },
- })
-end
+minetest.register_craft( {
+ output = "homedecor:bathroom_tiles_medium 4",
+ recipe = {
+ { "group:marble", "group:marble", "" },
+ { "group:marble", "group:marble", "dye:grey" }
+ },
+})
+
+minetest.register_craft( {
+ output = "homedecor:bathroom_tiles_dark 4",
+ recipe = {
+ { "group:marble", "group:marble", "" },
+ { "group:marble", "group:marble", "dye:dark_grey" }
+ },
+})
-- misc electrical
@@ -2673,39 +2467,21 @@ minetest.register_craft( {
},
})
-local bedcolors = {
- { "red", "red"},
- { "orange", "orange" },
- { "yellow", "yellow"},
- { "green", "dark_green"},
- { "blue", "blue"},
- { "violet", "violet"},
- { "pink", "pink"},
- { "darkgrey", "dark_grey"},
- { "brown", "brown" },
-}
-
-for c in ipairs(bedcolors) do
- local color = bedcolors[c][1]
- local woolcolor = bedcolors[c][2]
-
- minetest.register_craft( {
- output = "homedecor:bed_"..color.."_regular",
- recipe = {
- { "group:stick", "", "group:stick" },
- { "wool:white", "wool:"..woolcolor, "wool:"..woolcolor },
- { "group:wood", "", "group:wood" },
- },
- })
-
- minetest.register_craft( {
- output = "homedecor:bed_"..color.."_kingsize",
- recipe = {
- { "homedecor:bed_"..color.."_regular", "homedecor:bed_"..color.."_regular" }
- },
- })
+minetest.register_craft( {
+ output = "homedecor:bed_regular",
+ recipe = {
+ { "group:stick", "", "group:stick" },
+ { "wool:white", "wool:white", "wool:white" },
+ { "group:wood", "", "group:wood" },
+ },
+})
-end
+minetest.register_craft( {
+ output = "homedecor:bed_kingsize",
+ recipe = {
+ { "homedecor:bed_regular", "homedecor:bed_regular" }
+ },
+})
minetest.register_craft( {
output = "homedecor:bottle_green",
@@ -3045,7 +2821,6 @@ minetest.register_craft({
})
minetest.register_alias("homedecor:wine_rack", "homedecor:drink_rack")
-
local picture_dyes = {
{"dye:brown", "dye:green"}, -- the figure sitting by the tree, wielding a pick
{"dye:green", "dye:blue"} -- the "family photo"
@@ -3061,18 +2836,14 @@ for i in ipairs(picture_dyes) do
})
end
-local dlamp_colors = { "red","blue","green","violet" }
-
-for _, color in ipairs(dlamp_colors) do
- minetest.register_craft({
- output = "homedecor:desk_lamp_"..color,
- recipe = {
- { "", "homedecor:steel_strip", "homedecor:glowlight_small_cube" },
- { "", "homedecor:copper_wire", "" },
- { "homedecor:plastic_sheeting", "dye:"..color, "homedecor:plastic_sheeting" },
- },
- })
-end
+minetest.register_craft({
+ output = "homedecor:desk_lamp 2",
+ recipe = {
+ { "", "default:steel_ingot", "homedecor:glowlight_small_cube" },
+ { "", "homedecor:steel_strip", "" },
+ { "homedecor:plastic_sheeting", "homedecor:copper_wire", "homedecor:plastic_sheeting" },
+ },
+})
minetest.register_craft({
output = "homedecor:hanging_lantern 2",
@@ -3245,10 +3016,28 @@ minetest.register_craft({
})
minetest.register_craft({
- output = "homedecor:stained_glass",
+ output = "homedecor:stained_glass 3",
+ recipe = {
+ {"", "dye:blue", ""},
+ {"dye:red", "xpanes:pane_flat", "dye:green"},
+ {"", "dye:yellow", ""},
+ },
+})
+
+minetest.register_craft({
+ output = "homedecor:stained_glass 2",
+ recipe = {
+ {"", "dye:blue", ""},
+ {"dye:red", "cottages:glass_pane_side", "dye:green"},
+ {"", "dye:yellow", ""},
+ },
+})
+
+minetest.register_craft({
+ output = "homedecor:stained_glass 2",
recipe = {
{"", "dye:blue", ""},
- {"dye:red", "xpanes:pane", "dye:green"},
+ {"dye:red", "cottages:glass_pane", "dye:green"},
{"", "dye:yellow", ""},
},
})
diff --git a/patches/subgame/mods/homedecor_modpack/homedecor/gastronomy.lua b/patches/subgame/mods/homedecor_modpack/homedecor/gastronomy.lua
index b5a9f66..bee7b10 100644
--- a/patches/subgame/mods/homedecor_modpack/homedecor/gastronomy.lua
+++ b/patches/subgame/mods/homedecor_modpack/homedecor/gastronomy.lua
@@ -1,4 +1,6 @@
+local S = homedecor_i18n.gettext
+
local cutlery_cbox = {
type = "fixed",
fixed = {
@@ -12,7 +14,7 @@ homedecor.register("cutlery_set", {
mesh = "homedecor_cutlery_set.obj",
tiles = { "homedecor_cutlery_set.png" },
inventory_image = "homedecor_cutlery_set_inv.png",
- description = "Cutlery set",
+ description = S("Cutlery set"),
groups = {snappy=3},
selection_box = cutlery_cbox,
walkable = false,
@@ -33,14 +35,19 @@ local fbottle_cbox = {
}
}
-local bottle_colors = {"brown", "green"}
+local bottle_colors = {
+ { "brown", S("Brown bottle"), S("Four brown bottles") },
+ { "green", S("Green bottle"), S("Four green bottles") },
+}
for _, b in ipairs(bottle_colors) do
- homedecor.register("bottle_"..b, {
- tiles = { "homedecor_bottle_"..b..".png" },
- inventory_image = "homedecor_bottle_"..b.."_inv.png",
- description = "Bottle ("..b..")",
+ local name, desc, desc4 = unpack(b)
+
+ homedecor.register("bottle_"..name, {
+ tiles = { "homedecor_bottle_"..name..".png" },
+ inventory_image = "homedecor_bottle_"..name.."_inv.png",
+ description = desc,
mesh = "homedecor_bottle.obj",
walkable = false,
groups = {snappy=3},
@@ -50,13 +57,13 @@ for _, b in ipairs(bottle_colors) do
-- 4-bottle sets
- homedecor.register("4_bottles_"..b, {
+ homedecor.register("4_bottles_"..name, {
tiles = {
- "homedecor_bottle_"..b..".png",
- "homedecor_bottle_"..b..".png"
+ "homedecor_bottle_"..name..".png",
+ "homedecor_bottle_"..name..".png"
},
- inventory_image = "homedecor_4_bottles_"..b.."_inv.png",
- description = "Four "..b.." bottles",
+ inventory_image = "homedecor_4_bottles_"..name.."_inv.png",
+ description = desc4,
mesh = "homedecor_4_bottles.obj",
walkable = false,
groups = {snappy=3},
@@ -71,7 +78,7 @@ homedecor.register("4_bottles_multi", {
"homedecor_bottle_green.png"
},
inventory_image = "homedecor_4_bottles_multi_inv.png",
- description = "Four misc brown/green bottles",
+ description = S("Four misc brown/green bottles"),
mesh = "homedecor_4_bottles.obj",
groups = {snappy=3},
walkable = false,
@@ -81,7 +88,7 @@ homedecor.register("4_bottles_multi", {
local wine_cbox = homedecor.nodebox.slab_z(-0.75)
homedecor.register("drink_rack", {
- description = "Drink rack",
+ description = S("Drink rack"),
mesh = "homedecor_wine_rack.obj",
tiles = {
"homedecor_generic_wood_red.png",
@@ -98,7 +105,7 @@ homedecor.register("drink_rack", {
})
homedecor.register("dartboard", {
- description = "Dartboard",
+ description = S("Dartboard"),
mesh = "homedecor_dartboard.obj",
tiles = { "homedecor_dartboard.png" },
inventory_image = "homedecor_dartboard_inv.png",
@@ -114,7 +121,7 @@ homedecor.register("dartboard", {
})
homedecor.register("drink_tap", {
- description = "Drink tap",
+ description = S("drink tap"),
mesh = "homedecor_beer_taps.obj",
tiles = {
"homedecor_generic_metal_bright.png",
@@ -127,26 +134,26 @@ homedecor.register("drink_tap", {
type = "fixed",
fixed = { -0.25, -0.5, -0.4375, 0.25, 0.235, 0 }
},
- on_punch = function(pos, node, puncher, pointed_thing)
- local wielditem = puncher:get_wielded_item()
- local inv = puncher:get_inventory()
+ on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+ local inv = clicker:get_inventory()
- local wieldname = wielditem:get_name()
+ local wieldname = itemstack:get_name()
if wieldname == "vessels:drinking_glass" then
if inv:room_for_item("main", "homedecor:drink_mug 1") then
- wielditem:take_item()
- puncher:set_wielded_item(wielditem)
+ itemstack:take_item()
+ clicker:set_wielded_item(itemstack)
inv:add_item("main", "homedecor:drink_mug 1")
- minetest.chat_send_player(puncher:get_player_name(), "Ahh, a nice cold drink - look in your inventory for it!")
+ minetest.chat_send_player(clicker:get_player_name(),
+ S("Ahh, a nice cold drink - look in your inventory for it!"))
else
- minetest.chat_send_player(puncher:get_player_name(), "No room in your inventory to add a drink mug!")
+ minetest.chat_send_player(clicker:get_player_name(),
+ S("No room in your inventory to add a drink mug!"))
end
end
end
})
minetest.register_alias("homedecor:beer_tap", "homedecor:drink_tap")
-
minetest.register_craft({
output = "homedecor:drink_tap",
recipe = {
@@ -162,7 +169,7 @@ local beer_cbox = {
}
homedecor.register("drink_mug", {
- description = "Drink mug",
+ description = S("Drink mug"),
drawtype = "mesh",
mesh = "homedecor_beer_mug.obj",
tiles = { "homedecor_beer_mug.png" },
@@ -171,7 +178,24 @@ homedecor.register("drink_mug", {
walkable = false,
sounds = default.node_sound_glass_defaults(),
selection_box = beer_cbox,
- on_use = minetest.item_eat(2)
+ on_use = function(itemstack, user, pointed_thing)
+ local inv = user:get_inventory()
+ if not creative.is_enabled_for(user:get_player_name()) then
+ if inv:room_for_item("main", "vessels:drinking_glass 1") then
+ inv:add_item("main", "vessels:drinking_glass 1")
+ else
+ local pos = user:get_pos()
+ local dir = user:get_look_dir()
+ local fdir = minetest.dir_to_facedir(dir)
+ local pos_fwd = { x = pos.x + homedecor.fdir_to_fwd[fdir+1][1],
+ y = pos.y + 1,
+ z = pos.z + homedecor.fdir_to_fwd[fdir+1][2] }
+ minetest.add_item(pos_fwd, "vessels:drinking_glass 1")
+ end
+ minetest.do_item_eat(2, nil, itemstack, user, pointed_thing)
+ return itemstack
+ end
+ end
})
minetest.register_alias("homedecor:beer_mug", "homedecor:drink_mug")
@@ -181,7 +205,7 @@ local svm_cbox = {
}
homedecor.register("soda_machine", {
- description = "Soda Vending Machine",
+ description = S("Soda vending machine"),
mesh = "homedecor_soda_machine.obj",
tiles = {"homedecor_soda_machine.png"},
groups = {snappy=3},
@@ -190,21 +214,25 @@ homedecor.register("soda_machine", {
expand = { top="placeholder" },
sounds = default.node_sound_wood_defaults(),
on_rotate = screwdriver.rotate_simple,
- on_punch = function(pos, node, puncher, pointed_thing)
- local wielditem = puncher:get_wielded_item()
+ on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+ local playername = clicker:get_player_name()
+ local wielditem = clicker:get_wielded_item()
local wieldname = wielditem:get_name()
local fdir_to_fwd = { {0, -1}, {-1, 0}, {0, 1}, {1, 0} }
local fdir = node.param2
local pos_drop = { x=pos.x+fdir_to_fwd[fdir+1][1], y=pos.y, z=pos.z+fdir_to_fwd[fdir+1][2] }
if wieldname == "homedecor:coin" then
- wielditem:take_item()
- puncher:set_wielded_item(wielditem)
minetest.spawn_item(pos_drop, "homedecor:soda_can")
minetest.sound_play("insert_coin", {
pos=pos, max_hear_distance = 5
})
+ if not creative.is_enabled_for(playername) then
+ wielditem:take_item()
+ clicker:set_wielded_item(wielditem)
+ return wielditem
+ end
else
- minetest.chat_send_player(puncher:get_player_name(), "Please insert a coin in the machine.")
+ minetest.chat_send_player(playername, S("Please insert a coin in the machine."))
end
end
})