From c9c6a983606418402f6bc03d7054727ba28f6aaf Mon Sep 17 00:00:00 2001
From: root <root@runs-PC.runs.es>
Date: Thu, 30 Jul 2020 14:09:18 +0200
Subject: [PATCH] lapis mod fixed

---
 mods/{lapislazuli => lapis}/README.md         |   0
 mods/{lapislazuli => lapis}/columns.lua       |   0
 mods/{lapislazuli => lapis}/init.lua          |  72 +++++++++---------
 mods/lapis/locale/lapis.es.tr                 |  23 ++++++
 mods/lapis/mod.conf                           |   4 +
 mods/{lapislazuli => lapis}/textures/License  |   0
 .../textures/lapis_block.png                  | Bin
 .../textures/lapis_brick.png                  | Bin
 .../textures/lapis_brick_side.png             | Bin
 .../textures/lapis_brick_top.png              | Bin
 .../textures/lapis_cobble.png                 | Bin
 .../textures/lapis_lazurite_block.png         | Bin
 .../textures/lapis_lazurite_brick.png         | Bin
 .../textures/lapis_lazurite_brick_side.png    | Bin
 .../textures/lapis_lazurite_brick_top.png     | Bin
 .../textures/lapis_mineral_pyrite.png         | Bin
 .../textures/lapis_pyrite_block.png           | Bin
 .../textures/lapis_pyrite_ingot.png           | Bin
 .../textures/lapis_pyrite_nugget.png          | Bin
 .../textures/lapis_pyrite_sacred.png          | Bin
 .../textures/lapis_rosace_front.png           | Bin
 .../textures/lapis_rosace_side.png            | Bin
 .../textures/lapis_stone.png                  | Bin
 .../textures/lapis_tile.png                   | Bin
 mods/lapislazuli/depends.txt                  |   3 -
 mods/lapislazuli/mod.conf                     |   1 -
 26 files changed, 64 insertions(+), 39 deletions(-)
 rename mods/{lapislazuli => lapis}/README.md (100%)
 rename mods/{lapislazuli => lapis}/columns.lua (100%)
 rename mods/{lapislazuli => lapis}/init.lua (85%)
 create mode 100644 mods/lapis/locale/lapis.es.tr
 create mode 100755 mods/lapis/mod.conf
 rename mods/{lapislazuli => lapis}/textures/License (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_block.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_brick.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_brick_side.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_brick_top.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_cobble.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_lazurite_block.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_lazurite_brick.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_lazurite_brick_side.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_lazurite_brick_top.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_mineral_pyrite.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_pyrite_block.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_pyrite_ingot.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_pyrite_nugget.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_pyrite_sacred.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_rosace_front.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_rosace_side.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_stone.png (100%)
 rename mods/{lapislazuli => lapis}/textures/lapis_tile.png (100%)
 delete mode 100755 mods/lapislazuli/depends.txt
 delete mode 100755 mods/lapislazuli/mod.conf

diff --git a/mods/lapislazuli/README.md b/mods/lapis/README.md
similarity index 100%
rename from mods/lapislazuli/README.md
rename to mods/lapis/README.md
diff --git a/mods/lapislazuli/columns.lua b/mods/lapis/columns.lua
similarity index 100%
rename from mods/lapislazuli/columns.lua
rename to mods/lapis/columns.lua
diff --git a/mods/lapislazuli/init.lua b/mods/lapis/init.lua
similarity index 85%
rename from mods/lapislazuli/init.lua
rename to mods/lapis/init.lua
index f9c73b9..5b89a30 100755
--- a/mods/lapislazuli/init.lua
+++ b/mods/lapis/init.lua
@@ -2,12 +2,14 @@ screwdriver = screwdriver or {}
 
 --dofile(minetest.get_modpath("lapis").."/columns.lua")
 
+local S = minetest.get_translator(minetest.get_current_modname())
+
 ----------
 --Nodes
 ----------
 
-minetest.register_node( "lapis:lapis_block",  {
-   description = "Lapislázuli con calcita",
+minetest.register_node("lapis:lapis_block",  {
+   description = S("Lapis with Calcite"),
    tiles = {"lapis_block.png"},
    paramtype = "light",
    is_ground_content = true,
@@ -22,8 +24,8 @@ minetest.register_node( "lapis:lapis_block",  {
    sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node( "lapis:lapis_brick",  {
-   description = "Ladrillo de lapislázuli",
+minetest.register_node("lapis:lapis_brick",  {
+   description = S("Lapis Brick"),
    tiles = {
    "lapis_brick_top.png",
    "lapis_brick_top.png^[transformFXR90",
@@ -41,8 +43,8 @@ minetest.register_node( "lapis:lapis_brick",  {
    sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node( "lapis:lapis_cobble",  {
-   description = "Bloque de lapislázuli",
+minetest.register_node("lapis:lapis_cobble",  {
+   description = S("Cobbled Lapis"),
    tiles = {
    "lapis_cobble.png",
    "lapis_cobble.png^[transformFY",
@@ -58,7 +60,7 @@ minetest.register_node( "lapis:lapis_cobble",  {
 })
 
 minetest.register_node( "lapis:lazurite_block",  {
-   description = "Lazurita",
+   description = S("Lazurite"),
    tiles = {"lapis_lazurite_block.png"},
    paramtype = "light",
    is_ground_content = true,
@@ -67,7 +69,7 @@ minetest.register_node( "lapis:lazurite_block",  {
 })
 
 minetest.register_node( "lapis:lazurite_brick",  {
-   description = "Ladrillo de lazurita",
+   description = S("Lazurite Brick"),
    tiles = {
    "lapis_lazurite_brick_top.png",
    "lapis_lazurite_brick_top.png^[transformFXR90",
@@ -86,7 +88,7 @@ minetest.register_node( "lapis:lazurite_brick",  {
 })
 
 minetest.register_node( "lapis:lapis_tile",  {
-   description = "Mosaico de lapislázuli",
+   description = S("Lapis Floor Tile"),
    tiles = {"lapis_tile.png" },
    is_ground_content = false,
    paramtype = 'light',
@@ -95,7 +97,7 @@ minetest.register_node( "lapis:lapis_tile",  {
    })
 
 minetest.register_node( "lapis:pyrite_ore",  {
-   description = "Mineral de pirita",
+   description = S("Pyrite Ore"),
    tiles = {"default_stone.png^lapis_mineral_pyrite.png" },
    paramtype = "light",
    is_ground_content = true,
@@ -105,7 +107,7 @@ minetest.register_node( "lapis:pyrite_ore",  {
 })
 
 minetest.register_node( "lapis:pyrite_block",  {
-   description = "Bloque de pirita",
+   description = S("Pyrite Block"),
    tiles = {
    "lapis_pyrite_sacred.png",
    "lapis_pyrite_sacred.png",
@@ -123,7 +125,7 @@ minetest.register_node( "lapis:pyrite_block",  {
 })
 --Unused Rosace Stone from Darkage mod
 minetest.register_node("lapis:rosace", {
-	description = "Piedra rosa",
+	description = S("Rose Stone"),
 	tiles = {"lapis_rosace_front.png",
 	"lapis_rosace_front.png",
 	"lapis_rosace_side.png^[transformFX",
@@ -144,14 +146,14 @@ minetest.register_node("lapis:rosace", {
 	if minetest.get_modpath("moreblocks") then
 
 	stairsplus:register_all("lapis", "lapis_block", "lapis:lapis_block", {
-	description = ("Lapislázuli con calcita"),
+	description = S("Lapis with Calcite"),
 	tiles = {"lapis_block.png"},
 	groups = {cracky = 3},
 	sounds = default.node_sound_stone_defaults(),
 	})
 
 	stairsplus:register_all("lapis", "lapis_brick", "lapis:lapis_brick", {
-	description = ("Ladrillo de lapislázuli"),
+	description = S("Lapis Brick"),
 	tiles = {"lapis_brick_top.png",
    "lapis_brick_top.png^[transformFXR90",
    "lapis_brick_side.png",
@@ -163,7 +165,7 @@ minetest.register_node("lapis:rosace", {
 	})
 
 	stairsplus:register_all("lapis", "lapis_cobble", "lapis:lapis_cobble", {
-	description = ("Bloque de lapislázuli"),
+	description = S("Cobbled Lapis"),
 	tiles = {"lapis_cobble.png",
    "lapis_cobble.png^[transformFY",
    "lapis_cobble.png^[transformFX",
@@ -175,14 +177,14 @@ minetest.register_node("lapis:rosace", {
 	})
 
 	stairsplus:register_all("lapis", "lapis_lazurite_block", "lapis:lazurite_block", {
-	description = ("Lazurita"),
+	description = S("Lazurite"),
 	tiles = {"lapis_lazurite_block.png"},
 	groups = {cracky = 3},
 	sounds = default.node_sound_stone_defaults(),
 	})
 
 	stairsplus:register_all("lapis", "lapis_lazurite_brick", "lapis:lazurite_brick", {
-	description = ("Ladrillo de lazurita"),
+	description = S("Lazurite Brick"),
 	tiles = {"lapis_lazurite_brick_top.png",
    "lapis_lazurite_brick_top.png^[transformFXR90",
    "lapis_lazurite_brick_side.png",
@@ -194,14 +196,14 @@ minetest.register_node("lapis:rosace", {
 	})
 
 	stairsplus:register_all("lapis", "lapis_tile", "lapis:lapis_tile", {
-	description = ("Mosaico de lapislázuli"),
+	description = S("Lapis Floor Tile"),
 	tiles = {"lapis_tile.png"},
 	groups = {cracky = 3},
 	sounds = default.node_sound_stone_defaults(),
 	})
 
 	stairsplus:register_all("lapis", "pyrite_block", "lapis:pyrite_block", {
-	description = ("Bloque de pirita"),
+	description = S("Pyrite Block"),
 	tiles = {"lapis_pyrite_block.png"},
 	groups = {cracky = 2},
 	sounds = default.node_sound_metal_defaults({
@@ -215,36 +217,36 @@ minetest.register_node("lapis:rosace", {
 	stairs.register_stair_and_slab("lapis_block", "lapis:lapis_block",
 	{cracky = 3},
 	{"lapis_block.png"},
-	"Escalera de lapislázuli",
-	"Losa de lapislázuli",
+	S("Lapis Stair"),
+	S("Lapis Slab"),
 	default.node_sound_stone_defaults())
 
 	stairs.register_stair_and_slab("lapis_brick", "lapis:lapis_brick",
 	{cracky = 3},
 	{"lapis_brick.png"},
-	"Escalera de ladrillo de lapislázuli",
-	"Losa de ladrillo de lapislázuli",
+	S("Lapis Brick Stair"),
+	S("Lapis Brick Slab"),
 	default.node_sound_stone_defaults())
-	
+
 	stairs.register_stair_and_slab("lapis_cobble", "lapis:lapis_cobble",
 	{cracky = 3},
 	{"lapis_cobble.png"},
-	"Escalera de bloques de lapislázuli",
-	"Losa de bloques de lapislázuli",
+	S("Lapis Cobble Stair"),
+	S("Lapis Cobble Slab"),
 	default.node_sound_stone_defaults())
-	
+
 	stairs.register_stair_and_slab("lazurite", "lapis:lazurite_block",
 	{cracky = 3},
 	{"lapis_lazurite_block.png"},
-	"Escalera de lazurita",
-	"Losa de lazurita",
+	S("Lazurite Stair"),
+	S("Lazurite Slab"),
 	default.node_sound_stone_defaults())
 
 	stairs.register_stair_and_slab("lazurite_brick", "lapis:lazurite_brick",
 	{cracky = 3},
 	{"lapis_lazurite_brick.png"},
-	"Escalera de ladrillo de lazurita",
-	"Losa de ladrillo de lazurita",
+	S("Lazurite Brick Stair"),
+	S("Lazurite Brick Slab"),
 	default.node_sound_stone_defaults())
 	end
 
@@ -253,17 +255,17 @@ minetest.register_node("lapis:rosace", {
 ---------------
 
 minetest.register_craftitem("lapis:lapis_stone", {
-	description = "Lapislázuli",
+	description = S("Lapis Gemstone"),
 	inventory_image = "lapis_stone.png",
 })
 
 minetest.register_craftitem("lapis:pyrite_ingot", {
-	description = "Lingote de pirita",
+	description = S("Pyrite Ingot"),
 	inventory_image = "lapis_pyrite_ingot.png",
 })
 
 minetest.register_craftitem("lapis:pyrite_lump", {
-	description = "Pepita de pirita",
+	description = S("Fool's Gold"),
 	inventory_image = "lapis_pyrite_nugget.png",
 })
 
@@ -373,7 +375,7 @@ minetest.register_ore({
 		column_height_max = 3,
 		column_midpoint_factor = 0.5,
 		y_min = -500,
-		y_max = 200,
+		y_max = -20,
 		noise_threshhold = 1.25,
 		noise_params = {offset=0, scale=2, spread={x=20, y=20, z=10}, seed= 10 , octaves=2, persist=0.8}
 	})
diff --git a/mods/lapis/locale/lapis.es.tr b/mods/lapis/locale/lapis.es.tr
new file mode 100644
index 0000000..b190842
--- /dev/null
+++ b/mods/lapis/locale/lapis.es.tr
@@ -0,0 +1,23 @@
+# textdomain: lapis
+Cobbled Lapis=Bloque de lapislázuli
+Lazurite=Lazurita
+Lapis Brick=Ladrillo de lapislázuli
+Lapis with Calcite=Lapislázuli con calcita
+Lazurite Brick=Ladrillo de lazurita
+Lapis Floor Tile=Mosaico de lapislázuli
+Pyrite Ore=Mineral de pirita
+Pyrite Block=Bloque de pirita
+Rose Stone=Piedra rosa
+Lapis Stair=Escaleras de lapislázuli
+Lapis Slab=Losa de lapislázuli
+Lapis Cobble Stair=Escaleras de bloques de lapislázuli
+Lapis Cobble Slab=Losa de bloques de lapislázuli
+Lapis Brick Stair=Escaleras de ladrillo de lapislázuli
+Lapis Brick Slab=Losa de ladrillo de lapislázuli
+Lazurite Stair=Escalera de lazurita
+Lazurite Slab=Losa de lazurita
+Lazurite Brick Stair=Escaleras de ladrillo de lazurita
+Lazurite Brick Slab=Losa de ladrillo de lazurita
+Lapis Gemstone=Lapislázuli
+Pyrite Ingot=Lingote de pirita
+Fool's Gold=Pepita de pirita
diff --git a/mods/lapis/mod.conf b/mods/lapis/mod.conf
new file mode 100755
index 0000000..476fcbe
--- /dev/null
+++ b/mods/lapis/mod.conf
@@ -0,0 +1,4 @@
+name = lapis
+description = Lapislazuli Stuff
+depends = default
+optional_depends = moreblocks, stairs
diff --git a/mods/lapislazuli/textures/License b/mods/lapis/textures/License
similarity index 100%
rename from mods/lapislazuli/textures/License
rename to mods/lapis/textures/License
diff --git a/mods/lapislazuli/textures/lapis_block.png b/mods/lapis/textures/lapis_block.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_block.png
rename to mods/lapis/textures/lapis_block.png
diff --git a/mods/lapislazuli/textures/lapis_brick.png b/mods/lapis/textures/lapis_brick.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_brick.png
rename to mods/lapis/textures/lapis_brick.png
diff --git a/mods/lapislazuli/textures/lapis_brick_side.png b/mods/lapis/textures/lapis_brick_side.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_brick_side.png
rename to mods/lapis/textures/lapis_brick_side.png
diff --git a/mods/lapislazuli/textures/lapis_brick_top.png b/mods/lapis/textures/lapis_brick_top.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_brick_top.png
rename to mods/lapis/textures/lapis_brick_top.png
diff --git a/mods/lapislazuli/textures/lapis_cobble.png b/mods/lapis/textures/lapis_cobble.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_cobble.png
rename to mods/lapis/textures/lapis_cobble.png
diff --git a/mods/lapislazuli/textures/lapis_lazurite_block.png b/mods/lapis/textures/lapis_lazurite_block.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_lazurite_block.png
rename to mods/lapis/textures/lapis_lazurite_block.png
diff --git a/mods/lapislazuli/textures/lapis_lazurite_brick.png b/mods/lapis/textures/lapis_lazurite_brick.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_lazurite_brick.png
rename to mods/lapis/textures/lapis_lazurite_brick.png
diff --git a/mods/lapislazuli/textures/lapis_lazurite_brick_side.png b/mods/lapis/textures/lapis_lazurite_brick_side.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_lazurite_brick_side.png
rename to mods/lapis/textures/lapis_lazurite_brick_side.png
diff --git a/mods/lapislazuli/textures/lapis_lazurite_brick_top.png b/mods/lapis/textures/lapis_lazurite_brick_top.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_lazurite_brick_top.png
rename to mods/lapis/textures/lapis_lazurite_brick_top.png
diff --git a/mods/lapislazuli/textures/lapis_mineral_pyrite.png b/mods/lapis/textures/lapis_mineral_pyrite.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_mineral_pyrite.png
rename to mods/lapis/textures/lapis_mineral_pyrite.png
diff --git a/mods/lapislazuli/textures/lapis_pyrite_block.png b/mods/lapis/textures/lapis_pyrite_block.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_pyrite_block.png
rename to mods/lapis/textures/lapis_pyrite_block.png
diff --git a/mods/lapislazuli/textures/lapis_pyrite_ingot.png b/mods/lapis/textures/lapis_pyrite_ingot.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_pyrite_ingot.png
rename to mods/lapis/textures/lapis_pyrite_ingot.png
diff --git a/mods/lapislazuli/textures/lapis_pyrite_nugget.png b/mods/lapis/textures/lapis_pyrite_nugget.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_pyrite_nugget.png
rename to mods/lapis/textures/lapis_pyrite_nugget.png
diff --git a/mods/lapislazuli/textures/lapis_pyrite_sacred.png b/mods/lapis/textures/lapis_pyrite_sacred.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_pyrite_sacred.png
rename to mods/lapis/textures/lapis_pyrite_sacred.png
diff --git a/mods/lapislazuli/textures/lapis_rosace_front.png b/mods/lapis/textures/lapis_rosace_front.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_rosace_front.png
rename to mods/lapis/textures/lapis_rosace_front.png
diff --git a/mods/lapislazuli/textures/lapis_rosace_side.png b/mods/lapis/textures/lapis_rosace_side.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_rosace_side.png
rename to mods/lapis/textures/lapis_rosace_side.png
diff --git a/mods/lapislazuli/textures/lapis_stone.png b/mods/lapis/textures/lapis_stone.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_stone.png
rename to mods/lapis/textures/lapis_stone.png
diff --git a/mods/lapislazuli/textures/lapis_tile.png b/mods/lapis/textures/lapis_tile.png
similarity index 100%
rename from mods/lapislazuli/textures/lapis_tile.png
rename to mods/lapis/textures/lapis_tile.png
diff --git a/mods/lapislazuli/depends.txt b/mods/lapislazuli/depends.txt
deleted file mode 100755
index 7c7d288..0000000
--- a/mods/lapislazuli/depends.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-default
-moreblocks?
-stairs?
diff --git a/mods/lapislazuli/mod.conf b/mods/lapislazuli/mod.conf
deleted file mode 100755
index 95f18cc..0000000
--- a/mods/lapislazuli/mod.conf
+++ /dev/null
@@ -1 +0,0 @@
-name = lapis