nalc/maptools
1
0
Fork 0
forked from mff/maptools
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

Browse Source
This commit is contained in:
Sys Quatre 2020-06-20 15:31:28 +02:00
commit 3ade16647e
14 changed files with 212 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.luacheckrc
View File

@ -3,6 +3,10 @@ unused_args = false
allow_defined_top = true allow_defined_top = true
max_line_length = 90 max_line_length = 90
globals = {
"maptools"
}
stds.minetest = { stds.minetest = {
read_globals = { read_globals = {
"DIR_DELIM", "DIR_DELIM",
@ -23,7 +27,3 @@ stds.minetest = {
}, },
} }
} }
read_globals = {
"intllib",
}

14
CHANGELOG.md
View File

@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased] ## [Unreleased]
## [2.1.0] - 2020-06-08
### Changed
- 10 coins of each type can now be crafted using 2 ingots (bronze, silver or gold).
- Silver coins require [More Ores](https://github.com/minetest-mods/moreores)
to be crafted, since minetest_game doesn't have silver ingots.
- Coins are now displayed in the creative inventory.
- Moved translations from intllib to Minetest's built-in localization system.
- This allows translations to show up independently of the server's language.
## [2.0.0] - 2019-11-25 ## [2.0.0] - 2019-11-25
### Changed ### Changed
@ -32,6 +43,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Initial versioned release. - Initial versioned release.
[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.0.0...HEAD [Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.1.0...HEAD
[2.1.0]: https://github.com/minetest-mods/maptools/compare/v2.0.0...v2.1.0
[2.0.0]: https://github.com/minetest-mods/maptools/compare/v1.1.0...v2.0.0 [2.0.0]: https://github.com/minetest-mods/maptools/compare/v1.1.0...v2.0.0
[1.1.0]: https://github.com/minetest-mods/maptools/compare/v1.0.0...v1.1.0 [1.1.0]: https://github.com/minetest-mods/maptools/compare/v1.0.0...v1.1.0

1
NODES_ITEMS.md
View File

@ -23,6 +23,7 @@ as they cannot be removed by hand (they can only be removed with
| `maptools:no_interact` | Prevents interacting through the block (opening chests, furnaces, attacking entities, …), but can still be walked through. | | `maptools:no_interact` | Prevents interacting through the block (opening chests, furnaces, attacking entities, …), but can still be walked through. |
| `maptools:damage_{1…5}` | :warning: Damaging blocks which damage players by 1 to 5 HP per second. | | `maptools:damage_{1…5}` | :warning: Damaging blocks which damage players by 1 to 5 HP per second. |
| `maptools:kill` | :warning: Instant kill blocks (damages players by 20 HP per second). | | `maptools:kill` | :warning: Instant kill blocks (damages players by 20 HP per second). |
| `maptools:drowning` | :warning: Simulates drowning in water. |
| `maptools:light_block` | :warning: Invisible non-solid block, prevents light from passing through. | | `maptools:light_block` | :warning: Invisible non-solid block, prevents light from passing through. |
| `maptools:light_bulb` | :warning: Invisible non-solid block, emitting the maximum amount of light. | | `maptools:light_bulb` | :warning: Invisible non-solid block, emitting the maximum amount of light. |

3
craftitems.lua
View File

@ -14,7 +14,6 @@ minetest.register_craftitem("maptools:copper_coin", {
inventory_image = "maptools_copper_coin.png", inventory_image = "maptools_copper_coin.png",
wield_scale = {x = 0.5, y = 0.5, z = 0.25}, wield_scale = {x = 0.5, y = 0.5, z = 0.25},
stack_max = 10000, stack_max = 10000,
groups = {not_in_creative_inventory = maptools.creative},
}) })
minetest.register_craftitem("maptools:silver_coin", { minetest.register_craftitem("maptools:silver_coin", {
@ -22,7 +21,6 @@ minetest.register_craftitem("maptools:silver_coin", {
inventory_image = "maptools_silver_coin.png", inventory_image = "maptools_silver_coin.png",
wield_scale = {x = 0.5, y = 0.5, z = 0.25}, wield_scale = {x = 0.5, y = 0.5, z = 0.25},
stack_max = 10000, stack_max = 10000,
groups = {not_in_creative_inventory = maptools.creative},
}) })
minetest.register_craftitem("maptools:gold_coin", { minetest.register_craftitem("maptools:gold_coin", {
@ -30,7 +28,6 @@ minetest.register_craftitem("maptools:gold_coin", {
inventory_image = "maptools_gold_coin.png", inventory_image = "maptools_gold_coin.png",
wield_scale = {x = 0.5, y = 0.5, z = 0.25}, wield_scale = {x = 0.5, y = 0.5, z = 0.25},
stack_max = 10000, stack_max = 10000,
groups = {not_in_creative_inventory = maptools.creative},
}) })
minetest.register_craftitem("maptools:infinitefuel", { minetest.register_craftitem("maptools:infinitefuel", {

3
init.lua
View File

@ -12,9 +12,8 @@ maptools = {}
local modpath = minetest.get_modpath("maptools") local modpath = minetest.get_modpath("maptools")
local S, NS = dofile(modpath .. "/intllib.lua") local S = minetest.get_translator("maptools")
maptools.S = S maptools.S = S
maptools.NS = NS
maptools.drop_msg = function(itemstack, player) maptools.drop_msg = function(itemstack, player)
local name = player:get_player_name() local name = player:get_player_name()

44
intllib.lua
View File

@ -1,44 +0,0 @@
-- 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

39
locale/es.txt
View File

@ -1,39 +0,0 @@
# Translation by kaeza
[maptools] loaded. = [maptools] cargado.
Cloud = Nube
Infinite Fuel = Combustible Infinito
Admin Pickaxe = Pico de Administrador
Copper Coin = Moneda de Cobre
Silver Coin = Moneda de Plata
Gold Coin = Moneda de Oro
Super Apple = Super Manzana
Fake Ladder = Escalera Falsa
Smoke Block = Bloque de Humo
Damaging Block: %s = Bloque Dañino: %s
Kill Block = Bloque Mortal
Build Prevention = Bloqueador de Construcción
Interact Prevention = Bloqueador de Interacción
Climb Block = Bloque Escalable
Light Block = Bloqueador de Luz
Light Bulb = Lamparilla
Player Clip = Bloqueo de Jugador
Full Clip = Bloqueo Total
Unbreakable Stone = Piedra Irrompible
Unbreakable Sand = Arena Irrompible
Unbreakable Desert Stone = Piedra Desértica Irrompible
Unbreakable Desert Sand = Arena Desértica Irrompible
Unbreakable Gravel = Gravilla Irrompible
Unbreakable Dirt = Tierra Irrompible
Unbreakable Dirt with Grass = Hierba Irrompible
Unbreakable Full Grass= Bloque de Hierba Irrompible
Unbreakable Brick = Ladrillos Irrompibles
Unbreakable Wooden Planks = Planchas de Madera Irrompibles
Unbreakable Tree = Tronco de Árbol Irrompible
Unbreakable Glass = Cristal Irrompible
Unbreakable Sandstone = Arenisca Irrompible
Unbreakable Leaves = Foliaje Irrompible
Unbreakable Cobblestone = Guijarros Irrompibles
Unbreakable Mossy Cobblestone = Guijarros Enmohecidos Irrompibles

47
locale/fr.txt
View File

@ -1,47 +0,0 @@
# Translation by Calinou
[maptools] loaded. = [maptools] a été chargé.
Cloud = Nuage
Infinite Fuel = Carburant infini
Admin Pickaxe = Pioche d'administrateur
Admin Pickaxe With Drops = Pioche d'administrateur qui donne des objets
Copper Coin = Pièce de cuivre
Silver Coin = Pièce d'argent
Gold Coin = Pièce d'or
Super Apple = Super pomme
Fake Ladder = Fausse échelle
Smoke Block = Bloc de fumée
Damaging Block: %s = Bloc de dégâts : %s
Kill Block = Bloc qui tue
Build Prevention = Prévention de construction
Interact Prevention = Prévention d'interaction
Climb Block = Bloc à grimper
Light Block = Bloqueur de lumière
Light Bulb = Bloc lumineux
Player Clip = Bloque-joueurs
Player Clip Bottom Face = Face inférieure de bloque-joueurs
Player Clip Top Face = Face supérieure de bloque-joueurs
Full Clip = Bloque-tout
Full Clip Face = Face de bloque-tout
Permanent Fire = Feu permanent
Fake Fire = Faux feu
Igniter = Incendieur
Pusher: %s = Pousseur : %s
Unbreakable Stone = Pierre incassable
Unbreakable Sand = Sable incassable
Unbreakable Desert Stone = Pierre de désert incassable
Unbreakable Desert Sand = Sable de désert incassable
Unbreakable Gravel = Gravier incassable
Unbreakable Dirt = Terre incassable
Unbreakable Dirt with Grass = Herbe incassable
Unbreakable Full Grass= Bloc d'herbe incassable
Unbreakable Brick = Briques incassables
Unbreakable Wooden Planks = Planches de bois incassables
Unbreakable Tree = Tronc d'arbre incassable
Unbreakable Glass = Verre incassable
Unbreakable Sandstone = Grès incassable
Unbreakable Leaves = Feuillage incassable
Unbreakable Cobblestone = Pierre taillée incassable
Unbreakable Mossy Cobblestone = Pierre taillée mousseusse incassable

38
locale/maptools.es.tr Normal file
View File

@ -0,0 +1,38 @@
# textdomain: maptools
[maptools] loaded.=[maptools] cargado.
Cloud=Nube
Infinite Fuel=Combustible Infinito
Admin Pickaxe=Pico de Administrador
Copper Coin=Moneda de Cobre
Silver Coin=Moneda de Plata
Gold Coin=Moneda de Oro
Super Apple=Super Manzana
Fake Ladder=Escalera Falsa
Smoke Block=Bloque de Humo
Damaging Block: %s=Bloque Dañino: %s
Kill Block=Bloque Mortal
Build Prevention=Bloqueador de Construcción
Interact Prevention=Bloqueador de Interacción
Climb Block=Bloque Escalable
Light Block=Bloqueador de Luz
Light Bulb=Lamparilla
Player Clip=Bloqueo de Jugador
Full Clip=Bloqueo Total
Unbreakable Stone=Piedra Irrompible
Unbreakable Sand=Arena Irrompible
Unbreakable Desert Stone=Piedra Desértica Irrompible
Unbreakable Desert Sand=Arena Desértica Irrompible
Unbreakable Gravel=Gravilla Irrompible
Unbreakable Dirt=Tierra Irrompible
Unbreakable Dirt with Grass=Hierba Irrompible
Unbreakable Full Grass=Bloque de Hierba Irrompible
Unbreakable Brick=Ladrillos Irrompibles
Unbreakable Wooden Planks=Planchas de Madera Irrompibles
Unbreakable Tree=Tronco de Árbol Irrompible
Unbreakable Glass=Cristal Irrompible
Unbreakable Sandstone=Arenisca Irrompible
Unbreakable Leaves=Foliaje Irrompible
Unbreakable Cobblestone=Guijarros Irrompibles
Unbreakable Mossy Cobblestone=Guijarros Enmohecidos Irrompibles

46
locale/maptools.fr.tr Normal file
View File

@ -0,0 +1,46 @@
# textdomain: maptools
[maptools] loaded.=[maptools] a été chargé.
Cloud=Nuage
Infinite Fuel=Carburant infini
Admin Pickaxe=Pioche d'administrateur
Admin Pickaxe With Drops=Pioche d'administrateur qui donne des objets
Copper Coin=Pièce de cuivre
Silver Coin=Pièce d'argent
Gold Coin=Pièce d'or
Super Apple=Super pomme
Fake Ladder=Fausse échelle
Smoke Block=Bloc de fumée
Damaging Block: %s=Bloc de dégâts : %s
Kill Block=Bloc qui tue
Build Prevention=Prévention de construction
Interact Prevention=Prévention d'interaction
Climb Block=Bloc à grimper
Light Block=Bloqueur de lumière
Light Bulb=Bloc lumineux
Player Clip=Bloque-joueurs
Player Clip Bottom Face=Face inférieure de bloque-joueurs
Player Clip Top Face=Face supérieure de bloque-joueurs
Full Clip=Bloque-tout
Full Clip Face=Face de bloque-tout
Permanent Fire=Feu permanent
Fake Fire=Faux feu
Igniter=Incendieur
Pusher: %s=Pousseur : %s
Unbreakable Stone=Pierre incassable
Unbreakable Sand=Sable incassable
Unbreakable Desert Stone=Pierre de désert incassable
Unbreakable Desert Sand=Sable de désert incassable
Unbreakable Gravel=Gravier incassable
Unbreakable Dirt=Terre incassable
Unbreakable Dirt with Grass=Herbe incassable
Unbreakable Full Grass=Bloc d'herbe incassable
Unbreakable Brick=Briques incassables
Unbreakable Wooden Planks=Planches de bois incassables
Unbreakable Tree=Tronc d'arbre incassable
Unbreakable Glass=Verre incassable
Unbreakable Sandstone=Grès incassable
Unbreakable Leaves=Feuillage incassable
Unbreakable Cobblestone=Pierre taillée incassable
Unbreakable Mossy Cobblestone=Pierre taillée mousseusse incassable

46
locale/maptools.it.tr Normal file
View File

@ -0,0 +1,46 @@
# textdomain: maptools
[maptools] loaded.=[maptools] caricato.
Cloud=Nuvola
Infinite Fuel=Combustibile infinito
Admin Pickaxe=Piccone della amministrazione
Admin Pickaxe With Drops=Piccone della amministrazione che lascia cadere a terra
Copper Coin=Moneta di rame
Silver Coin=Moneta di argento
Gold Coin=Moneta di oro
Super Apple=Super mela
Fake Ladder=Finta scala a pioli
Smoke Block=Blocco di fumo
Damaging Block: %s=Blocco che danneggia : %s
Kill Block=Blocco che uccide
Build Prevention=Impedimento alla costruzione
Interact Prevention=Impedimento alla interazione
Climb Block=Blocco su cui ci si può arrampicare
Light Block=Blocco di luce
Light Bulb=Lampadina
Player Clip=Blocca giocatori
Player Clip Bottom Face=Blocca giocatori - faccia inferiore
Player Clip Top Face=Glocca giocatori - faccia superiore
Full Clip=Blocca tutti
Full Clip Face=Faccia del blocca tutti
Permanent Fire=Fuoco eterno
Fake Fire=Fuoco finto
Igniter=Accendino
Pusher: %s=Che ha spinto : %s
Unbreakable Stone=Pietra infrangibile
Unbreakable Sand=Sabbia infrangibile
Unbreakable Desert Stone=Pietra del deserto infrangibile
Unbreakable Desert Sand=Sabbia del deserto infrangibile
Unbreakable Gravel=Ghiaia infrangibile
Unbreakable Dirt=Terra infrangibile
Unbreakable Dirt with Grass=Erba infrangibile
Unbreakable Full Grass=Blocco d'erba infrangibile
Unbreakable Brick=Mattoni infrangibile
Unbreakable Wooden Planks=Assi in legno infrangibili
Unbreakable Tree=Albero infrangibile
Unbreakable Glass=Vetro infrangibile
Unbreakable Sandstone=Arenaria infrangibile
Unbreakable Leaves=Foglie infrangibili
Unbreakable Cobblestone=Ciottolo infrangibile
Unbreakable Mossy Cobblestone=Ciottolo muschioso infrangibile

46
locale/maptools.template.tr Normal file
View File

@ -0,0 +1,46 @@
# textdomain: maptools
[maptools] loaded.=
Cloud=Nuage
Infinite Fuel=
Admin Pickaxe=
Admin Pickaxe With Drops=
Copper Coin=
Silver Coin=
Gold Coin=
Super Apple=
Fake Ladder=
Smoke Block=
Damaging Block: %s=
Kill Block=
Build Prevention=
Interact Prevention=
Climb Block=
Light Block=
Light Bulb=
Player Clip=
Player Clip Bottom Face=
Player Clip Top Face=
Full Clip=
Full Clip Face=
Permanent Fire=
Fake Fire=
Igniter=
Pusher: %s=
Unbreakable Stone=
Unbreakable Sand=
Unbreakable Desert Stone=
Unbreakable Desert Sand=
Unbreakable Gravel=
Unbreakable Dirt=
Unbreakable Dirt with Grass=
Unbreakable Full Grass=
Unbreakable Brick=
Unbreakable Wooden Planks=
Unbreakable Tree=
Unbreakable Glass=
Unbreakable Sandstone=
Unbreakable Leaves=
Unbreakable Cobblestone=
Unbreakable Mossy Cobblestone=

2
mod.conf
View File

@ -1,4 +1,4 @@
name = maptools name = maptools
description = Adds various special versions of normal blocks, tools, and other map maintainer tools. description = Adds various special versions of normal blocks, tools, and other map maintainer tools.
depends = default depends = default
optional_depends = intllib min_minetest_version = 5.0.0

16
nodes.lua
View File

@ -476,3 +476,19 @@ minetest.register_node("maptools:superapple", {
on_use = minetest.item_eat(20), on_use = minetest.item_eat(20),
sounds = default.node_sound_defaults(), sounds = default.node_sound_defaults(),
}) })
minetest.register_node("maptools:drowning", {
description = S("Drownable Air"),
range = 12,
stack_max = 10000,
inventory_image = "default_steel_block.png^dye_black.png",
drawtype = "airlike",
paramtype = "light",
pointable = false,
walkable = false,
drowning = 1,
sunlight_propagates = true,
drop = "",
groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
on_drop = maptools.drop_msg
})