From f4699123d803619d5121bfe5cd29af56b77bf246 Mon Sep 17 00:00:00 2001
From: rudzik8 <rudzik8@protonmail.com>
Date: Tue, 22 Mar 2022 16:54:53 +0700
Subject: [PATCH] Add table lamps and update locales

and something i forgor
---
 api.lua                                |   4 +--
 locale/mcl_decor.ru.tr                 |   4 +++
 locale/template.txt                    |   4 +++
 register.lua                           |  37 ++++++++++++++++++++++++-
 textures/mcl_decor_table_lamp.png      | Bin 0 -> 368 bytes
 textures/mcl_decor_table_lamp_side.png | Bin 0 -> 529 bytes
 6 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 textures/mcl_decor_table_lamp.png
 create mode 100644 textures/mcl_decor_table_lamp_side.png

diff --git a/api.lua b/api.lua
index 94e9ef4..6675470 100644
--- a/api.lua
+++ b/api.lua
@@ -78,8 +78,8 @@ function mcl_decor.register_chair(name, desc, material, tiles)
 			fixed = { -0.25, -0.5, -0.25, 0.25, 0.5, 0.25 },
 		},
 		groups = {handy=1, axey=1, attached_node=1, material_wood=1, deco_block=1, flammable=-1},
-		_mcl_hardness = 2,
-		_mcl_blast_resistance = 3,
+		_mcl_hardness = 1,
+		_mcl_blast_resistance = 1,
 		sounds = mcl_sounds.node_sound_wood_defaults(),
 		on_rightclick = mcl_decor.sit
 	})
diff --git a/locale/mcl_decor.ru.tr b/locale/mcl_decor.ru.tr
index 97472ea..efc88ce 100644
--- a/locale/mcl_decor.ru.tr
+++ b/locale/mcl_decor.ru.tr
@@ -1,8 +1,12 @@
 # textdomain: mcl_decor
 You have to stop moving before sitting down!=Вам нужно перестать двигаться, чтобы сесть!
 Coalquartz Tile=Уголекварцевая плитка
+Coalquartz Stair=Уголекварцевая ступенька
+Coalquartz Slab=Уголекварцевая плита
+Double Coalquartz Slab=Двойная уголекварцевая плита
 Gravel Path=Дорожка из гравия
 Rainbow Block=Радужный блок
+Table Lamp=Настольная лампа
 Oak Chair=Дубовый стул
 Acacia Chair=Стул из акации
 Birch Chair=Берёзовый стул
diff --git a/locale/template.txt b/locale/template.txt
index e9daed9..a5e105a 100644
--- a/locale/template.txt
+++ b/locale/template.txt
@@ -1,8 +1,12 @@
 # textdomain: mcl_decor
 You have to stop moving before sitting down!=
 Coalquartz Tile=
+Coalquartz Stair=
+Coalquartz Slab=
+Double Coalquartz Slab=
 Gravel Path=
 Rainbow Block=
+Table Lamp=
 Oak Chair=
 Acacia Chair=
 Birch Chair=
diff --git a/register.lua b/register.lua
index 01df573..0d5626c 100644
--- a/register.lua
+++ b/register.lua
@@ -26,7 +26,7 @@ minetest.register_craft({
 		{"mcl_core:coal_lump", "mcl_nether:quartz"}
 	}
 })
-mcl_stairs.register_stair_and_slab_simple("coalquartz_tile", "mcl_decor:coalquartz_tile", S("Coalquartz Tile Stair"), S("Coalquartz Tile Slab"), S("Double Coal Quartz Slab"))
+mcl_stairs.register_stair_and_slab_simple("coalquartz_tile", "mcl_decor:coalquartz_tile", S("Coalquartz Stair"), S("Coalquartz Slab"), S("Double Coalquartz Slab"))
 
 --- Gravel Path ---
 minetest.register_node("mcl_decor:gravel_path", {
@@ -103,6 +103,41 @@ minetest.register_craft({
 	}
 })
 
+--- Table Lamp ---
+minetest.register_node("mcl_decor:table_lamp", {
+	description = S("Table Lamp"),
+	tiles = {"mcl_decor_table_lamp.png", "mcl_decor_table_lamp.png", "mcl_decor_table_lamp_side.png",
+		"mcl_decor_table_lamp_side.png", "mcl_decor_table_lamp_side.png", "mcl_decor_table_lamp_side.png"},
+	drawtype = "nodebox",
+	paramtype = "light",
+	stack_max = 64,
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.25, -0.5, -0.25, 0.25, -0.375, 0.25},
+			{-0.0625, -0.375, -0.0625, 0.0625, 0, 0.0625},
+			{-0.3125, 0, -0.3125, 0.3125, 0.5, 0.3125},
+		}
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125},
+	},
+	is_ground_content = false,
+	light_source = minetest.LIGHT_MAX,
+	groups = {handy=1, axey=1, attached_node=1, material_wood=1, deco_block=1, flammable=-1},
+	sounds = mcl_sounds.node_sound_wood_defaults(),
+	_mcl_blast_resistance = 0.9,
+	_mcl_hardness = 0.9,
+})
+minetest.register_craft({
+	output = "mcl_decor:table_lamp 3",
+	recipe = {
+		{"group:wool", "group:wool", "group:wool"},
+		{"group:wool", "mcl_torches:torch", "group:wool"},
+		{"group:stone", "group:stone", "group:stone"}
+	}
+})
 
 
 --- Tables and Chairs ---
diff --git a/textures/mcl_decor_table_lamp.png b/textures/mcl_decor_table_lamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3ae6aef1d6b8ea70dab35f4665d0ac2b7ec3bcf
GIT binary patch
literal 368
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufG}g$wN6f;23AiO#}EtuWQku5f?mxBw@$YHS6}gON@H|D
z$HUjZ%Xz%m(h@$F>(4h*=#FMpIsA2@M8U@gzy4>N%Qt=6z-(=+$~JvR%nmy>4PLf2
zGIJ7U&F<#bW@FT|<KSi1U~8De$?S9Au3_UI7G{aV2e$j)U!cR`VCdiwBz1}@>rzm<
zN55c#!LwZlKYYHNzCwdh{LjCSvZtCD$~5cSe)Io#suXCr&bq;Xq4E9tcLr-_Y;Sq^
zF5a>&JYS%#<J4(~NPz}pp17LFtdIS9_VE1Q!Lncx56^meyT(ll3`ZFPY?=>T&%eJR
zNx*@hc}ht^&fz=%73`Zt4rWYP_~?@sPdJ}!L$~tsW<`Dp2?mQbStk4|o>c%tiNVv=
K&t;ucLK6Uis)#}W

literal 0
HcmV?d00001

diff --git a/textures/mcl_decor_table_lamp_side.png b/textures/mcl_decor_table_lamp_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..8638f0637803716556c820ee0349272a85b41051
GIT binary patch
literal 529
zcmV+s0`C2ZP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0j5brK~y+TrIF7{
z0#Ovk&kP7Prlnz`5k|EzD5yo&14OlM)dTbbLA$_x579H!vPA@Kg4#&5(7+%u6_flk
z<|w$Z`93=`)vkVUx#!+F-#Op8W87Yx4g8_7bQ*P;ip@&1QW8Bctfd6htEF%E$m{pI
z;u{+m<KgCffB@hUSm7B71cHp)ZCjlB8)I)Ca%#^xF;UTH1-Jmt09~<EtROF%SYqth
zj+n5+gPRC3Z1$Zt@6;x`VTTyb)Rh&q#6%JVNQf*Znd}vZqwc);{w1y!@}p*SpmPCy
zz(O(#L5yxX9%7&mNe6gcph>Lk76A~TyN*QLZecj(S>FJi6ubfO3IUzDZuJftI4}-&
zHU_C=TrThO{II^9;9e-#BoU8{;(E(rJRhHy(BuT;>-(&jj9m6Mhrg!L`rxkM9P|(0
z31UU_Os$+NHn_i(-`NplvIXux@iw6Y6$9-8`#KId++C66T!;<4umC<N+p96z-&z=T
zQNe4o#~s+6u4JByjDI<}daN)RLhlGwyUztMb|_#mHcrzg14e(uNFN{lqkzaKGxha&
TqHXj;00000NkvXXu0mjfPmtsd

literal 0
HcmV?d00001