From db18e31484e06f493fa6210102871f86790c3e0c Mon Sep 17 00:00:00 2001
From: Zeg9 <dazeg9@gmail.com>
Date: Mon, 17 Jun 2013 19:15:29 +0200
Subject: [PATCH] Add tin

---
 mods/default/crafting.lua                     |  24 +++++++++++++++++-
 mods/default/craftitems.lua                   |  10 ++++++++
 mods/default/mapgen.lua                       |  23 +++++++++++++++++
 mods/default/nodes.lua                        |  17 +++++++++++++
 mods/default/textures/default_mineral_tin.png | Bin 0 -> 197 bytes
 mods/default/textures/default_tin_block.png   | Bin 0 -> 541 bytes
 mods/default/textures/default_tin_ingot.png   | Bin 0 -> 258 bytes
 mods/default/textures/default_tin_lump.png    | Bin 0 -> 276 bytes
 mods/external_legacy/init.lua                 |   2 ++
 9 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 mods/default/textures/default_mineral_tin.png
 create mode 100644 mods/default/textures/default_tin_block.png
 create mode 100644 mods/default/textures/default_tin_ingot.png
 create mode 100644 mods/default/textures/default_tin_lump.png

diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index 868623f7..3cde5161 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -301,7 +301,7 @@ minetest.register_craft({
 minetest.register_craft({
 	type = "shapeless",
 	output = "default:bronze_ingot",
-	recipe = {"default:steel_ingot", "default:copper_ingot"},
+	recipe = {"default:tin_ingot", "default:copper_ingot"},
 })
 
 minetest.register_craft({
@@ -352,6 +352,22 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:tinblock',
+	recipe = {
+		{'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'},
+		{'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'},
+		{'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:tin_ingot 9',
+	recipe = {
+		{'default:tinblock'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:bronzeblock',
 	recipe = {
@@ -593,6 +609,12 @@ minetest.register_craft({
 	recipe = "default:copper_lump",
 })
 
+minetest.register_craft({
+	type = "cooking",
+	output = "default:tin_ingot",
+	recipe = "default:tin_lump",
+})
+
 minetest.register_craft({
 	type = "cooking",
 	output = "default:gold_ingot",
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index 5826d669..98be843b 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -30,6 +30,11 @@ minetest.register_craftitem("default:copper_lump", {
 	inventory_image = "default_copper_lump.png",
 })
 
+minetest.register_craftitem("default:tin_lump", {
+	description = "Tin Lump",
+	inventory_image = "default_tin_lump.png",
+})
+
 minetest.register_craftitem("default:mese_crystal", {
 	description = "Mese Crystal",
 	inventory_image = "default_mese_crystal.png",
@@ -60,6 +65,11 @@ minetest.register_craftitem("default:copper_ingot", {
 	inventory_image = "default_copper_ingot.png",
 })
 
+minetest.register_craftitem("default:tin_ingot", {
+	description = "Tin Ingot",
+	inventory_image = "default_tin_ingot.png",
+})
+
 minetest.register_craftitem("default:bronze_ingot", {
 	description = "Bronze Ingot",
 	inventory_image = "default_bronze_ingot.png",
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index bbdd8671..3956fe95 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -207,6 +207,29 @@ minetest.register_ore({
 	flags          = "absheight",
 })
 
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_tin",
+	wherein        = "default:stone",
+	clust_scarcity = 10*10*10,
+	clust_num_ores = 2,
+	clust_size     = 3,
+	height_min     = -63,
+	height_max     = -16,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_tin",
+	wherein        = "default:stone",
+	clust_scarcity = 7*7*7,
+	clust_num_ores = 3,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
 if minetest.setting_get("mg_name") == "indev" then
 	-- Floatlands and high mountains springs
 	minetest.register_ore({
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index a05d98b1..cc659f7e 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -47,6 +47,15 @@ minetest.register_node("default:stone_with_copper", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:stone_with_tin", {
+	description = "Tin Ore",
+	tiles = {"default_stone.png^default_mineral_tin.png"},
+	is_ground_content = true,
+	groups = {cracky=2},
+	drop = 'default:tin_lump',
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:stone_with_mese", {
 	description = "Mese Crystals in Stone",
 	tiles = {"default_stone.png^default_mineral_mese.png"},
@@ -1042,6 +1051,14 @@ minetest.register_node("default:copperblock", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:tinblock", {
+	description = "Tin Block",
+	tiles = {"default_tin_block.png"},
+	is_ground_content = true,
+	groups = {cracky=1,level=2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:bronzeblock", {
 	description = "Bronze Block",
 	tiles = {"default_bronze_block.png"},
diff --git a/mods/default/textures/default_mineral_tin.png b/mods/default/textures/default_mineral_tin.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fd21a15bc0cf9837120e5f256217f3305c76d2d
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP)o1h>g)BA*<ia?<tPZ!4!i_^&o3(O*RmHhqx^78Zl
z@-l5rCg)~u7Fkz#b5n0Z^9Cul&8@G_Esu{-sAiOHKEx>b_^X!2f(fFRujlWW!!~L8
niGY&-m+wiJaB8oT<YHLyv4`=Hz^+w5(-}Nn{an^LB{Ts5?D0dC

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_tin_block.png b/mods/default/textures/default_tin_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..02b5a5356fa349c86a21c0f756663ac4c1f73350
GIT binary patch
literal 541
zcmV+&0^<FNP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3Ad61O$6@s8Ij_03~Tu
zSad^gZEa<4bN~SW000P?b1q6vEJ;mKD9<d(P;mG34FCW)odx0(HgF9900DVPL_t(I
z%WYF@bAmt&<bNwNB3P?!2T=rkVC@V3<(1vAJUac52|1FzO|s{O;l|BoOWJ%M(nrzG
z1;LuJJk0l3Zn22ykpuIhXzQw~ae4mU`q~|jSH`#75B=rxMW1Ci`m+4!EexNX2V@I2
zEV^F533R_VERf+GU`diQ7d2q##qrJ+#iK9CvWfu1O^*(w?yTt;-`Q5rV0`20R888!
z1u6#1Bq><4TD2{J4i1z6sz4Xm-+%Z%91NH(_<q>^Xhu{UG7<yW`TR*!oTeAITt3+r
z)UURo7_EQ-fYS8b=Kvf4+yZE5XgD0RP|rrW?&qNkI79%T(E7H)jb|X*Sf8j%BbZ+c
z5b;1gVjiH5bt+K|B`O&K&<BG3zMQO4#imfLFYj}30i}#dN}>{odITfWM?G5UAS4cP
zy?$c?=;()rX=^kEYA!Z?%Y}+PyeuS03;(@=sgwspEtLosusD99I6zI$H3;JN-z$@`
fG342E-ZJkO@@d2}Ty^}q00000NkvXXu0mjf760B1

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_tin_ingot.png b/mods/default/textures/default_tin_ingot.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde51061a1b36639c660113c3ed240f298cce797
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP)o1h@G^iEsjWS~&Lr;B5V#p&b(iGL3+Ead+G{jK%i
z`8vJT-{!D9o@?FTWEjZSXmZHpfI%SJL6b$=$I>nw>#hEGe)jf1_MY3C3_Oyvv%mj;
z_s;XbxA$rRwg#2uJ~Kbpzr8g#g7?;@rwkFwMs9_69>zv(k}R7A)3n>p8eF(@r!&c+
x{(s4aq!j6mSw~U@HZi(n9!V33lxkOFV2I*p{bb5%A_8<8gQu&X%Q~loCIIXhTyg*a

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_tin_lump.png b/mods/default/textures/default_tin_lump.png
new file mode 100644
index 0000000000000000000000000000000000000000..54590fb5764e43170d95ebca89a7788f2c7c045a
GIT binary patch
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP)o1h?*hWxi=6QIySPZ!4!i_>=}B(fhi5NP|od9}~J
zH_0!j8>p`GwN{H>R+8GYF~01xoOx`-w7NTe?H1qnlut_iAAPxGd1c*%@8MCp&P<Oh
zl%MOJF_@D%HRo;T(tY3cS7o_-GRBrKS!QWantT7=MS&B!uPY=J6<@eB_uTv}c2g>j
zX{W}O=L~Ck8&f+@yijLvnX)uZ;rUOse-n*(rrg@3QZsd_f?jIJ$xrXE3LopczkIK+
S<ZYm189ZJ6T-G@yGywooE^9#m

literal 0
HcmV?d00001

diff --git a/mods/external_legacy/init.lua b/mods/external_legacy/init.lua
index c4d8bb06..9ae87470 100644
--- a/mods/external_legacy/init.lua
+++ b/mods/external_legacy/init.lua
@@ -9,6 +9,8 @@ minetest.register_alias("moreores:gold_ingot", "default:gold_ingot")
 minetest.register_alias("moreores:mineral_copper", "default:stone_with_copper")
 minetest.register_alias("moreores:copper_lump", "default:copper_lump")
 minetest.register_alias("moreores:copper_ingot", "default:copper_ingot")
+minetest.register_alias("moreores:tin_lump", "default:tin_lump")
+minetest.register_alias("moreores:tin_ingot", "default:tin_ingot")
 minetest.register_alias("moreores:copper_block", "default:copperblock")
 minetest.register_alias("moreores:bronze_ingot", "default:bronze_ingot")
 minetest.register_alias("moreores:bronze_block", "default:bronzeblock")