Merge remote-tracking branch 'upstream/master'

Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{lua,luacheckrc}]
+indent_style = tab
+indent_size = 4

.github/CONTRIBUTING.md

@@ -0,0 +1,10 @@
+# Contributing to Map Tools
+
+Thank you for your interest in Map Tools! Before contributing,
+be sure to know about these few guidelines:
+
+- Contributions have to be licensed under the zlib license (or compatible)
+  for code, and CC BY-SA 3.0 (or compatible) for assets.
+- Make sure to update the changelog, keeping the
+  [changelog format](http://keepachangelog.com/en/1.0.0/) we use.
+- Don't bump the version yourself. Maintainers will do this when necessary.

.github/workflows/build.yml

@@ -0,0 +1,21 @@
+on: [push, pull_request]
+name: build
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+
+      - name: Install LuaRocks
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qqq luarocks
+      - name: Install pre-commit and LuaCheck
+        run: |
+          pip3 install pre-commit
+          luarocks install --local luacheck
+      - name: Run LuaCheck with pre-commit
+        run: |
+          pre-commit run --all-files
+          $HOME/.luarocks/bin/luacheck .

.luacheckrc

@@ -0,0 +1,29 @@
+std = "lua51+minetest"
+unused_args = false
+allow_defined_top = true
+max_line_length = 90
+
+globals = {
+	"maptools"
+}
+
+stds.minetest = {
+	read_globals = {
+		"DIR_DELIM",
+		"minetest",
+		"core",
+		"dump",
+		"vector",
+		"nodeupdate",
+		"VoxelManip",
+		"VoxelArea",
+		"PseudoRandom",
+		"ItemStack",
+		"default",
+		table = {
+			fields = {
+				"copy",
+			},
+		},
+	}
+}

.pre-commit-config.yaml

@@ -0,0 +1,10 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.3.0
+    hooks:
+      - id: fix-byte-order-marker
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+
+      - id: mixed-line-ending
+        args: [--fix=lf]

LICENSE.md

@@ -1,7 +1,7 @@
 zlib license
 ============
 
-Copyright (c) 2012-2015 Calinou and contributors
+Copyright © 2012-2020 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.**
 

NODES.md

@@ -1,45 +0,0 @@
-Item names for spawning the items using /give or /giveme
-========================================================
-
-Items
------
-
-* `admin_pick:` magenta pickaxe, infinite durability, mines everything including unbreakable blocks instantly. No drops. Don't put this pickaxe in the hands of a griefer, of course.
-
-* `admin_pick_with_drops:` same as admin pickaxe, but drops stuff.
-
-* `infinite_fuel:` fuel lasting for a (near)-infinite time. Don't worry about the "near" * it lasts for about 50 in-real-life years.
-
-* `super_apple:` a yellow apple which heals 20 HP.
-
-* `copper_coin,`
-* `silver_coin,`
-* `gold_coin:` these have nothing to do with the More Ores mod; they can be used as a currency for trading, or as an universal currency for mods that add shops.
-
-Blocks
-------
-
-**[!]** denotes an unpointable, unbreakable block; be very careful with them, they cannot be removed by hand (they can only be removed with WorldEdit or similar).
-
-
-* `(block)_u` : unbreakable, non-flammable, non-falling, non-decaying blocks, most common blocks have their unbreakable form (examples: maptools:stone or maptools:wood for unbreakable stone/wood). Examples: `stone_u`, `wood_u`, `glass_u`, …
-
-* `full_grass:` unbreakable block with the grass texture on all sides.
-
-* `player_clip:` **[!]** invisible block, not pointable.
-
-* `full_clip:` invisible block, pointable. Also available as a thin face: full_clip_face.
-
-* `smoke_block:` some smoke (does not harm players or entities).
-
-* `no_build:` **[!]** very basic building prevention.
-
-* `no_interact:` prevents interacting through the block (opening chests, furnaces, attacking entities, …).
-
-* `damage_(1…5):` **[!]** damaging blocks. The damage is in half hearts and ranges from 1 to 5 (0.5 to 2.5 hearts damage every second).
-
-* `kill:` **[!]** instant kill (deals 10 heart damage) blocks.
-
-* `light_block:` **[!]** invisible non-solid block, prevents light from passing through.
-
-* `light_bulb:` **[!]** invisible non-solid block, emitting a good amount of light.

README.md

@@ -1,11 +1,75 @@
-Map Tools
-=========
+# Map Tools [![](https://github.com/minetest-mods/maptools/workflows/build/badge.svg)](https://github.com/minetest-mods/maptools/actions)
 
-Map Tools for Minetest <http://minetest.net>, a free/libre infinite
+Map Tools for [Minetest](https://www.minetest.net/), a free and open source infinite
 world block sandbox game.
 
-To install, just clone this repository into your "mods" directory.
+## Resources
 
-Map Tools code is licensed under the zlib license, textures are by Calinou and are licensed under CC BY-SA 3.0 Unported.
+- [Forum topic](https://forum.minetest.net/viewtopic.php?f=11&t=1882)
+- [List of nodes and items available](docs/NODES_ITEMS.md)
 
-**Forum topic:** <https://forum.minetest.net/viewtopic.php?f=11&t=1882>
+## Installation
+
+### Download the mod
+
+To install Map Tools, clone this Git repository into your Minetest's `mods/`
+directory:
+
+```bash
+git clone https://github.com/minetest-mods/maptools.git
+```
+
+You can also
+[download a ZIP archive](https://github.com/minetest-mods/maptools/archive/master.zip)
+of Map Tools.
+
+### Enable the mod
+
+Once you have installed Map Tools, you need to enable it in Minetest.
+The procedure is as follows:
+
+#### Using the client's main menu
+
+This is the easiest way to enable Map Tools when playing in singleplayer
+(or on a server hosted from a client).
+
+1. Start Minetest and switch to the **Local Game** tab.
+2. Select the world you want to enable Map Tools in.
+3. Click **Configure**, then enable `maptools` by double-clicking it
+   (or ticking the **Enabled** checkbox).
+4. Save the changes, then start a game on the world you enabled Map Tools on.
+5. Map Tools should now be running on your world.
+
+#### Using a text editor
+
+This is the recommended way to enable the mod on a server without using a GUI.
+
+1. Make sure Minetest is not currently running (otherwise, it will overwrite
+   the changes when exiting).
+2. Open the world's `world.mt` file using a text editor.
+3. Add the following line at the end of the file:
+
+```text
+load_mod_maptools = true
+```
+
+If the line is already present in the file, then replace `false` with `true`
+on that line.
+
+4. Save the file, then start a game on the world you enabled Map Tools on.
+5. Map Tools should now be running on your world.
+
+## Version compatibility
+
+Map Tools is currently primarily tested with Minetest 5.1.0.
+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.
+
+## License
+
+Copyright © 2012-2020 Hugo Locurcio and contributors
+
+- Map Tools code is licensed under the zlib license, see
+  [`LICENSE.md`](LICENSE.md) for details.
+- Unless otherwise specified, Map Tools textures are licensed under
+  [CC BY-SA 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/).

aliases.lua

@@ -1,7 +1,7 @@
 --[[
 Map Tools: alias definitions
 
-Copyright (c) 2012-2015 Calinou and contributors.
+Copyright © 2012-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

config.lua

@@ -1,14 +1,14 @@
 --[[
 Map Tools: configuration handling
 
-Copyright (c) 2012-2015 Calinou and contributors.
+Copyright © 2012-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
 maptools.config = {}
 
 local function getbool_default(setting, default)
-	local value = minetest.setting_getbool(setting)
+	local value = minetest.settings:get_bool(setting)
 	if value == nil then
 		value = default
 	end
@@ -21,9 +21,11 @@ local function setting(settingtype, name, default)
 			getbool_default("maptools." .. name, default)
 	else
 		maptools.config[name] =
-			minetest.setting_get("maptools." .. name) or default
+			minetest.settings:get("maptools." .. name) or default
 	end
 end
 
 -- Show Map Tools stuff in creative inventory (1 or 0):
-setting("integer", "hide_from_creative_inventory", 0)
+setting("integer", "hide_from_creative_inventory", 1)
+-- Enable crafting recipes for coins (true or false):
+setting("bool", "enable_coin_crafting", false)

craftitems.lua

@@ -1,11 +1,11 @@
 --[[
 Map Tools: item definitions
 
-Copyright (c) 2012-2015 Calinou and contributors.
+Copyright © 2012-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
-local S = maptools.intllib
+local S = maptools.S
 
 maptools.creative = maptools.config["hide_from_creative_inventory"]
 
@@ -14,29 +14,52 @@ minetest.register_craftitem("maptools:copper_coin", {
 	inventory_image = "maptools_copper_coin.png",
 	wield_scale = {x = 0.5, y = 0.5, z = 0.25},
 	stack_max = 10000,
-	groups = {not_in_creative_inventory = maptools.creative},
 })
 
+if maptools.config and maptools.config.enable_coin_crafting then
+	minetest.register_craft({
+		output = "maptools:copper_coin 10",
+		type = "shapeless",
+		recipe = { "default:copper_ingot", "default:copper_ingot" }
+	})
+end
+
 minetest.register_craftitem("maptools:silver_coin", {
 	description = S("Silver Coin"),
 	inventory_image = "maptools_silver_coin.png",
 	wield_scale = {x = 0.5, y = 0.5, z = 0.25},
 	stack_max = 10000,
-	groups = {not_in_creative_inventory = maptools.creative},
 })
 
+if maptools.config and maptools.config.enable_coin_crafting then
+	if minetest.get_modpath("moreores") then
+		minetest.register_craft({
+			output = "maptools:silver_coin 10",
+			type = "shapeless",
+			recipe = { "moreores:silver_ingot", "moreores:silver_ingot" }
+		})
+	end
+end
+
 minetest.register_craftitem("maptools:gold_coin", {
 	description = S("Gold Coin"),
 	inventory_image = "maptools_gold_coin.png",
 	wield_scale = {x = 0.5, y = 0.5, z = 0.25},
 	stack_max = 10000,
-	groups = {not_in_creative_inventory = maptools.creative},
 })
 
+if maptools.config and maptools.config.enable_coin_crafting then
+	minetest.register_craft({
+		output = "maptools:gold_coin 10",
+		type = "shapeless",
+		recipe = { "default:gold_ingot", "default:gold_ingot" }
+	})
+end
+
 minetest.register_craftitem("maptools:infinitefuel", {
 	description = S("Infinite Fuel"),
 	inventory_image = "maptools_infinitefuel.png",
-	stack_max = 10000,
+	stack_max = 65535,
 	groups = {not_in_creative_inventory = maptools.creative},
 })
 
@@ -45,49 +68,3 @@ minetest.register_craft({
 	recipe = "maptools:infinitefuel",
 	burntime = 1000000000,
 })
-
--- Coin based craft recipes
--- //MFF_BEG(Mg|07/24/15)
--- //MFF_BEG(Darcidride|07/06/16)
-
---[[
--- 9CC -> 1SC
-minetest.register_craft({
-	output = "maptools:silver_coin",
-	recipe = {
-		{"maptools:copper_coin", "maptools:copper_coin", "maptools:copper_coin"},
-		{"maptools:copper_coin", "maptools:copper_coin", "maptools:copper_coin"},
-		{"maptools:copper_coin", "maptools:copper_coin", "maptools:copper_coin"},
-	}
-})
-
--- 9SC -> 1GC
-minetest.register_craft({
-	output = "maptools:gold_coin",
-	recipe = {
-		{"maptools:silver_coin", "maptools:silver_coin", "maptools:silver_coin"},
-		{"maptools:silver_coin", "maptools:silver_coin", "maptools:silver_coin"},
-		{"maptools:silver_coin", "maptools:silver_coin", "maptools:silver_coin"},
-	}
-})
-
--- 1GC -> 9SC
-minetest.register_craft({
-	output = "maptools:silver_coin 9",
-	recipe = {
-		{"maptools:gold_coin"}
-	}
-})
-
--- 1SC -> 9CC
-minetest.register_craft({
-	output = "maptools:copper_coin 9",
-	recipe = {
-		{"maptools:silver_coin"}
-	}
-})
-
---
--- //MFF_END(Mg|07/24/15)
--- //MFF_END(Darcidride|07/06/16)
---]] 

default_nodes.lua

@@ -1,268 +1,213 @@
 --[[
 Map Tools: unbreakable default nodes
 
-Copyright (c) 2012-2015 Calinou and contributors.
+Copyright © 2012-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
-local S = maptools.intllib
+local S = maptools.S
+local register_node = maptools.register_node
 
 maptools.creative = maptools.config["hide_from_creative_inventory"]
 
-minetest.register_node("maptools:stone", {
+register_node("maptools:stone", {
 	description = S("Unbreakable Stone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_stone.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:stonebrick", {
+register_node("maptools:stonebrick", {
 	description = S("Unbreakable Stone Brick"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_stone_brick.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:tree", {
+register_node("maptools:tree", {
 	description = S("Unbreakable Tree"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node
 })
 
-minetest.register_node("maptools:jungletree", {
+register_node("maptools:jungletree", {
 	description = S("Unbreakable Jungle Tree"),
-	range = 12,
-	stack_max = 10000,
-	tiles = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	tiles = {
+		"default_jungletree_top.png",
+		"default_jungletree_top.png",
+		"default_jungletree.png",
+	},
 	sounds = default.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node
 })
 
-minetest.register_node("maptools:cactus", {
+register_node("maptools:cactus", {
 	description = S("Unbreakable Cactus"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node
 })
 
-minetest.register_node("maptools:papyrus", {
+register_node("maptools:papyrus", {
 	description = S("Unbreakable Papyrus"),
 	drawtype = "plantlike",
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_papyrus.png"},
 	inventory_image = "default_papyrus.png",
 	wield_image = "default_papyrus.png",
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.375, -0.5, -0.375, 0.375, 0.5, 0.375}
 	},
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
-minetest.register_node("maptools:dirt", {
+register_node("maptools:dirt", {
 	description = S("Unbreakable Dirt"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_dirt.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_dirt_defaults(),
+	sounds = default.node_sound_dirt_defaults()
 })
 
-minetest.register_node("maptools:wood", {
+register_node("maptools:wood", {
 	description = S("Unbreakable Wooden Planks"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_wood.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
-minetest.register_node("maptools:junglewood", {
+register_node("maptools:junglewood", {
 	description = S("Unbreakable Junglewood Planks"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_junglewood.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
-minetest.register_node("maptools:glass", {
+register_node("maptools:glass", {
 	description = S("Unbreakable Glass"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "glasslike",
 	tiles = {"default_glass.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults()
 })
 
-minetest.register_node("maptools:leaves", {
+register_node("maptools:leaves", {
 	description = S("Unbreakable Leaves"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "allfaces_optional",
 	tiles = {"default_leaves.png"},
 	paramtype = "light",
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
-minetest.register_node("maptools:sand", {
+register_node("maptools:sand", {
 	description = S("Unbreakable Sand"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_sand.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_sand_defaults(),
+	sounds = default.node_sound_sand_defaults()
 })
 
-minetest.register_node("maptools:gravel", {
+register_node("maptools:gravel", {
 	description = S("Unbreakable Gravel"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_gravel.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_gravel_footstep", gain=0.35},
 		dug = {name="default_gravel_footstep", gain=0.6},
-	}),
+	})
 })
 
-minetest.register_node("maptools:clay", {
+register_node("maptools:clay", {
 	description = S("Unbreakable Clay"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_clay.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_dirt_defaults(),
+	sounds = default.node_sound_dirt_defaults()
 })
 
-minetest.register_node("maptools:desert_sand", {
+register_node("maptools:desert_sand", {
 	description = S("Unbreakable Desert Sand"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_desert_sand.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_sand_defaults(),
+	sounds = default.node_sound_sand_defaults()
 })
 
-minetest.register_node("maptools:sandstone", {
+register_node("maptools:sandstone", {
 	description = S("Unbreakable Sandstone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_sandstone.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:sandstone_brick", {
+register_node("maptools:sandstone_brick", {
 	description = S("Unbreakable Sandstone Brick"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_sandstone_brick.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 -- Compatibility for change made there ^
-minetest.register_alias("maptools:sandstone_brick","maptools:sandstonebrick")
+minetest.register_alias("maptools:sandstonebrick","maptools:sandstone_brick")
 
-minetest.register_node("maptools:desert_stone", {
+minetest.register_node("maptools:desert_sandstone_brick", {
+	description = S("Unbreakable Desert Sandstone Brick"),
+	range = 12,
+	stack_max = 10000,
+	tiles = {"default_desert_sandstone_brick.png"},
+	drop = "",
+	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	sounds = default.node_sound_stone_defaults(),
+	on_drop = maptools.drop_msg
+})
+
+minetest.register_node("maptools:silver_sandstone_brick", {
+	description = S("Unbreakable Silver Sandstone Brick"),
+	range = 12,
+	stack_max = 10000,
+	tiles = {"default_silver_sandstone_brick.png"},
+	drop = "",
+	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	sounds = default.node_sound_stone_defaults(),
+	on_drop = maptools.drop_msg
+})
+
+register_node("maptools:desert_stone", {
 	description = S("Unbreakable Desert Stone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_desert_stone.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:desert_cobble", {
+register_node("maptools:desert_cobble", {
 	description = S("Unbreakable Desert Cobble"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_desert_cobble.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:desert_stonebrick", {
+register_node("maptools:desert_stonebrick", {
 	description = S("Unbreakable Desert Stone Brick"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_desert_stone_brick.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:grass", {
+register_node("maptools:grass", {
 	description = S("Unbreakable Dirt with Grass"),
-	range = 12,
-	stack_max = 10000,
-	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+	tiles = {
+		"default_grass.png",
+		"default_dirt.png",
+		"default_dirt.png^default_grass_side.png",
+	},
 	paramtype2 = "facedir",
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain = 0.4},
-	}),
+	})
 })
 
-minetest.register_node("maptools:fullgrass", {
+register_node("maptools:fullgrass", {
 	description = S("Unbreakable Full Grass"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_grass.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain=0.4},
-	}),
+	})
 })
 
 for slab_num = 1,3,1 do
-	minetest.register_node("maptools:slab_grass_" .. slab_num * 4, {
+	register_node("maptools:slab_grass_" .. slab_num * 4, {
 		description = S("Grass Slab"),
-		range = 12,
-		stack_max = 10000,
-		tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^maptools_grass_side_" .. slab_num * 4 .. ".png"},
+		tiles = {
+			"default_grass.png",
+			"default_dirt.png",
+			"default_dirt.png^maptools_grass_side_" .. slab_num * 4 .. ".png",
+		},
 		drawtype = "nodebox",
 		node_box = {
 			type = "fixed",
@@ -271,123 +216,92 @@ for slab_num = 1,3,1 do
 		sunlight_propagates = true,
 		paramtype = "light",
 		paramtype2 = "facedir",
-		drop = "",
-		groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-		sounds = default.node_sound_dirt_defaults({footstep = {name="default_grass_footstep", gain = 0.4}}),
+		sounds = default.node_sound_dirt_defaults(
+			{footstep = {name="default_grass_footstep", gain = 0.4}}
+		)
 	})
 end
 
-minetest.register_node("maptools:cobble", {
+register_node("maptools:cobble", {
 	description = S("Unbreakable Cobblestone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_cobble.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:mossycobble", {
+register_node("maptools:mossycobble", {
 	description = S("Unbreakable Mossy Cobblestone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_mossycobble.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:brick", {
+register_node("maptools:brick", {
 	description = S("Unbreakable Brick"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_brick.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:coalblock", {
+register_node("maptools:coalblock", {
 	description = S("Unbreakable Coal Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_coal_block.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
 
-minetest.register_node("maptools:steelblock", {
+register_node("maptools:steelblock", {
 	description = S("Unbreakable Steel Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_steel_block.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:goldblock", {
+register_node("maptools:goldblock", {
 	description = S("Unbreakable Gold Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_gold_block.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:copperblock", {
+register_node("maptools:copperblock", {
 	description = S("Unbreakable Copper Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_copper_block.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:bronzeblock", {
+register_node("maptools:bronzeblock", {
 	description = S("Unbreakable Bronze Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_bronze_block.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
-minetest.register_node("maptools:diamondblock", {
+register_node("maptools:diamondblock", {
 	description = S("Unbreakable Diamond Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_diamond_block.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
 -- Farming:
 
-minetest.register_node("maptools:soil_wet", {
+register_node("maptools:soil_wet", {
 	description = "Wet Soil",
-	range = 12,
-	stack_max = 10000,
-	tiles = {"farming_soil_wet.png", "farming_soil_wet_side.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative, soil = 3, wet = 1, grassland = 1},
-	sounds = default.node_sound_dirt_defaults(),
+	tiles = {
+		"default_dirt.png^farming_soil_wet.png",
+		"default_dirt.png^farming_soil_wet_side.png",
+	},
+	groups = {
+		soil = 3,
+		wet = 1,
+		grassland = 1,
+	},
+	sounds = default.node_sound_dirt_defaults()
 })
 
-minetest.register_node("maptools:desert_sand_soil_wet", {
+register_node("maptools:desert_sand_soil_wet", {
 	description = "Wet Desert Sand Soil",
-	range = 12,
-	stack_max = 10000,
-	drop = "",
 	tiles = {"farming_desert_sand_soil_wet.png", "farming_desert_sand_soil_wet_side.png"},
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative, soil = 3, wet = 1, desert = 1},
-	sounds = default.node_sound_sand_defaults(),
+	groups = {
+		soil = 3,
+		wet = 1,
+		desert = 1,
+	},
+	sounds = default.node_sound_sand_defaults()
 })
 
 -- Fence:
@@ -494,9 +408,9 @@ minetest.register_node(":fences:fence_wood", {
 minetest.register_node(":maptools:unbreakable_rail", {
 	description = "Unbreakable Rail",
 	drawtype = "raillike",
-	tiles = {"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"},
-	inventory_image = "default_rail.png",
-	wield_image = "default_rail.png",
+	tiles = {"carts_rail_straight.png", "carts_rail_curved.png", "carts_rail_t_junction.png", "carts_rail_crossing.png"},
+	inventory_image = "carts_rail_straight.png",
+	wield_image = "carts_rail_straight.png",
 	paramtype = "light",
 	stack_max = 10000,
 	sunlight_propagates = true,
@@ -523,9 +437,9 @@ minetest.register_node(":maptools:unbreakable_rail", {
 minetest.register_node(":maptools:unbreakable_rail_copper", {
 	description = "Unbreakable Copper Rail",
 	drawtype = "raillike",
-	tiles = {"carts_rail_cp.png", "carts_rail_curved_cp.png", "carts_rail_t_junction_cp.png", "carts_rail_crossing_cp.png"},
-	inventory_image = "carts_rail_cp.png",
-	wield_image = "carts_rail_cp.png",
+	tiles = {"carts_rail_straight_cp.png", "carts_rail_curved_cp.png", "carts_rail_t_junction_cp.png", "carts_rail_crossing_cp.png"},
+	inventory_image = "carts_rail_straight_cp.png",
+	wield_image = "carts_rail_straight_cp.png",
 	paramtype = "light",
 	stack_max = 10000,
 	sunlight_propagates = true,
@@ -559,9 +473,9 @@ minetest.register_node(":maptools:unbreakable_rail_copper", {
 minetest.register_node("maptools:unbreakable_rail_power", {
 	description = "Unbreakable Powered Rail",
 	drawtype = "raillike",
-	tiles = {"carts_rail_pwr.png", "carts_rail_curved_pwr.png", "carts_rail_t_junction_pwr.png", "carts_rail_crossing_pwr.png"},
-	inventory_image = "carts_rail_pwr.png",
-	wield_image = "carts_rail_pwr.png",
+	tiles = {"carts_rail_straight_pwr.png", "carts_rail_curved_pwr.png", "carts_rail_t_junction_pwr.png", "carts_rail_crossing_pwr.png"},
+	inventory_image = "carts_rail_straight_pwr.png",
+	wield_image = "carts_rail_straight_pwr.png",
 	paramtype = "light",
 	stack_max = 10000,
 	sunlight_propagates = true,
@@ -605,3 +519,4 @@ minetest.register_node("maptools:chest",{
 	on_metadata_inventory_take = chestdef.on_metadata_inventory_take,
 	groups = {unbreakable = 1, not_in_creative_inventory = 1},
 })
+

depends.txt

@@ -1,2 +0,0 @@
-default
-fire

docs/CHANGELOG.md

@@ -0,0 +1,64 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Fixed
+
+- [The Admin Pickaxe can now dig More Ores' mithril blocks with client-side prediction (thanks to `maxlevel` being increased from 3 to 5).](https://github.com/minetest-mods/maptools/pull/30)
+
+## [2.2.0] - 2021-06-28
+
+### Changed
+
+- [Disabled crafting recipes for coins by default.](https://github.com/minetest-mods/maptools/pull/29)
+  - They can be enabled again by setting `maptools.enable_coin_crafting = true`
+    in `minetest.conf`.
+- Map Tools nodes can no longer be exploded by TNT.
+- Switched from Travis CI to GitHub Actions for continuous integration.
+
+## [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
+
+### Changed
+
+- The minimum supported Minetest version is now 5.0.0.
+- Map Tools nodes/items can no longer be dropped to prevent them from falling
+  into bad hands.
+
+### Fixed
+
+- The inventory images of `no_interact`, `no_build`, `ignore_like_no_clip`
+  and `ignore_like_no_point` now use textures that are available in
+  Minetest Game 5.0.0.
+
+## [1.1.0] - 2019-03-23
+
+### Changed
+
+- Increased the range of the Admin Pickaxe from 12 to 20 nodes.
+- Updated intllib support to avoid using deprecated functions.
+
+## 1.0.0 - 2017-02-19
+
+- Initial versioned release.
+
+[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.2.0...HEAD
+[2.2.0]: https://github.com/minetest-mods/maptools/compare/v2.1.0...v2.2.0
+[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
+[1.1.0]: https://github.com/minetest-mods/maptools/compare/v1.0.0...v1.1.0

docs/NODES_ITEMS.md

@@ -0,0 +1,45 @@
+# List of nodes/items
+
+To use an item, make sure you have the `give` privilege, then use
+`/give <player> <item code> [amount]` or `/giveme <item code> [amount]`.
+
+**Tip:** To give yourself a large amount of items quickly (65535 as of writing),
+use `-1` as the amount.
+
+## Nodes
+
+:warning: denotes an unpointable, unbreakable block; be very careful with them,
+as they cannot be removed by hand (they can only be removed with
+[WorldEdit](https://github.com/Uberi/Minetest-WorldEdit) or similar).
+
+> **Note**
+>
+> All of the nodes mentioned below have aliases which can be used as well.\
+> Here's the full aliases list: <https://github.com/minetest-mods/maptools/blob/master/aliases.lua>
+
+| Item code               | Description                                                                                                                                                            |
+| ----------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `maptools:{block}_u`    | Unbreakable, non-flammable, non-falling, non-decaying blocks. Most common default blocks have an unbreakable form available (`maptools:stone_u`, `maptools:wood_u`, …) |
+| `maptools:full_grass`   | Unbreakable block with the grass texture on all sides.                                                                                                                 |
+| `maptools:playerclip`  | :warning: Invisible, non-pointable block that blocks players and entities.                                                                                              |
+| `maptools:fullclip`    | Invisible, pointable block that blocks players and entities. Also available as a thin face (`maptools:fullclip_face`).                                                  |
+| `maptools:smoke`        | Some smoke. Decreases visibility, but doesn't damage players or entities).                                                                                             |
+| `maptools:nobuild`     | :warning: Very basic building prevention.                                                                                                                               |
+| `maptools:nointeract`  | 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: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:lightbulb`   | :warning: Invisible non-solid block, emitting the maximum amount of light.                                                                                              |
+
+## Items
+
+| Item code                        | Description                                                                                                                                       |
+| -------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `maptools:pick_admin`            | A bright magenta pickaxe with infinite durability, digs everything including unbreakable blocks instantly. No drops are given when digging nodes. |
+| `maptools:pick_admin_with_drops` | Same as the admin pickaxe, but drops are given when digging nodes.                                                                                |
+| `maptools:infinitefuel`         | Fuel lasting for a near-infinite time (about 50 real-life years).                                                                                  |
+| `maptools:superapple`           | A yellow apple which heals the player by 20 HP when used.                                                                                          |
+| `maptools:copper_coin`           | Decorative item (can be used in mini-games).                                                                                                      |
+| `maptools:silver_coin`           | Decorative item (can be used in mini-games).                                                                                                      |
+| `maptools:gold_coin`             | Decorative item (can be used in mini-games).                                                                                                      |

init.lua

@@ -3,35 +3,45 @@
 ** Map Tools **
 By Calinou.
 
-Copyright (c) 2012-2015 Calinou and contributors.
+Copyright © 2012-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 =====================================================================
 --]]
 
 maptools = {}
 
-local S
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function(s) return s end
-end
-maptools.intllib = S
-
 local modpath = minetest.get_modpath("maptools")
 
+local S = minetest.get_translator("maptools")
+maptools.S = S
+
+maptools.drop_msg = function(itemstack, player)
+	local name = player:get_player_name()
+	minetest.chat_send_player(name, S("[maptools] tools/nodes do not drop!"))
+end
+
+function maptools.register_node(name, def)
+	-- Increase the interaction range when holding Map Tools nodes to make building easier.
+	def.range = 12
+	def.stack_max = 65535
+	def.drop = ""
+	if def.groups then
+		if not def.groups.dig_immediate then
+			def.groups.unbreakable = 1
+		end
+		def.groups.not_in_creative_inventory = maptools.creative
+	else
+		def.groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative}
+	end
+	def.on_drop = maptools.drop_msg
+	-- Prevent Map Tools nodes from being exploded by TNT.
+	def.on_blast = function() end
+	minetest.register_node(name, def)
+end
+
 dofile(modpath .. "/config.lua")
 dofile(modpath .. "/aliases.lua")
 dofile(modpath .. "/craftitems.lua")
 dofile(modpath .. "/default_nodes.lua")
 dofile(modpath .. "/nodes.lua")
 dofile(modpath .. "/tools.lua")
-
---[[
-Map Tools by Calinou
-Licensed under the zlib license for code and CC BY-SA 3.0 for textures, see LICENSE.txt for info.
---]]
-
-if minetest.setting_getbool("log_mods") then
-	minetest.log("action", S("[maptools] loaded."))
-end

locale/es.txt

@@ -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

locale/fr.txt

@@ -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

locale/maptools.es.tr

@@ -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

locale/maptools.fr.tr

@@ -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

locale/maptools.it.tr

@@ -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

locale/maptools.template.tr

@@ -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=

mod.conf

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

nodes.lua

@@ -1,66 +1,49 @@
 --[[
 Map Tools: node definitions
 
-Copyright (c) 2012-2015 Calinou and contributors.
+Copyright © 2012-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
-local S = maptools.intllib
+local S = maptools.S
+local register_node = maptools.register_node
 
 maptools.creative = maptools.config["hide_from_creative_inventory"]
 
--- Redefine cloud so that the admin pickaxe can mine it:
-minetest.register_node(":default:cloud", {
+-- Redefine cloud so that the admin pickaxe can mine it
+register_node(":default:cloud", {
 	description = S("Cloud"),
 	tiles = {"default_cloud.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_defaults(),
 })
 
 -- Nodes
--- =====
 
-minetest.register_node("maptools:black", {
+register_node("maptools:black", {
 	description = S("Black"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"black.png"},
-	drop = "",
 	post_effect_color = {a=255, r=0, g=0, b=0},
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("maptools:white", {
+register_node("maptools:white", {
 	description = S("White"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"white.png"},
-	drop = "",
 	post_effect_color = {a=255, r=128, g=128, b=128},
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("maptools:playerclip", {
+register_node("maptools:playerclip", {
 	description = S("Player Clip"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_green.png",
 	drawtype = "airlike",
 	paramtype = "light",
 	pointable = false,
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 
-minetest.register_node("maptools:fake_walkable", {
+register_node("maptools:fake_walkable", {
 	description = S("Player Clip"),
-	drawtype = "nodebox",
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_green.png",
 	drawtype = "airlike",
 	paramtype = "light",
@@ -72,27 +55,18 @@ minetest.register_node("maptools:fake_walkable", {
 			{0, 0, 0, 0, 0, 0},
 		},
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 
-minetest.register_node("maptools:fullclip", {
+register_node("maptools:fullclip", {
 	description = S("Full Clip"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_blue.png",
 	drawtype = "airlike",
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 
-minetest.register_node("maptools:fake_walkable_pointable", {
+register_node("maptools:fake_walkable_pointable", {
 	description = S("Player Clip"),
-	drawtype = "nodebox",
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_green.png",
 	drawtype = "airlike",
 	paramtype = "light",
@@ -103,141 +77,125 @@ minetest.register_node("maptools:fake_walkable_pointable", {
 			{0, 0, 0, 0, 0, 0},
 		},
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 
-minetest.register_node("maptools:ignore_like", {
+register_node("maptools:ignore_like", {
 	description = S("Ignore-like"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_pink.png",
 	tiles = {"invisible.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	use_texture_alpha = "clip",
 })
 
-minetest.register_node("maptools:ignore_like_no_clip", {
+register_node("maptools:ignore_like_no_clip", {
 	description = S("Ignore-like (no clip)"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_violet.png",
 	tiles = {"invisible.png"},
 	paramtype = "light",
 	walkable = false,
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	use_texture_alpha = "clip",
 })
 
 
-minetest.register_node("maptools:ignore_like_no_point", {
+register_node("maptools:ignore_like_no_point", {
 	description = S("Ignore-like (no point)"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_violet.png",
 	tiles = {"invisible.png"},
 	paramtype = "light",
 	pointable = false,
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	use_texture_alpha = "clip",
 })
 
-minetest.register_node("maptools:ignore_like_no_clip_no_point", {
+register_node("maptools:ignore_like_no_clip_no_point", {
 	description = S("Ignore-like (no clip, no point)"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_pink.png",
 	tiles = {"invisible.png"},
 	paramtype = "light",
 	walkable = false,
 	pointable = false,
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 
-minetest.register_node("maptools:fullclip_face", {
+register_node("maptools:fullclip_face", {
 	description = S("Full Clip Face"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_white.png",
 	drawtype = "nodebox",
 	tiles = {"invisible.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
+	use_texture_alpha = "clip",
 	node_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4999, 0.5},
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative, fall_damage_add_percent=-100},
+	groups = {
+		fall_damage_add_percent = -100,
+	},
 })
 
-minetest.register_node("maptools:playerclip_bottom", {
+register_node("maptools:playerclip_bottom", {
 	description = S("Player Clip Bottom Face"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_orange.png",
 	drawtype = "nodebox",
 	tiles = {"invisible.png"},
 	pointable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
+	use_texture_alpha = "clip",
 	node_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4999, 0.5},
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative, fall_damage_add_percent=-100},
+	groups = {
+		fall_damage_add_percent = -100,
+	},
 })
 
-minetest.register_node("maptools:playerclip_top", {
+register_node("maptools:playerclip_top", {
 	description = S("Player Clip Top Face"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_yellow.png",
 	drawtype = "nodebox",
 	tiles = {"invisible.png"},
 	pointable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
+	use_texture_alpha = "clip",
 	node_box = {
 		type = "fixed",
 		fixed = {-0.5, 0.4999, -0.5, 0.5, 0.5, 0.5},
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative, fall_damage_add_percent=-100},
+	groups = {
+		fall_damage_add_percent = -100,
+	},
 })
 
 for pusher_num=1,10,1 do
-minetest.register_node("maptools:pusher_" .. pusher_num, {
+	register_node("maptools:pusher_" .. pusher_num, {
 		description = S("Pusher (%s)"):format(pusher_num),
-	range = 12,
-	stack_max = 10000,
 				inventory_image = "default_steel_block.png^default_apple.png",
 		drawtype = "nodebox",
 		tiles = {"invisible.png"},
 		paramtype = "light",
 		paramtype2 = "facedir",
 		sunlight_propagates = true,
+		use_texture_alpha = "clip",
 		node_box = {
 			type = "fixed",
 			fixed = {-0.5, -0.5, -0.5, 0.5, -0.4999, 0.5},
 		},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative, fall_damage_add_percent=-100, bouncy=pusher_num*100},
-})
+		groups = {
+			fall_damage_add_percent = -100,
+			bouncy = pusher_num * 100,
+		},
+	})
 end
 
-minetest.register_node("maptools:lightbulb", {
+register_node("maptools:lightbulb", {
 	description = S("Light Bulb"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^default_mese_crystal_fragment.png",
 	drawtype = "airlike",
 	walkable = false,
@@ -245,41 +203,29 @@ minetest.register_node("maptools:lightbulb", {
 	light_source = default.LIGHT_MAX,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 
-minetest.register_node("maptools:nobuild", {
+register_node("maptools:nobuild", {
 	description = S("Build Prevention"),
-	range = 12,
-	stack_max = 10000,
-	inventory_image = "default_steel_block.png^bones_bones.png",
+	inventory_image = "default_steel_block.png^default_flint.png",
 	drawtype = "airlike",
 	walkable = false,
 	pointable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 
-minetest.register_node("maptools:nointeract", {
+register_node("maptools:nointeract", {
 	description = S("Interact Prevention"),
-	range = 12,
-	stack_max = 10000,
-	inventory_image = "default_steel_block.png^default_scorched_stuff.png",
+	inventory_image = "default_steel_block.png^default_bush_stem.png",
 	drawtype = "airlike",
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 
-minetest.register_node("maptools:climb", {
+register_node("maptools:climb", {
 	description = S("Climb Block"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^default_ladder_wood.png",
 	drawtype = "airlike",
 	walkable = false,
@@ -287,15 +233,11 @@ minetest.register_node("maptools:climb", {
 	pointable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 
 for damage_num=1,5,1 do
-minetest.register_node("maptools:damage_" .. damage_num, {
+register_node("maptools:damage_" .. damage_num, {
 	description = S("Damaging Block (%s)"):format(damage_num),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^farming_cotton_" .. damage_num .. ".png",
 	drawtype = "airlike",
 	walkable = false,
@@ -303,15 +245,11 @@ minetest.register_node("maptools:damage_" .. damage_num, {
 	damage_per_second = damage_num,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 end
 
-minetest.register_node("maptools:kill", {
+register_node("maptools:kill", {
 	description = S("Kill Block"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_black.png",
 	drawtype = "airlike",
 	walkable = false,
@@ -319,27 +257,19 @@ minetest.register_node("maptools:kill", {
 	damage_per_second = 20,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 })
 
-minetest.register_node("maptools:smoke", {
+register_node("maptools:smoke", {
 	description = S("Smoke Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"maptools_smoke.png"},
 	drawtype = "allfaces_optional",
 	walkable = false,
 	paramtype = "light",
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	post_effect_color = {a=192, r=96, g=96, b=96},
 })
 
-minetest.register_node("maptools:ladder", {
+register_node("maptools:ladder", {
 	description = S("Fake Ladder"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "signlike",
 	tiles = {"default_ladder_wood.png"},
 	inventory_image = "default_ladder_wood.png",
@@ -351,24 +281,26 @@ minetest.register_node("maptools:ladder", {
 	selection_box = {
 		type = "wallmounted",
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_wood_defaults(),
 })
 
-local permafire = table.copy(minetest.registered_nodes["fire:basic_flame"])
-permafire.damage_per_second = 4
-permafire.stack_max = 10000
-permafire.range = 12
-permafire.description = S("Permanent Fire")
-permafire.groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative}
-
-minetest.register_node("maptools:permanent_fire", permafire)
-
-minetest.register_node("maptools:fake_fire", {
-	description = S("Fake Fire"),
-	range = 12,
-	stack_max = 10000,
+register_node("maptools:permanent_fire", {
+	description = S("Permanent Fire"),
+	drawtype = "plantlike",
+	paramtype = "light",
+	tiles = {{
+		name="fire_basic_flame_animated.png",
+		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1},
+	}},
+	inventory_image = "fire_basic_flame.png",
+	light_source = 14,
+	sunlight_propagates = true,
+	walkable = false,
+	damage_per_second = 4,
+})
+
+register_node("maptools:fake_fire", {
+	description = S("Fake Fire"),
 	drawtype = "plantlike",
 	paramtype = "light",
 	tiles = {{
@@ -377,32 +309,24 @@ minetest.register_node("maptools:fake_fire", {
 	}},
 	inventory_image = "fire_basic_flame.png",
 	light_source = 14,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sunlight_propagates = true,
 	walkable = false,
 })
 
-minetest.register_node("maptools:igniter", {
+register_node("maptools:igniter", {
 	drawtype = "airlike",
-	range = 12,
-	stack_max = 10000,
-	inventory_image = "default_steel_block.png^crosshair.png",
 	description = S("Igniter"),
 	paramtype = "light",
 	inventory_image = "fire_basic_flame.png",
-	drop = "",
-	groups = {igniter=2, unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	groups = {igniter=2},
 	sunlight_propagates = true,
 	pointable = false,
 	walkable = false,
 })
 
-minetest.register_node("maptools:superapple", {
+register_node("maptools:superapple", {
 	description = S("Super Apple"),
-	range = 12,
-	stack_max = 99,
-	drawtype = "nodebox",
+	drawtype = "plantlike",
 	visual_scale = 1.0,
 	tiles = {"maptools_super_apple_top.png","maptools_super_apple_bottom.png","maptools_super_apple_side.png"},
 	inventory_image = "maptools_superapple.png",
@@ -426,9 +350,15 @@ minetest.register_node("maptools:superapple", {
 	groups = {fleshy=3, dig_immediate=3, not_in_creative_inventory = 0, flammable = 2, leafdecay = 3, leafdecay_drop = 1},
 	on_use = minetest.item_eat(20),
 	sounds = default.node_sound_defaults(),
-	after_place_node = function(pos, placer, itemstack)
-		if placer:is_player() then
-			minetest.set_node(pos, {name = "maptools:superapple", param2= 1})
-		end
-	end,
+})
+
+register_node("maptools:drowning", {
+	description = S("Drownable Air"),
+	inventory_image = "default_steel_block.png^dye_black.png",
+	drawtype = "airlike",
+	paramtype = "light",
+	pointable = false,
+	walkable = false,
+	drowning = 1,
+	sunlight_propagates = true,
 })

settingtypes.txt

@@ -0,0 +1,3 @@
+# If `true`, enables coin crafting recipes. If `false`, disables coin crafting recipes.
+# Takes effect only at load-time; runtime changes to this setting are ignored.
+maptools.enable_coin_crafting (Enable crafting recipes for coins) bool false

tools.lua

@@ -1,61 +1,63 @@
 --[[
 Map Tools: tool definitions
 
-Copyright (c) 2012-2015 Calinou and contributors.
+Copyright © 2012-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
-local S = maptools.intllib
+local S = maptools.S
 
 maptools.creative = maptools.config["hide_from_creative_inventory"]
 
-minetest.register_tool("maptools:pick_admin", {
-	description = S("Admin Pickaxe"),
-	range = 12,
-	inventory_image = "maptools_adminpick.png",
-	groups = {not_in_creative_inventory = maptools.creative},
-	tool_capabilities = {
+local pick_admin_toolcaps = {
 	full_punch_interval = 0.1,
 	max_drop_level = 3,
-		groupcaps= {
-			unbreakable = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			fleshy =      {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			choppy =      {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			bendy =       {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			cracky =      {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			crumbly =     {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			snappy =      {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+	groupcaps = {
+		unbreakable = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
+		fleshy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
+		choppy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
+		bendy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
+		cracky = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
+		crumbly = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
+		snappy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
 	},
 	damage_groups = {fleshy = 1000},
-	},
+}
+
+minetest.register_tool("maptools:pick_admin", {
+	description = S("Admin Pickaxe"),
+	range = 20,
+	inventory_image = "maptools_adminpick.png",
+	groups = {not_in_creative_inventory = maptools.creative},
+	tool_capabilities = pick_admin_toolcaps,
+	on_drop = maptools.drop_msg,
 })
 
 minetest.register_tool("maptools:pick_admin_with_drops", {
 	description = S("Admin Pickaxe with Drops"),
-	range = 12,
+	range = 20,
 	inventory_image = "maptools_adminpick_with_drops.png",
 	groups = {not_in_creative_inventory = maptools.creative},
-	tool_capabilities = {
-		full_punch_interval = 0.35,
-		max_drop_level = 3,
-		groupcaps = {
-			unbreakable = {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			fleshy =      {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			choppy =      {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			bendy =       {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			cracky =      {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			crumbly =     {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-			snappy =      {times={[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
-		},
-		damage_groups = {fleshy = 1000},
-	},
+	tool_capabilities = pick_admin_toolcaps,
+	on_drop = maptools.drop_msg,
 })
 
 minetest.register_on_punchnode(function(pos, node, puncher)
 	if puncher:get_wielded_item():get_name() == "maptools:pick_admin"
 	and minetest.get_node(pos).name ~= "air" then
-		minetest.log("action", puncher:get_player_name() .. " digs " .. minetest.get_node(pos).name .. " at " .. minetest.pos_to_string(pos) .. " using an Admin Pickaxe.")
-		minetest.remove_node(pos) -- The node is removed directly, which means it even works on non-empty containers and group-less nodes.
-		nodeupdate(pos) -- Run node update actions like falling nodes.
+		minetest.log(
+			"action",
+			puncher:get_player_name() ..
+			" digs " ..
+			minetest.get_node(pos).name ..
+			" at " ..
+			minetest.pos_to_string(pos) ..
+			" using an Admin Pickaxe."
+		)
+		-- The node is removed directly, which means it even works
+		-- on non-empty containers and group-less nodes
+		minetest.remove_node(pos)
+		-- Run node update actions like falling nodes
+		minetest.check_for_falling(pos)
 	end
 end)