Merge remote-tracking branch 'upstream/master'

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

.github/workflows/build.yml

@@ -4,8 +4,18 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
-      - name: lint
+      - uses: actions/setup-python@v4
-        uses: Roang-zero1/factorio-mod-luacheck@master
+
-        with:
+      - name: Install LuaRocks
-          luacheckrc_url: ""
+        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 .

LICENSE.md

@@ -1,4 +1,5 @@
-# zlib license
+zlib license
+============
 
 Copyright © 2012-2020 Hugo Locurcio and contributors
 

craftitems.lua

@@ -59,7 +59,7 @@ 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},
 })
 

default_nodes.lua

@@ -6,26 +6,10 @@ Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
 local S = maptools.S
+local register_node = maptools.register_node
 
 maptools.creative = maptools.config["hide_from_creative_inventory"]
 
-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"),
 	tiles = {"default_stone.png"},
@@ -152,6 +136,30 @@ register_node("maptools:sandstone_brick", {
 	tiles = {"default_sandstone_brick.png"},
 	sounds = default.node_sound_stone_defaults()
 })
+-- Compatibility for change made there ^
+minetest.register_alias("maptools:sandstonebrick","maptools:sandstone_brick")
+
+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"),
@@ -295,3 +303,220 @@ register_node("maptools:desert_sand_soil_wet", {
 	},
 	sounds = default.node_sound_sand_defaults()
 })
+
+-- Fence:
+
+local function dockable(nodename)
+	if nodename == "default:wood" or nodename == "default:brick" or nodename == "default:cobble" or nodename == "default:dirt" or nodename == "default:sandstone" or nodename == "default:stone" or string.find(nodename, "fences:fence_wood") or string.find(nodename, "fences:fencegate") then
+		return true
+	end
+end
+local function find_dock(pos, second)
+	if pos == nil then
+		return false
+	end
+
+	local h1 = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z})
+	local v1 = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z})
+	local r1 = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1})
+	local l1 = minetest.get_node({x=pos.x, y=pos.y, z=pos.z-1})
+	local code = 0
+	if dockable(l1.name) then
+		code = code+1
+		if second < 2 then
+			minetest.punch_node({x=pos.x, y=pos.y, z=pos.z-1})
+		end
+	end
+	if dockable(r1.name) then
+		code = code+2
+		if second < 2 then
+			minetest.punch_node({x=pos.x, y=pos.y, z=pos.z+1})
+		end
+	end
+	if dockable(v1.name) then
+		code = code+11
+		if second < 2 then
+			minetest.punch_node({x=pos.x-1, y=pos.y, z=pos.z})
+		end
+	end
+	if dockable(h1.name) then
+		code = code+21
+		if second < 2 then
+			minetest.punch_node({x=pos.x+1, y=pos.y, z=pos.z})
+		end
+	end
+		local me = minetest.get_node(pos)
+		if code > 0 then
+			local tmp_name = "fences:fence_wood_"..code
+			--minetest.chat_send_all(tmp_name)
+			local tmp_node = {name=tmp_name, param1=me.param1, param2=me.param2}
+			if second > 0 then
+				local tmp_node = {name=tmp_name, param1=me.param1, param2=me.param2}
+				minetest.set_node(pos, tmp_node)
+			end
+		elseif code == 0 then
+			if second == 2 then
+				local tmp_node = {name="fences:fence_wood", param1=me.param1, param2=me.param2}
+				minetest.set_node(pos, tmp_node)
+			end
+		end
+
+end
+
+
+local p0 = {-2/16, -1/2, -2/16, 2/16, 1/2, 2/16}
+local p1 = {-2/16, 1/2, -2/16, -2/16, 1/2+8/16, -2/16}
+local p2 = {-2/16, 1/2, 2/16, -2/16, 1/2+8/16, 2/16}
+local p3 = {0, 0, 0, 0, 0, 0}
+local p4 = {2/16, 1/2, -2/16, 2/16, 1/2+8/16, -2/16}
+local p5 = {2/16, 1/2, 2/16, 2/16, 1/2+8/16, 2/16}
+
+
+minetest.register_node(":fences:fence_wood", {
+	description = S("Unbreakable Wooden Fence"),
+	range = 12,
+	stack_max = 10000,
+	tiles = {"default_wood.png"},
+	inventory_image = "default_wood.png",
+	wield_image = "default_wood.png",
+	paramtype = "light",
+	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	sounds = default.node_sound_wood_defaults(),
+	drop = "",
+	sunlight_propagates = true,
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {p0,p1,p2,p3,p4,p5,}
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {-2/16, -1/2, -2/16, 2/16, 1/2, 2/16},
+	},
+	on_construct = function(pos)
+		find_dock(pos, 1)
+	end,
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		find_dock(pos, -1)
+	end
+})
+
+
+
+-- carts:
+
+minetest.register_node(":maptools:unbreakable_rail", {
+	description = "Unbreakable Rail",
+	drawtype = "raillike",
+	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,
+	is_ground_content = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	groups = {snappy = 1, rail = 1, connect_to_raillike = 1, unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	mesecons = {
+		effector = {
+			action_off = function(pos, node)
+				minetest.get_meta(pos):set_string("cart_acceleration", "0.5")
+			end,
+
+			action_on = function(pos, node)
+				minetest.get_meta(pos):set_string("cart_acceleration", "0")
+			end,
+		},
+	},
+})
+
+minetest.register_node(":maptools:unbreakable_rail_copper", {
+	description = "Unbreakable Copper Rail",
+	drawtype = "raillike",
+	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,
+	is_ground_content = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	groups = {rail = 1, connect_to_raillike = 1, unbreakable = 1, not_in_creative_inventory = maptools.creative},
+
+	after_place_node = function(pos, placer, itemstack)
+		if not mesecon then
+			minetest.get_meta(pos):set_string("cart_acceleration", "0.5")
+		end
+	end,
+
+	mesecons = {
+		effector = {
+			action_off = function(pos, node)
+				minetest.get_meta(pos):set_string("cart_acceleration", "0.5")
+			end,
+
+			action_on = function(pos, node)
+				minetest.get_meta(pos):set_string("cart_acceleration", "0")
+			end,
+		},
+	},
+})
+
+minetest.register_node("maptools:unbreakable_rail_power", {
+	description = "Unbreakable Powered Rail",
+	drawtype = "raillike",
+	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,
+	is_ground_content = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	groups = {rail = 1, connect_to_raillike = 1, unbreakable = 1, not_in_creative_inventory = maptools.creative},
+
+	after_place_node = function(pos, placer, itemstack)
+		if not mesecon then
+			minetest.get_meta(pos):set_string("cart_acceleration", "0.5")
+		end
+	end,
+
+	mesecons = {
+		effector = {
+			action_off = function(pos, node)
+				minetest.get_meta(pos):set_string("cart_acceleration", "0.5")
+			end,
+
+			action_on = function(pos, node)
+				minetest.get_meta(pos):set_string("cart_acceleration", "0")
+			end,
+		},
+	},
+})
+
+local chestdef = minetest.registered_nodes["default:chest"]
+
+minetest.register_node("maptools:chest",{
+	description = "Chest",
+	tiles = chestdef.tiles,
+	stack_max = 1000,
+	paramtype2 = "facedir",
+	on_construct = chestdef.on_construct,
+	on_metadata_inventory_move = chestdef.on_metadata_inventory_move,
+	on_metadata_inventory_put  = chestdef.on_metadata_inventory_put,
+	on_metadata_inventory_take = chestdef.on_metadata_inventory_take,
+	groups = {unbreakable = 1, not_in_creative_inventory = 1},
+})
+

docs/CHANGELOG.md

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

docs/NODES_ITEMS.md

@@ -12,15 +12,20 @@ use `-1` as the amount.
 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:player_clip`  | :warning: Invisible, non-pointable block that blocks players and entities.                                                                                             |
+| `maptools:playerclip`  | :warning: Invisible, non-pointable block that blocks players and entities.                                                                                              |
-| `maptools:full_clip`    | Invisible, pointable block that blocks players and entities. Also available as a thin face (`maptools:full_clip_face`).                                                |
+| `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:no_build`     | :warning: Very basic building prevention.                                                                                                                              |
+| `maptools:nobuild`     | :warning: Very basic building prevention.                                                                                                                               |
-| `maptools:no_interact`  | Prevents interacting through the block (opening chests, furnaces, attacking entities, …), but can still be walked through.                                             |
+| `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.                                                                                                                                 |
@@ -31,10 +36,10 @@ as they cannot be removed by hand (they can only be removed with
 
 | 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:pick_admin`            | 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:pick_admin_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).                                                                                 |
+| `maptools:infinitefuel`         | Fuel lasting for a near-infinite time (about 50 real-life years).                                                                                  |
-| `maptools:super_apple`           | A yellow apple which heals the player by 20 HP when used.                                                                                         |
+| `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

@@ -20,6 +20,25 @@ maptools.drop_msg = function(itemstack, player)
 	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")

mod.conf

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

nodes.lua

@@ -6,63 +6,44 @@ Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
 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", {
+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(),
-	on_drop = maptools.drop_msg
 })
 
 -- 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(),
-	on_drop = maptools.drop_msg
 })
 
-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(),
-	on_drop = maptools.drop_msg
 })
 
-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},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:fake_walkable", {
+register_node("maptools:fake_walkable", {
 	description = S("Player Clip"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_green.png",
 	drawtype = "airlike",
 	paramtype = "light",
@@ -74,28 +55,18 @@ minetest.register_node("maptools:fake_walkable", {
 			{0, 0, 0, 0, 0, 0},
 		},
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-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},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:fake_walkable_pointable", {
+register_node("maptools:fake_walkable_pointable", {
 	description = S("Player Clip"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_green.png",
 	drawtype = "airlike",
 	paramtype = "light",
@@ -106,212 +77,155 @@ minetest.register_node("maptools:fake_walkable_pointable", {
 			{0, 0, 0, 0, 0, 0},
 		},
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	use_texture_alpha = "clip",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-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 = "",
+	use_texture_alpha = "clip",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
 
-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 = "",
+	use_texture_alpha = "clip",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-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},
-	on_drop = maptools.drop_msg
 })
 
-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,
 	},
-	on_drop = maptools.drop_msg
 })
 
-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,
 	},
-	on_drop = maptools.drop_msg
 })
 
-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,
 	},
-	on_drop = maptools.drop_msg
 })
 
 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,
+				inventory_image = "default_steel_block.png^default_apple.png",
-		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,
 		},
-		on_drop = maptools.drop_msg
 	})
 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,
 	pointable = false,
-	light_source = 14,
+	light_source = default.LIGHT_MAX,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:nobuild", {
+register_node("maptools:nobuild", {
 	description = S("Build Prevention"),
-	range = 12,
-	stack_max = 10000,
 	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},
-	on_drop = maptools.drop_msg
 })
 
-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_bush_stem.png",
 	drawtype = "airlike",
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-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,
@@ -319,16 +233,11 @@ minetest.register_node("maptools:climb", {
 	pointable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
 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,
@@ -336,16 +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},
-	on_drop = maptools.drop_msg
 })
 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,
@@ -353,29 +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},
-	on_drop = maptools.drop_msg
 })
 
-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},
-	on_drop = maptools.drop_msg
 })
 
-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",
@@ -387,16 +281,11 @@ 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(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:permanent_fire", {
+register_node("maptools:permanent_fire", {
 	description = S("Permanent Fire"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "plantlike",
 	paramtype = "light",
 	tiles = {{
@@ -405,18 +294,13 @@ minetest.register_node("maptools:permanent_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,
 	damage_per_second = 4,
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:fake_fire", {
+register_node("maptools:fake_fire", {
 	description = S("Fake Fire"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "plantlike",
 	paramtype = "light",
 	tiles = {{
@@ -425,53 +309,51 @@ 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,
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:igniter", {
+register_node("maptools:igniter", {
 	drawtype = "airlike",
-	range = 12,
-	stack_max = 10000,
 	description = S("Igniter"),
 	paramtype = "light",
 	inventory_image = "fire_basic_flame.png",
-	drop = "",
+	groups = {igniter=2},
-	groups = {igniter=2, unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sunlight_propagates = true,
 	pointable = false,
 	walkable = false,
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:superapple", {
+register_node("maptools:superapple", {
 	description = S("Super Apple"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "plantlike",
 	visual_scale = 1.0,
-	tiles = {"maptools_superapple.png"},
+	tiles = {"maptools_super_apple_top.png","maptools_super_apple_bottom.png","maptools_super_apple_side.png"},
 	inventory_image = "maptools_superapple.png",
 	paramtype = "light",
 	sunlight_propagates = true,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
-	},
 	walkable = false,
-	groups = {fleshy=3, dig_immediate=3, not_in_creative_inventory = maptools.creative},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-3/16,	-7/16,	-3/16,	3/16,	1/16,	3/16},
+			{-4/16,	-6/16,	-3/16,	4/16,	0,		3/16},
+			{-3/16,	-6/16,	-4/16,	3/16,	0,		4/16},
+			{-1/32,	1/16,	-1/32,	1/32,	4/16,	1/32},
+			{-1/16,	1.6/16,	0,		1/16,	1.8/16,	1/16},
+			{-2/16,	1.4/16,	1/16,	1/16,	1.6/16,	2/16},
+			{-2/16,	1.2/16,	2/16,	0,		1.4/16,	3/16},
+			{-1.5/16,	1/16,	.5/16,	0.5/16,		1.2/16,	2.5/16},
+		}
+	},
+	is_ground_content = true,
+	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(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:drowning", {
+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",
@@ -479,7 +361,4 @@ minetest.register_node("maptools:drowning", {
 	walkable = false,
 	drowning = 1,
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })

tools.lua

@@ -13,13 +13,13 @@ 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},
+		unbreakable = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		fleshy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		fleshy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		choppy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		choppy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		bendy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		bendy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		cracky = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		cracky = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		crumbly = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		crumbly = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		snappy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		snappy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
 	},
 	damage_groups = {fleshy = 1000},
 }