Merge branch 'master' of yunohost.local:minetest-mods/quartz into nalc-1.2-dev

The existing recipe(s) never seem to work. I can craft multiple kinds of quartz slabs using the crafting UI, a circular saw, or an xdecor Work Bench, but none of fit back together to form chiselled quartz.

README.txt

@@ -12,10 +12,11 @@ License: MIT (see LICENSE.txt)
 Dependencies:
 default (found in minetest_game)
 stairs (found in minetest_game)
-moreblocks (optional, for stairsplus support)
+intllib (optional, for translations)
+moreblocks or stairsplus (optional, for stairsplus support)
 
-Please report bugs at the github issue tracker:
-https://github.com/4Evergreen4/quartz/issues/
+Please report bugs at the GitHub issue tracker:
+https://github.com/minetest-mods/quartz/issues/
 
 Crafting:
 
@@ -80,3 +81,6 @@ x|x|x
 x|c|x
 -----
 x|x|x
+
+If you have stairsplus (or moreblocks) installed, you will be able to use
+circular saws to cut quartz blocks.

depends.txt

@@ -1,3 +1,5 @@
 default
 stairs
+intllib?
 moreblocks?
+stairsplus?

description.txt

@@ -1 +1 @@
-Adds quartz ore and some decorative quartz blocks
+Adds quartz ore and some decorative quartz blocks.

init.lua

@@ -1,4 +1,8 @@
-dofile(minetest.get_modpath("quartz").."/settings.txt")
+local settings = Settings(minetest.get_modpath("quartz").."/settings.txt")
+
+-- internationalization boilerplate
+local MP = minetest.get_modpath(minetest.get_current_modname())
+local S, NS = dofile(MP.."/intllib.lua")
 
 --
 --  Item Registration
@@ -6,11 +10,11 @@ dofile(minetest.get_modpath("quartz").."/settings.txt")
 
 --  Quartz Crystal
 minetest.register_craftitem("quartz:quartz_crystal", {
-	description = "Quartz Crystal",
+	description = S("Quartz Crystal"),
 	inventory_image = "quartz_crystal_full.png",
 })
 minetest.register_craftitem("quartz:quartz_crystal_piece", {
-	description = "Quartz Crystal Piece",
+	description = S("Quartz Crystal Piece"),
 	inventory_image = "quartz_crystal_piece.png",
 })
 
@@ -20,7 +24,7 @@ minetest.register_craftitem("quartz:quartz_crystal_piece", {
 
 --  Ore
 minetest.register_node("quartz:quartz_ore", {
-	description = "Quartz Ore",
+	description = S("Quartz Ore"),
 	tiles = {"default_stone.png^quartz_ore.png"},
 	groups = {cracky=3, stone=1},
 	drop = 'quartz:quartz_crystal',
@@ -40,7 +44,7 @@ minetest.register_ore({
 
 -- Quartz Block
 minetest.register_node("quartz:block", {
-	description = "Quartz Block",
+	description = S("Quartz Block"),
 	tiles = {"quartz_block.png"},
 	groups = {cracky=3, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_glass_defaults(),
@@ -48,7 +52,7 @@ minetest.register_node("quartz:block", {
 
 -- Chiseled Quartz
 minetest.register_node("quartz:chiseled", {
-	description = "Chiseled Quartz",
+	description = S("Chiseled Quartz"),
 	tiles = {"quartz_chiseled.png"},
 	groups = {cracky=3, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_glass_defaults(),
@@ -56,29 +60,15 @@ minetest.register_node("quartz:chiseled", {
 
 -- Quartz Pillar
 minetest.register_node("quartz:pillar", {
-	description = "Quartz Pillar",
+	description = S("Quartz Pillar"),
 	paramtype2 = "facedir",
-	tiles = {"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"},
+	tiles = {"quartz_pillar_top.png", "quartz_pillar_top.png",
+		"quartz_pillar_side.png"},
 	groups = {cracky=3, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })
 
--- Stairs & Slabs
-stairs.register_stair_and_slab("quartzblock", "quartz:block",
-		{cracky=3, oddly_breakable_by_hand=1},
-		{"quartz_block.png"},
-		"Quartz stair",
-		"Quartz slab",
-		default.node_sound_glass_defaults())
-
-stairs.register_slab("quartzstair", "quartz:pillar",
-		{cracky=3, oddly_breakable_by_hand=1},
-		{"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"},
-		"Quartz Pillar stair",
-		"Quartz Pillar slab",
-		default.node_sound_glass_defaults())
-
 --
 -- Crafting
 --
@@ -103,20 +93,10 @@ minetest.register_craft({
 
 -- Chiseled Quartz
 minetest.register_craft({
-	output = 'quartz:chiseled 2',
+	output = 'quartz:chiseled 4',
 	recipe = {
-		{'stairs:slab_quartzblock', '', ''},
-		{'stairs:slab_quartzblock', '', ''},
-		{'', '', ''},
-	}
-})
-
--- Chiseled Quartz (for stairsplus)
-minetest.register_craft({
-	output = 'quartz:chiseled 2',
-	recipe = {
-		{'quartz:slab_block', '', ''},
-		{'quartz:slab_block', '', ''},
+		{'quartz:block', 'quartz:block', ''},
+		{'quartz:block', 'quartz:block', ''},
 		{'',             '',             ''},
 	}
 })
@@ -153,49 +133,65 @@ minetest.register_abm({
 -- Compatibility with stairsplus
 --
 
-if minetest.get_modpath("moreblocks") and enable_stairsplus then
-	register_stair_slab_panel_micro("quartz", "block", "quartz:block",
-		{cracky=3},
+if minetest.global_exists("stairsplus") then
+	local nodename = "quartz:block"
+	local ndef = table.copy(minetest.registered_nodes[nodename])
+	ndef.sunlight_propagates = true
+	ndef.place_param2 = nil
+	stairsplus:register_all("quartz", "block", nodename, ndef)
+
+	nodename = "quartz:chiseled"
+	ndef = table.copy(minetest.registered_nodes[nodename])
+	ndef.sunlight_propagates = true
+	ndef.place_param2 = nil
+	stairsplus:register_all("quartz", "chiseled", nodename, ndef)
+
+	nodename = "quartz:pillar"
+	ndef = table.copy(minetest.registered_nodes[nodename])
+	ndef.sunlight_propagates = true
+	ndef.place_param2 = nil
+	stairsplus:register_all("quartz", "pillar", nodename, ndef)
+
+	minetest.register_alias("stairs:stair_quartzblock", "quartz:stair_block")
+	minetest.register_alias("stairs:slab_quartzblock", "quartz:slab_block")
+	minetest.register_alias("stairs:stair_quartzstair", "quartz:stair_pillar")
+	minetest.register_alias("stairs:slab_quartzstair", "quartz:slab_pillar")
+else
+	-- Stairs & Slabs
+	stairs.register_stair_and_slab("quartzblock", "quartz:block",
+		{cracky=3, oddly_breakable_by_hand=1},
 		{"quartz_block.png"},
-		"Quartz Block",
-		"block",
-		0
-	)
+		S("Quartz stair"),
+		S("Quartz slab"),
+		default.node_sound_glass_defaults())
 
-	register_stair_slab_panel_micro("quartz", "chiseled", "quartz:chiseled",
-		{cracky=3},
-		{"quartz_chiseled.png"},
-		"Chiseled Quartz",
-		"chiseled",
-		0
-	)
-
-	register_stair_slab_panel_micro("quartz", "pillar", "quartz:pillar",
-		{cracky=3},
-		{"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"},
-		"Quartz Pillar",
-		"pillar",
-		0
-	)
-
-	table.insert(circular_saw.known_stairs, "quartz:block")
-	table.insert(circular_saw.known_stairs, "quartz:chiseled")
-	table.insert(circular_saw.known_stairs, "quartz:pillar")
+	stairs.register_stair_and_slab("quartzstair", "quartz:pillar",
+		{cracky=3, oddly_breakable_by_hand=1},
+		{"quartz_pillar_top.png", "quartz_pillar_top.png",
+			"quartz_pillar_side.png"},
+		S("Quartz Pillar stair"),
+		S("Quartz Pillar slab"),
+		default.node_sound_glass_defaults())
 end
 
 --
 -- Deprecated
 --
 
-if enable_horizontal_pillar then
+if settings:get_bool("ENABLE_HORIZONTAL_PILLAR") then
 	-- Quartz Pillar (horizontal)
 	minetest.register_node("quartz:pillar_horizontal", {
 			description = "Quartz Pillar Horizontal",
-			tiles = {"quartz_pillar_side.png", "quartz_pillar_side.png", "quartz_pillar_side.png^[transformR90",
-			"quartz_pillar_side.png^[transformR90", "quartz_pillar_top.png", "quartz_pillar_top.png"},
+			tiles = {"quartz_pillar_side.png", "quartz_pillar_side.png",
+				"quartz_pillar_side.png^[transformR90",
+				"quartz_pillar_side.png^[transformR90", "quartz_pillar_top.png",
+				"quartz_pillar_top.png"},
 			paramtype2 = "facedir",
 			drop = 'quartz:pillar',
-			groups = {cracky=3, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
+			groups = {cracky=3, oddly_breakable_by_hand=1,
+				not_in_creative_inventory=1},
 			sounds = default.node_sound_glass_defaults(),
 	})
 end
+
+minetest.log("action", "[quartz] loaded.")

intllib.lua

@@ -0,0 +1,45 @@
+
+-- Fallback functions for when `intllib` is not installed.
+-- Code released under Unlicense <http://unlicense.org>.
+
+-- Get the latest version of this file at:
+--   https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua
+
+local function format(str, ...)
+	local args = { ... }
+	local function repl(escape, open, num, close)
+		if escape == "" then
+			local replacement = tostring(args[tonumber(num)])
+			if open == "" then
+				replacement = replacement..close
+			end
+			return replacement
+		else
+			return "@"..open..num..close
+		end
+	end
+	return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl))
+end
+
+local gettext, ngettext
+if minetest.get_modpath("intllib") then
+	if intllib.make_gettext_pair then
+		-- New method using gettext.
+		gettext, ngettext = intllib.make_gettext_pair()
+	else
+		-- Old method using text files.
+		gettext = intllib.Getter()
+	end
+end
+
+-- Fill in missing functions.
+
+gettext = gettext or function(msgid, ...)
+	return format(msgid, ...)
+end
+
+ngettext = ngettext or function(msgid, msgid_plural, n, ...)
+	return format(n==1 and msgid or msgid_plural, ...)
+end
+
+return gettext, ngettext

locale/es.po

@@ -0,0 +1,59 @@
+# Spanish translations for PACKAGE package
+# Traducciones al español para el paquete PACKAGE.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Diego Martínez <kaeza@users.noreply.github.com>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-19 21:50-0700\n"
+"PO-Revision-Date: 2017-02-20 15:03-0300\n"
+"Last-Translator: Diego Martínez <kaeza@users.noreply.github.com>\n"
+"Language-Team: Spanish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: init.lua:13
+msgid "Quartz Crystal"
+msgstr "Cristal de cuarzo"
+
+#: init.lua:17
+msgid "Quartz Crystal Piece"
+msgstr "Trozo de cristal de cuarzo"
+
+#: init.lua:27
+msgid "Quartz Ore"
+msgstr "Mineral de cuarzo"
+
+#: init.lua:47
+msgid "Quartz Block"
+msgstr "Bloque de cuarzo"
+
+#: init.lua:55
+msgid "Chiseled Quartz"
+msgstr "Cuarzo cincelado"
+
+#: init.lua:63
+msgid "Quartz Pillar"
+msgstr "Pilar de cuarzo"
+
+#: init.lua:75
+msgid "Quartz stair"
+msgstr "Escaleras de cuarzo"
+
+#: init.lua:76
+msgid "Quartz slab"
+msgstr "Losa de cuarzo"
+
+#: init.lua:82
+msgid "Quartz Pillar stair"
+msgstr "Escaleras de pilar de cuarzo"
+
+#: init.lua:83
+msgid "Quartz Pillar slab"
+msgstr "Losa de pilar de cuarzo"

locale/fr.po

@@ -0,0 +1,54 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-04 07:46+0100\n"
+"PO-Revision-Date: 2017-03-04 07:48+0100\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.9\n"
+"Last-Translator: Peppy <peppy@twang-factory.com>\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Language: fr\n"
+
+#: init.lua:13
+msgid "Quartz Crystal"
+msgstr "Cristal de quartz"
+
+#: init.lua:17
+msgid "Quartz Crystal Piece"
+msgstr "Morceau de cristal de quartz"
+
+#: init.lua:27
+msgid "Quartz Ore"
+msgstr "Minerai de quartz"
+
+#: init.lua:47
+msgid "Quartz Block"
+msgstr "Bloc de quartz"
+
+#: init.lua:55
+msgid "Chiseled Quartz"
+msgstr "Quartz ciselé"
+
+#: init.lua:63
+msgid "Quartz Pillar"
+msgstr "Pilier en quartz"
+
+#: init.lua:75
+msgid "Quartz stair"
+msgstr "Escalier en quartz"
+
+#: init.lua:76
+msgid "Quartz slab"
+msgstr "Dalle en quartz"
+
+#: init.lua:82
+msgid "Quartz Pillar stair"
+msgstr "Escalier en pilier en quartz"
+
+#: init.lua:83
+msgid "Quartz Pillar slab"
+msgstr "Dalle en pilier en quartz"

locale/pt_br.po

@@ -0,0 +1,57 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-19 21:50-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: init.lua:13
+msgid "Quartz Crystal"
+msgstr "Cristal de Quartzo"
+
+#: init.lua:17
+msgid "Quartz Crystal Piece"
+msgstr "Pedaço de Cristal de Quartzo"
+
+#: init.lua:27
+msgid "Quartz Ore"
+msgstr "Minério de Quartzo"
+
+#: init.lua:47
+msgid "Quartz Block"
+msgstr "Bloco de Quartzo"
+
+#: init.lua:55
+msgid "Chiseled Quartz"
+msgstr "Quartzo Cinzelado"
+
+#: init.lua:63
+msgid "Quartz Pillar"
+msgstr "Pilar de Quartzo"
+
+#: init.lua:75
+msgid "Quartz stair"
+msgstr "Escada de quartzo"
+
+#: init.lua:76
+msgid "Quartz slab"
+msgstr "Laje de quartzo"
+
+#: init.lua:82
+msgid "Quartz Pillar stair"
+msgstr "Escada de Pilar de Quartzo"
+
+#: init.lua:83
+msgid "Quartz Pillar slab"
+msgstr "Laje de Pilar de Quartzo"

locale/template.pot

@@ -0,0 +1,57 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-19 21:50-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: init.lua:13
+msgid "Quartz Crystal"
+msgstr ""
+
+#: init.lua:17
+msgid "Quartz Crystal Piece"
+msgstr ""
+
+#: init.lua:27
+msgid "Quartz Ore"
+msgstr ""
+
+#: init.lua:47
+msgid "Quartz Block"
+msgstr ""
+
+#: init.lua:55
+msgid "Chiseled Quartz"
+msgstr ""
+
+#: init.lua:63
+msgid "Quartz Pillar"
+msgstr ""
+
+#: init.lua:75
+msgid "Quartz stair"
+msgstr ""
+
+#: init.lua:76
+msgid "Quartz slab"
+msgstr ""
+
+#: init.lua:82
+msgid "Quartz Pillar stair"
+msgstr ""
+
+#: init.lua:83
+msgid "Quartz Pillar slab"
+msgstr ""

mod.conf

@@ -1 +1,4 @@
 name             = quartz
+description      = Adds quartz ore and some decorative quartz blocks.
+depends          = default,stairs
+optional_depends = intllib,moreblocks,stairsplus

settings.txt

@@ -1,7 +1,7 @@
--- Set this to true to allow usage of the stairsplus mod in moreblocks
+# Set this to true to allow usage of the stairsplus mod in moreblocks
 
-enable_stairsplus = false
+ENABLE_STAIRSPLUS = true
 
--- This enables the old horizontal pillar block(deprecated, be sure to convert them back to normal pillars)
+# This enables the old horizontal pillar block(deprecated, be sure to convert them back to normal pillars)
 
-enable_horizontal_pillar = true
+ENABLE_HORIZONTAL_PILLAR = true