Merge branch 'master' into nalc-1.2

.luacheckrc

@@ -25,10 +25,7 @@ stds.minetest = {
 }
 
 read_globals = {
-	"carts",
 	"farming",
-	"frame",
 	"intllib",
 	"mg",
-	"toolranks",
 }

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v2.1.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace

.travis.yml

@@ -1,16 +1,16 @@
-dist: bionic
+language: generic
-language: python
 
-python:
+addons:
-  - 3.7.1
+  apt:
+    packages:
+    - luarocks
 
 install:
-  - sudo apt-get update -qq
+  - pyenv global 3.6.3
-  - sudo apt-get install -qqq luarocks
+  - pip3 install --user pre-commit
-  - pip3 install pre-commit
   - luarocks install --local luacheck
 
 script:
   # All linters are run with pre-commit hooks
   - export PATH="$HOME/.luarocks/bin:$PATH"
-  - pre-commit run --all-files
+  - $HOME/.local/bin/pre-commit run --all-files

CHANGELOG.md

@@ -9,20 +9,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- More Ores tools now have [`toolranks`](https://github.com/lisacvuk/minetest-toolranks) support.
-- Hungarian translation.
-
-### Changed
-
-- Migrated translations to the
-  [Minetest translation file format](https://rubenwardy.com/minetest_modding_book/lua_api.html#translation-file-format).
-
-## [2.0.0] - 2019-11-25
-
-### Added
-
-- More Ores nodes/items/tools can now be placed in item frames
-  from the [`frame`](https://github.com/minetest-mods/frame) mod.
 - Polish translation.
 
 ### Changed
@@ -61,6 +47,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Initial versioned release.
 
-[Unreleased]: https://github.com/minetest-mods/moreores/compare/v2.0.0...HEAD
+[Unreleased]: https://github.com/minetest-mods/moreores/compare/v1.1.0...HEAD
-[2.0.0]: https://github.com/minetest-mods/moreores/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/minetest-mods/moreores/compare/v1.0.0...v1.1.0

LICENSE.md

@@ -1,6 +1,6 @@
 # zlib license
 
-Copyright © 2011-2020 Hugo Locurcio and contributors
+Copyright © 2011-2019 Hugo Locurcio and contributors
 
 **This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.**
 

README.md

@@ -18,7 +18,9 @@ git clone https://github.com/minetest-mods/moreores.git
 
 You can also
 [download a ZIP archive](https://github.com/minetest-mods/moreores/archive/master.zip)
-of More Ores.
+of More Ores. If you do so, you will need to extract the archive then rename
+the resulting folder from `moreores-master` to `moreores` – this is
+**absolutely** required, as the mod won't work otherwise.
 
 ### Enable the mod
 
@@ -58,13 +60,13 @@ on that line.
 
 ## Version compatibility
 
-More Ores is currently primarily tested with Minetest 5.1.0.
+More Ores is currently primarily tested with Minetest 0.4.17.
 It may or may not work with newer or older versions. Issues arising in older
-versions than 5.0.0 will generally not be fixed.
+versions than 0.4.17 will generally not be fixed.
 
 ## License
 
-Copyright © 2011-2020 Hugo Locurcio and contributors
+Copyright © 2011-2019 Hugo Locurcio and contributors
 
 - More Ores code is licensed under the zlib license, see
   [`LICENSE.md`](LICENSE.md) for details.

init.lua

@@ -3,7 +3,7 @@
 ** More Ores **
 By Calinou, with the help of Nore.
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 =====================================================================
 --]]
@@ -12,8 +12,9 @@ moreores = {}
 
 local modpath = minetest.get_modpath("moreores")
 
-local S = minetest.get_translator("moreores")
+local S, NS = dofile(modpath .. "/intllib.lua")
 moreores.S = S
+moreores.NS = NS
 
 dofile(modpath .. "/_config.txt")
 
@@ -22,9 +23,6 @@ if minetest.get_modpath("mg") then
 	dofile(modpath .. "/mg.lua")
 end
 
--- `frame` support
-local use_frame = minetest.get_modpath("frame")
-
 local default_stone_sounds = default.node_sound_stone_defaults()
 local default_metal_sounds = default.node_sound_metal_defaults()
 
@@ -85,22 +83,18 @@ local function add_ore(modname, description, mineral_name, oredef)
 
 	if oredef.makes.ore then
 		minetest.register_node(modname .. ":mineral_" .. mineral_name, {
-			description = S("@1 Ore", S(description)),
+			description = S("%s Ore"):format(S(description)),
 			tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"},
 			groups = {cracky = 2},
 			sounds = default_stone_sounds,
 			drop = lump_item,
 		})
-
-		if use_frame then
-			frame.register(modname .. ":mineral_" .. mineral_name)
-		end
 	end
 
 	if oredef.makes.block then
 		local block_item = item_base .. "_block"
 		minetest.register_node(block_item, {
-			description = S("@1 Block", S(description)),
+			description = S("%s Block"):format(S(description)),
 			tiles = {img_base .. "_block.png"},
 			groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2},
 			sounds = default_metal_sounds,
@@ -118,14 +112,11 @@ local function add_ore(modname, description, mineral_name, oredef)
 				}
 			})
 		end
-		if use_frame then
-			frame.register(block_item)
-		end
 	end
 
 	if oredef.makes.lump then
 		minetest.register_craftitem(lump_item, {
-			description = S("@1 Lump", S(description)),
+			description = S("%s Lump"):format(S(description)),
 			inventory_image = img_base .. "_lump.png",
 		})
 		minetest.register_alias(mineral_name .. "_lump", lump_item)
@@ -136,20 +127,14 @@ local function add_ore(modname, description, mineral_name, oredef)
 				recipe = lump_item,
 			})
 		end
-		if use_frame then
-			frame.register(lump_item)
-		end
 	end
 
 	if oredef.makes.ingot then
 		minetest.register_craftitem(ingot, {
-			description = S("@1 Ingot", S(description)),
+			description = S("%s Ingot"):format(S(description)),
 			inventory_image = img_base .. "_ingot.png",
 		})
 		minetest.register_alias(mineral_name .. "_ingot", ingot)
-		if use_frame then
-			frame.register(ingot)
-		end
 	end
 
 	if oredef.makes.chest then
@@ -186,63 +171,40 @@ local function add_ore(modname, description, mineral_name, oredef)
 		if tool_name == "sword" then
 			tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval
 			tdef.tool_capabilities.damage_groups = oredef.damage_groups
-			tdef.description = S("@1 Sword", S(description))
+			tdef.description = S("%s Sword"):format(S(description))
 		end
 
 		if tool_name == "pick" then
 			tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval
 			tdef.tool_capabilities.damage_groups = oredef.damage_groups
-			tdef.description = S("@1 Pickaxe", S(description))
+			tdef.description = S("%s Pickaxe"):format(S(description))
 		end
 
 		if tool_name == "axe" then
 			tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval
 			tdef.tool_capabilities.damage_groups = oredef.damage_groups
-			tdef.description = S("@1 Axe", S(description))
+			tdef.description = S("%s Axe"):format(S(description))
 		end
 
 		if tool_name == "shovel" then
 			tdef.full_punch_interval = oredef.full_punch_interval
 			tdef.tool_capabilities.damage_groups = oredef.damage_groups
-			tdef.description = S("@1 Shovel", S(description))
+			tdef.description = S("%s Shovel"):format(S(description))
 			tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90"
 		end
 
 		local fulltool_name = tool_base .. tool_name .. tool_post
 
-		if tool_name == "hoe" and minetest.get_modpath("farming") then
+		minetest.register_tool(fulltool_name, tdef)
-			tdef.max_uses = tooldef.uses
-			tdef.description = S("@1 Hoe", S(description))
-			farming.register_hoe(fulltool_name, tdef)
-		end
 
-		-- Hoe registration is handled above.
+		if oredef.makes.ingot then
-		-- There are no crafting recipes for hoes, as they have been
+			minetest.register_craft({
-		-- deprecated from Minetest Game:
+				output = fulltool_name,
-		-- https://github.com/minetest/minetest_game/commit/9c459e77a
+				recipe = get_recipe(ingot, tool_name)
-		if tool_name ~= "hoe" then
+			})
-			minetest.register_tool(fulltool_name, tdef)
-
-			if oredef.makes.ingot then
-				minetest.register_craft({
-					output = fulltool_name,
-					recipe = get_recipe(ingot, tool_name)
-				})
-			end
-		end
-
-		-- Toolranks support
-		if minetest.get_modpath("toolranks") then
-			minetest.override_item(fulltool_name, {
-				original_description = tdef.description,
-				description = toolranks.create_description(tdef.description, 0, 1),
-				after_use = toolranks.new_afteruse})
 		end
 
 		minetest.register_alias(tool_name .. tool_post, fulltool_name)
-		if use_frame then
-			frame.register(fulltool_name)
-		end
 	end
 end
 
@@ -365,11 +327,11 @@ if minetest.get_modpath("carts") then
 end
 
 minetest.register_craft({
-	output = "moreores:copper_rail 18",
+	output = "moreores:copper_rail 24",
 	recipe = {
-		{"default:copper_ingot", "group:wood", "default:copper_ingot"},
 		{"default:copper_ingot", "", "default:copper_ingot"},
-		{"default:copper_ingot", "group:wood", "default:copper_ingot"},
+		{"default:copper_ingot", "group:stick", "default:copper_ingot"},
+		{"default:copper_ingot", "", "default:copper_ingot"},
 	},
 })
 

intllib.lua

@@ -0,0 +1,44 @@
+-- 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/de.txt

@@ -0,0 +1,21 @@
+# Translation by Xanthin
+
+[moreores] loaded. = [moreores] geladen.
+
+%s Ore = %serz
+%s Lump = %sklumpen
+%s Ingot = %sbarren
+%s Block = %sblock
+%s Pickaxe = %sspitzhacke
+%s Shovel = %sschaufel
+%s Axe = %saxt
+%s Sword = %sschwert
+
+Copper = Kupfer
+Tin = Zinn
+Bronze = Bronze
+Silver = Silber
+Gold = Gold
+Mithril = Mithril
+
+Copper Rail = Kupferschiene

locale/es.txt

@@ -0,0 +1,21 @@
+# Translation by kaeza
+
+[moreores] loaded. = [moreores] cargado.
+
+%s Ore = Mineral de %s
+%s Lump = Pepita de %s
+%s Ingot = Lingote de %s
+%s Block = Bloque de %s
+%s Pickaxe = Pico de %s
+%s Shovel = Pala de %s
+%s Axe = Hacha de %s
+%s Sword = Espada de %s
+
+Copper = cobre
+Tin = estaño
+Bronze = bronce
+Silver = plata
+Gold = oro
+Mithril = mitrilo
+
+Copper Rail = Riel de Cobre

locale/fr.txt

@@ -0,0 +1,21 @@
+# Translation by Calinou
+
+[moreores] loaded. = [moreores] a été chargé.
+
+%s Ore = Minerai en %s
+%s Lump = Roche en %s
+%s Ingot = Lingot en %s
+%s Block = Bloc en %s
+%s Pickaxe = Pioche en %s
+%s Shovel = Pelle en %s
+%s Axe = Hache en %s
+%s Sword = Épée en %s
+
+Copper = cuivre
+Tin = étain
+Bronze = bronze
+Silver = argent
+Gold = or
+Mithril = mithril
+
+Copper Rail = Rail en cuivre

locale/it.txt

@@ -0,0 +1,21 @@
+# Translation by Pagliaccio
+
+[moreores] loaded. = [moreores] caricato.
+
+%s Ore = Minerale di %s
+%s Lump = %s grezzo
+%s Ingot = Lingotto di %s
+%s Block = Blocco di %s
+%s Pickaxe = Piccone di %s
+%s Shovel = Badile di %s
+%s Axe = Ascia di %s
+%s Sword = Spada di %s
+
+Copper = Rame
+Tin = Stagno
+Bronze = Bronzo
+Silver = Argento
+Gold = Oro
+Mithril = Mithril
+
+Copper Rail = Binario di rame

locale/moreores.de.tr

@@ -1,22 +0,0 @@
-# textdomain: moreores
-
-# Translation by Xanthin
-
-[moreores] loaded.=[moreores] geladen.
-
-@1 Ore=@1erz
-@1 Lump=@1klumpen
-@1 Ingot=@1barren
-@1 Block=@1block
-@1 Pickaxe=@1spitzhacke
-@1 Shovel=@1schaufel
-@1 Axe=@1axt
-@1 Sword=@1schwert
-
-Copper=Kupfer
-Tin=Zinn
-Bronze=Bronze
-Silver=Silber
-Gold=Gold
-Mithril=Mithril
-Copper Rail=Kupferschiene

locale/moreores.en.tr

@@ -1,21 +0,0 @@
-# textdomain: moreores
-
-[moreores] loaded.=[moreores] loaded.
-
-@1 Ore=@1 Ore
-@1 Lump=@1 Lump
-@1 Ingot=@1 Ingot
-@1 Block=@1 Block
-@1 Pickaxe=@1 Pickaxe
-@1 Shovel=@1 Shovel
-@1 Axe=@1 Axe
-@1 Sword=@1 Sword
-@1 Hoe=@1 Hoe
-
-Copper=Copper
-Tin=Tin
-Bronze=Bronze
-Silver=Silver
-Gold=Gold
-Mithril=Mithril
-Copper Rail=Copper Rail

locale/moreores.es.tr

@@ -1,22 +0,0 @@
-# textdomain: moreores
-
-# Translation by kaeza
-
-[moreores] loaded.=[moreores] cargado.
-
-@1 Ore=Mineral de @1
-@1 Lump=Pepita de @1
-@1 Ingot=Lingote de @1
-@1 Block=Bloque de @1
-@1 Pickaxe=Pico de @1
-@1 Shovel=Pala de @1
-@1 Axe=Hacha de @1
-@1 Sword=Espada de @1
-
-Copper=cobre
-Tin=estaño
-Bronze=bronce
-Silver=plata
-Gold=oro
-Mithril=mitrilo
-Copper Rail=Riel de Cobre

locale/moreores.fr.tr

@@ -1,23 +0,0 @@
-# textdomain: moreores
-
-# Translation by Calinou
-
-[moreores] loaded.=[moreores] a été chargé.
-
-@1 Ore=Minerai en @1
-@1 Lump=Roche en @1
-@1 Ingot=Lingot en @1
-@1 Block=Bloc en @1
-@1 Pickaxe=Pioche en @1
-@1 Shovel=Pelle en @1
-@1 Axe=Hache en @1
-@1 Sword=Épée en @1
-@1 Hoe=Houe en @1
-
-Copper=cuivre
-Tin=étain
-Bronze=bronze
-Silver=argent
-Gold=or
-Mithril=mithril
-Copper Rail=Rail en cuivre

locale/moreores.hu.tr

@@ -1,22 +0,0 @@
-# textdomain: moreores
-
-# Translation by An0n3m0us
-
-[moreores] loaded.=[moreores] betöltve.
-
-@1 Ore=@1 érc
-@1 Lump=@1 rög
-@1 Ingot=@1 öntvény
-@1 Block=@1 blokk
-@1 Pickaxe=@1 csákány
-@1 Shovel=@1 ásó
-@1 Axe=@1 fejsze
-@1 Sword=@1 kard
-
-Copper=Réz
-Tin=Ón
-Bronze=Bronz
-Silver=Ezüst
-Gold=Arany
-Mithril=Mithril
-Copper Rail=Réz sín

locale/moreores.it.tr

@@ -1,22 +0,0 @@
-# textdomain: moreores
-
-# Translation by Pagliaccio
-
-[moreores] loaded.=[moreores] caricato.
-
-@1 Ore=Minerale di @1
-@1 Lump=@1 grezzo
-@1 Ingot=Lingotto di @1
-@1 Block=Blocco di @1
-@1 Pickaxe=Piccone di @1
-@1 Shovel=Badile di @1
-@1 Axe=Ascia di @1
-@1 Sword=Spada di @1
-
-Copper=Rame
-Tin=Stagno
-Bronze=Bronzo
-Silver=Argento
-Gold=Oro
-Mithril=Mithril
-Copper Rail=Binario di rame

locale/moreores.nl.tr

@@ -1,19 +0,0 @@
-# textdomain: moreores
-
-[moreores] loaded.=[moreores] geladen.
-
-@1 Ore=@1 Erts
-@1 Lump=@1 Klomp
-@1 Ingot=@1 Staaf
-@1 Block=@1 Blok
-@1 Pickaxe=@1 Pikhouweel
-@1 Shovel=@1 Schep
-@1 Axe=@1 Bijl
-@1 Sword=@1 Zwaard
-
-Copper=Koper
-Tin=Tin
-Bronze=Brons
-Silver=Silver
-Gold=Goud
-Mithril=Mithril

locale/moreores.pl.tr

@@ -1,22 +0,0 @@
-# textdomain: moreores
-
-# Translation by mat9117
-
-[moreores] loaded.=[moreores] załadowano.
-
-@1 Ore=@1 Ruda
-@1 Lump=@1 Bryłka
-@1 Ingot=@1 Sztabka
-@1 Block=@1 Blok
-@1 Pickaxe=@1 Kilof
-@1 Shovel=@1 Łopatka
-@1 Axe=@1 Siekiera
-@1 Sword=@1 Miecz
-
-Copper=Miedź
-Tin=Cyna
-Bronze=Brąz
-Silver=Srebro
-Gold=Złoto
-Mithril=Mithril
-Copper Rail=Miedziany tor

locale/moreores.pt_br.txt

@@ -1,23 +0,0 @@
-# textdomain: moreores
-
-# Translation by github.com/caiorrs
-
-[moreores] loaded.=[moreores] carregado.
-
-@1 Ore=Minério de @1
-@1 Lump=Pepita de @1
-@1 Ingot=Lingote de @1
-@1 Block=Bloco de @1
-@1 Pickaxe=Picareta de @1
-@1 Shovel=Pá de @1
-@1 Axe=Machado de @1
-@1 Sword=Espada de @1
-
-Copper=Cobre
-Tin=Estanho
-Bronze=Bronze
-Silver=Prata
-Gold=Ouro
-Mithril=Mitrilo
-
-Copper Rail=Trilho de Cobre

locale/moreores.tr.tr

@@ -1,28 +0,0 @@
-# textdomain: moreores
-
-# Translation by Mahmutelmas06
-# mahmutelmas06@hotmail.com
-
-# Türkçe Çeviri
-# Turkish translation
-# Language 2 letter iso code is "tr"
-
-[moreores] loaded.=[moreores] yüklendi.
-
-@1 Ore=@1 madeni
-@1 Lump=@1 yığını
-@1 Ingot=@1 külçesi
-@1 Block=@1 blok
-@1 Pickaxe=@1 kazma
-@1 Shovel=@1 kürek
-@1 Axe=@1 balta
-@1 Sword=@1 kılıç
-
-Copper=Bakır
-Tin=Kalay
-Bronze=Bronz
-Silver=Gümüş
-Gold=Altın
-Mithril=Mithril
-
-Copper Rail=Bakır ray

locale/nl.txt

@@ -0,0 +1,19 @@
+[moreores] loaded. = [moreores] geladen.
+
+%s Ore = %s Erts
+%s Lump = %s Klomp
+%s Ingot = %s Staaf
+%s Block = %s Blok
+%s Pickaxe = %s Pikhouweel
+%s Shovel = %s Schep
+%s Axe = %s Bijl
+%s Sword = %s Zwaard
+
+Copper = Koper
+Tin = Tin
+Bronze = Brons
+Silver = Silver
+Gold = Goud
+Mithril = Mithril
+
+Copper Rail = Koperen Spoor

locale/pl.txt

@@ -0,0 +1,21 @@
+# Translation by mat9117
+
+[moreores] loaded. = [moreores] załadowano.
+
+%s Ore = %Ruda
+%s Lump = %Bryłka
+%s Ingot = %Sztabka
+%s Block = %sBlok
+%s Pickaxe = %sKilof
+%s Shovel = %sŁopatka
+%s Axe = %sSiekiera
+%s Sword = %sMiecz
+
+Copper = Miedź
+Tin = Cyna
+Bronze = Brąz
+Silver = Srebro
+Gold = Złoto
+Mithril = Mithril
+
+Copper Rail = Miedziany tor

locale/pt_br.txt

@@ -0,0 +1,21 @@
+# Translation by github.com/caiorrs
+
+[moreores] loaded. = [moreores] carregado.
+
+%s Ore = Minério de %s
+%s Lump = Pepita de %s
+%s Ingot = Lingote de %s
+%s Block = Bloco de %s
+%s Pickaxe = Picareta de %s
+%s Shovel = Pá de %s
+%s Axe = Machado de %s
+%s Sword = Espada de %s
+
+Copper = Cobre
+Tin = Estanho
+Bronze = Bronze
+Silver = Prata
+Gold = Ouro
+Mithril = Mitrilo
+
+Copper Rail = Trilho de Cobre

locale/tr.txt

@@ -0,0 +1,25 @@
+# Translation by Mahmutelmas06
+# mahmutelmas06@hotmail.com
+# Türkçe Çeviri
+# Turkish translation
+# Language 2 letter iso code is "tr"
+
+[moreores] loaded. = [moreores] yüklendi.
+
+%s Ore = %s madeni
+%s Lump = %s yığını
+%s Ingot = %s külçesi
+%s Block = %s blok
+%s Pickaxe = %s kazma
+%s Shovel = %s kürek
+%s Axe = %s balta
+%s Sword = %s kılıç
+
+Copper = Bakır
+Tin = Kalay
+Bronze = Bronz
+Silver = Gümüş
+Gold = Altın
+Mithril = Mithril
+
+Copper Rail = Bakır ray

mg.lua

@@ -1,7 +1,7 @@
 --[[
 More Ores: `mg` mod support
 
-Copyright © 2011-2020 Hugo Locurcio and contributors.
+Copyright © 2011-2019 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

mod.conf

@@ -1,5 +1,4 @@
 name = moreores
 description = Adds new ore types.
 depends = default
-optional_depends = carts,farming,frame,mg,toolranks
+optional_depends = carts,farming,intllib,mg
-min_minetest_version = 5.0.0