From 05332037107d406bf7578fa9e846d300aac11315 Mon Sep 17 00:00:00 2001 From: paramat Date: Thu, 23 Jun 2016 04:37:19 +0100 Subject: [PATCH] merge upstream commit: Default: Add stone / desert stone / sandstone / obsidian blocks --- mods/default/README.txt | 4 ++ mods/default/crafting.lua | 36 ++++++++++++++++++ mods/default/nodes.lua | 36 ++++++++++++++++++ .../textures/default_desert_stone_block.png | Bin 0 -> 527 bytes .../textures/default_obsidian_block.png | Bin 0 -> 336 bytes .../textures/default_sandstone_block.png | Bin 0 -> 637 bytes mods/default/textures/default_stone_block.png | Bin 0 -> 498 bytes 7 files changed, 76 insertions(+) create mode 100644 mods/default/textures/default_desert_stone_block.png create mode 100644 mods/default/textures/default_obsidian_block.png create mode 100644 mods/default/textures/default_sandstone_block.png create mode 100644 mods/default/textures/default_stone_block.png diff --git a/mods/default/README.txt b/mods/default/README.txt index 8e72ca5e..9648f2ca 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -112,6 +112,10 @@ paramat (CC BY-SA 3.0): default_obsidian_brick.png default_stone_brick.png default_desert_stone_brick.png + default_sandstone_block.png + default_obsidian_block.png + default_stone_block.png + default_desert_stone_block.png default_river_water.png default_river_water_source_animated.png default_river_water_flowing_animated.png diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 998d86ba..0f10e7f9 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -499,6 +499,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:sandstone_block 9', + recipe = { + {'default:sandstone', 'default:sandstone', 'default:sandstone'}, + {'default:sandstone', 'default:sandstone', 'default:sandstone'}, + {'default:sandstone', 'default:sandstone', 'default:sandstone'}, + } +}) + minetest.register_craft({ output = 'default:clay', recipe = { @@ -627,6 +636,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:obsidian_block 9', + recipe = { + {'default:obsidian', 'default:obsidian', 'default:obsidian'}, + {'default:obsidian', 'default:obsidian', 'default:obsidian'}, + {'default:obsidian', 'default:obsidian', 'default:obsidian'}, + } +}) + minetest.register_craft({ output = 'default:stonebrick 4', recipe = { @@ -635,6 +653,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:stone_block 9', + recipe = { + {'default:stone', 'default:stone', 'default:stone'}, + {'default:stone', 'default:stone', 'default:stone'}, + {'default:stone', 'default:stone', 'default:stone'}, + } +}) + minetest.register_craft({ output = 'default:desert_stonebrick 4', recipe = { @@ -643,6 +670,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:desert_stone_block 9', + recipe = { + {'default:desert_stone', 'default:desert_stone', 'default:desert_stone'}, + {'default:desert_stone', 'default:desert_stone', 'default:desert_stone'}, + {'default:desert_stone', 'default:desert_stone', 'default:desert_stone'}, + } +}) + minetest.register_craft({ output = 'default:snowblock', recipe = { diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index f732a8b9..d624829f 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -19,17 +19,21 @@ Stone default:stone default:cobble default:stonebrick +default:stone_block default:mossycobble default:desert_stone default:desert_cobble default:desert_stonebrick +default:desert_stone_block default:sandstone default:sandstonebrick +default:sandstone_block default:obsidian default:obsidianbrick +default:obsidian_block Soft / Non-Stone ---------------- @@ -210,6 +214,14 @@ minetest.register_node("default:stonebrick", { sounds = default.node_sound_stone_defaults(), }) +minetest.register_node("default:stone_block", { + description = "Stone Block", + tiles = {"default_stone_block.png"}, + is_ground_content = false, + groups = {cracky = 2, stone = 1}, + sounds = default.node_sound_stone_defaults(), +}) + minetest.register_node("default:mossycobble", { description = "Mossy Cobblestone", tiles = {"default_mossycobble.png"}, @@ -246,6 +258,14 @@ minetest.register_node("default:desert_stonebrick", { sounds = default.node_sound_stone_defaults(), }) +minetest.register_node("default:desert_stone_block", { + description = "Desert Stone Block", + tiles = {"default_desert_stone_block.png"}, + is_ground_content = false, + groups = {cracky = 2, stone = 1}, + sounds = default.node_sound_stone_defaults(), +}) + minetest.register_node("default:sandstone", { description = "Sandstone", @@ -264,6 +284,14 @@ minetest.register_node("default:sandstonebrick", { sounds = default.node_sound_stone_defaults(), }) +minetest.register_node("default:sandstone_block", { + description = "Sandstone Block", + tiles = {"default_sandstone_block.png"}, + is_ground_content = false, + groups = {cracky = 2}, + sounds = default.node_sound_stone_defaults(), +}) + minetest.register_node("default:obsidian", { description = "Obsidian", @@ -282,6 +310,14 @@ minetest.register_node("default:obsidianbrick", { groups = {cracky = 1, level = 2}, }) +minetest.register_node("default:obsidian_block", { + description = "Obsidian Block", + tiles = {"default_obsidian_block.png"}, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + groups = {cracky = 1, level = 2}, +}) + -- -- Soft / Non-Stone -- diff --git a/mods/default/textures/default_desert_stone_block.png b/mods/default/textures/default_desert_stone_block.png new file mode 100644 index 0000000000000000000000000000000000000000..ef7ba5bc64680852d603ccd62bf813759bdcac58 GIT binary patch literal 527 zcmV+q0`UEbP)3CL*bduZdF-WANM3-n@imbw%hclGxTbp2=<;7aiN1gPdhT3C05ByaN@)U* zTZn6|@H!~Nxpu31NH@R*8(j@&Gnk z9^UV2-vb~JfbE+acPlN7l#BeU!<_h?$yd4h-CViV-O401vphSp0~g>Veuw~!k^s6s z5=d-J{;AkjF0cc`0dTnA0Z1ve{lHp{548)T^+V-CLhAYm;7@x4(2p-Rms*OgRtbso z0N5BMmh@YrI5&VU#HA~Px`uJankcb+A4dSITrFglc!kxK3;VUHTo68tdutdA*FD_t z8Xo{0%WgK;3c#ss-4KP%)v0V3y~66o2WIej{~rc`b*_w*f;rxX$Z(f8SysM${J@9+ z{Jb>c8pgtEPWd+Ra`VS?voIi#czCWJ&ouxe=Wlnsv^?p@ars47NdU*P{RgY`0Eq@> RNOAxG002ovPDHLkV1o4;<52(r literal 0 HcmV?d00001 diff --git a/mods/default/textures/default_obsidian_block.png b/mods/default/textures/default_obsidian_block.png new file mode 100644 index 0000000000000000000000000000000000000000..262cd37e0d58269035ccc4351f3f6f39b21c7d94 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#0h>6JA*YJ8!yTZ|drud~5RLP_6MeG|8wj+z+lz2*wWK+PGKv0J478q8Ba6CUNQ8JV+V&ii_&Jd?veepg(6 zeMN;cOZsn3pq&33>!0lJ%C0{=6P1xvcBuG8>iG<#XIVhp+$u0Qj)jZs3N|pT_MoK=HBt`1y(ez&SZL)mHAi z#7P@_#|kH7cP>mR2SO?(VDM*XJPZfhKhD!TG`?dfNgHdVP0<@^=lRH$$MFja)F24{ z2bJdJNzk}?$TSDTb$y`~QK?ni>Zk(b=BmjuTD>J5Wz5kT8 z=EMG*TQ8_|-)&P4sm8*(02ly)*y)W@=2qCd6LXOOFwbuQz%hD3oRjSzy*ue{@7%fX zAH2VTAZ;v(L5Nu*s$uiQjY*Jm=h{k&@UO8uZXENx-@b5T?{6hLtgZU6kf6i~0EW%e zFdUpalORbd`r9~ub?%&^CvBzbv6e(iFY5;(3DnM=Qx1LqAQ0VpsjYZ-8n@3eT{(F~ zl+ZYZD+(z|fdK$}H*;6q5=%32_FaCP4zRa85bY!lW(d zq)C$?(zZ2LW*j#Uwi{x&$=Boc{cXx6)>=z;t+DBLDK6IT5h=u#NHU+a`V4;l^?UjY X^zU=7P3joD00000NkvXXu0mjfs@EKb literal 0 HcmV?d00001 diff --git a/mods/default/textures/default_stone_block.png b/mods/default/textures/default_stone_block.png new file mode 100644 index 0000000000000000000000000000000000000000..3b771e725e32c342a26dcee06ec7b7cb5800d974 GIT binary patch literal 498 zcmV#g1^`uEr&2!*^?ncFa=FU(+8&Qbo#$a30Tf!NBJLp~ zk!7uO0Qy@m0q8t0joG#hz_zYqj41c;A#M-C{ly9R_0ol z#sEkTDX}d}02G4vep}b7u3gv3zw&7Y@BJ8K3(V65Kq-~7$)YHlrzav}hpMW$^Z9V# z4TZp0L^Q@IV~p&`0)5|eU6y4#rFa0&1E9zY$=y7h$g;95+5PXVah~Hm|6twLmF1UZ zVZ@0{idR(?zibFW&dXBo_l$*u9-4+i0Kkt0fHAhtP17XvJpVeKg%H+SCQTtQ1BQ`; zmBtW}G{y)a!Z