Update minetestforfun_game, fix maptools

minetestforfun_game/mods/vessels/README.txt

@@ -1,45 +1,22 @@
 Minetest Game mod: vessels
 ==========================
+See license.txt for license information.
 
-Crafts
--------
-Glass bottle (yields 10)
+Authors of source code
+----------------------
+Originally by Vanessa Ezekowitz (LGPL 2.1)
+Modified by Perttu Ahola <celeron55@gmail.com> (LGPL 2.1)
+Various Minetest developers and contributors (LGPL 2.1)
 
-   G - G
-   G - G
-   - G -
+Authors of media (textures)
+---------------------------
+All not listed below, Vanessa Ezekowitz (CC BY-SA 3.0)
 
-Drinking Glass (yields 14)
-
-   G - G
-   G - G
-   G G G
-
-Heavy Steel Bottle (yields 5)
-
-   S - S
-   S - S
-   - S -
-
-License of source code:
------------------------
-Copyright (C) 2012 Vanessa Ezekowitz
-Version 2012-09-02
-Modifications by Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-http://www.gnu.org/licenses/lgpl-2.1.html
-
-License of media (textures and sounds)
---------------------------------------
-WTFPL
-
-Authors of media files
------------------------
-Unless specifically noted,
-Copyright (C) 2012 Vanessa Ezekowitz
+The following textures were modified by Thomas-S (CC BY-SA 3.0):
+  vessels_drinking_glass.png
+  vessels_drinking_glass_inv.png
+  vessels_glass_bottle.png
+  vessels_steel_bottle.png
 
+The following texture was created by Wuzzy (CC BY-SA 3.0):
+  vessels_shelf_slot.png (based on vessels_glass_bottle.png)

minetestforfun_game/mods/vessels/init.lua

@@ -2,22 +2,36 @@
 -- See README.txt for licensing and other information.
 
 local vessels_shelf_formspec =
-	"size[8,7;]"..
-	default.gui_bg..
-	default.gui_bg_img..
-	default.gui_slots..
-	"list[context;vessels;0,0.3;8,2;]"..
-	"list[current_player;main;0,2.85;8,1;]"..
-	"list[current_player;main;0,4.08;8,3;8]"..
-	"listring[context;vessels]"..
-	"listring[current_player;main]"..
-	default.get_hotbar_bg(0,2.85)
+	"size[8,7;]" ..
+	default.gui_bg ..
+	default.gui_bg_img ..
+	default.gui_slots ..
+	"list[context;vessels;0,0.3;8,2;]" ..
+	"list[current_player;main;0,2.85;8,1;]" ..
+	"list[current_player;main;0,4.08;8,3;8]" ..
+	"listring[context;vessels]" ..
+	"listring[current_player;main]" ..
+	default.get_hotbar_bg(0, 2.85)
+
+-- Inventory slots overlay
+local vx, vy = 0, 0.3
+for i = 1, 16 do
+	if i == 9 then
+		vx = 0
+		vy = vy + 1
+	end
+	vessels_shelf_formspec = vessels_shelf_formspec ..
+		"image[" .. vx .. "," .. vy .. ";1,1;vessels_shelf_slot.png]"
+	vx = vx + 1
+end
 
 minetest.register_node("vessels:shelf", {
-	description = "Vessels shelf",
-	tiles = {"default_wood.png", "default_wood.png", "default_wood.png^vessels_shelf.png"},
+	description = "Vessels Shelf",
+	tiles = {"default_wood.png", "default_wood.png", "default_wood.png",
+		"default_wood.png", "vessels_shelf.png", "vessels_shelf.png"},
+	paramtype2 = "facedir",
 	is_ground_content = false,
-	groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3},
+	groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
 	sounds = default.node_sound_wood_defaults(),
 
 	on_construct = function(pos)
@@ -48,14 +62,21 @@ minetest.register_node("vessels:shelf", {
 		minetest.log("action", player:get_player_name() ..
 			   " takes stuff from vessels shelf at ".. minetest.pos_to_string(pos))
 	end,
+	on_blast = function(pos)
+		local drops = {}
+		default.get_inventory_drops(pos, "vessels", drops)
+		drops[#drops + 1] = "vessels:shelf"
+		minetest.remove_node(pos)
+		return drops
+	end,
 })
 
 minetest.register_craft({
-	output = 'vessels:shelf',
+	output = "vessels:shelf",
 	recipe = {
-		{'group:wood', 'group:wood', 'group:wood'},
-		{'group:vessel', 'group:vessel', 'group:vessel'},
-		{'group:wood', 'group:wood', 'group:wood'},
+		{"group:wood", "group:wood", "group:wood"},
+		{"group:vessel", "group:vessel", "group:vessel"},
+		{"group:wood", "group:wood", "group:wood"},
 	}
 })
 
@@ -63,25 +84,25 @@ minetest.register_node("vessels:glass_bottle", {
 	description = "Glass Bottle (empty)",
 	drawtype = "plantlike",
 	tiles = {"vessels_glass_bottle.png"},
-	inventory_image = "vessels_glass_bottle_inv.png",
+	inventory_image = "vessels_glass_bottle.png",
 	wield_image = "vessels_glass_bottle.png",
 	paramtype = "light",
 	is_ground_content = false,
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25}
+		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
 	},
-	groups = {vessel=1,dig_immediate=3,attached_node=1},
+	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
 	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_craft( {
 	output = "vessels:glass_bottle 10",
 	recipe = {
-		{ "default:glass", "", "default:glass" },
-		{ "default:glass", "", "default:glass" },
-		{ "", "default:glass", "" }
+		{"default:glass", "", "default:glass"},
+		{"default:glass", "", "default:glass"},
+		{"", "default:glass", ""}
 	}
 })
 
@@ -96,18 +117,18 @@ minetest.register_node("vessels:drinking_glass", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25}
+		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
 	},
-	groups = {vessel=1,dig_immediate=3,attached_node=1},
+	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
 	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_craft( {
 	output = "vessels:drinking_glass 14",
 	recipe = {
-		{ "default:glass", "", "default:glass" },
-		{ "default:glass", "", "default:glass" },
-		{ "default:glass", "default:glass", "default:glass" }
+		{"default:glass", "", "default:glass"},
+		{"default:glass", "", "default:glass"},
+		{"default:glass", "default:glass", "default:glass"}
 	}
 })
 
@@ -115,30 +136,30 @@ minetest.register_node("vessels:steel_bottle", {
 	description = "Heavy Steel Bottle (empty)",
 	drawtype = "plantlike",
 	tiles = {"vessels_steel_bottle.png"},
-	inventory_image = "vessels_steel_bottle_inv.png",
+	inventory_image = "vessels_steel_bottle.png",
 	wield_image = "vessels_steel_bottle.png",
 	paramtype = "light",
 	is_ground_content = false,
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25}
+		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
 	},
-	groups = {vessel=1,dig_immediate=3,attached_node=1},
+	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
 	sounds = default.node_sound_defaults(),
 })
 
 minetest.register_craft( {
 	output = "vessels:steel_bottle 5",
 	recipe = {
-		{ "default:steel_ingot", "", "default:steel_ingot" },
-		{ "default:steel_ingot", "", "default:steel_ingot" },
-		{ "", "default:steel_ingot", "" }
+		{"default:steel_ingot", "", "default:steel_ingot"},
+		{"default:steel_ingot", "", "default:steel_ingot"},
+		{"", "default:steel_ingot", ""}
 	}
 })
 
 
--- Make sure we can recycle them
+-- Glass and steel recycling
 
 minetest.register_craftitem("vessels:glass_fragments", {
 	description = "Pile of Glass Fragments",

minetestforfun_game/mods/vessels/license.txt

@@ -0,0 +1,52 @@
+License of source code
+----------------------
+
+GNU Lesser General Public License, version 2.1
+Copyright (C) 2012-2016 Vanessa Ezekowitz
+Copyright (C) 2012-2016 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2012-2016 Various Minetest developers and contributors
+
+This program is free software; you can redistribute it and/or modify it under the terms
+of the GNU Lesser General Public License as published by the Free Software Foundation;
+either version 2.1 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Lesser General Public License for more details:
+https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+
+
+Licenses of media (textures)
+----------------------------
+
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+Copyright (C) 2012-2016 Vanessa Ezekowitz
+Copyright (C) 2016 Thomas-S
+
+You are free to:
+Share — copy and redistribute the material in any medium or format.
+Adapt — remix, transform, and build upon the material for any purpose, even commercially.
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+Under the following terms:
+
+Attribution — You must give appropriate credit, provide a link to the license, and
+indicate if changes were made. You may do so in any reasonable manner, but not in any way
+that suggests the licensor endorses you or your use.
+
+ShareAlike — If you remix, transform, or build upon the material, you must distribute
+your contributions under the same license as the original.
+
+No additional restrictions — You may not apply legal terms or technological measures that
+legally restrict others from doing anything the license permits.
+
+Notices:
+
+You do not have to comply with the license for elements of the material in the public
+domain or where your use is permitted by an applicable exception or limitation.
+No warranties are given. The license may not give you all of the permissions necessary
+for your intended use. For example, other rights such as publicity, privacy, or moral
+rights may limit how you use the material.
+
+For more details:
+http://creativecommons.org/licenses/by-sa/3.0/