From 1d45b27c1257ced84eccc7908bb3347cc22f42c9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Mart=C3=ADnez?= <kaeza@users.noreply.github.com>
Date: Tue, 7 Mar 2017 00:03:30 -0300
Subject: [PATCH] Add desert/silver sandstone-related blocks. (#1596)

Add desert and silver sand-related blocks, and stairs.
---
 mods/default/README.txt                       |  10 +++
 mods/default/crafting.lua                     |  82 ++++++++++++++++--
 mods/default/license.txt                      |   2 +
 mods/default/nodes.lua                        |  56 +++++++++++-
 .../textures/default_desert_sandstone.png     | Bin 0 -> 275 bytes
 .../default_desert_sandstone_block.png        | Bin 0 -> 587 bytes
 .../default_desert_sandstone_brick.png        | Bin 0 -> 630 bytes
 .../textures/default_silver_sandstone.png     | Bin 0 -> 461 bytes
 .../default_silver_sandstone_block.png        | Bin 0 -> 520 bytes
 .../default_silver_sandstone_brick.png        | Bin 0 -> 612 bytes
 mods/stairs/init.lua                          |  60 +++++++++++++
 11 files changed, 200 insertions(+), 10 deletions(-)
 create mode 100644 mods/default/textures/default_desert_sandstone.png
 create mode 100644 mods/default/textures/default_desert_sandstone_block.png
 create mode 100644 mods/default/textures/default_desert_sandstone_brick.png
 create mode 100644 mods/default/textures/default_silver_sandstone.png
 create mode 100644 mods/default/textures/default_silver_sandstone_block.png
 create mode 100644 mods/default/textures/default_silver_sandstone_brick.png

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 342a8c4f..1ca66e4e 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -202,6 +202,16 @@ npx (CC BY-SA 3.0)
   default_rainforest_litter.png
   default_rainforest_litter_side.png
 
+GreenXenith (CC-BY-SA 3.0):
+  default_silver_sandstone.png
+  default_silver_sandstone_brick.png
+  default_silver_sandstone_block.png
+
+kaeza (CC-BY-SA 3.0):
+  default_desert_sandstone.png
+  default_desert_sandstone_brick.png
+  default_desert_sandstone_block.png
+
 Glass breaking sounds (CC BY 3.0):
   1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
   2: http://www.freesound.org/people/Tomlija/sounds/97669/
diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index ce27bb42..b360ddcf 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -503,26 +503,90 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'default:sand 4',
+	output = "default:sand 4",
 	recipe = {
-		{'default:sandstone'},
+		{"default:sandstone"},
 	}
 })
 
 minetest.register_craft({
-	output = 'default:sandstonebrick 4',
+	output = "default:sandstonebrick 4",
 	recipe = {
-		{'default:sandstone', 'default:sandstone'},
-		{'default:sandstone', 'default:sandstone'},
+		{"default:sandstone", "default:sandstone"},
+		{"default:sandstone", "default:sandstone"},
 	}
 })
 
 minetest.register_craft({
-	output = 'default:sandstone_block 9',
+	output = "default:sandstone_block 9",
 	recipe = {
-		{'default:sandstone', 'default:sandstone', 'default:sandstone'},
-		{'default:sandstone', 'default:sandstone', 'default:sandstone'},
-		{'default:sandstone', 'default:sandstone', 'default:sandstone'},
+		{"default:sandstone", "default:sandstone", "default:sandstone"},
+		{"default:sandstone", "default:sandstone", "default:sandstone"},
+		{"default:sandstone", "default:sandstone", "default:sandstone"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:desert_sandstone",
+	recipe = {
+		{"default:desert_sand", "default:desert_sand"},
+		{"default:desert_sand", "default:desert_sand"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:desert_sand 4",
+	recipe = {
+		{"default:desert_sandstone"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:desert_sandstone_brick 4",
+	recipe = {
+		{"default:desert_sandstone", "default:desert_sandstone"},
+		{"default:desert_sandstone", "default:desert_sandstone"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:desert_sandstone_block 9",
+	recipe = {
+		{"default:desert_sandstone", "default:desert_sandstone", "default:desert_sandstone"},
+		{"default:desert_sandstone", "default:desert_sandstone", "default:desert_sandstone"},
+		{"default:desert_sandstone", "default:desert_sandstone", "default:desert_sandstone"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:silver_sandstone",
+	recipe = {
+		{"default:silver_sand", "default:silver_sand"},
+		{"default:silver_sand", "default:silver_sand"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:silver_sand 4",
+	recipe = {
+		{"default:silver_sandstone"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:silver_sandstone_brick 4",
+	recipe = {
+		{"default:silver_sandstone", "default:silver_sandstone"},
+		{"default:silver_sandstone", "default:silver_sandstone"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:silver_sandstone_block 9",
+	recipe = {
+		{"default:silver_sandstone", "default:silver_sandstone", "default:silver_sandstone"},
+		{"default:silver_sandstone", "default:silver_sandstone", "default:silver_sandstone"},
+		{"default:silver_sandstone", "default:silver_sandstone", "default:silver_sandstone"},
 	}
 })
 
diff --git a/mods/default/license.txt b/mods/default/license.txt
index e9267366..09e4225f 100644
--- a/mods/default/license.txt
+++ b/mods/default/license.txt
@@ -41,6 +41,8 @@ Copyright (C) 2010-2016:
   asl97
   KevDoy
   Mito551
+  GreenXenith
+  kaeza
 
 You are free to:
 Share — copy and redistribute the material in any medium or format.
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 82a97c65..34136cb3 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -30,6 +30,12 @@ default:desert_stone_block
 default:sandstone
 default:sandstonebrick
 default:sandstone_block
+default:desert_sandstone
+default:desert_sandstone_brick
+default:desert_sandstone_block
+default:silver_sandstone
+default:silver_sandstone_brick
+default:silver_sandstone_block
 
 default:obsidian
 default:obsidianbrick
@@ -275,7 +281,6 @@ minetest.register_node("default:desert_stone_block", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
-
 minetest.register_node("default:sandstone", {
 	description = "Sandstone",
 	tiles = {"default_sandstone.png"},
@@ -301,6 +306,55 @@ minetest.register_node("default:sandstone_block", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:desert_sandstone", {
+	description = "Desert Sandstone",
+	tiles = {"default_desert_sandstone.png"},
+	groups = {crumbly = 1, cracky = 3},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:desert_sandstone_brick", {
+	description = "Desert Sandstone Brick",
+	paramtype2 = "facedir",
+	place_param2 = 0,
+	tiles = {"default_desert_sandstone_brick.png"},
+	is_ground_content = false,
+	groups = {cracky = 2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:desert_sandstone_block", {
+	description = "Desert Sandstone Block",
+	tiles = {"default_desert_sandstone_block.png"},
+	is_ground_content = false,
+	groups = {cracky = 2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone", {
+	description = "Silver Sandstone",
+	tiles = {"default_silver_sandstone.png"},
+	groups = {crumbly = 1, cracky = 3},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone_brick", {
+	description = "Silver Sandstone Brick",
+	paramtype2 = "facedir",
+	place_param2 = 0,
+	tiles = {"default_silver_sandstone_brick.png"},
+	is_ground_content = false,
+	groups = {cracky = 2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone_block", {
+	description = "Silver Sandstone Block",
+	tiles = {"default_silver_sandstone_block.png"},
+	is_ground_content = false,
+	groups = {cracky = 2},
+	sounds = default.node_sound_stone_defaults(),
+})
 
 minetest.register_node("default:obsidian", {
 	description = "Obsidian",
diff --git a/mods/default/textures/default_desert_sandstone.png b/mods/default/textures/default_desert_sandstone.png
new file mode 100644
index 0000000000000000000000000000000000000000..52e445fa1b0c2f4ad19ab643587d3abd37273f76
GIT binary patch
literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!N`Oy@>$digUA^IZCPwU;8h2<~
z^r0ECM`y>KoSSfbUhL_4@uwCfo?V#W|MB`opn9H?AirRS{|LZ&BtQ))KFQO?F+^gj
zY=5Abiz0^;>qnWVZ|nCv2g|R#+mMyM|68<g{^q=O=DNl==dM%UIHx~sTi{t<n``16
z#YfEr{@z`>{PYJOuJ@iByxrF-{(Pq#!X($3X?*93J>!o)n}qPZ;+=0_KQ}w-`0ShD
zjR~$_Sf^iE%(7yN?0!+@g$ITAmKX;*Fope5{x_-h&nNNxm<N2%TAuLRIk0|U>XCK_
Px{krq)z4*}Q$iB}e|B}q

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_desert_sandstone_block.png b/mods/default/textures/default_desert_sandstone_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fc54e75bc0a0eab48724341a18f42a53829c327
GIT binary patch
literal 587
zcmV-R0<`^!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006KNkl<ZIE`hJ
zTXxeh5QaZpEX#4~q$k^EMQns606k5cIB~4IcyJLE^f;P-=D&>i_Vr7>zrCP4=%i$R
zRQ7}9-*;aN<j8*ClWS&mf*&vM=yZE!y?kddlJi;_hl-230q5(=bQsXUyktbG0Hgrd
z_Zt!*_{jC<Db6>La|tDC8{{5=X;eg4P*P*9rucxqxvgn@>QGWMFS&to6_`$;M8)n*
zV{<t_u%qE{=#k|3pI*}`g5T=n*imvtl=2B2e54A2-0yozswk;(E@4y!DL=7DlqSOt
z8n*<d!vKKvF7o_rnXfC9LTA|YrHXq5+#{gmX6j%y<Jcj!;BtQ8T|@)Czq@TiN+1o3
zUpbz3jqbc;rcrH6plyG-J9KY5j;Gz9*p^I5mHE21y8ZYoskYjDU5QyBeaLOHa|wXs
zX~+1~wM0ZI%uD8Y+A%L%zv(+VRgp0yOy6yEt%eksmyD8{X;g?(+KpV!55}QVQYH9E
zZ`9_2TLRMdEvmndr^TujMpdFKjfr;)dcW^UcMW8&tHOv4<krN~vmv@dh?$ZS_CvpW
z1dNh+mp2A>XSSG1At8ybAhjR{KuV^AY1&Jw*g+F~WIEdI4t^U|r9??hh#Av&1RpnF
z03$MJgB`Y8m<|K;#i7r4$K~}6B@{knVipu1n2whFT6kJKi9+&)-gbBwvAyQD1b$u?
ZegUJ`SZq;McX|K-002ovPDHLkV1kz<5KjOA

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_desert_sandstone_brick.png b/mods/default/textures/default_desert_sandstone_brick.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab58db52350591442c6a84101fa9fd57c84a694a
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006#Nkl<ZIE`hJ
z%Wm8_5Je9klBkwO?Zk^L0?Z<d@yE^=&5vX~L5z6DMmyc=mc%!+AR@pCcO>evs_wbs
z^FM!=<@*b|fksN^wJ`RQU(apJkOJe_kxF8-f-jHH=yW@=ouBAi$!RMLeZdC33+Kzm
zbnMZ<yd*>{07MUVxgr6)3tX;_Y~3!hHljq?KeDT58Wh21l++lb$<Cv%wiXS4G$^T=
zm$Zvg5wwj$iGn$_`!wg%iWypt#|}vfzwO&L3h(OsFf`;;5IMgQdlx7|Ajh#I$AXd?
zYa^{HAmy7WB6(lK^cuT(rehC)bT;trongLgkTXq7-7gmG>anXw$!cnEG{ev!wcvbO
zaW<g8e0$~c^0IgA4h_La#<An;^R?cSVC*HgTQzwcI{=<uSM*<>KES6BZ+K_tky_A=
z3l9$uxLa*7pDoj!sdYEU$3GkN`S}s=0@Ja_+K5krX;7pXIlWwQAK&B7-?(grX;3^r
zC5WE3YpMs{1=_Bu?ivlzGcO4xHDfOkrR*6wpH_yxkYmBSfH4{kU>A=x-Hz(#aW-IG
ztXQ?8RfS+PclQV8C1F>Oo{l|s^+4jXDO%wxvMr*!iqnTgjuCTz*m1T>VwYGaFo(8c
z%9)5H*o@SIcmt$lI`+&<V!mwTSTMcDyTIN30a?3)$eAJ~N@{#av|Yv7wW_95B+xCU
zuUYt+O8x(3Bb{$3p>RGCk{~<JbZ7YQ?D+Tb#Cm%rx=d#poDG;xb6slVA5Upp5RR8w
Q*Z=?k07*qoM6N<$f`LmZH2?qr

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_silver_sandstone.png b/mods/default/textures/default_silver_sandstone.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb4f404a9987e808bb93e64b5c8ef300aa76ec2e
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0zrS5CG_Nwk`kw0a{5!
zK~y-)Ws*U5#UKbpuMkbn-~VPh@1CMjp@S4p(lS(dTppzF?=SDYlXE7e#Ce|NocSBQ
zcSHnLMOCS_A|l8$={!%4<9HR$IRVHyV`iu-0IG_a-2(2;bzQF_Gh^GzdNVU}&h*}y
zb0Q+QK&=&kQVKa|YOR<V0ApOFl-Ra{h^)fa8fM1l^I;Q_fAgy9N-pKVeJ=Fy%iZrB
zRb`BUyT4|P7~^`45#o_2fzo?lW(Ad*VP-EQOF0k`dhfSS0O3P~yD!63b&3C7rJ3Cx
zY}<A_`fE@`+{2S7-a=H&Y$=a10ND4PQp!pSihbYL8iPXIos<%-wfnMuDdwEyoY&Pw
z*W)-CW2`O7^V&i+FoW)SeL)ic5?!KGINw@ZLeU@ypX=PhJP~;r6srm|d+#q#Vp9?V
zDJABd%sFxQl@uFzj#0|7#*t@n%p9VD8pT2AJ{RQ=4*n)dK!&Iw00000NkvXXu0mjf
D!^y(9

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_silver_sandstone_block.png b/mods/default/textures/default_silver_sandstone_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..f33ea68347fb44394337bf5e031feaea82aad593
GIT binary patch
literal 520
zcmV+j0{8uiP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0zrS4>%1g04@Lk0hLKa
zK~y-)U6M(X+#nD|ABh;MDt!O5dDAy=bX2HY0zpDAWU%C13jO?3nvaj)ecQfhtzoUD
z)`GPQ|Bq?~4AxozYCZV;{KK+sU+nugIq#&Dh%ut77obj1DTNp#Av{QFI~SbWD#vl$
zK*kunkEredwAOIWQA$BoQB`u@ky9FY?{UtNQlhmsWg25x7LSOas)z_V=Sd=9*!S<7
zUu*5O;eDj{(}uN{QVPyFa^BB{XK<C?`wa3rwf?g<-c=Rv0|3%m<N172N&&z*hlor-
zYi+7=&f$GTL}*QEt(_sJly0oO_ZirbJz5YEthIO_0a!$Y5CW~W8PFK#+$r;-XnZ@4
zL@D{SFgDkEHWEU>dq0_niV(uAF@y)s1*G?mF@~HoB66$AIfu1&S{#Q|Yn_$KIGn*`
zt(`K5y3x#4$;e6uXfTcBbIx<oAQ%d-buZV40T`KFt1YG6GU>hZdi_FbJy2CrO7q5h
z@AIe8z}1HL@voiCvTYmd`kr^cuJ4(0tp|_C>vl||%A9xB_011{FH6fPzLB{A0000<
KMNUMnLSTZVKITdQ

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_silver_sandstone_brick.png b/mods/default/textures/default_silver_sandstone_brick.png
new file mode 100644
index 0000000000000000000000000000000000000000..711d963539f122cd99f65e4a28f3131a0ea3f45a
GIT binary patch
literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0zrS6b@^rUM&Cs0r5#h
zK~y-)Ws*&6+%OP^AB`m2fzVJ0X)ihT|No4h(o;@7gkAy(Y+%`4+iQJTqaM6A*;W^U
z(9HWjGp~7m{#C6NYOT~-Nh#2_H~f1_nE`{f7J$A#GLAhCln^4*G!R0d>pF(v^r^6H
zMLB1>uG<>CzrP~Rd7zR~x++ptoNKl>RmFQx&iT^Rp{huXiD^31G!5Q+LI|iT0P~zM
z#^79oh)_yFM2In>TDZOaf~YD@(_ZmfYbm7w&@>&jE*REYa?W_~5n29-_l~|lQfoz3
zH{SKkbGpJ<o44&U3ula>ZCg@Glu~fcQEO$M6SdaOkuhd-6yrqBd6|<cyuSWn9D778
z-nZ0RXqt}Q?v1;<uK={|4KYp_V`!R1{pIC1=IQBY-S0nmc=(2hCFi&)k7Li{;}1@!
zJpeIA+P1x*&BQq2j>iwIH4MX%d7dwPEyfsjyEpFdzcY?KAq2el48sW#*^oqJnQn{`
z5!u#MO2PX@Erf6tq*X{nkTp2#u&lLs?*XW_Ty17u<BFlGIPX34Ja0;$V{5JFvw(>F
zw@#<3oAp&W=X^<C2G}B;bKacPT9-hr4U93Qlt?L&^OAvSny#|2-c8eOIPP%RBO<6O
ywU!OXTFZXF<9r@C9QKrwF~(kE?MW#hBK!sWw^todZ*rgj0000<MNUMnLSTY|MiYAg

literal 0
HcmV?d00001

diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua
index 191c78df..86dadf97 100644
--- a/mods/stairs/init.lua
+++ b/mods/stairs/init.lua
@@ -444,6 +444,66 @@ stairs.register_stair_and_slab(
 	default.node_sound_stone_defaults()
 )
 
+stairs.register_stair_and_slab(
+	"desert_sandstone",
+	"default:desert_sandstone",
+	{crumbly = 1, cracky = 3},
+	{"default_desert_sandstone.png"},
+	"Desert Sandstone Stair",
+	"Desert Sandstone Slab",
+	default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+	"desert_sandstone_brick",
+	"default:desert_sandstone_brick",
+	{cracky = 2},
+	{"default_desert_sandstone_brick.png"},
+	"Desert Sandstone Brick Stair",
+	"Desert Sandstone Brick Slab",
+	default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+	"desert_sandstone_block",
+	"default:desert_sandstone_block",
+	{cracky = 2},
+	{"default_desert_sandstone_block.png"},
+	"Desert Sandstone Block Stair",
+	"Desert Sandstone Block Slab",
+	default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+	"silver_sandstone",
+	"default:silver_sandstone",
+	{crumbly = 1, cracky = 3},
+	{"default_silver_sandstone.png"},
+	"Silver Sandstone Stair",
+	"Silver Sandstone Slab",
+	default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+	"silver_sandstone_brick",
+	"default:silver_sandstone_brick",
+	{cracky = 2},
+	{"default_silver_sandstone_brick.png"},
+	"Silver Sandstone Brick Stair",
+	"Silver Sandstone Brick Slab",
+	default.node_sound_stone_defaults()
+)
+
+stairs.register_stair_and_slab(
+	"silver_sandstone_block",
+	"default:silver_sandstone_block",
+	{cracky = 2},
+	{"default_silver_sandstone_block.png"},
+	"Silver Sandstone Block Stair",
+	"Silver Sandstone Block Slab",
+	default.node_sound_stone_defaults()
+)
+
 stairs.register_stair_and_slab(
 	"obsidian",
 	"default:obsidian",
-- 
2.25.1