Merge remote-tracking branch 'upstream/master'

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

.github/workflows/build.yml

@@ -0,0 +1,11 @@
+on: [push, pull_request]
+name: build
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: lint
+        uses: Roang-zero1/factorio-mod-luacheck@master
+        with:
+          luacheckrc_url: ""

.travis.yml

@@ -1,15 +0,0 @@
-dist: bionic
-language: python
-
-python:
-  - 3.7.1
-
-install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qqq luarocks
-  - pip3 install pre-commit
-  - luarocks install --local luacheck
-
-script:
-  - pre-commit run --all-files
-  - $HOME/.luarocks/bin/luacheck .

README.md

@@ -1,4 +1,4 @@
-# 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](https://www.minetest.net/), a free and open source infinite
 world block sandbox game.
@@ -6,7 +6,7 @@ world block sandbox game.
 ## Resources
 
 - [Forum topic](https://forum.minetest.net/viewtopic.php?f=11&t=1882)
-- [List of nodes and items available](NODES_ITEMS.md)
+- [List of nodes and items available](docs/NODES_ITEMS.md)
 
 ## Installation
 

default_nodes.lua

@@ -9,216 +9,148 @@ local S = maptools.S
 
 maptools.creative = maptools.config["hide_from_creative_inventory"]
 
-minetest.register_node("maptools:stone", {
+local function register_node(name, def)
+	-- Increase the interaction range when holding Map Tools nodes to make building easier.
+	def.range = 12
+	def.stack_max = 10000
+	def.drop = ""
+	if def.groups then
+		def.groups.unbreakable = 1
+		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
+
+register_node("maptools:stone", {
 	description = S("Unbreakable Stone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_stone.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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,
+	on_place = minetest.rotate_node
-	on_drop = maptools.drop_msg
 })
 
-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},
 	sounds = default.node_sound_wood_defaults(),
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
-	on_drop = maptools.drop_msg
 })
 
-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,
+	on_place = minetest.rotate_node
-	on_drop = maptools.drop_msg
 })
 
-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(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:dirt", {
+register_node("maptools:dirt", {
 	description = S("Unbreakable Dirt"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_dirt.png"},
-	drop = "",
+	sounds = default.node_sound_dirt_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_dirt_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:wood", {
+register_node("maptools:wood", {
 	description = S("Unbreakable Wooden Planks"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_wood.png"},
-	drop = "",
+	sounds = default.node_sound_wood_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_wood_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:junglewood", {
+register_node("maptools:junglewood", {
 	description = S("Unbreakable Junglewood Planks"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_junglewood.png"},
-	drop = "",
+	sounds = default.node_sound_wood_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_wood_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_glass_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_glass_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_leaves_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_leaves_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:sand", {
+register_node("maptools:sand", {
 	description = S("Unbreakable Sand"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_sand.png"},
-	drop = "",
+	sounds = default.node_sound_sand_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_sand_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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},
-	}),
+	})
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:clay", {
+register_node("maptools:clay", {
 	description = S("Unbreakable Clay"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_clay.png"},
-	drop = "",
+	sounds = default.node_sound_dirt_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_dirt_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_sand_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_sand_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:sandstone", {
+register_node("maptools:sandstone", {
 	description = S("Unbreakable Sandstone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_sandstone.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 -- Compatibility for change made there ^
 minetest.register_alias("maptools:sandstonebrick","maptools:sandstone_brick")
@@ -245,75 +177,48 @@ minetest.register_node("maptools:silver_sandstone_brick", {
 	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:desert_stone", {
+register_node("maptools:desert_stone", {
 	description = S("Unbreakable Desert Stone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_desert_stone.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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",
 	},
 	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},
-	}),
+	})
-	on_drop = maptools.drop_msg
 })
 
-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},
-	}),
+	})
-	on_drop = maptools.drop_msg
 })
 
 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",
@@ -327,152 +232,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}}
-		),
+		)
-		on_drop = maptools.drop_msg
 	})
 end
 
-minetest.register_node("maptools:cobble", {
+register_node("maptools:cobble", {
 	description = S("Unbreakable Cobblestone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_cobble.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:mossycobble", {
+register_node("maptools:mossycobble", {
 	description = S("Unbreakable Mossy Cobblestone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_mossycobble.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:brick", {
+register_node("maptools:brick", {
 	description = S("Unbreakable Brick"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_brick.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
 
-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 = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
 -- Farming:
 
-minetest.register_node("maptools:soil_wet", {
+register_node("maptools:soil_wet", {
 	description = "Wet Soil",
-	range = 12,
-	stack_max = 10000,
 	tiles = {
 		"default_dirt.png^farming_soil_wet.png",
 		"default_dirt.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(),
+	sounds = default.node_sound_dirt_defaults()
-	on_drop = maptools.drop_msg
 })
 
-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(),
+	sounds = default.node_sound_sand_defaults()
-	on_drop = maptools.drop_msg
 })
 
 -- Fence:

docs/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- 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

docs/NODES_ITEMS.md

@@ -13,7 +13,7 @@ as they cannot be removed by hand (they can only be removed with
 [WorldEdit](https://github.com/Uberi/Minetest-WorldEdit) or similar).
 
 | 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:player_clip`  | :warning: Invisible, non-pointable block that blocks players and entities.                                                                                             |
@@ -30,7 +30,7 @@ as they cannot be removed by hand (they can only be removed with
 ## Items
 
 | Item code                        | Description                                                                                                                                       |
-| -------------------------------: | ------------------------------------------------------------------------------------------------------------------------------------------------- |
+| -------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------ |
 | `maptools:admin_pick`            | A bright magenta pickaxe with infinite durability, digs everything including unbreakable blocks instantly. No drops are given when digging nodes. |
 | `maptools:admin_pick_with_drops` | Same as the admin pickaxe, but drops are given when digging nodes.                                                                                |
 | `maptools:infinite_fuel`         | Fuel lasting for a near-infinite time (about 50 real-life years).                                                                                 |