merge upstream

.luacheckrc

@@ -7,11 +7,12 @@ read_globals = {
 	"dump",
 	"vector",
 	"VoxelManip", "VoxelArea",
-	"PseudoRandom", "ItemStack",
+	"PseudoRandom", "PcgRandom",
+	"ItemStack",
 	"Settings",
 	"unpack",
-	-- Silence "accessing undefined field copy of global table".
-	table = { fields = { "copy" } }
+	-- Silence errors about custom table methods.
+	table = { fields = { "copy", "indexof" } }
 }
 
 -- Overwrites minetest.handle_node_drops

game.conf

-name = Illuna
+name = TechEth Game
+author = minetest, illuna
+description = Game of the Illuna TechEth flagship-server, based on the official minetest_game

minetest.conf.example

-# This file contains settings of Minetest Game that can be changed in minetest.conf
+# This file contains settings of Minetest Game that can be changed in
+# minetest.conf.
 # By default, all the settings are commented and not functional.
 # Uncomment settings by removing the preceding #.
 
-# Whether creative mode (fast digging of all blocks, unlimited resources) should be enabled
+# Whether creative mode (fast digging of all blocks, unlimited resources) should
+# be enabled.
 #creative_mode = false
 
 # Sets the behaviour of the inventory items when a player dies.
-#  "bones": Store all items inside a bone node but drop items if inside protected area
-#  "drop": Drop all items on the ground
-#  "keep": Player keeps all items
-#bones_mode = "bones"
+#   bones: Store items in a bone node but drop items if inside protected area.
+#   drop: Drop items on the ground.
+#   keep: Player keeps items.
+#bones_mode = bones
 
-# The time in seconds after which the bones of a dead player can be looted by everyone
-# 0 to disable
+# The time in seconds after which the bones of a dead player can be looted by
+# everyone.
+# 0 to disable.
 #share_bones_time = 1200
 
 # How much earlier the bones of a dead player can be looted by
@@ -20,8 +23,12 @@
 # 0 to disable. By default it is "share_bones_time" divide by four.
 #share_bones_time_early = 300
 
-# Whether fire should be enabled. If disabled, 'basic flame' nodes will disappear.
-# 'permanent flame' nodes will remain with either setting.
+# Inform player of condition and location of new bones.
+#bones_position_message = false
+
+# Whether fire should be enabled. If disabled, 'basic_flame' nodes will
+# disappear.
+# 'permanent_flame' nodes will remain with either setting.
 #enable_fire = true
 
 # Enable flame sound.
@@ -30,24 +37,30 @@
 # Whether lavacooling should be enabled.
 #enable_lavacooling = true
 
-# Whether the stuff in initial_stuff should be given to new players
+# Whether the stuff in initial_stuff should be given to new players.
 #give_initial_stuff = false
-#initial_stuff = default:pick_steel,default:axe_steel,default:shovel_steel,default:torch 99,default:cobble 99
+#initial_stuff = default:pick_steel,default:axe_steel,default:shovel_steel,
+default:torch 99,default:cobble 99
 
-# Whether the TNT mod should be enabled
+# Whether the TNT mod should be enabled.
 #enable_tnt = <true in singleplayer, false in multiplayer>
 
-# The radius of a TNT explosion
+# The radius of a TNT explosion.
 #tnt_radius = 3
 
 # Enable the stairs mod ABM that replaces the old 'upside down'
 # stair and slab nodes in old maps with the new param2 versions.
 #enable_stairs_replace_abm = false
 
-# Whether you allow respawning in beds
-# Default value is true
+# Whether to allow respawning in beds.
+# Default value is true.
 #enable_bed_respawn = true
 
-# Whether players can skip night by sleeping
-# Default value is true
+# Whether players can skip night by sleeping.
+# Default value is true.
 #enable_bed_night_skip = true
+
+# Whether the engine's spawn search, which does not check for a suitable
+# starting biome, is used.
+# Default value is false.
+#engine_spawn = false

mods/beds/README.txt

@@ -10,6 +10,10 @@ Various Minetest developers and contributors (MIT)
 Authors of media (textures)
 ---------------------------
 BlockMen (CC BY-SA 3.0)
+ All textures unless otherwise noted
+
+TumeniNodes (CC BY-SA 3.0)
+ beds_bed_under.png
 
 This mod adds a bed to Minetest which allows to skip the night.
 To sleep, rightclick the bed. If playing in singleplayer mode the night gets skipped

mods/beds/api.lua

@@ -49,21 +49,24 @@ function beds.register_bed(name, def)
 			local node = minetest.get_node(under)
 			local udef = minetest.registered_nodes[node.name]
 			if udef and udef.on_rightclick and
-					not (placer and placer:get_player_control().sneak) then
+					not (placer and placer:is_player() and
+					placer:get_player_control().sneak) then
 				return udef.on_rightclick(under, node, placer, itemstack,
 					pointed_thing) or itemstack
 			end
 
 			local pos
-			if minetest.registered_items[minetest.get_node(under).name].buildable_to then
+			if udef and udef.buildable_to then
 				pos = under
 			else
 				pos = pointed_thing.above
 			end
 
-			if minetest.is_protected(pos, placer:get_player_name()) and
-					not minetest.check_player_privs(placer, "protection_bypass") then
-				minetest.record_protection_violation(pos, placer:get_player_name())
+			local player_name = placer and placer:get_player_name() or ""
+
+			if minetest.is_protected(pos, player_name) and
+					not minetest.check_player_privs(player_name, "protection_bypass") then
+				minetest.record_protection_violation(pos, player_name)
 				return itemstack
 			end
 
@@ -72,12 +75,13 @@ function beds.register_bed(name, def)
 				return itemstack
 			end
 
-			local dir = minetest.dir_to_facedir(placer:get_look_dir())
+			local dir = placer and placer:get_look_dir() and
+				minetest.dir_to_facedir(placer:get_look_dir()) or 0
 			local botpos = vector.add(pos, minetest.facedir_to_dir(dir))
 
-			if minetest.is_protected(botpos, placer:get_player_name()) and
-					not minetest.check_player_privs(placer, "protection_bypass") then
-				minetest.record_protection_violation(botpos, placer:get_player_name())
+			if minetest.is_protected(botpos, player_name) and
+					not minetest.check_player_privs(player_name, "protection_bypass") then
+				minetest.record_protection_violation(botpos, player_name)
 				return itemstack
 			end
 
@@ -90,7 +94,7 @@ function beds.register_bed(name, def)
 			minetest.set_node(botpos, {name = name .. "_top", param2 = dir})
 
 			if not (creative and creative.is_enabled_for
-					and creative.is_enabled_for(placer:get_player_name())) then
+					and creative.is_enabled_for(player_name)) then
 				itemstack:take_item()
 			end
 			return itemstack
@@ -137,6 +141,9 @@ function beds.register_bed(name, def)
 			minetest.set_node(newp, {name = name .. "_top", param2 = new_param2})
 			return true
 		end,
+		can_dig = function(pos, player)
+			return beds.can_dig(pos)
+		end,
 	})
 
 	minetest.register_node(name .. "_top", {
@@ -156,6 +163,12 @@ function beds.register_bed(name, def)
 		on_destruct = function(pos)
 			destruct_bed(pos, 2)
 		end,
+		can_dig = function(pos, player)
+			local node = minetest.get_node(pos)
+			local dir = minetest.facedir_to_dir(node.param2)
+			local p = vector.add(pos, dir)
+			return beds.can_dig(p)
+		end,
 	})
 
 	minetest.register_alias(name, name .. "_bottom")

mods/beds/beds.lua

@@ -7,19 +7,19 @@ beds.register_bed("beds:fancy_bed", {
 	tiles = {
 		bottom = {
 			"beds_bed_top1.png",
-			"default_wood.png",
+			"beds_bed_under.png",
 			"beds_bed_side1.png",
 			"beds_bed_side1.png^[transformFX",
-			"default_wood.png",
+			"beds_bed_foot.png",
 			"beds_bed_foot.png",
 		},
 		top = {
 			"beds_bed_top2.png",
-			"default_wood.png",
+			"beds_bed_under.png",
 			"beds_bed_side2.png",
 			"beds_bed_side2.png^[transformFX",
 			"beds_bed_head.png",
-			"default_wood.png",
+			"beds_bed_head.png",
 		}
 	},
 	nodebox = {
@@ -58,7 +58,7 @@ beds.register_bed("beds:bed", {
 	tiles = {
 		bottom = {
 			"beds_bed_top_bottom.png^[transformR90",
-			"default_wood.png",
+			"beds_bed_under.png",
 			"beds_bed_side_bottom_r.png",
 			"beds_bed_side_bottom_r.png^[transformfx",
 			"beds_transparent.png",
@@ -66,7 +66,7 @@ beds.register_bed("beds:bed", {
 		},
 		top = {
 			"beds_bed_top_top.png^[transformR90",
-			"default_wood.png",
+			"beds_bed_under.png",
 			"beds_bed_side_top_r.png",
 			"beds_bed_side_top_r.png^[transformfx",
 			"beds_bed_side_top.png",

mods/beds/functions.lua

@@ -9,15 +9,18 @@ end
 -- Helper functions
 
 local function get_look_yaw(pos)
-	local n = minetest.get_node(pos)
-	if n.param2 == 1 then
-		return pi / 2, n.param2
-	elseif n.param2 == 3 then
-		return -pi / 2, n.param2
-	elseif n.param2 == 0 then
-		return pi, n.param2
+	local rotation = minetest.get_node(pos).param2
+	if rotation > 3 then
+		rotation = rotation % 4 -- Mask colorfacedir values
+	end
+	if rotation == 1 then
+		return pi / 2, rotation
+	elseif rotation == 3 then
+		return -pi / 2, rotation
+	elseif rotation == 0 then
+		return pi, rotation
 	else
-		return 0, n.param2
+		return 0, rotation
 	end
 end
 
@@ -58,6 +61,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
 		local p = beds.pos[name] or nil
 		if beds.player[name] ~= nil then
 			beds.player[name] = nil
+			beds.bed_position[name] = nil
 			player_in_bed = player_in_bed - 1
 		end
 		-- skip here to prevent sending player specific changes (used for leaving players)
@@ -65,7 +69,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
 			return
 		end
 		if p then
-			player:setpos(p)
+			player:set_pos(p)
 		end
 
 		-- physics, eye_offset, etc
@@ -80,6 +84,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
 	else
 		beds.player[name] = 1
 		beds.pos[name] = pos
+		beds.bed_position[name] = bed_pos
 		player_in_bed = player_in_bed + 1
 
 		-- physics, eye_offset, etc
@@ -89,7 +94,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
 		local dir = minetest.facedir_to_dir(param2)
 		local p = {x = bed_pos.x + dir.x / 2, y = bed_pos.y, z = bed_pos.z + dir.z / 2}
 		player:set_physics_override(0, 0, 0)
-		player:setpos(p)
+		player:set_pos(p)
 		default.player_attached[name] = true
 		hud_flags.wielditem = false
 		default.player_set_animation(player, "lay" , 0)
@@ -104,12 +109,12 @@ local function update_formspecs(finished)
 	local is_majority = (ges / 2) < player_in_bed
 
 	if finished then
-		form_n = beds.formspec .. "label[2.7,11; Good morning.]"
+		form_n = beds.formspec .. "label[2.7,9; Good morning.]"
 	else
-		form_n = beds.formspec .. "label[2.2,11;" .. tostring(player_in_bed) ..
+		form_n = beds.formspec .. "label[2.2,9;" .. tostring(player_in_bed) ..
 			" of " .. tostring(ges) .. " players are in bed]"
 		if is_majority and is_night_skip_enabled() then
-			form_n = form_n .. "button_exit[2,8;4,0.75;force;Force night skip]"
+			form_n = form_n .. "button_exit[2,6;4,0.75;force;Force night skip]"
 		end
 	end
 
@@ -134,7 +139,7 @@ end
 
 function beds.on_rightclick(pos, player)
 	local name = player:get_player_name()
-	local ppos = player:getpos()
+	local ppos = player:get_pos()
 	local tod = minetest.get_timeofday()
 
 	if tod > 0.2 and tod < 0.805 then
@@ -171,6 +176,15 @@ function beds.on_rightclick(pos, player)
 	end
 end
 
+function beds.can_dig(bed_pos)
+	-- Check all players in bed which one is at the expected position
+	for _, player_bed_pos in pairs(beds.bed_position) do
+		if vector.equals(bed_pos, player_bed_pos) then
+			return false
+		end
+	end
+	return true
+end
 
 -- Callbacks
 -- Only register respawn callback if respawn enabled
@@ -180,7 +194,7 @@ if enable_respawn then
 		local name = player:get_player_name()
 		local pos = beds.spawn[name]
 		if pos then
-			player:setpos(pos)
+			player:set_pos(pos)
 			return true
 		end
 	end)
@@ -205,16 +219,25 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	if formname ~= "beds_form" then
 		return
 	end
+
+	-- Because "Force night skip" button is a button_exit, it will set fields.quit
+	-- and lay_down call will change value of player_in_bed, so it must be taken
+	-- earlier.
+	local last_player_in_bed = player_in_bed
+
 	if fields.quit or fields.leave then
 		lay_down(player, nil, nil, false)
 		update_formspecs(false)
 	end
 
 	if fields.force then
-		update_formspecs(is_night_skip_enabled())
-		if is_night_skip_enabled() then
+		local is_majority = (#minetest.get_connected_players() / 2) < last_player_in_bed
+		if is_majority and is_night_skip_enabled() then
+			update_formspecs(true)
 			beds.skip_night()
 			beds.kick_players()
+		else
+			update_formspecs(false)
 		end
 	end
 end)

mods/beds/init.lua

 beds = {}
 beds.player = {}
+beds.bed_position = {}
 beds.pos = {}
 beds.spawn = {}
 
-beds.formspec = "size[8,15;true]" ..
-	"bgcolor[#080808BB; true]" ..
-	"button_exit[2,12;4,0.75;leave;Leave Bed]"
+beds.formspec = "size[8,11;true]" ..
+	"no_prepend[]" ..
+	"bgcolor[#080808BB;true]" ..
+	"button_exit[2,10;4,0.75;leave;Leave Bed]"
 
 local modpath = minetest.get_modpath("beds")
 

mods/beds/license.txt

@@ -30,6 +30,7 @@ Licenses of media (textures)
 
 Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
 Copyright (C) 2014-2016 BlockMen
+Copyright (C) 2018 TumeniNodes
 
 You are free to:
 Share — copy and redistribute the material in any medium or format.

mods/beds/spawns.lua

@@ -53,7 +53,7 @@ end
 function beds.set_spawns()
 	for name,_ in pairs(beds.player) do
 		local player = minetest.get_player_by_name(name)
-		local p = player:getpos()
+		local p = player:get_pos()
 		-- but don't change spawn location if borrowing a bed
 		if not minetest.is_protected(p, name) then
 			beds.spawn[name] = p

mods/binoculars/README.txt

+Minetest Game mod: binoculars
+=============================
+See license.txt for license information.
+
+Authors of source code
+----------------------
+paramat (MIT)
+
+Authors of media (textures)
+---------------------------
+paramat (CC BY-SA 3.0):
+  binoculars_binoculars.png
+
+Crafting
+--------
+binoculars:binoculars
+
+default:obsidian_glass O
+default:bronze_ingot B
+
+O_O
+BBB
+O_O
+
+Usage
+-----
+In survival mode, use of zoom requires the binoculars item in your inventory,
+they will allow a 10 degree field of view.
+It can take up to 5 seconds for adding to or removal from inventory to have an
+effect, however to instantly allow the use of this zoom 'use' (leftclick) the
+item.
+
+Zoom with a field of view of 15 degrees is automatically allowed in creative
+mode and for any player with the 'creative' privilege.
+
+The 'binoculars.update_player_property()' function is global so can be
+redefined by a mod for alternative behaviour.

mods/binoculars/depends.txt

+default
+creative?

mods/binoculars/init.lua

+-- Mod global namespace
+
+binoculars = {}
+
+
+-- Detect creative mod
+local creative_mod = minetest.get_modpath("creative")
+-- Cache creative mode setting as fallback if creative mod not present
+local creative_mode_cache = minetest.settings:get_bool("creative_mode")
+
+
+-- Update player property
+-- Global to allow overriding
+
+function binoculars.update_player_property(player)
+	local creative_enabled =
+		(creative_mod and creative.is_enabled_for(player:get_player_name())) or
+		creative_mode_cache
+	local new_zoom_fov = 0
+
+	if player:get_inventory():contains_item(
+			"main", "binoculars:binoculars") then
+		new_zoom_fov = 10
+	elseif creative_enabled then
+		new_zoom_fov = 15
+	end
+
+	-- Only set property if necessary to avoid player mesh reload
+	if player:get_properties().zoom_fov ~= new_zoom_fov then
+		player:set_properties({zoom_fov = new_zoom_fov})
+	end
+end
+
+
+-- Set player property 'on joinplayer'
+
+minetest.register_on_joinplayer(function(player)
+	binoculars.update_player_property(player)
+end)
+
+
+-- Cyclic update of player property
+
+local function cyclic_update()
+	for _, player in ipairs(minetest.get_connected_players()) do
+		binoculars.update_player_property(player)
+	end
+	minetest.after(4.7, cyclic_update)
+end
+
+minetest.after(4.7, cyclic_update)
+
+
+-- Binoculars item
+
+minetest.register_craftitem("binoculars:binoculars", {
+	description = "Binoculars\nUse with 'Zoom' key",
+	inventory_image = "binoculars_binoculars.png",
+	stack_max = 1,
+
+	on_use = function(itemstack, user, pointed_thing)
+		binoculars.update_player_property(user)
+	end,
+})
+
+
+-- Crafting
+
+minetest.register_craft({
+	output = "binoculars:binoculars",
+	recipe = {
+		{"default:obsidian_glass", "", "default:obsidian_glass"},
+		{"default:bronze_ingot", "default:bronze_ingot", "default:bronze_ingot"},
+		{"default:obsidian_glass", "", "default:obsidian_glass"},
+	}
+})

mods/binoculars/license.txt

+License of source code
+----------------------
+
+The MIT License (MIT)
+Copyright (C) 2017 paramat
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+For more details:
+https://opensource.org/licenses/MIT
+
+
+Licenses of media (textures)
+----------------------------
+
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+Copyright (C) 2017 paramat
+
+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/

mods/boats/README.txt

@@ -13,3 +13,19 @@ Textures: Zeg9 (CC BY-SA 3.0)
 Model: thetoon and Zeg9 (CC BY-SA 3.0),
   modified by PavelS(SokolovPavel) (CC BY-SA 3.0),
   modified by sofar (CC BY-SA 3.0)
+
+Controls
+--------
+Right mouse button = Enter or exit boat when pointing at boat.
+Forward            = Speed up.
+                     Slow down when moving backwards.
+Forward + backward = Enable cruise mode: Boat will accelerate to maximum forward
+                     speed and remain at that speed without needing to hold the
+                     forward key.
+Backward           = Slow down.
+                     Speed up when moving backwards.
+                     Disable cruise mode.
+Left               = Turn to the left.
+                     Turn to the right when moving backwards.
+Right              = Turn to the right.
+                     Turn to the left when moving backwards.

mods/boats/depends.txt

 default
+player_api

mods/boats/init.lua

@@ -33,18 +33,21 @@ end
 --
 
 local boat = {
-	physical = true,
-	-- Warning: Do not change the position of the collisionbox top surface,
-	-- lowering it causes the boat to fall through the world if underwater
-	collisionbox = {-0.5, -0.35, -0.5, 0.5, 0.3, 0.5},
-	visual = "mesh",
-	mesh = "boats_boat.obj",
-	textures = {"default_wood.png"},
+	initial_properties = {