Update and cleanup: beds, bucket, farming, flowers, walls etc.

files/beds/functions.lua

@@ -5,11 +5,11 @@ if enable_respawn == nil then
 	enable_respawn = true
 end
 
--- Helper functions
-
 -- Intllib
 local S = intllib.make_gettext_pair()
 
+-- Helper functions
+
 local function get_look_yaw(pos)
 	local rotation = minetest.get_node(pos).param2
 	if rotation > 3 then
@@ -111,17 +111,18 @@ end
 
 local function update_formspecs(finished)
 	local ges = #minetest.get_connected_players()
-	local form_n
 	local player_in_bed = get_player_in_bed_count()
 	local is_majority = (ges / 2) < player_in_bed
 
+	local form_n
 	if finished then
-		form_n = beds.formspec .. "label[2.7,9; Good morning.]"
+		form_n = beds.formspec .. "label[2.7,9;" .. S("Good morning.") .. "]"
 	else
-		form_n = beds.formspec .. "label[2.2,9;" .. tostring(player_in_bed) ..
-			" of " .. tostring(ges) .. " players are in bed]"
+		form_n = beds.formspec .. "label[2.2,9;" ..
+			S("@1 of @2 players are in bed", player_in_bed, ges) .. "]"
 		if is_majority and is_night_skip_enabled() then
-			form_n = form_n .. "button_exit[2,6;4,0.75;force;Force night skip]"
+			form_n = form_n .. "button_exit[2,6;4,0.75;force;" ..
+			S("Force night skip") .. "]"
 		end
 	end
 

files/beds/locale/ru.txt

@@ -1,2 +1,5 @@
 Leave Bed = Покинуть Кровать
 You can only sleep at night. = Вы можете спать только ночью.
+Good morning. = Доброе утро.
+@1 of @2 players are in bed = @1 из @2 игроков в кровати
+Force night skip = Принудительно пропустить ночь

files/bucket/README.txt

@@ -1,20 +1,16 @@
 MultiCraft Game mod: bucket
 ===========================
+See license.txt for license information.
 
-License of source code:
------------------------
-Copyright (C) 2011-2012 Kahrl <kahrl@gmx.net>
-Copyright (C) 2011-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Authors of source code
+----------------------
+Kahrl <kahrl@gmx.net> (LGPLv3.0+)
+celeron55, Perttu Ahola <celeron55@gmail.com> (LGPLv3.0+)
+Various Minetest developers and contributors (LGPLv3.0+)
+MultiCraft Development Team (LGPLv3.0+)
 
-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 3.0 of the License, or
-(at your option) any later version.
-
-http://www.gnu.org/licenses/lgpl-3.0.html
-
-License of textures:
---------------------
+Authors of media (textures)
+---------------------------
 Copyright (C) MultiCraft Development Team
 
 Graphics in this mod is NOT free and can be used only as part of the official MultiCraft build.

files/bucket/init.lua

@@ -98,7 +98,6 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 				end
 
 				local player_name = user:get_player_name()
-
 				if not minetest.is_singleplayer() then
 					if pointed_thing.under.y >= 8 then
 						minetest.chat_send_player(player_name, S("Too much liquid is bad, right?"), true)

files/bucket/license.txt

@@ -0,0 +1,24 @@
+License of source code
+----------------------
+
+GNU Lesser General Public License, version 3.0
+Copyright (C) 2011-2016 Kahrl <kahrl@gmx.net>
+Copyright (C) 2011-2016 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2011-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 3.0 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:
+http://www.gnu.org/licenses/lgpl-3.0.html
+
+
+Licenses of media (textures)
+----------------------------
+Copyright (C) MultiCraft Development Team
+
+Graphics in this mod is NOT free and can be used only as part of the official MultiCraft build.
+Allowed to be used in non-official builds ONLY for personal use.

files/farming/farming/depends.txt

@@ -1 +1,2 @@
 default
+colored

files/farming/farming/hoes.lua

@@ -3,33 +3,37 @@ farming.register_hoe("farming:hoe_wood", {
 	inventory_image = "farming_tool_woodhoe.png",
 	max_uses = 30,
 	material = "group:wood",
-	groups = {flammable = 2},
+	groups = {hoe = 1, flammable = 2},
 })
 
 farming.register_hoe("farming:hoe_stone", {
 	description = "Stone Hoe",
 	inventory_image = "farming_tool_stonehoe.png",
 	max_uses = 90,
-	material = "group:stone"
+	material = "group:stone",
+	groups = {hoe = 1}
 })
 
 farming.register_hoe("farming:hoe_steel", {
 	description = "Steel Hoe",
 	inventory_image = "farming_tool_steelhoe.png",
 	max_uses = 500,
-	material = "default:steel_ingot"
+	material = "default:steel_ingot",
+	groups = {hoe = 1}
 })
 
 farming.register_hoe("farming:hoe_gold", {
 	description = "Gold Hoe",
 	inventory_image = "farming_tool_goldhoe.png",
 	max_uses = 350,
-	material = "default:gold_ingot"
+	material = "default:gold_ingot",
+	groups = {hoe = 1}
 })
 
 farming.register_hoe("farming:hoe_diamond", {
 	description = "Diamond Hoe",
 	inventory_image = "farming_tool_diamondhoe.png",
 	max_uses = 1000,
-	material = "default:diamond"
+	material = "default:diamond",
+	groups = {hoe = 1}
 })

files/flowers/README.txt

@@ -2,7 +2,8 @@ MultiCraft Game mod: flowers
 ============================
 See license.txt for license information.
 
------------------------
+Authors of source code
+----------------------
 Originally by Ironzorg (MIT) and VanessaE (MIT)
 Various Minetest developers and contributors (MIT)
 

files/flowers/init.lua

@@ -17,7 +17,7 @@ minetest.register_alias("flowers:flower_tulip", "flowers:tulip")
 minetest.register_alias("flowers:flower_dandelion_yellow", "flowers:dandelion_yellow")
 minetest.register_alias("flowers:flower_orchid", "flowers:orchid")
 minetest.register_alias("flowers:flower_allium", "flowers:allium")
-minetest.register_alias("flowers:flower_dandelion_white", "flowers:dandelion_white")
+minetest.register_alias("flowers:flower_dandelion_white", "flowers:oxeye_daisy")
 minetest.register_alias("flowers:dandelion_white", "flowers:oxeye_daisy")
 
 -- Flower registration
@@ -52,7 +52,7 @@ end
 flowers.datas = {
 	{
 		"rose",
-		"Rose",
+		"Red Rose",
 		{-2 / 16, -0.5, -2 / 16, 2 / 16, 5 / 16, 2 / 16},
 		{color_red = 1, flammable = 1}
 	},
@@ -85,10 +85,10 @@ flowers.datas = {
 		"White Oxeye",
 		{-5 / 16, -0.5, -5 / 16, 5 / 16, -2 / 16, 5 / 16},
 		{color_white = 1, flammable = 1}
-	},
+	}
 }
 
-for _,item in pairs(flowers.datas) do
+for _, item in pairs(flowers.datas) do
 	add_simple_flower(unpack(item))
 end
 
@@ -156,7 +156,7 @@ minetest.register_abm({
 	chance = 200,
 	action = function(...)
 		flowers.flower_spread(...)
-	end,
+	end
 })
 
 
@@ -180,7 +180,7 @@ minetest.register_node("flowers:mushroom_red", {
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
-	},
+	}
 })
 
 minetest.register_node("flowers:mushroom_brown", {
@@ -199,7 +199,7 @@ minetest.register_node("flowers:mushroom_brown", {
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
-	},
+	}
 })
 
 
@@ -233,7 +233,7 @@ minetest.register_abm({
 	chance = 100,
 	action = function(...)
 		flowers.mushroom_spread(...)
-	end,
+	end
 })
 
 

files/flowers/mapgen.lua

@@ -18,7 +18,7 @@ local function register_mgv6_flower(flower_name)
 		},
 		y_max = 30,
 		y_min = 1,
-		decoration = "flowers:"..flower_name,
+		decoration = "flowers:"..flower_name
 	})
 end
 
@@ -40,7 +40,7 @@ local function register_mgv6_mushroom(mushroom_name)
 		y_min = 1,
 		decoration = "flowers:"..mushroom_name,
 		spawn_by = "default:tree",
-		num_spawn_by = 1,
+		num_spawn_by = 1
 	})
 end
 
@@ -60,7 +60,7 @@ local function register_mgv6_waterlily()
 		y_min = 0,
 		y_max = 0,
 		schematic = minetest.get_modpath("flowers") .. "/schematics/waterlily.mts",
-		rotation = "random",
+		rotation = "random"
 	})
 end
 
@@ -70,7 +70,7 @@ function flowers.register_mgv6_decorations()
 	register_mgv6_flower("dandelion_yellow")
 	register_mgv6_flower("orchid")
 	register_mgv6_flower("allium")
-	register_mgv6_flower("dandelion_white")
+	register_mgv6_flower("oxeye_daisy")
 
 	register_mgv6_mushroom("mushroom_brown")
 	register_mgv6_mushroom("mushroom_red")
@@ -101,7 +101,7 @@ local function register_flower(seed, flower_name)
 			"deciduous_forest", "coniferous_forest", "floatland_grassland", "floatland_coniferous_forest"},
 		y_max = 31000,
 		y_min = 1,
-		decoration = "flowers:"..flower_name,
+		decoration = "flowers:"..flower_name
 	})
 end
 
@@ -123,7 +123,7 @@ local function register_mushroom(mushroom_name)
 			"floatland_coniferous_forest"},
 		y_max = 31000,
 		y_min = 1,
-		decoration = "flowers:"..mushroom_name,
+		decoration = "flowers:"..mushroom_name
 	})
 end
 
@@ -143,7 +143,7 @@ local function register_waterlily()
 		y_min = 0,
 		y_max = 0,
 		schematic = minetest.get_modpath("flowers") .. "/schematics/waterlily.mts",
-		rotation = "random",
+		rotation = "random"
 	})
 end
 
@@ -153,7 +153,7 @@ function flowers.register_decorations()
 	register_flower(1220999, "dandelion_yellow")
 	register_flower(36662,	 "orchid")
 	register_flower(1133,	 "allium")
-	register_flower(73133,	 "dandelion_white")
+	register_flower(73133,	 "oxeye_daisy")
 
 	register_mushroom("mushroom_brown")
 	register_mushroom("mushroom_red")

files/player_api/README.txt

@@ -11,8 +11,8 @@ Originally by celeron55, Perttu Ahola <celeron55@gmail.com> (LGPLv3.0+)
 Various Minetest developers and contributors (LGPLv3.0+)
 Copyright (C) 2018-2019 MultiCraft Development Team
 
-Authors of media (textures, models and sounds)
-----------------------------------------------
+Authors of models
+-----------------
 stujones11 (CC BY-SA 3.0):
   character.b3d
   character.blend -- Both derived from a model by MirceaKitsune (CC BY-SA 3.0)

files/player_api/api.lua

@@ -87,17 +87,6 @@ minetest.register_on_leaveplayer(function(player)
 	player_textures[name] = nil
 end)
 
-local function table_iter(t)
-	local i = 0
-	local n = table.getn(t)
-	return function ()
-		i = i + 1
-		if i <= n then
-			return t[i]
-		end
-	end
-end
-
 -- Localize for better performance.
 local player_set_animation = player_api.set_animation
 local player_attached = player_api.player_attached

files/player_api/init.lua

@@ -2,10 +2,6 @@ dofile(minetest.get_modpath("player_api") .. "/api.lua")
 
 local creative_mode_cache = minetest.settings:get_bool("creative_mode")
 
-function player_api.is_enabled_for(name)
-	return creative_mode_cache
-end
-
 -- Default player appearance
 player_api.register_model("character.b3d", {
 	animation_speed = 30,

files/player_api/license.txt

@@ -16,8 +16,8 @@ See the GNU Lesser General Public License for more details:
 https://www.gnu.org/licenses/lgpl-3.0.html
 
 
-Licenses of media (textures, models and sounds)
------------------------------------------------
+Licenses of models
+------------------
 
 Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
 Copyright (C) 2018 stujones11

files/sethome/README.txt

@@ -5,4 +5,4 @@ See license.txt for license information.
 Authors of source code
 ----------------------
 sfan5 (MIT)
-Copyright (C) MultiCraft Development Team
+MultiCraft Development Team

files/sfinv/README.txt

@@ -5,7 +5,7 @@ See license.txt for license information.
 Simple Fast Inventory.
 A cleaner, simpler, solution to having an advanced inventory in Minetest.
 
-License of source code:
------------------------
+License of source code
+----------------------
 Copyright (C) 2016 rubenwardy <rubenwardy@gmail.com>
 Copyright (C) 2019 MultiCraft Development Team

files/walls/init.lua

@@ -11,12 +11,20 @@ walls.register = function(wall_name, wall_desc, wall_texture_table, wall_mat, wa
 		drawtype = "nodebox",
 		node_box = {
 			type = "connected",
-			fixed = {{-1/4, -1/2, -1/4, 1/4, 1/2, 1/4}},
+			fixed         = {{-1/4,  -1/2, -1/4,   1/4,  1/2,  1/4}},
 			connect_front = {{-3/16, -1/2, -1/2,   3/16, 3/8, -1/4}},
-			connect_left =  {{-1/2,  -1/2, -3/16, -1/4,  3/8,  3/16}},
-			connect_back =  {{-3/16, -1/2,  1/4,   3/16, 3/8,  1/2}},
+			connect_left  = {{-1/2,  -1/2, -3/16, -1/4,  3/8,  3/16}},
+			connect_back  = {{-3/16, -1/2,  1/4,   3/16, 3/8,  1/2}},
 			connect_right = {{ 1/4,  -1/2, -3/16,  1/2,  3/8,  3/16}}
 		},
+		collision_box = {
+			type = "connected",
+			fixed         = {-1/4, -1/2, -1/4,  1/4, 1/2 + 3/8,  1/4},
+			connect_front = {-1/4, -1/2, -1/2,  1/4, 1/2 + 3/8, -1/4},
+			connect_left  = {-1/2, -1/2, -1/4, -1/4, 1/2 + 3/8,  1/4},
+			connect_back  = {-1/4, -1/2,  1/4,  1/4, 1/2 + 3/8,  1/2},
+			connect_right = {1/4,  -1/2, -1/4,  1/2, 1/2 + 3/8,  1/4}
+		},
 		connects_to = {"group:wall", "group:stone", "group:fence"},
 		paramtype = "light",
 		is_ground_content = false,
@@ -30,9 +38,9 @@ walls.register = function(wall_name, wall_desc, wall_texture_table, wall_mat, wa
 	minetest.register_craft({
 		output = wall_name .. " 6",
 		recipe = {
-			{ "", "", "" },
-			{ wall_mat, wall_mat, wall_mat},
-			{ wall_mat, wall_mat, wall_mat}
+			{"", "", ""},
+			{wall_mat, wall_mat, wall_mat},
+			{wall_mat, wall_mat, wall_mat}
 		}
 	})