Bump to version 2.2.0

Crafting recipes for coins can be enabled again by setting
`maptools.enable_coin_crafting = true` in `minetest.conf`.

LICENSE.md

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

config.lua

@@ -26,4 +26,6 @@ local function setting(settingtype, name, default)
 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

@@ -16,6 +16,14 @@ minetest.register_craftitem("maptools:copper_coin", {
 	stack_max = 10000,
 })
 
+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",
@@ -23,6 +31,16 @@ minetest.register_craftitem("maptools:silver_coin", {
 	stack_max = 10000,
 })
 
+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",
@@ -30,6 +48,14 @@ minetest.register_craftitem("maptools:gold_coin", {
 	stack_max = 10000,
 })
 
+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",

default_nodes.lua

@@ -152,30 +152,6 @@ 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"),
@@ -319,220 +295,3 @@ 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,8 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.2.0] - 2021-06-28
+
 ### Changed
 
+- Disabled crafting recipes for coins by default.
+  - 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.
 
@@ -48,7 +53,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Initial versioned release.
 
-[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.1.0...HEAD
+[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

@@ -25,7 +25,7 @@ as they cannot be removed by hand (they can only be removed with
 | `maptools:kill`         | :warning: Instant kill blocks (damages players by 20 HP per second).                                                                                                   |
 | `maptools:drowning`     | :warning: Simulates drowning in water.                                                                                                                                 |
 | `maptools:light_block`  | :warning: Invisible non-solid block, prevents light from passing through.                                                                                              |
-| `maptools:light_bulb`   | :warning: Invisible non-solid block, emitting the maximum amount of light.                                                                                             |
+| `maptools:lightbulb`   | :warning: Invisible non-solid block, emitting the maximum amount of light.                                                                                              |
 
 ## Items
 

mod.conf

@@ -1,4 +1,5 @@
 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

@@ -271,7 +271,7 @@ minetest.register_node("maptools:lightbulb", {
 	drawtype = "airlike",
 	walkable = false,
 	pointable = false,
-	light_source = default.LIGHT_MAX,
+	light_source = 14,
 	paramtype = "light",
 	sunlight_propagates = true,
 	drop = "",
@@ -450,31 +450,22 @@ minetest.register_node("maptools:igniter", {
 minetest.register_node("maptools:superapple", {
 	description = S("Super Apple"),
 	range = 12,
-	stack_max = 99,
+	stack_max = 10000,
-	drawtype = "nodebox",
+	drawtype = "plantlike",
 	visual_scale = 1.0,
-	tiles = {"maptools_super_apple_top.png","maptools_super_apple_bottom.png","maptools_super_apple_side.png"},
+	tiles = {"maptools_superapple.png"},
 	inventory_image = "maptools_superapple.png",
 	paramtype = "light",
 	sunlight_propagates = true,
-	walkable = false,
+	selection_box = {
-	node_box = {
 		type = "fixed",
-		fixed = {
+		fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
-			{-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,
+	walkable = false,
-	groups = {fleshy=3, dig_immediate=3, not_in_creative_inventory = 0, flammable = 2, leafdecay = 3, leafdecay_drop = 1},
+	groups = {fleshy=3, dig_immediate=3, not_in_creative_inventory = maptools.creative},
 	on_use = minetest.item_eat(20),
 	sounds = default.node_sound_defaults(),
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:drowning", {

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