Ajout de nouveaux blocs indestructibles

Adds a function to message a player that they cannot drop tools/nodes registered by maptools

CHANGELOG.md

@@ -1,10 +1,14 @@
-# Change Log
+# Changelog
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/)
-and this project adheres to [Semantic Versioning](http://semver.org/).
+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).
 
-## [1.0.0] - 2017-02-19
+## [Unreleased]
 
-- Initial versioned release.
+## 1.0.0 - 2017-02-19
+
+- Initial versioned release.
+
+[Unreleased]: https://github.com/minetest-mods/maptools/compare/v1.0.0...HEAD

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.

LICENSE.md

@@ -1,6 +1,7 @@
-# zlib license
+zlib license
+============
 
-Copyright (c) 2012-2017 Hugo Locurcio and contributors
+Copyright (c) 2012-2015 Calinou 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 +1,26 @@
-Item names for spawning the items using /give or /giveme
-========================================================
+# Item names for spawning the items using /give or /giveme
 
-Items
------
+## 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`: 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.
 
-* `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
-------
+## 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.
+- `(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,73 @@
-Map Tools
-=========
+# Map Tools
 
-Map Tools for [Minetest](http://minetest.net), a free and open source 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.
+[**Forum topic**](https://forum.minetest.net/viewtopic.php?f=11&t=1882)
 
-Map Tools code is licensed under the zlib license, textures are by Calinou and are licensed under CC BY-SA 3.0 Unported.
+## Installation
 
-**Forum topic:** <https://forum.minetest.net/viewtopic.php?f=11&t=1882>
+### Download the mod
+
+To install Map Tools, clone this Git repository into your Minetest's `mods/`
+directory:
+
+```
+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. If you do so, you will need to extract the archive, then rename
+the resulting folder from `maptools-master` to `maptools` – this is
+**absolutely** necessary to do, else, it won't work!
+
+### 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 (else, 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:
+
+```
+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 0.4.16.
+It may or may not work with newer or older versions. Issues arising in older
+versions than 0.4.16 will generally not be fixed.
+
+## License
+
+Copyright © 2012-2017 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-2017 Hugo Locurcio and contributors.
+Copyright (c) 2012-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 

config.lua

@@ -1,7 +1,7 @@
 --[[
 Map Tools: configuration handling
 
-Copyright (c) 2012-2017 Hugo Locurcio and contributors.
+Copyright (c) 2012-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -26,4 +26,4 @@ local function setting(settingtype, name, default)
 end
 
 -- Show Map Tools stuff in creative inventory (1 or 0):
-setting("integer", "hide_from_creative_inventory", 1)
+setting("integer", "hide_from_creative_inventory", 0)

craftitems.lua

@@ -1,7 +1,7 @@
 --[[
 Map Tools: item definitions
 
-Copyright (c) 2012-2017 Hugo Locurcio and contributors.
+Copyright (c) 2012-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -45,3 +45,49 @@ 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,7 +1,7 @@
 --[[
 Map Tools: unbreakable default nodes
 
-Copyright (c) 2012-2017 Hugo Locurcio and contributors.
+Copyright (c) 2012-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -17,6 +17,7 @@ minetest.register_node("maptools:stone", {
 	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:stonebrick", {
@@ -27,6 +28,7 @@ minetest.register_node("maptools:stonebrick", {
 	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:tree", {
@@ -37,7 +39,8 @@ minetest.register_node("maptools:tree", {
 	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", {
@@ -48,7 +51,8 @@ minetest.register_node("maptools:jungletree", {
 	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", {
@@ -59,7 +63,8 @@ minetest.register_node("maptools:cactus", {
 	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", {
@@ -80,6 +85,7 @@ minetest.register_node("maptools:papyrus", {
 	},
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_leaves_defaults(),
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:dirt", {
@@ -90,6 +96,7 @@ minetest.register_node("maptools:dirt", {
 	drop = "",
 	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", {
@@ -100,6 +107,7 @@ minetest.register_node("maptools:wood", {
 	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:junglewood", {
@@ -110,6 +118,7 @@ minetest.register_node("maptools:junglewood", {
 	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:glass", {
@@ -123,6 +132,7 @@ minetest.register_node("maptools:glass", {
 	drop = "",
 	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", {
@@ -135,6 +145,7 @@ minetest.register_node("maptools:leaves", {
 	drop = "",
 	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", {
@@ -145,6 +156,7 @@ minetest.register_node("maptools:sand", {
 	drop = "",
 	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", {
@@ -158,6 +170,7 @@ minetest.register_node("maptools:gravel", {
 		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", {
@@ -168,6 +181,7 @@ minetest.register_node("maptools:clay", {
 	drop = "",
 	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", {
@@ -178,6 +192,7 @@ minetest.register_node("maptools:desert_sand", {
 	drop = "",
 	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", {
@@ -188,6 +203,7 @@ minetest.register_node("maptools:sandstone", {
 	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:sandstone_brick", {
@@ -198,6 +214,31 @@ minetest.register_node("maptools:sandstone_brick", {
 	drop = "",
 	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")
+
+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
 })
 
 minetest.register_node("maptools:desert_stone", {
@@ -208,6 +249,7 @@ minetest.register_node("maptools:desert_stone", {
 	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:desert_cobble", {
@@ -218,6 +260,7 @@ minetest.register_node("maptools:desert_cobble", {
 	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:desert_stonebrick", {
@@ -228,6 +271,7 @@ minetest.register_node("maptools:desert_stonebrick", {
 	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:grass", {
@@ -241,6 +285,7 @@ minetest.register_node("maptools:grass", {
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain = 0.4},
 	}),
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:fullgrass", {
@@ -253,6 +298,7 @@ minetest.register_node("maptools:fullgrass", {
 	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
@@ -272,6 +318,7 @@ for slab_num = 1,3,1 do
 		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
 
@@ -283,6 +330,7 @@ minetest.register_node("maptools:cobble", {
 	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:mossycobble", {
@@ -293,6 +341,7 @@ minetest.register_node("maptools:mossycobble", {
 	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:brick", {
@@ -303,6 +352,7 @@ minetest.register_node("maptools:brick", {
 	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:coalblock", {
@@ -313,6 +363,7 @@ minetest.register_node("maptools:coalblock", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_stone_defaults(),
+	on_drop = maptools.drop_msg
 })
 
 
@@ -324,6 +375,7 @@ minetest.register_node("maptools:steelblock", {
 	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:goldblock", {
@@ -334,6 +386,7 @@ minetest.register_node("maptools:goldblock", {
 	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:copperblock", {
@@ -344,6 +397,7 @@ minetest.register_node("maptools:copperblock", {
 	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:bronzeblock", {
@@ -354,6 +408,7 @@ minetest.register_node("maptools:bronzeblock", {
 	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:diamondblock", {
@@ -364,6 +419,7 @@ minetest.register_node("maptools:diamondblock", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_stone_defaults(),
+	on_drop = maptools.drop_msg
 })
 
 -- Farming:
@@ -372,10 +428,11 @@ minetest.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"},
+	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(),
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:desert_sand_soil_wet", {
@@ -386,4 +443,222 @@ minetest.register_node("maptools:desert_sand_soil_wet", {
 	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(),
+	on_drop = maptools.drop_msg
 })
+
+-- 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},
+})
+

depends.txt

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

description.txt

@@ -1 +0,0 @@
-Adds various special versions of normal blocks, tools, and other map maintainer tools.

init.lua

@@ -3,7 +3,7 @@
 ** Map Tools **
 By Calinou.
 
-Copyright (c) 2012-2017 Hugo Locurcio and contributors.
+Copyright (c) 2012-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 =====================================================================
 --]]
@@ -20,6 +20,11 @@ maptools.intllib = S
 
 local modpath = minetest.get_modpath("maptools")
 
+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
+
 dofile(modpath .. "/config.lua")
 dofile(modpath .. "/aliases.lua")
 dofile(modpath .. "/craftitems.lua")
@@ -27,6 +32,11 @@ 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/it.txt

@@ -1,47 +0,0 @@
-# Translation by Emon
-
-[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

mod.conf

@@ -1 +0,0 @@
-name = maptools

nodes.lua

@@ -1,7 +1,7 @@
 --[[
 Map Tools: node definitions
 
-Copyright (c) 2012-2017 Hugo Locurcio and contributors.
+Copyright (c) 2012-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -16,6 +16,7 @@ minetest.register_node(":default:cloud", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_defaults(),
+	on_drop = maptools.drop_msg
 })
 
 -- Nodes
@@ -30,6 +31,7 @@ minetest.register_node("maptools:black", {
 	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", {
@@ -41,6 +43,7 @@ minetest.register_node("maptools:white", {
 	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", {
@@ -54,6 +57,7 @@ minetest.register_node("maptools:playerclip", {
 	sunlight_propagates = true,
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:fake_walkable", {
@@ -74,6 +78,7 @@ minetest.register_node("maptools:fake_walkable", {
 	},
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:fullclip", {
@@ -86,6 +91,7 @@ minetest.register_node("maptools:fullclip", {
 	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", {
@@ -105,6 +111,7 @@ minetest.register_node("maptools:fake_walkable_pointable", {
 	},
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:ignore_like", {
@@ -117,19 +124,21 @@ minetest.register_node("maptools:ignore_like", {
 	sunlight_propagates = true,
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	on_drop = maptools.drop_msg
 })
 
 minetest.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_purple.png",
+	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},
+	on_drop = maptools.drop_msg
 })
 
 
@@ -137,13 +146,14 @@ minetest.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_purple.png",
+	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},
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:ignore_like_no_clip_no_point", {
@@ -158,6 +168,7 @@ minetest.register_node("maptools:ignore_like_no_clip_no_point", {
 	sunlight_propagates = true,
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:fullclip_face", {
@@ -176,6 +187,7 @@ minetest.register_node("maptools:fullclip_face", {
 	},
 	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", {
@@ -194,6 +206,7 @@ minetest.register_node("maptools:playerclip_bottom", {
 	},
 	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", {
@@ -212,6 +225,7 @@ minetest.register_node("maptools:playerclip_top", {
 	},
 	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
@@ -231,6 +245,7 @@ minetest.register_node("maptools:pusher_" .. pusher_num, {
 	},
 	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
 
@@ -242,11 +257,12 @@ minetest.register_node("maptools:lightbulb", {
 	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", {
@@ -261,6 +277,7 @@ minetest.register_node("maptools:nobuild", {
 	sunlight_propagates = true,
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:nointeract", {
@@ -274,6 +291,7 @@ minetest.register_node("maptools:nointeract", {
 	sunlight_propagates = true,
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:climb", {
@@ -289,6 +307,7 @@ minetest.register_node("maptools:climb", {
 	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
@@ -305,6 +324,7 @@ minetest.register_node("maptools:damage_" .. damage_num, {
 	sunlight_propagates = true,
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	on_drop = maptools.drop_msg
 })
 end
 
@@ -321,6 +341,7 @@ minetest.register_node("maptools:kill", {
 	sunlight_propagates = true,
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:smoke", {
@@ -334,6 +355,7 @@ minetest.register_node("maptools:smoke", {
 	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", {
@@ -354,6 +376,7 @@ minetest.register_node("maptools:ladder", {
 	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", {
@@ -373,6 +396,7 @@ minetest.register_node("maptools:permanent_fire", {
 	sunlight_propagates = true,
 	walkable = false,
 	damage_per_second = 4,
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:fake_fire", {
@@ -391,6 +415,7 @@ minetest.register_node("maptools:fake_fire", {
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sunlight_propagates = true,
 	walkable = false,
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:igniter", {
@@ -406,24 +431,35 @@ minetest.register_node("maptools:igniter", {
 	sunlight_propagates = true,
 	pointable = false,
 	walkable = false,
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:superapple", {
 	description = S("Super Apple"),
 	range = 12,
-	stack_max = 10000,
-	drawtype = "plantlike",
+	stack_max = 99,
+	drawtype = "nodebox",
 	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(),
 })

tools.lua

@@ -1,7 +1,7 @@
 --[[
 Map Tools: tool definitions
 
-Copyright (c) 2012-2017 Hugo Locurcio and contributors.
+Copyright (c) 2012-2015 Calinou and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
@@ -28,6 +28,7 @@ minetest.register_tool("maptools:pick_admin", {
 		},
 		damage_groups = {fleshy = 1000},
 	},
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_tool("maptools:pick_admin_with_drops", {
@@ -49,6 +50,7 @@ minetest.register_tool("maptools:pick_admin_with_drops", {
 		},
 		damage_groups = {fleshy = 1000},
 	},
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_on_punchnode(function(pos, node, puncher)
@@ -56,6 +58,6 @@ minetest.register_on_punchnode(function(pos, node, puncher)
 	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.check_for_falling(pos) -- Run node update actions like falling nodes.
 	end
 end)