Merge branch 'master' into nalc-1.2

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v2.1.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace

.travis.yml

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

CHANGELOG.md

@@ -7,19 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [2.0.0] - 2019-11-25
-
 ### Changed
 
 - The minimum supported Minetest version is now 5.0.0.
-- Map Tools nodes/items can no longer be dropped to prevent them from falling
-  into bad hands.
-
-### Fixed
-
-- The inventory images of `no_interact`, `no_build`, `ignore_like_no_clip`
-  and `ignore_like_no_point` now use textures that are available in
-  Minetest Game 5.0.0.
 
 ## [1.1.0] - 2019-03-23
 
@@ -32,6 +22,5 @@ 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.0.0...HEAD
-[2.0.0]: https://github.com/minetest-mods/maptools/compare/v1.1.0...v2.0.0
+[Unreleased]: https://github.com/minetest-mods/maptools/compare/v1.1.0...HEAD
 [1.1.0]: https://github.com/minetest-mods/maptools/compare/v1.0.0...v1.1.0

LICENSE.md

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

NODES_ITEMS.md

@@ -9,8 +9,8 @@ use `-1` as the amount.
 ## Nodes
 
 :warning: denotes an unpointable, unbreakable block; be very careful with them,
-as they cannot be removed by hand (they can only be removed with
-[WorldEdit](https://github.com/Uberi/Minetest-WorldEdit) or similar).
+as they cannot be removed by hand (they can only be removed with WorldEdit or
+similar).
 
 | Item code               | Description                                                                                                                                                            |
 | ----------------------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |

README.md

@@ -63,9 +63,9 @@ on that line.
 
 ## Version compatibility
 
-Map Tools is currently primarily tested with Minetest 5.1.0.
+Map Tools is currently primarily tested with Minetest 0.4.17.
 It may or may not work with newer or older versions. Issues arising in older
-versions than 5.0.0 will generally not be fixed.
+versions than 0.4.17 will generally not be fixed.
 
 ## License
 

config.lua

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

default_nodes.lua

@@ -220,6 +220,30 @@ minetest.register_node("maptools:sandstone_brick", {
 	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", {
 	description = S("Unbreakable Desert Stone"),
@@ -450,3 +474,220 @@ minetest.register_node("maptools:desert_sand_soil_wet", {
 	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},
+})
+

init.lua

@@ -16,14 +16,14 @@ local S, NS = dofile(modpath .. "/intllib.lua")
 maptools.S = S
 maptools.NS = NS
 
-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")
 dofile(modpath .. "/default_nodes.lua")
 dofile(modpath .. "/nodes.lua")
 dofile(modpath .. "/tools.lua")
+
+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

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

nodes.lua

@@ -271,7 +271,7 @@ 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 = "",
@@ -283,7 +283,7 @@ minetest.register_node("maptools:nobuild", {
 	description = S("Build Prevention"),
 	range = 12,
 	stack_max = 10000,
-	inventory_image = "default_steel_block.png^default_flint.png",
+	inventory_image = "default_steel_block.png^bones_bones.png",
 	drawtype = "airlike",
 	walkable = false,
 	pointable = false,
@@ -298,7 +298,7 @@ minetest.register_node("maptools:nointeract", {
 	description = S("Interact Prevention"),
 	range = 12,
 	stack_max = 10000,
-	inventory_image = "default_steel_block.png^default_bush_stem.png",
+	inventory_image = "default_steel_block.png^default_scorched_stuff.png",
 	drawtype = "airlike",
 	walkable = false,
 	paramtype = "light",
@@ -450,20 +450,29 @@ minetest.register_node("maptools:igniter", {
 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(),
-	on_drop = maptools.drop_msg
 })