update 0.4.17.3 as most compatible with 0.4

* update readme, but not set to markdown yet
* update game.conf mostly description and name

.luacheckrc

@@ -3,25 +3,19 @@ allow_defined_top = true
 
 read_globals = {
 	"DIR_DELIM",
-	"minetest",
+	"minetest", "core",
 	"dump",
 	"vector",
 	"VoxelManip", "VoxelArea",
-	"PseudoRandom", "PcgRandom",
-	"ItemStack",
+	"PseudoRandom", "ItemStack",
 	"Settings",
 	"unpack",
-	-- Silence errors about custom table methods.
-	table = { fields = { "copy", "indexof" } },
-	-- Silence warnings about accessing undefined fields of global 'math'
-	math = { fields = { "sign" } }
+	-- Silence "accessing undefined field copy of global table".
+	table = { fields = { "copy" } }
 }
 
 -- Overwrites minetest.handle_node_drops
 files["mods/creative/init.lua"].globals = { "minetest" }
 
--- Overwrites minetest.calculate_knockback
-files["mods/player_api/api.lua"].globals = { "minetest" }
-
 -- Don't report on legacy definitions of globals.
 files["mods/default/legacy.lua"].global = false

.travis.yml

@@ -1,11 +1,12 @@
 language: generic
+sudo: false
 addons:
   apt:
     packages:
     - luarocks
 before_install:
   - luarocks install --local luacheck
-script:
-- $HOME/.luarocks/bin/luacheck ./mods
+script: 
+- $HOME/.luarocks/bin/luacheck --no-color ./mods
 notifications:
   email: false

LICENSE.txt

@@ -12,7 +12,6 @@ Copyright (C) 2015 paramat CC BY-SA 3.0
 
 License of source code
 ----------------------
-Copyright (C) 2010-2012 Blockmen
 Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
 See README.txt in each mod directory for information about other authors.
 

README.md

@@ -1,63 +0,0 @@
-Minetest5 Game
-==============
-
-The default game for the Minetest5 engine.  
-
-This is a fork from minetest default game, this 
-are made from minenux project https://codeberg.org/minenux
-for minetest v5 and minetest v4 or 0.4.
-
-Introduction
-------------
-
-This is the branch `stable-5.2` of minetest game for minetest5 a version 
-that is focused in v5 of minetest but mainly in 5.2 release. There's 
-also a minetest4 game version too in `stable-4.0` branch.
-
-This are focused to provide minimal default game featured for minetest5 
-to be playable, with an [api](game_api.md) for more aditions (in the form of mods)
-
-For further information, check the [Minetest Wiki](https://wiki.minetest.org/index.php?title=Games/Minetest_Game) 
-
-## Download
-
-Can be obtained from https://codeberg.org/minenux/minetest-game-minetest/tags 
-those like 5.2.X by example https://codeberg.org/minenux/minetest-game-minetest/releases/tag/5.2.1
-
-It will download a tar.gz file, uncompress the content and a directory will be created, 
-the name of the directory does not matter, the contents will be used later to install.
-
-When stable releases are made, Minetest Game and the Minetest engine is packaged 
-and made available at https://codeberg.org/minenux/minetest-engine/archive/stable-5.2.tar.gz 
-or generally at https://codeberg.org/minenux/minetest-engine/releases/tag/5.2.1 by example.
-
-This have a mirror at https://git.minetest.org/minenux/minetest-game-minetest/releases
-
-## Installation
-
-This game can be used in any version from 5.0 to 5.2, it may work with recents versions
-
-After download, rename the directory decompressed to `minetest_game` and put to the "games" directory:
-
-- GNU/Linux: If you use a system-wide installation place
-    it in ~/.minetest5/games/.
-- Others:  `minetest/games/` or `games` directory from the path were the binary are.
-
-For further information or help, see: https://wiki.minetest.net/Installing_Mods
-
-## Content
-
-This sub game or game will contain a set of mods, that provide a behaviour of the game, 
-For more information check [mods/README.md](mods/README.md)
-
-## Compatibility
-
-This source code and files are focused in most newer minetest5 engine
-from https://codeberg.org/minenux/minetest-engine/src/branch/stable-5.2 
-
-For minetest4 check https://codeberg.org/minenux/minetest-engine/src/branch/stable-4.0 
-
-## Licensing
-
-See `LICENSE.txt` original autor fo first set of mods game was Blockmen
-

README.txt

@@ -0,0 +1,36 @@
+Minetest Game [minetest_game]
+=============================
+
+The main and default (sub)game for the Minetest engine
+
+For further information, check 
+[this forum topic](https://forum.minetest.net/viewtopic.php?f=15&t=9724).   
+Also see the [Minetest Wiki](https://wiki.minetest.net/Subgames/Minetest_Game) 
+for more information.
+
+## Installation
+---------------
+
+* clone or download this repository or game tarball
+* Unzip the archive, 
+* rename the directory to `minetest` 
+* and place it in .. `<SHAREDIR>/minetest/games/` if you use a system-wide installation
+* or place it in `~/.minetest/games/` of your home.
+
+## Compatibility
+----------------
+
+This source code and files are only compatible with matched minetest older engine
+from https://codeberg.org/minenux/minetest-engine/src/branch/stable-0.4 
+Additionally, when the Minetest4 engine is tagged to be a certain version (e.g.
+0.4.17.1), Minetest Game is tagged with the version 0.4.17.1 too.
+
+When stable releases are made, Minetest Game and the Minetest engine is packaged 
+and made available at https://codeberg.org/minenux/minetest-engine/archive/stable-0.4.tar.gz 
+or generally at https://codeberg.org/minenux/minetest-engine/releases/tag/0.4.17.3 by example.
+
+## Licensing
+------------
+
+See `LICENSE.txt`
+

game.conf

@@ -1,5 +1,2 @@
-title = Minetest5
-name = Minetest5
-author = Minetest
-description = GAME set for MinenuX Bundled by default with Minetest5
-min_minetest_version = 5.0
+name = Minetest
+description = MinenuX updated version of default bundled game

minetest.conf.example

@@ -1,21 +1,18 @@
-# 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 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
+#  "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"
 
-# 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
@@ -23,12 +20,8 @@
 # 0 to disable. By default it is "share_bones_time" divide by four.
 #share_bones_time_early = 300
 
-# 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.
+# 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.
@@ -37,43 +30,24 @@
 # Whether lavacooling should be enabled.
 #enable_lavacooling = true
 
-# Whether the stuff in initial_stuff should be given to new players.
-# its depends of the configured at the initital_stuff_mod
-#give_initial_stuff = true
+# 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
 
-# What initial stuff will be given to player if initial stuff are set to true
-#initial_stuff = default:wood,farming:bread,default:furnace,default:torch
-
-# 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 to allow respawning in beds.
-# Default value is true.
+# Whether you 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
-
-# If enabled, fences and walls cannot be jumped over.
-#enable_fence_tall = false
-
-# Whether the engine's spawn search, which does not check for a suitable
-# starting biome, is used.
-# Default value is false.
-#engine_spawn = false
-
-# Whether river water source nodes create flowing sounds.
-# Helps rivers create more sound, especially on level sections.
-#river_source_sounds = false
-
-# Enable cloud variation by the 'weather' mod.
-# Non-functional in V6 or Singlenode mapgens.
-#enable_weather = true

mods/README.md

@@ -1,61 +0,0 @@
-Default mods
-------------
-
-For information check [../README.md](../README.md)
-
-## Content
-
-| mod name           | origin or work                                      | version | info |
-| ------------------ | --------------------------------------------------- | -------- | --- |
-| api                | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | [api](../game_api.md) |
-| beds               | https://codeberg.org/minenux/minetest-mod-beds      | https://codeberg.org/minenux/minetest-mod-beds/commit/a1aac5940c88106b901c00409d7dac942720dd5b | [beds/README.md](beds/README.md) |
-| boats              | https://codeberg.org/minenux/minetest-mod-boats     | https://codeberg.org/minenux/minetest-mod-boats/commit/e412ae84db3c443618b117fb35ae69e3c9bbae10 | [boats/README.md](boats/README.md) |
-| bucket             | https://codeberg.org/minenux/minetest-mod-bucket.git | https://codeberg.org/minenux/minetest-mod-bucket/commit/1d9f32295aba3ef2a86be302050f34c1766e93d5 | [bucket/README.md](bucket/README.md) |
-| butterflies        | https://codeberg.org/minenux/minetest-mod-bucket.git | https://codeberg.org/minenux/minetest-mod-bucket/commit/1d9f32295aba3ef2a86be302050f34c1766e93d5 | [bucket/README.md](bucket/README.md) |
-| bones              | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| binoculars         | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| carts              | https://codeberg.org/minenux/minetest-mod-carts     | https://codeberg.org/minenux/minetest-mod-carts/commit/dcbca916cffdcec281f0129ef350db2686bda933 | [carts/README.md](carts/README.md) |
-| creative           | https://codeberg.org/minenux/minetest-mod-creative  | https://codeberg.org/minenux/minetest-mod-creative/commit/ca09e773701f834fec7de18bf13598b3323778db | [creative/README.md](creative/README.md) |
-| default            | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| player_api         | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| env_sounds         | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| game_commands      | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| spawn              | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| doors              | https://codeberg.org/minenux/minetest-mod-doors     | https://codeberg.org/minenux/minetest-mod-doors/commit/a89ab0454deb4933b6e4971c57055c40b7938e5b | [doors/README.md](doors/README.md) |
-| dungeon_loot       | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| dye                | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| farming            | https://codeberg.org/minenux/minetest-mod-farming   | https://codeberg.org/minenux/minetest-mod-farming/commit/08c3a9b37bab5d8a0f5971b168aef412db5fc424 | [farming/README.md](farming/README.md) |
-| fire               | https://codeberg.org/minenux/minetest-mod-fire      | https://codeberg.org/minenux/minetest-mod-fire/commit/4e5f7ad55314bd9b126fb133cfc5a32fa58b20d2 | [fire/README.md](fire/README.md) |
-| fireflies          | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/fc4ab2538d432a20978ee3bbd1b69a42446e9132 | [fireflies/README.md](fireflies/README.md) |
-| flowers            | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| hudbars            | https://codeberg.org/minenux/minetest-mod-hudbars   | https://codeberg.org/minenux/minetest-mod-hudbars/commit/e3db263828cb96f06d848e6dc80d90f21c7f92a0 | [hudbars/README.md](hudbars/README.md) |
-| give_initial_stuff | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/ee86fb1c41e7d8d2a1d94764dd64808bc8ff5999 | [give_initial_stuff/README.md](give_initial_stuff/README.md) |
-| killme             | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| sfinv              | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| stairs             | https://codeberg.org/minenux/minetest-mod-stairs    | https://codeberg.org/minenux/minetest-mod-stairs/commit/c3a5af6c452daca599d226df694df1b75f15c110 | [stairs/README.md](stairs/README.md) |
-| screwdriver        | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| sethome            | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/8e59006dc81ebe6785380158e57ba126cb3a4163 | |
-| tnt                | https://codeberg.org/minenux/minetest-mod-tnt       | https://codeberg.org/minenux/minetest-mod-tnt/commit/8195861f905a90b53cd52348deb34df41a053027 | [tnt/README.md](tnt/README.md) |
-| toolranks          | https://codeberg.org/minenux/minetest-mod-toolranks | https://codeberg.org/minenux/minetest-mod-toolranks/commit/5c9553e5ac6cc7ae375033b76ef7771a6935c771 | [toolranks/README.md](toolranks/README.md) |
-| vessels            | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| walls              | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| weather            | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| wool               | https://codeberg.org/minenux/minetest-mod-wool      | https://codeberg.org/minenux/minetest-mod-wool/commit/de642a08e80bfd7a4a1e5629e50458a609dbda3a | [wool/README.md](wool/README.md) |
-| xpanes             | https://codeberg.org/minenux/minetest-game-minetest | https://codeberg.org/minenux/minetest-game-minetest/commit/eb64ff94f82d726e4a55b20fa7ce30e4a7470cc5 | |
-| xdecor             | https://codeberg.org/minenux/minetest-game-xdecor   | https://codeberg.org/minenux/minetest-game-xdecor/commit/cd0c35b8c58153f7c353b5dbfac35e524fa0ea18 | [xdecor/README.md](xdecor/README.md) |
-
-The default mod was splitted now sethome and player_api are mods, binoculars from v5 are 
-just separate privilegies for zoom, butterflies and fireflies from v5 can be set 
-by dmobs or mobs_doomed mod, the spawn mod is just minimal spawn management 
-pooly provided and better managed by mods like rspawn and spawnrandom.
-
-## Compatibility
-
-This source code and files are focused in most newer minetest5 engine
-from https://codeberg.org/minenux/minetest-engine/src/branch/stable-5.2 
-
-For minetest4 check https://codeberg.org/minenux/minetest-engine/src/branch/stable-4.0 
-
-## Licensing
-
-See `LICENSE.txt`

mods/beds/Changelog.txt

@@ -1,33 +0,0 @@
-NEXT
-----
-
-- add more beds as fuel, add mini-game respawn flag.
-- add new white simple bed, change red bed recipes to use red wool, add my own screenshot
-- older engine detection and intlib
-
-1.0.1 beta
-----------
-- Add backwards compatibility with PilzAdam's beds mod
-- Fix placement
-- Fix small bugs
-- Prevent possible crash
-
-1.1
----
-- Add fancy bed model (based on jp's model)
-- Add API to register beds
-- Allow players always to detach from bed (by donat-b)
-- If more than 50% of players want sleep they can skip the night
-- Don't show sleep dialog in singleplayer
-
-1.1.1
------
-- Prevent possbile crash by trying to reposition leaving players
-
-1.2
----
-- Updated to use default bed functions
-- Texture check to fix beds using old api
-- 'bed_sleep_divide' setting added [1 for all, 2 for half, 3 for third]
-- Add POVA support
-- Add pink fancy bed and blue simple bed

mods/beds/README.md

@@ -1,104 +0,0 @@
-minetest mod Beds
-=========================
-
-This mod improves beds which allows sleep, featured to (auto) skip the night.
-
-Information
------------
-
-This mod is named `beds` to sleep, by rightclick the bed. It featured
-in singleplayer mode that the night gets skipped immediately. If playing
-in multiplayer you get shown how many other players are in bed too,
-if all players are sleeping the night gets skipped.
-
-![screenshot.jpg](screenshot.jpg)
-
-Tech information
-----------------
-
-This mod sustitute default one, you must disable the default of minetest
-game if present or override it.
-
-#### Features
-
-* Night Skypping:
-
-This mod auto featured night skip in singleplayer, in multiplayer it skipped
-if more than a set percentage (default 50%) of the players are lying
-in bed and use this option. Check configuration section for more info.
-
-* Controlled respawning:
-
-If you have slept in bed (not just lying in it) your respawn point
-is set to the beds location and you will respawn there after
-death. Check configuration section for more info.
-
-* More beds:
-
-It features more beds, so along with the Red simple bed we now have White and
-Blue, and the fance beds has the original Red and now Pink.
-
-#### Dependencies
-
-* default
-* player_api (for newer engines)
-
-Optional dependences:
-
-* intllib (only for older engines)
-* pova (optional)
-
-The pova mod are not xplicit set as optional depends, due the circular depends bug,
-its detected and used.
-
-#### Configuration
-
-| Configuration         | type  | default | place file   |  Notes about                             |
-| --------------------- | ----- | ------- | ------------ | ----------------------------------------- |
-| enable_bed_respawn    | bool  |  true   | minetest.conf | Enable respawn point set to last sleep bed |
-| enable_bed_night_skip | bool  |  false  | minetest.conf | You can disable the night skip feature |
-| bed_sleep_divide      |  int  |    2    | minetest.conf | Division of players needed to skip night |
-
-#### Nodes
-
-Crafting are same as original default mod, but colored uses a white plus the other color.
-
-| Node name               | Description name      |
-| ----------------------- | --------------------- |
-| beds:bed                | Simple bed            |
-| beds:bed_blue           | Simple bed blue       |
-| beds:fancy_bed          | Fancy shaped bed      |
-| beds:fancy_bed_pink     | Fancy shaped bed pink |
-
-#### Nodes and Aliasing
-
-| mod name : node name        | new mod name : new node |
-| --------------------------- | ----------------------- |
-| beds:bed_top_red            | beds:bed_top            |
-| beds:bed_bottom_red         | beds:bed_bottom         |
-
-#### Mini-Game Support
-
-If enable_bed_respawn is set to true and a player dies when playing a mini-game then this
-can interrupt the game, so a special beds.respawn[player_name] flag has been added which
-is set to 'true' by default to always respawn player at their bed, but can be set to
-'false' during a mini-game to stop this behaviour.
-
-
-License
-------
-
-### Authors of source code
-
-Originally by BlockMen (MIT)
-Various Minetest developers and contributors (MIT)
-
-### Authors of media (textures)
-
-BlockMen (CC BY-SA 3.0)
- All textures unless otherwise noted
-
-JP (WTFPL)
- All models unless otherwise noted
-
-Check [license.txt](license.txt)

mods/beds/README.txt

@@ -0,0 +1,26 @@
+Minetest Game mod: beds
+=======================
+See license.txt for license information.
+
+Authors of source code
+----------------------
+Originally by BlockMen (MIT)
+Various Minetest developers and contributors (MIT)
+
+Authors of media (textures)
+---------------------------
+BlockMen (CC BY-SA 3.0)
+
+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
+immediately. If playing multiplayer you get shown how many other players are in bed too,
+if all players are sleeping the night gets skipped. The night skip can be forced if more
+than 50% of the players are lying in bed and use this option.
+
+Another feature is a controlled respawning. If you have slept in bed (not just lying in
+it) your respawn point is set to the beds location and you will respawn there after
+death.
+You can disable the respawn at beds by setting "enable_bed_respawn = false" in
+minetest.conf.
+You can disable the night skip feature by setting "enable_bed_night_skip = false" in
+minetest.conf or by using the /set command in-game.

mods/beds/api.lua

@@ -1,62 +1,61 @@
 
-function beds.register_bed(name, def)
+local reverse = true
 
-	local new_tiles
-	local new_mesh = "beds_simple_bed.obj"
+local function destruct_bed(pos, n)
+	local node = minetest.get_node(pos)
+	local other
 
-	-- old api texture check
-	if def.tiles and def.tiles.bottom then
-
-		new_tiles = "beds_simple_bed.png" -- default
-
-		-- check for fancy bed
-		if def.nodebox and def.nodebox.bottom and #def.nodebox.bottom > 3 then
-			new_tiles = "beds_fancy_bed.png"
-			new_mesh = "beds_fancy_bed.obj"
-		end
+	if n == 2 then
+		local dir = minetest.facedir_to_dir(node.param2)
+		other = vector.subtract(pos, dir)
+	elseif n == 1 then
+		local dir = minetest.facedir_to_dir(node.param2)
+		other = vector.add(pos, dir)
 	end
 
-	-- register bed node
-	minetest.register_node(name, {
+	if reverse then
+		reverse = not reverse
+		minetest.remove_node(other)
+		minetest.check_for_falling(other)
+	else
+		reverse = not reverse
+	end
+end
+
+function beds.register_bed(name, def)
+	minetest.register_node(name .. "_bottom", {
 		description = def.description,
 		inventory_image = def.inventory_image,
 		wield_image = def.wield_image,
-		drawtype = "mesh",
-		mesh = def.mesh or new_mesh,
-		tiles = new_tiles or def.tiles,
+		drawtype = "nodebox",
+		tiles = def.tiles.bottom,
 		paramtype = "light",
 		paramtype2 = "facedir",
+		is_ground_content = false,
 		stack_max = 1,
-		groups = {
-			choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 1,
-			fall_damage_add_percent = -40, bouncy = 85
+		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 1},
+		sounds = def.sounds or default.node_sound_wood_defaults(),
+		node_box = {
+			type = "fixed",
+			fixed = def.nodebox.bottom,
 		},
-		sounds = default.node_sound_wood_defaults(),
 		selection_box = {
 			type = "fixed",
-			fixed = def.selectionbox
-		},
-		collision_box = {
-			type = "fixed",
-			fixed = def.collisionbox
+			fixed = def.selectionbox,
 		},
 
 		on_place = function(itemstack, placer, pointed_thing)
-
 			local under = pointed_thing.under
 			local node = minetest.get_node(under)
 			local udef = minetest.registered_nodes[node.name]
-
-			if udef and udef.on_rightclick
-			and not (placer and placer:is_player()
-			and placer:get_player_control().sneak) then
-
+			if udef and udef.on_rightclick and
+					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 udef and udef.buildable_to then
 				pos = under
 			else
@@ -65,16 +64,13 @@ function beds.register_bed(name, def)
 
 			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
-
+			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
 
 			local node_def = minetest.registered_nodes[minetest.get_node(pos).name]
-
 			if not node_def or not node_def.buildable_to then
 				return itemstack
 			end
@@ -83,46 +79,91 @@ function beds.register_bed(name, def)
 				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, player_name)
-			and not minetest.check_player_privs(player_name, "protection_bypass") then
-
+			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
 
 			local botdef = minetest.registered_nodes[minetest.get_node(botpos).name]
-
 			if not botdef or not botdef.buildable_to then
 				return itemstack
 			end
 
-			minetest.set_node(pos, {name = name, param2 = dir})
+			minetest.set_node(pos, {name = name .. "_bottom", param2 = dir})
+			minetest.set_node(botpos, {name = name .. "_top", param2 = dir})
 
-			if not beds.is_creative(player_name) then
+			if not (creative and creative.is_enabled_for
+					and creative.is_enabled_for(player_name)) then
 				itemstack:take_item()
 			end
-
 			return itemstack
 		end,
 
-		on_rightclick = function(pos, node, clicker)
-			beds.on_rightclick(pos, clicker)
-		end,
-
 		on_destruct = function(pos)
-			beds.remove_spawns_at(pos)
+			destruct_bed(pos, 1)
 		end,
 
-		can_dig = function(pos, player)
-			return beds.can_dig(pos)
-		end
+		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+			beds.on_rightclick(pos, clicker)
+			return itemstack
+		end,
+
+		on_rotate = function(pos, node, user, mode, new_param2)
+			local dir = minetest.facedir_to_dir(node.param2)
+			local p = vector.add(pos, dir)
+			local node2 = minetest.get_node_or_nil(p)
+			if not node2 or not minetest.get_item_group(node2.name, "bed") == 2 or
+					not node.param2 == node2.param2 then
+				return false
+			end
+			if minetest.is_protected(p, user:get_player_name()) then
+				minetest.record_protection_violation(p, user:get_player_name())
+				return false
+			end
+			if mode ~= screwdriver.ROTATE_FACE then
+				return false
+			end
+			local newp = vector.add(pos, minetest.facedir_to_dir(new_param2))
+			local node3 = minetest.get_node_or_nil(newp)
+			local node_def = node3 and minetest.registered_nodes[node3.name]
+			if not node_def or not node_def.buildable_to then
+				return false
+			end
+			if minetest.is_protected(newp, user:get_player_name()) then
+				minetest.record_protection_violation(newp, user:get_player_name())
+				return false
+			end
+			node.param2 = new_param2
+			-- do not remove_node here - it will trigger destroy_bed()
+			minetest.set_node(p, {name = "air"})
+			minetest.set_node(pos, node)
+			minetest.set_node(newp, {name = name .. "_top", param2 = new_param2})
+			return true
+		end,
 	})
 
-	minetest.register_alias(name .. "_bottom", name)
-	minetest.register_alias(name .. "_top", "air")
+	minetest.register_node(name .. "_top", {
+		drawtype = "nodebox",
+		tiles = def.tiles.top,
+		paramtype = "light",
+		paramtype2 = "facedir",
+		is_ground_content = false,
+		pointable = false,
+		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, bed = 2},
+		sounds = def.sounds or default.node_sound_wood_defaults(),
+		drop = name .. "_bottom",
+		node_box = {
+			type = "fixed",
+			fixed = def.nodebox.top,
+		},
+		on_destruct = function(pos)
+			destruct_bed(pos, 2)
+		end,
+	})
+
+	minetest.register_alias(name, name .. "_bottom")
 
-	-- register recipe
 	minetest.register_craft({
 		output = name,
 		recipe = def.recipe

mods/beds/beds.lua

@@ -1,79 +1,87 @@
-local S = beds.get_translator
-
 -- Fancy shaped bed
 
 beds.register_bed("beds:fancy_bed", {
-	description = S("Red Fancy Bed"),
+	description = "Fancy Bed",
 	inventory_image = "beds_bed_fancy.png",
 	wield_image = "beds_bed_fancy.png",
-	tiles = {"beds_fancy_bed.png", "default_wood.png"},
-	mesh = "beds_fancy_bed.obj",
-	selectionbox = {-0.5, -0.5, -0.5, 0.5, -0.06, 1.5},
-	collisionbox = {-0.5, -0.5, -0.5, 0.5, -0.06, 1.5},
+	tiles = {
+		bottom = {
+			"beds_bed_top1.png",
+			"default_wood.png",
+			"beds_bed_side1.png",
+			"beds_bed_side1.png^[transformFX",
+			"default_wood.png",
+			"beds_bed_foot.png",
+		},
+		top = {
+			"beds_bed_top2.png",
+			"default_wood.png",
+			"beds_bed_side2.png",
+			"beds_bed_side2.png^[transformFX",
+			"beds_bed_head.png",
+			"default_wood.png",
+		}
+	},
+	nodebox = {
+		bottom = {
+			{-0.5, -0.5, -0.5, -0.375, -0.065, -0.4375},
+			{0.375, -0.5, -0.5, 0.5, -0.065, -0.4375},
+			{-0.5, -0.375, -0.5, 0.5, -0.125, -0.4375},
+			{-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5},
+			{0.4375, -0.375, -0.5, 0.5, -0.125, 0.5},
+			{-0.4375, -0.3125, -0.4375, 0.4375, -0.0625, 0.5},
+		},
+		top = {
+			{-0.5, -0.5, 0.4375, -0.375, 0.1875, 0.5},
+			{0.375, -0.5, 0.4375, 0.5, 0.1875, 0.5},
+			{-0.5, 0, 0.4375, 0.5, 0.125, 0.5},
+			{-0.5, -0.375, 0.4375, 0.5, -0.125, 0.5},
+			{-0.5, -0.375, -0.5, -0.4375, -0.125, 0.5},
+			{0.4375, -0.375, -0.5, 0.5, -0.125, 0.5},
+			{-0.4375, -0.3125, -0.5, 0.4375, -0.0625, 0.4375},
+		}
+	},
+	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
 	recipe = {
 		{"", "", "group:stick"},
 		{"wool:red", "wool:red", "wool:white"},
-		{"group:wood", "group:wood", "group:wood"}
-	}
-})
-
-beds.register_bed("beds:fancy_bed_pink", {
-	description = S("Pink Fancy Bed"),
-	inventory_image = "beds_bed_fancy_pink.png",
-	wield_image = "beds_bed_fancy_pink.png",
-	tiles = {"beds_fancy_bed_pink.png", "default_wood.png"},
-	mesh = "beds_fancy_bed.obj",
-	selectionbox = {-0.5, -0.5, -0.5, 0.5, -0.06, 1.5},
-	collisionbox = {-0.5, -0.5, -0.5, 0.5, -0.06, 1.5},
-	recipe = {
-		{"", "", "group:stick"},
-		{"wool:pink", "wool:pink", "wool:white"},
-		{"group:wood", "group:wood", "group:wood"}
-	}
+		{"group:wood", "group:wood", "group:wood"},
+	},
 })
 
 -- Simple shaped bed
 
-beds.register_bed("beds:bed_white", {
-	description = S("White Simple Bed"),
-	inventory_image = "beds_bed_white.png",
-	wield_image = "beds_bed_white.png",
-	tiles = {"beds_simple_bed_white.png"},
-	mesh = "beds_simple_bed.obj",
-	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
-	collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
-	recipe = {
-		{"wool:white", "wool:white", "wool:white"},
-		{"group:wood", "group:wood", "group:wood"}
-	}
-})
-
 beds.register_bed("beds:bed", {
-	description = S("Red Simple Bed"),
+	description = "Simple Bed",
 	inventory_image = "beds_bed.png",
 	wield_image = "beds_bed.png",
-	tiles = {"beds_simple_bed.png"},
-	mesh = "beds_simple_bed.obj",
+	tiles = {
+		bottom = {
+			"beds_bed_top_bottom.png^[transformR90",
+			"default_wood.png",
+			"beds_bed_side_bottom_r.png",
+			"beds_bed_side_bottom_r.png^[transformfx",
+			"beds_transparent.png",
+			"beds_bed_side_bottom.png"
+		},
+		top = {
+			"beds_bed_top_top.png^[transformR90",
+			"default_wood.png",
+			"beds_bed_side_top_r.png",
+			"beds_bed_side_top_r.png^[transformfx",
+			"beds_bed_side_top.png",
+			"beds_transparent.png",
+		}
+	},
+	nodebox = {
+		bottom = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
+		top = {-0.5, -0.5, -0.5, 0.5, 0.06, 0.5},
+	},
 	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
-	collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
 	recipe = {
 		{"wool:red", "wool:red", "wool:white"},
 		{"group:wood", "group:wood", "group:wood"}
-	}
-})
-
-beds.register_bed("beds:bed_blue", {
-	description = S("Blue Simple Bed"),
-	inventory_image = "beds_bed_blue.png",
-	wield_image = "beds_bed_blue.png",
-	tiles = {"beds_simple_bed_blue.png"},
-	mesh = "beds_simple_bed.obj",
-	selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
-	collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5},
-	recipe = {
-		{"wool:blue", "wool:blue", "wool:white"},
-		{"group:wood", "group:wood", "group:wood"}
-	}
+	},
 })
 
 -- Aliases for PilzAdam's beds mod
@@ -85,30 +93,12 @@ minetest.register_alias("beds:bed_top_red", "beds:bed_top")
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "beds:fancy_bed",
-	burntime = 13
+	recipe = "beds:fancy_bed_bottom",
+	burntime = 13,
 })
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "beds:fancy_bed_pink",
-	burntime = 13
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "beds:bed",
-	burntime = 12
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "beds:bed_blue",
-	burntime = 12
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "beds:bed_white",
-	burntime = 12
+	recipe = "beds:bed_bottom",
+	burntime = 12,
 })

mods/beds/depends.txt

@@ -1,4 +1,2 @@
 default
 wool
-pova?
-intllib?

mods/beds/description.txt

@@ -1 +0,0 @@
-beds which allows sleep, featured to (auto) skip the night.

mods/beds/functions.lua

@@ -1,11 +1,7 @@
-local S = beds.get_translator
-local is_50 = beds.is_50
-local is_54 = beds.is_54
-local is_pova = minetest.get_modpath("pova")
 local pi = math.pi
+local player_in_bed = 0
 local is_sp = minetest.is_singleplayer()
 local enable_respawn = minetest.settings:get_bool("enable_bed_respawn")
-
 if enable_respawn == nil then
 	enable_respawn = true
 end
@@ -13,49 +9,34 @@ end
 -- Helper functions
 
 local function get_look_yaw(pos)
-
-	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
+	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
 	else
-		return 0, rotation
+		return 0, n.param2
 	end
 end
 
-
 local function is_night_skip_enabled()
-
 	local enable_night_skip = minetest.settings:get_bool("enable_bed_night_skip")
-
 	if enable_night_skip == nil then
 		enable_night_skip = true
 	end
-
 	return enable_night_skip
 end
 
-
 local function check_in_beds(players)
-
 	local in_bed = beds.player
-
 	if not players then
 		players = minetest.get_connected_players()
 	end
 
 	for n, player in ipairs(players) do
-
 		local name = player:get_player_name()
-
 		if not in_bed[name] then
 			return false
 		end
@@ -64,9 +45,7 @@ local function check_in_beds(players)
 	return #players > 0
 end
 
-
 local function lay_down(player, pos, bed_pos, state, skip)
-
 	local name = player:get_player_name()
 	local hud_flags = player:hud_get_flags()
 
@@ -76,156 +55,61 @@ local function lay_down(player, pos, bed_pos, state, skip)
 
 	-- stand up
 	if state ~= nil and not state then
-
-		if not beds.player[name] then
-			return false -- player not in bed, do nothing
+		local p = beds.pos[name] or nil
+		if beds.player[name] ~= nil then
+			beds.player[name] = nil
+			player_in_bed = player_in_bed - 1
 		end
-
-		beds.bed_position[name] = nil
-
 		-- skip here to prevent sending player specific changes (used for leaving players)
 		if skip then
 			return
 		end
-
-		player:set_pos(beds.pos[name])
+		if p then
+			player:setpos(p)
+		end
 
 		-- physics, eye_offset, etc
-		local physics_override = beds.player[name].physics_override
-
-		beds.player[name] = nil
-
-		if is_pova then
-			pova.del_override(name, "force")
-			pova.do_override(player)
-		else
-			player:set_physics_override({
-				speed = physics_override.speed,
-				jump = physics_override.jump,
-				gravity = physics_override.gravity
-			})
-		end
-
 		player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
 		player:set_look_horizontal(math.random(1, 180) / 100)
-
-		if beds.is_50 then
-			player_api.player_attached[name] = false
-			player_api.set_animation(player, "stand" , 30)
-		else
-			default.player_attached[name] = false
-			default.player_set_animation(player, "stand" , 30)
-		end
-
+		default.player_attached[name] = false
+		player:set_physics_override(1, 1, 1)
 		hud_flags.wielditem = true
+		default.player_set_animation(player, "stand" , 30)
 
-	else -- lay down
-
-		-- Check if bed is occupied
-		for _, other_pos in pairs(beds.bed_position) do
-
-			if vector.distance(bed_pos, other_pos) < 0.1 then
-
-				minetest.chat_send_player(name, S("This bed is already occupied!"))
-
-				return false
-			end
-		end
-
-		if beds.is_54 then
-			-- Check if player is moving
-			if vector.length(player:get_velocity()) > 0.001 then
-				minetest.chat_send_player(name,
-						S("You have to stop moving before going to bed!"))
-				return false
-			end
-		end
-
-		-- Check if player is attached to an object
-		if player:get_attach() then
-			return false
-		end
-
-		if beds.player[name] then
-			-- player already in bed, do nothing
-			return false
-		end
-
+	-- lay down
+	else
+		beds.player[name] = 1
 		beds.pos[name] = pos
-		beds.bed_position[name] = bed_pos
-		beds.player[name] = {physics_override = player:get_physics_override()}
+		player_in_bed = player_in_bed + 1
 
 		-- physics, eye_offset, etc
 		player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0})
-
 		local yaw, param2 = get_look_yaw(bed_pos)
-
 		player:set_look_horizontal(yaw)
-
 		local dir = minetest.facedir_to_dir(param2)
-
-		-- p.y is just above the nodebox height of the 'Simple Bed' (the highest bed),
-		-- to avoid sinking down through the bed.
-		local p = {
-			x = bed_pos.x + dir.x / 2,
-			y = bed_pos.y + 0.07,
-			z = bed_pos.z + dir.z / 2
-		}
-
-		if is_pova then
-			pova.add_override(name, "force", {speed = 0, jump = 0, gravity = 0})
-			pova.do_override(player)
-		else
-			player:set_physics_override({speed = 0, jump = 0, gravity = 0})
-		end
-
-		player:set_pos(p)
-
-		if beds.is_50 then
-			player_api.player_attached[name] = true
-			player_api.set_animation(player, "lay" , 0)
-		else
-
-			default.player_attached[name] = true
-			default.player_set_animation(player, "lay" , 0)
-		end
-
+		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)
+		default.player_attached[name] = true
 		hud_flags.wielditem = false
+		default.player_set_animation(player, "lay" , 0)
 	end
 
 	player:hud_set_flags(hud_flags)
 end
 
-
-local function get_player_in_bed_count()
-
-	local c = 0
-
-	for _, _ in pairs(beds.player) do
-		c = c + 1
-	end
-
-	return c
-end
-
-
 local function update_formspecs(finished)
-
 	local ges = #minetest.get_connected_players()
-	local player_in_bed = get_player_in_bed_count()
-	local is_majority = (ges / 2) < player_in_bed
 	local form_n
-	local esc = minetest.formspec_escape
+	local is_majority = (ges / 2) < player_in_bed
 
 	if finished then
-		form_n = beds.formspec .. "label[2.7,9;" .. esc(S("Good morning.")) .. "]"
+		form_n = beds.formspec .. "label[2.7,11; Good morning.]"
 	else
-		form_n = beds.formspec .. "label[2.2,9;" ..
-			esc(S("@1 of @2 players are in bed", player_in_bed, ges)) .. "]"
-
+		form_n = beds.formspec .. "label[2.2,11;" .. 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,6;4,0.75;force;" ..
-				esc(S("Force night skip")) .. "]"
+			form_n = form_n .. "button_exit[2,8;4,0.75;force;Force night skip]"
 		end
 	end
 
@@ -234,46 +118,36 @@ local function update_formspecs(finished)
 	end
 end
 
+
 -- Public functions
 
 function beds.kick_players()
-
 	for name, _ in pairs(beds.player) do
-
 		local player = minetest.get_player_by_name(name)
-
 		lay_down(player, nil, nil, false)
 	end
 end
 
-
 function beds.skip_night()
 	minetest.set_timeofday(0.23)
 end
 
-
 function beds.on_rightclick(pos, player)
-
 	local name = player:get_player_name()
-	local ppos = player:get_pos()
+	local ppos = player:getpos()
 	local tod = minetest.get_timeofday()
 
-	if tod > beds.day_interval.start and tod < beds.day_interval.finish then
-
+	if tod > 0.2 and tod < 0.805 then
 		if beds.player[name] then
 			lay_down(player, nil, nil, false)
 		end
-
-		minetest.chat_send_player(name, S("You can only sleep at night."))
-
+		minetest.chat_send_player(name, "You can only sleep at night.")
 		return
 	end
 
 	-- move to bed
 	if not beds.player[name] then
-
 		lay_down(player, ppos, pos)
-
 		beds.set_spawns() -- save respawn positions when entering bed
 	else
 		lay_down(player, nil, nil, false)
@@ -285,13 +159,10 @@ function beds.on_rightclick(pos, player)
 
 	-- skip the night and let all players stand up
 	if check_in_beds() then
-
 		minetest.after(2, function()
-
 			if not is_sp then
 				update_formspecs(is_night_skip_enabled())
 			end
-
 			if is_night_skip_enabled() then
 				beds.skip_night()
 				beds.kick_players()
@@ -301,66 +172,27 @@ function beds.on_rightclick(pos, player)
 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
 if enable_respawn then
-
-	-- set respawn flag to true by default
-	minetest.register_on_joinplayer(function(player)
-
-		if not player then return end
-
-		local name = player:get_player_name()
-		beds.respawn[name] = true
-	end)
-
 	-- respawn player at bed if enabled and valid position is found
 	minetest.register_on_respawnplayer(function(player)
-
-		if not player then return end
-
 		local name = player:get_player_name()
 		local pos = beds.spawn[name]
-
-		-- check if respawn flag is true (for mini-game support, can be set to false)
-		if pos and beds.respawn[name] then
-			player:set_pos(pos)
+		if pos then
+			player:setpos(pos)
 			return true
 		end
 	end)
 end
 
-
 minetest.register_on_leaveplayer(function(player)
-
-	if not player then return end
-
 	local name = player:get_player_name()
-
 	lay_down(player, nil, nil, false, true)
-
 	beds.player[name] = nil
-
 	if check_in_beds() then
-
 		minetest.after(2, function()
-
 			update_formspecs(is_night_skip_enabled())
-
 			if is_night_skip_enabled() then
 				beds.skip_night()
 				beds.kick_players()
@@ -369,54 +201,20 @@ minetest.register_on_leaveplayer(function(player)
 	end
 end)
 
-
-minetest.register_on_dieplayer(function(player)
-
-	if not player then return end
-
-	local name = player:get_player_name()
-	local in_bed = beds.player
-	local pos = player:get_pos()
-	local yaw = get_look_yaw(pos)
-
-	if in_bed[name] then
-		lay_down(player, nil, pos, false)
-		player:set_look_horizontal(yaw)
-		player:set_pos(pos)
-	end
-end)
-
-
-local div = tonumber(minetest.settings:get("bed_sleep_divide")) or 2
-
 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 = get_player_in_bed_count()
-
 	if fields.quit or fields.leave then
 		lay_down(player, nil, nil, false)
 		update_formspecs(false)
 	end
 
 	if fields.force then
-
-		-- check if enough players are sleeping to skip night (was half)
-		local is_majority = (
-				#minetest.get_connected_players() / div) < last_player_in_bed
-
-		if is_majority and is_night_skip_enabled() then
-			update_formspecs(true)
+		update_formspecs(is_night_skip_enabled())
+		if is_night_skip_enabled() then
 			beds.skip_night()
 			beds.kick_players()
-		else
-			update_formspecs(false)
 		end
 	end
 end)

mods/beds/init.lua

@@ -1,69 +1,17 @@
-local is_50 = nil
-local is_53 = minetest.has_feature("object_step_has_moveresult")
-local is_54 = minetest.has_feature("direct_velocity_on_players")
+beds = {}
+beds.player = {}
+beds.pos = {}
+beds.spawn = {}
 
- -- Load support for MT game translation.
-local S
-if minetest.get_translator ~= nil then
-	S = minetest.get_translator("beds") -- 5.x translation function
-	is_50 = true
-else
-	if minetest.get_modpath("intllib") then
-		dofile(minetest.get_modpath("intllib") .. "/init.lua")
-		if intllib.make_gettext_pair then
-			gettext, ngettext = intllib.make_gettext_pair() -- new gettext method
-		else
-			gettext = intllib.Getter() -- old text file method
-		end
-		S = gettext
-	else -- boilerplate function for 0.4
-		S = function(str, ...)
-			local args = {...}
-			return str:gsub("@%d+", function(match)
-				return args[tonumber(match:sub(2))]
-			end)
-		end
-	end
-end
-
-beds = {
-	mod = "redo",
-	player = {},
-	bed_position = {},
-	pos = {},
-	spawn = {},
-	respawn = {},
-	get_translator = S,
-	formspec = "size[8,11;true]"
-	.. "no_prepend[]"
-	.. "bgcolor[#080808BB;true]"
-	.. "button_exit[2,10;4,0.75;leave;" .. minetest.formspec_escape(S("Leave Bed")) .. "]"
-}
-beds.is_50 = is_50
-beds.is_53 = is_53
-beds.is_54 = is_54
-
-beds.day_interval = {
-	start = 0.2,
-	finish = 0.805,
-}
+beds.formspec = "size[8,15;true]" ..
+	"bgcolor[#080808BB; true]" ..
+	"button_exit[2,12;4,0.75;leave;Leave Bed]"
 
 local modpath = minetest.get_modpath("beds")
 
--- check for minetest 5.x/0.4 compatibility
-function beds.is_creative(name)
-	if is_53 then
-		return minetest.is_creative_enabled(name)
-	else
-		return creative.is_enabled_for(name) or minetest.settings:get_bool("creative_mode")
-	end
-end
 -- Load files
 
 dofile(modpath .. "/functions.lua")
 dofile(modpath .. "/api.lua")
 dofile(modpath .. "/beds.lua")
 dofile(modpath .. "/spawns.lua")
-
-
-print("[MOD] Beds loaded")

mods/beds/license.txt

@@ -30,7 +30,6 @@ 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.
@@ -59,7 +58,3 @@ rights may limit how you use the material.
 
 For more details:
 http://creativecommons.org/licenses/by-sa/3.0/
-
-
-WTFPL license applies to bed .obj files by jp from mesh beds mod:
-https://forum.minetest.net/viewtopic.php?t=11817

mods/beds/locale/beds.de.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Schickes Bett
-Simple Bed=Schlichtes Bett
-This bed is already occupied!=Dieses Bett ist bereits belegt!
-You have to stop moving before going to bed!=Sie müssen stehen bleiben, bevor Sie zu Bett gehen können!
-Good morning.=Guten Morgen.
-@1 of @2 players are in bed=@1 von @2 Spielern sind im Bett
-Force night skip=Überspringen der Nacht erzwingen
-You can only sleep at night.=Sie können nur nachts schlafen.
-Leave Bed=Bett verlassen

mods/beds/locale/beds.es.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Cama de lujo
-Simple Bed=Cama sencilla
-This bed is already occupied!=Esta cama esta ocupada
-You have to stop moving before going to bed!=Deja de moverte o no podras acostarte
-Good morning.=Buenos días.
-@1 of @2 players are in bed=@1 de @2 jugadores están durmiendo
-Force night skip=Forzar hacer de dia
-You can only sleep at night.=Sólo puedes dormir por la noche.
-Leave Bed=Levantarse 

mods/beds/locale/beds.fr.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Lit chic
-Simple Bed=Lit simple
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.=Bonjour.
-@1 of @2 players are in bed=@1 joueur(s) sur @2 sont au lit
-Force night skip=Forcer le passage de la nuit
-You can only sleep at night.=Vous ne pouvez dormir que la nuit.
-Leave Bed=Se lever du lit

mods/beds/locale/beds.id.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Ranjang Mewah
-Simple Bed=Ranjang Sederhana
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.=Selamat pagi.
-@1 of @2 players are in bed=@1 dari @2 pemain sedang tidur
-Force night skip=Paksa lewati malam
-You can only sleep at night.=Anda hanya dapat tidur pada waktu malam.
-Leave Bed=Tinggalkan Ranjang

mods/beds/locale/beds.it.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Letto decorato
-Simple Bed=Letto semplice
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.=
-@1 of @2 players are in bed=
-Force night skip=
-You can only sleep at night.=
-Leave Bed=Alzati dal letto

mods/beds/locale/beds.jbo.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=lo selja'i ckana
-Simple Bed=lo sampu ckana
-This bed is already occupied!=.i lo ti ckana cu canlu
-You have to stop moving before going to bed!=lo nu do cando cu sarcu lo nu do sipna
-Good morning.=.i .uise'inai cerni
-@1 of @2 players are in bed=.i @1 cmima be lu'i @2 le pilno cu vreta lo ckana
-Force night skip=bapli le nu co'u nicte
-You can only sleep at night.=.i steci le ka nicte kei fa le ka do kakne le ka sipna ca pa ckaji be ce'u
-Leave Bed=cliva lo ckana

mods/beds/locale/beds.ms.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Katil Beragam
-Simple Bed=Katil Biasa
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.=Selamat pagi.
-@1 of @2 players are in bed=@1 daripada @2 pemain sedang tidur
-Force night skip=Paksa langkau malam
-You can only sleep at night.=Anda hanya boleh tidur pada waktu malam.
-Leave Bed=Bangun

mods/beds/locale/beds.pt_BR.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Cama Bonita
-Simple Bed=Cama Simples
-This bed is already occupied!=Esta cama já está ocupada!
-You have to stop moving before going to bed!=Você precisa parar de se mover antes de ir para cama!
-Good morning.=Bom dia.
-@1 of @2 players are in bed=@1 de @2 jogadores estão na cama
-Force night skip=Forçar o amanhecer
-You can only sleep at night.=Você só pode dormir à noite
-Leave Bed=Sair da Cama

mods/beds/locale/beds.ru.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Детализированная Кровать
-Simple Bed=Обычная Кровать
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.=Доброе утро.
-@1 of @2 players are in bed=@1 из @2 игроков в кровати
-Force night skip=Пропустить ночь
-You can only sleep at night.=Вы можете спать только ночью.
-Leave Bed=Встать с кровати

mods/beds/locale/beds.se.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Fin säng
-Simple Bed=Enkel Säng
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.= God morgon.
-@1 of @2 players are in bed=@1 av @2 spelar försöker sover.
-Force night skip=Tvinga över natten
-You can only sleep at night.=Du kan bara sova på natten.
-Leave Bed=Lämna Säng

mods/beds/locale/beds.sk.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=Pekná posteľ
-Simple Bed=Jednoduchá posteľ
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.=Dobré ráno.
-@1 of @2 players are in bed=@1 z @2 hráčov sú v posteli
-Force night skip=Nútene preskočiť noc
-You can only sleep at night.=Môžeš spať len v noci.
-Leave Bed=Opusti posteľ

mods/beds/locale/beds.zh_CN.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=花式床
-Simple Bed=简易床
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.=早安！
-@1 of @2 players are in bed=@2位玩家中的@1位在床上
-Force night skip=强制跳过夜晚
-You can only sleep at night.=你只能在晚上睡觉。
-Leave Bed=离开床

mods/beds/locale/beds.zh_TW.tr

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=花式床
-Simple Bed=簡易床
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.=早安！
-@1 of @2 players are in bed=@2位玩家中的@1位在床上
-Force night skip=強制跳過夜晚
-You can only sleep at night.=你只能在晚上睡覺。
-Leave Bed=離開床

mods/beds/locale/template.txt

@@ -1,10 +0,0 @@
-# textdomain: beds
-Fancy Bed=
-Simple Bed=
-This bed is already occupied!=
-You have to stop moving before going to bed!=
-Good morning.=
-@1 of @2 players are in bed=
-Force night skip=
-You can only sleep at night.=
-Leave Bed=

mods/beds/mod.conf

@@ -1,4 +0,0 @@
-name = beds
-description = beds which allows sleep, featured to (auto) skip the night.
-depends = default, wool
-optional_depends = player_api, pova, intllib

mods/beds/models/beds_fancy_bed.obj

@@ -1,160 +0,0 @@
-# Blender v2.69 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib fancy_bed.mtl
-o mattress_Mattress_nodebox-6_none.001_fancy_bed.png.001
-v 0.437500 -0.312500 -0.437501
-v 0.437500 -0.062500 -0.437501
-v 0.437500 -0.062500 1.437499
-v 0.437500 -0.312500 1.437499
-v -0.437500 -0.312500 -0.437501
-v -0.437500 -0.312500 1.437499
-v -0.437500 -0.062500 1.437499
-v -0.437500 -0.062500 -0.437501
-v 0.437500 -0.176793 -0.437501
-v -0.437500 -0.176793 -0.437501
-vt 0.000171 0.499972
-vt 0.000161 0.000182
-vt 0.999791 0.000253
-vt 0.999873 0.500022
-vt 0.749576 0.000208
-vt 0.749876 0.499854
-vt 0.999848 0.999750
-vt 0.000152 0.999750
-vt 0.749276 0.130648
-vt 0.000112 0.130648
-g mattress_Mattress_nodebox-6_none.001_fancy_bed.png.001_none.001_fancy_bed.png.001
-usemtl none.001_fancy_bed.png.001
-s off
-f 1/1 2/2 3/3 4/4
-f 5/2 6/3 7/4 8/1
-f 4/5 3/2 7/1 6/6
-f 1/1 4/4 6/7 5/8
-f 2/1 8/2 7/3 3/4
-f 8/2 2/5 9/9 10/10
-o wood_structure_Wood_structure_nodebox-4.001_none.002
-v 0.374999 -0.375000 1.437499
-v 0.374999 -0.125000 1.437499
-v 0.374999 -0.125000 1.499999
-v 0.374999 -0.375000 1.499999
-v -0.374999 -0.375000 1.437499
-v -0.374999 -0.375000 1.499999
-v -0.374999 -0.125000 1.499999
-v -0.374999 -0.125000 1.437499
-v -0.375000 -0.500000 1.437499
-v -0.375000 0.187500 1.437499
-v -0.375000 0.187500 1.499999
-v -0.375000 -0.500000 1.499999
-v -0.500000 -0.500000 1.437499
-v -0.500000 -0.500000 1.499999
-v -0.500000 0.187500 1.499999
-v -0.500000 0.187500 1.437499
-v -0.437500 -0.375000 -0.437501
-v -0.437500 -0.125000 -0.437501
-v -0.437500 -0.125000 1.437498
-v -0.437500 -0.375000 1.437498
-v -0.500000 -0.375000 -0.437501
-v -0.500000 -0.375000 1.437498
-v -0.500000 -0.125000 1.437498
-v -0.500000 -0.125000 -0.437501
-v 0.375001 -0.000000 1.437499
-v 0.375001 0.125000 1.437499
-v 0.375001 0.125000 1.499999
-v 0.375001 -0.000000 1.499999
-v -0.375001 -0.000000 1.437499
-v -0.375001 -0.000000 1.499999
-v -0.375001 0.125000 1.499999
-v -0.375001 0.125000 1.437499
-v 0.500000 -0.500000 1.437499
-v 0.500000 0.187500 1.437499
-v 0.500000 0.187500 1.499999
-v 0.500000 -0.500000 1.499999
-v 0.375000 -0.500000 1.437499
-v 0.375000 -0.500000 1.499999
-v 0.375000 0.187500 1.499999
-v 0.375000 0.187500 1.437499
-v 0.500000 -0.375000 -0.437501
-v 0.500000 -0.125000 -0.437501
-v 0.500000 -0.125000 1.437499
-v 0.500000 -0.375000 1.437499
-v 0.437500 -0.375000 -0.437501
-v 0.437500 -0.375000 1.437499
-v 0.437500 -0.125000 1.437499
-v 0.437500 -0.125000 -0.437501
-v -0.375000 -0.500000 -0.500000
-v -0.375000 -0.065000 -0.500000
-v -0.375000 -0.065000 -0.437500
-v -0.375000 -0.500000 -0.437500
-v -0.500000 -0.500000 -0.500000
-v -0.500000 -0.500000 -0.437500
-v -0.500000 -0.065000 -0.437500
-v -0.500000 -0.065000 -0.500000
-v 0.375006 -0.375000 -0.500000
-v 0.375006 -0.125000 -0.500000
-v 0.375006 -0.125000 -0.437500
-v 0.375006 -0.375000 -0.437500
-v -0.375006 -0.375000 -0.500000
-v -0.375006 -0.375000 -0.437500
-v -0.375006 -0.125000 -0.437500
-v -0.375006 -0.125000 -0.500000
-v 0.500000 -0.500000 -0.500000
-v 0.500000 -0.065000 -0.500000
-v 0.500000 -0.065000 -0.437500
-v 0.500000 -0.500000 -0.437500
-v 0.375000 -0.500000 -0.500000
-v 0.375000 -0.500000 -0.437500
-v 0.375000 -0.065000 -0.437500
-v 0.375000 -0.065000 -0.500000
-vt 0.377610 0.378205
-vt 0.622484 0.378175
-vt 0.622515 0.623120
-vt 0.377671 0.623151
-g wood_structure_Wood_structure_nodebox-4.001_none.002_none.002
-usemtl none.002
-s off
-f 59/11 60/12 61/13 62/14
-f 63/14 64/11 65/12 66/13
-f 59/11 63/14 66/13 60/12
-f 62/14 61/13 65/12 64/11
-f 59/11 62/14 64/13 63/12
-f 60/12 66/11 65/14 61/13
-f 67/11 71/12 74/13 68/14
-f 70/14 69/11 73/12 72/13
-f 67/11 70/12 72/13 71/14
-f 68/11 74/12 73/13 69/14
-f 75/11 76/12 77/13 78/14
-f 79/14 80/11 81/12 82/13
-f 75/14 79/11 82/12 76/13
-f 78/11 77/12 81/13 80/14
-f 75/11 78/12 80/13 79/14
-f 76/11 82/12 81/13 77/14
-g wood_structure_Wood_structure_nodebox-4.001_none.002_none.003
-usemtl none.003
-f 15/11 16/12 17/13 18/14
-f 11/13 15/14 18/11 12/12
-f 14/14 13/11 17/12 16/13
-f 11/14 14/11 16/12 15/13
-f 12/11 18/12 17/13 13/14
-f 19/11 20/12 21/13 22/14
-f 23/14 24/11 25/12 26/13
-f 19/14 23/11 26/12 20/13
-f 22/11 21/12 25/13 24/14
-f 19/11 22/12 24/13 23/14
-f 20/11 26/12 25/13 21/14
-f 27/14 28/11 29/12 30/13
-f 31/11 32/12 33/13 34/14
-f 27/11 30/12 32/13 31/14
-f 28/14 34/11 33/12 29/13
-f 35/11 39/12 42/13 36/14
-f 38/14 37/11 41/12 40/13
-f 35/14 38/11 40/12 39/13
-f 36/11 42/12 41/13 37/14
-f 43/11 44/12 45/13 46/14
-f 47/14 48/11 49/12 50/13
-f 43/14 47/11 50/12 44/13
-f 46/11 45/12 49/13 48/14
-f 43/11 46/12 48/13 47/14
-f 44/11 50/12 49/13 45/14
-f 51/14 52/11 53/12 54/13
-f 55/13 56/14 57/11 58/12
-f 51/11 54/12 56/13 55/14
-f 52/14 58/11 57/12 53/13

mods/beds/models/beds_simple_bed.obj

@@ -1,32 +0,0 @@
-# Blender v2.69 (sub 0) OBJ File: ''
-# www.blender.org
-mtllib simple_bed.mtl
-o Simple_Bed
-v 0.500000 -0.500000 -0.500000
-v 0.500000 0.060000 -0.500000
-v 0.500000 0.060000 1.500000
-v 0.500000 -0.500000 1.500000
-v -0.500000 -0.500000 -0.500000
-v -0.500000 -0.500000 1.500000
-v -0.500000 0.060000 1.500000
-v -0.500000 0.060000 -0.500000
-vt 0.000112 0.780442
-vt 0.000110 0.999969
-vt 0.780324 0.999889
-vt 0.780377 0.780471
-vt 0.780636 0.390284
-vt 0.999906 0.780382
-vt 0.999906 0.390284
-vt 0.780636 0.000047
-vt 0.999906 0.000094
-vt 0.390235 0.780320
-vt 0.390235 0.000071
-vt 0.000142 0.000142
-usemtl none.002
-s off
-f 1/1 2/2 3/3 4/4
-f 5/1 6/4 7/3 8/2
-f 1/5 5/4 8/6 2/7
-f 4/8 3/9 7/7 6/5
-f 1/8 4/4 6/10 5/11
-f 2/11 8/12 7/1 3/10

mods/beds/settingtypes.txt

@@ -1,5 +0,0 @@
-enable_bed_respawn (Enable bed respawn) bool true
-
-enable_bed_night_skip (Enable night skip) bool true
-
-bed_sleep_divide (Division of players needed to skip night) float 2

mods/beds/spawns.lua

@@ -3,44 +3,30 @@ local org_file = world_path .. "/beds_spawns"
 local file = world_path .. "/beds_spawns"
 local bkwd = false
 
-
 -- check for PA's beds mod spawns
 local cf = io.open(world_path .. "/beds_player_spawns", "r")
-
 if cf ~= nil then
 	io.close(cf)
 	file = world_path .. "/beds_player_spawns"
 	bkwd = true
 end
 
-
 function beds.read_spawns()
-
 	local spawns = beds.spawn
 	local input = io.open(file, "r")
-
 	if input and not bkwd then
-
 		repeat
-
 			local x = input:read("*n")
-
 			if x == nil then
 				break
 			end
-
 			local y = input:read("*n")
 			local z = input:read("*n")
 			local name = input:read("*l")
-
 			spawns[name:sub(2)] = {x = x, y = y, z = z}
-
 		until input:read(0) == nil
-
 		io.close(input)
-
 	elseif input and bkwd then
-
 		beds.spawn = minetest.deserialize(input:read("*all"))
 		input:close()
 		beds.save_spawns()
@@ -49,54 +35,29 @@ function beds.read_spawns()
 	end
 end
 
-
--- load player spawn positions
 beds.read_spawns()
 
-
 function beds.save_spawns()
-
 	if not beds.spawn then
 		return
 	end
-
 	local data = {}
 	local output = io.open(org_file, "w")
-
 	for k, v in pairs(beds.spawn) do
 		table.insert(data, string.format("%.1f %.1f %.1f %s\n", v.x, v.y, v.z, k))
 	end
-
 	output:write(table.concat(data))
 	io.close(output)
 end
 
-
 function beds.set_spawns()
-
 	for name,_ in pairs(beds.player) do
-
 		local player = minetest.get_player_by_name(name)
-		local p = player:get_pos()
-
+		local p = player:getpos()
 		-- but don't change spawn location if borrowing a bed
 		if not minetest.is_protected(p, name) then
 			beds.spawn[name] = p
 		end
 	end
-
-	beds.save_spawns()
-end
-
-
-function beds.remove_spawns_at(pos)
-
-	for name, p in pairs(beds.spawn) do
-
-		if vector.equals(vector.round(p), pos) then
-			beds.spawn[name] = nil
-		end
-	end
-
 	beds.save_spawns()
 end

mods/binoculars/README.txt

@@ -1,37 +0,0 @@
-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/init.lua

@@ -1,81 +0,0 @@
--- binoculars/init.lua
-
--- Mod global namespace
-
-binoculars = {}
-
--- Load support for MT game translation.
-local S = minetest.get_translator("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 = S("Binoculars") .. "\n" .. S("Use 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

@@ -1,59 +0,0 @@
-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/binoculars/locale/binoculars.de.tr

@@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=Fernglas
-Use with 'Zoom' key=Mit „Zoom“-Taste benutzen

mods/binoculars/locale/binoculars.es.tr

@@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=Prismáticos
-Use with 'Zoom' key=Usar con la tecla 'Zoom'

mods/binoculars/locale/binoculars.fr.tr

@@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=Jumelles
-Use with 'Zoom' key=Utiliser avec le bouton « Zoom »

mods/binoculars/locale/binoculars.it.tr

@@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=Binocolo
-Use with 'Zoom' key=Usalo col tasto 'Ingrandimento'

mods/binoculars/locale/binoculars.ms.tr

@@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=Binokular
-Use with 'Zoom' key=Guna dengan kekunci 'Zum'

mods/binoculars/locale/binoculars.ru.tr

@@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=Бинокль
-Use with 'Zoom' key=Используется с привилегией 'Zoom'

mods/binoculars/locale/binoculars.se.tr

@@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=Kikare
-Use with 'Zoom' key=Används med 'Zoom' knappen

mods/binoculars/locale/binoculars.zh_CN.tr

@@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=望远镜
-Use with 'Zoom' key=与“缩放”键一起使用

mods/binoculars/locale/binoculars.zh_TW.tr

@@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=望遠鏡
-Use with 'Zoom' key=與“縮放”鍵一起使用

mods/binoculars/locale/template.txt

@@ -1,3 +0,0 @@
-# textdomain: binoculars
-Binoculars=
-Use with 'Zoom' key=

mods/binoculars/mod.conf

@@ -1,4 +0,0 @@
-name = binoculars
-description = Minetest Game mod: binoculars
-depends = default
-optional_depends = creative

mods/boats/README.md

@@ -1,77 +0,0 @@
-minetest mod boats
-==========================
-
-Boats improved for better performance and more realistic..
-
-Information
------------
-
-This mod is named `boats`, it features work from original mod, 
-code changed to make it turn **quicker, better performance agains lag**, 
-and if you hit the shore too hard the boat is destroyed and drops 3 wood
-
-![screenshot.png](screenshot.png)
-
-#### Additions by TenPlus1
-
-changed by TenPlus1 to add some new features
-- boat is destroyed when crashing at speed (drops 3 wood)
-- boats drop after 10 seconds if no driver
-- boats can be damaged by mobs attacking player
-- Improve physics of boat by implementing drag force (thanks gnag65)
-- nil player check functions by misterskullz
-
-Technical informaton
---------------------
-
-When crafted you can use by putting and right click on, 
-then control with your directional keys:
-
-#### Dependencies
-
-* default
-* mesecons (optional)
-
-#### Crafting
-
-W = any thing from wood group
-
-```
-   
-W W
-WWW
-```
-#### nodes
-
-| Name         | node            | notes |
-| ------------ | --------------- | ----- |
-| Boat         | boats:boat      | it destroyed when crash at speed |
-
-#### Controls (by default if not changed)
-
-| Default key assigned | Action                                 |
-| -------------------- | -------------------------------------- |
-| Right mouse button   | Enter or exit boat when pointing at boat. |
-| Forward              | Speed up.  Slow down when moving backwards. |
-| Forward + backward   | Enable cruise mode: accelerate to maximum speed without needing to hold. |
-| 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. |
-
-Licence
-------
-
-**Source code**
-
-Modifications by TenPlus1
-Originally by PilzAdam (MIT)
-Various Minetest developers and contributors (MIT)
-
-**Media (textures and model)**
-
-Textures: Zeg9 (CC BY-SA 3.0)
-original 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)
-
-Check [lisence.txt](lisence.txt)

mods/boats/README.txt

@@ -0,0 +1,15 @@
+Minetest Game mod: boats
+========================
+See license.txt for license information.
+
+Authors of source code
+----------------------
+Originally by PilzAdam (MIT)
+Various Minetest developers and contributors (MIT)
+
+Authors of media (textures and model)
+-------------------------------------
+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)

mods/boats/depends.txt

@@ -1,3 +1 @@
 default
-player_api?
-creative?

mods/boats/init.lua

@@ -1,33 +1,3 @@
--- boats/init.lua
-
-local is_pa = minetest.get_modpath("player_api")
-
--- translation support and 5.x version check
-local S, is_50, is_53
-if minetest.get_translator ~= nil then
-	S = minetest.get_translator("boats") -- 5.x translation function
-else
-	if minetest.get_modpath("intllib") then
-		dofile(minetest.get_modpath("intllib") .. "/init.lua")
-		if intllib.make_gettext_pair then
-			gettext, ngettext = intllib.make_gettext_pair() -- new gettext method
-		else
-			gettext = intllib.Getter() -- old text file method
-		end
-		S = gettext
-	else -- boilerplate function
-		S = function(str, ...)
-			local args = {...}
-			return str:gsub("@%d+", function(match)
-				return args[tonumber(match:sub(2))]
-			end)
-		end
-	end
-end
--- check for minetest 5.x compatibility
-is_50 = minetest.has_feature("httpfetch_binary_data")
-is_53 = minetest.has_feature("direct_velocity_on_players") or minetest.has_feature("is_creative_enabled") or false
-
 --
 -- Helper functions
 --
@@ -38,6 +8,15 @@ local function is_water(pos)
 end
 
 
+local function get_sign(i)
+	if i == 0 then
+		return 0
+	else
+		return i / math.abs(i)
+	end
+end
+
+
 local function get_velocity(v, yaw, y)
 	local x = -math.sin(yaw) * v
 	local z =  math.cos(yaw) * v
@@ -49,41 +28,23 @@ local function get_v(v)
 	return math.sqrt(v.x ^ 2 + v.z ^ 2)
 end
 
-local creative = minetest.settings:get_bool("creative_mode")
-
-function is_creative_enabled(name)
-
-	if creative or minetest.check_player_privs(name, {creative = true}) then
-		if is_53 then
-			return minetest.is_creative_enabled(name)
-		else
-			return true
-		end
-	end
-
-	return false
-end
-
 --
 -- Boat entity
 --
 
 local boat = {
-	initial_properties = {
-		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"}
-	},
+	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"},
 
 	driver = nil,
 	v = 0,
 	last_v = 0,
-	removed = false,
-	auto = false
+	removed = false
 }
 
 
@@ -92,58 +53,39 @@ function boat.on_rightclick(self, clicker)
 		return
 	end
 	local name = clicker:get_player_name()
-	if self.driver and name == self.driver then
-		-- Cleanup happens in boat.on_detach_child
+	if self.driver and clicker == self.driver then
+		self.driver = nil
 		clicker:set_detach()
-		if is_pa then
-			player_api.set_animation(clicker, "stand", 30)
-		else
-			default.player_set_animation(clicker, "stand", 30)
-		end
-		local pos = clicker:get_pos()
+		default.player_attached[name] = false
+		default.player_set_animation(clicker, "stand" , 30)
+		local pos = clicker:getpos()
 		pos = {x = pos.x, y = pos.y + 0.2, z = pos.z}
 		minetest.after(0.1, function()
-			clicker:set_pos(pos)
+			clicker:setpos(pos)
 		end)
 	elseif not self.driver then
-		clicker:set_attach(self.object, "",
-			{x = 0.5, y = 1, z = -3}, {x = 0, y = 0, z = 0})
-
-		self.driver = name
-		if is_pa then
-			player_api.player_attached[name] = true
-		else
-			default.player_attached[name] = true
-		end
-
-		minetest.after(0.2, function()
-			if is_pa then
-				player_api.set_animation(clicker, "sit", 30)
-			else
-				default.player_set_animation(clicker, "sit", 30)
+		local attach = clicker:get_attach()
+		if attach and attach:get_luaentity() then
+			local luaentity = attach:get_luaentity()
+			if luaentity.driver then
+				luaentity.driver = nil
 			end
-		end)
-		clicker:set_look_horizontal(self.object:get_yaw())
-	end
-end
-
-
--- If driver leaves server while driving boat
-function boat.on_detach_child(self, child)
-	if child and child:get_player_name() == self.driver then
-		if is_pa then
-			player_api.player_attached[child:get_player_name()] = false
-		else
-			default.player_attached[child:get_player_name()] = false
+			clicker:set_detach()
 		end
-		self.driver = nil
-		self.auto = false
+		self.driver = clicker
+		clicker:set_attach(self.object, "",
+			{x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0})
+		default.player_attached[name] = true
+		minetest.after(0.2, function()
+			default.player_set_animation(clicker, "sit" , 30)
+		end)
+		clicker:set_look_horizontal(self.object:getyaw())
 	end
 end
 
 
 function boat.on_activate(self, staticdata, dtime_s)
-	self.object:set_armor_groups({fleshy = 100})
+	self.object:set_armor_groups({immortal = 1})
 	if staticdata then
 		self.v = tonumber(staticdata)
 	end
@@ -160,26 +102,21 @@ function boat.on_punch(self, puncher)
 	if not puncher or not puncher:is_player() or self.removed then
 		return
 	end
-
-	local name = puncher:get_player_name()
-	if self.driver and name == self.driver then
+	if self.driver and puncher == self.driver then
 		self.driver = nil
 		puncher:set_detach()
-		if is_pa then
-			player_api.player_attached[name] = false
-		else
-			default.player_attached[name] = false
-		end
+		default.player_attached[puncher:get_player_name()] = false
 	end
 	if not self.driver then
 		self.removed = true
 		local inv = puncher:get_inventory()
-		if not is_creative_enabled(name)
+		if not (creative and creative.is_enabled_for
+				and creative.is_enabled_for(puncher:get_player_name()))
 				or not inv:contains_item("main", "boats:boat") then
 			local leftover = inv:add_item("main", "boats:boat")
 			-- if no room in inventory add a replacement boat to the world
 			if not leftover:is_empty() then
-				minetest.add_item(self.object:get_pos(), leftover)
+				minetest.add_item(self.object:getpos(), leftover)
 			end
 		end
 		-- delay remove to ensure player is detached
@@ -191,73 +128,46 @@ end
 
 
 function boat.on_step(self, dtime)
-
-	-- after 10 seconds remove boat and drop as item if not boarded
-	self.count = (self.count or 0) + dtime
-
-	if self.count > 10 then
-		minetest.add_item(self.object:get_pos(), "boats:boat")
-		self.object:remove()
-		return
-	end
-
-	self.v = get_v(self.object:get_velocity()) * math.sign(self.v)
+	self.v = get_v(self.object:getvelocity()) * get_sign(self.v)
 	if self.driver then
-		self.count = 0 -- reset 10 second drop counter
-		local driver_objref = minetest.get_player_by_name(self.driver)
-		if driver_objref then
-			local ctrl = driver_objref:get_player_control()
-			if ctrl.up and ctrl.down then
-				if not self.auto then
-					self.auto = true
-					minetest.chat_send_player(self.driver, S("Boat cruise mode on"))
-				end
-			elseif ctrl.down then
-				self.v = self.v - dtime * 2.0
-				if self.auto then
-					self.auto = false
-					minetest.chat_send_player(self.driver, S("Boat cruise mode off"))
-				end
-			elseif ctrl.up or self.auto then
-				self.v = self.v + dtime * 2.0
+		local ctrl = self.driver:get_player_control()
+		local yaw = self.object:getyaw()
+		if ctrl.up then
+			self.v = self.v + 0.1
+		elseif ctrl.down then
+			self.v = self.v - 0.1
+		end
+		if ctrl.left then
+			if self.v < 0 then
+				self.object:setyaw(yaw - (1 + dtime) * 0.03)
+			else
+				self.object:setyaw(yaw + (1 + dtime) * 0.03)
 			end
-			if ctrl.left then
-				if self.v < -0.001 then
-					self.object:set_yaw(self.object:get_yaw() - dtime * 0.9)
-				else
-					self.object:set_yaw(self.object:get_yaw() + dtime * 0.9)
-				end
-			elseif ctrl.right then
-				if self.v < -0.001 then
-					self.object:set_yaw(self.object:get_yaw() + dtime * 0.9)
-				else
-					self.object:set_yaw(self.object:get_yaw() - dtime * 0.9)
-				end
+		elseif ctrl.right then
+			if self.v < 0 then
+				self.object:setyaw(yaw + (1 + dtime) * 0.03)
+			else
+				self.object:setyaw(yaw - (1 + dtime) * 0.03)
 			end
-		else
-			-- If driver leaves server while driving 'driver' is present
-			-- but driver objectref is nil. Reset boat properties.
-			self.driver = nil
-			self.auto = false
 		end
 	end
-	local velo = self.object:get_velocity()
-	if not self.driver and
-			self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
-		self.object:set_pos(self.object:get_pos())
+	local velo = self.object:getvelocity()
+	if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
+		self.object:setpos(self.object:getpos())
 		return
 	end
-	-- We need to preserve velocity sign to properly apply drag force
-	-- while moving backward
-	local drag = dtime * math.sign(self.v) * (0.01 + 0.0796 * self.v * self.v)
-	-- If drag is larger than velocity, then stop horizontal movement
-	if math.abs(self.v) <= math.abs(drag) then
+	local s = get_sign(self.v)
+	self.v = self.v - 0.02 * s
+	if s ~= get_sign(self.v) then
+		self.object:setvelocity({x = 0, y = 0, z = 0})
 		self.v = 0
-	else
-		self.v = self.v - drag
+		return
+	end
+	if math.abs(self.v) > 5 then
+		self.v = 5 * get_sign(self.v)
 	end
 
-	local p = self.object:get_pos()
+	local p = self.object:getpos()
 	p.y = p.y - 0.5
 	local new_velo
 	local new_acce = {x = 0, y = 0, z = 0}
@@ -269,13 +179,13 @@ function boat.on_step(self, dtime)
 		else
 			new_acce = {x = 0, y = -9.8, z = 0}
 		end
-		new_velo = get_velocity(self.v, self.object:get_yaw(),
-			self.object:get_velocity().y)
-		self.object:set_pos(self.object:get_pos())
+		new_velo = get_velocity(self.v, self.object:getyaw(),
+			self.object:getvelocity().y)
+		self.object:setpos(self.object:getpos())
 	else
 		p.y = p.y + 1
 		if is_water(p) then
-			local y = self.object:get_velocity().y
+			local y = self.object:getvelocity().y
 			if y >= 5 then
 				y = 5
 			elseif y < 0 then
@@ -283,48 +193,24 @@ function boat.on_step(self, dtime)
 			else
 				new_acce = {x = 0, y = 5, z = 0}
 			end
-			new_velo = get_velocity(self.v, self.object:get_yaw(), y)
-			self.object:set_pos(self.object:get_pos())
+			new_velo = get_velocity(self.v, self.object:getyaw(), y)
+			self.object:setpos(self.object:getpos())
 		else
 			new_acce = {x = 0, y = 0, z = 0}
-			if math.abs(self.object:get_velocity().y) < 1 then
-				local pos = self.object:get_pos()
+			if math.abs(self.object:getvelocity().y) < 1 then
+				local pos = self.object:getpos()
 				pos.y = math.floor(pos.y) + 0.5
-				self.object:set_pos(pos)
-				new_velo = get_velocity(self.v, self.object:get_yaw(), 0)
+				self.object:setpos(pos)
+				new_velo = get_velocity(self.v, self.object:getyaw(), 0)
 			else
-				new_velo = get_velocity(self.v, self.object:get_yaw(),
-					self.object:get_velocity().y)
-				self.object:set_pos(self.object:get_pos())
+				new_velo = get_velocity(self.v, self.object:getyaw(),
+					self.object:getvelocity().y)
+				self.object:setpos(self.object:getpos())
 			end
 		end
 	end
-	self.object:set_velocity(new_velo)
-	self.object:set_acceleration(new_acce)
-
-	-- if boat comes to sudden stop then destroy boat and drop 3x wood
-	if (self.v2 or 0) - self.v >= 3 then
-
-		if self.driver then
---print ("Crash! with driver", self.v2 - self.v)
-			local driver_objref = minetest.get_player_by_name(self.driver)
-			default.player_attached[self.driver] = false
-			driver_objref:set_detach()
-			if is_pa then
-				player_api.set_animation(driver_objref, "stand" , 30)
-			else
-				default.player_set_animation(driver_objref, "stand" , 30)
-			end
-		else
---print ("Crash! no driver")
-		end
-
-		minetest.add_item(self.object:get_pos(), "default:wood 3")
-		self.object:remove()
-		return
-	end
-
-	self.v2 = self.v
+	self.object:setvelocity(new_velo)
+	self.object:setacceleration(new_acce)
 end
 
 
@@ -332,7 +218,7 @@ minetest.register_entity("boats:boat", boat)
 
 
 minetest.register_craftitem("boats:boat", {
-	description = S("Boat"),
+	description = "Boat",
 	inventory_image = "boats_inventory.png",
 	wield_image = "boats_wield.png",
 	wield_scale = {x = 2, y = 2, z = 1},
@@ -360,10 +246,11 @@ minetest.register_craftitem("boats:boat", {
 		boat = minetest.add_entity(pointed_thing.under, "boats:boat")
 		if boat then
 			if placer then
-				boat:set_yaw(placer:get_look_horizontal())
+				boat:setyaw(placer:get_look_horizontal())
 			end
 			local player_name = placer and placer:get_player_name() or ""
-			if not is_creative_enabled(player_name) then
+			if not (creative and creative.is_enabled_for and
+					creative.is_enabled_for(player_name)) then
 				itemstack:take_item()
 			end
 		end
@@ -386,6 +273,3 @@ minetest.register_craft({
 	recipe = "boats:boat",
 	burntime = 20,
 })
-
-
-print ("[MOD] Boats loaded")

mods/boats/license.txt

@@ -33,7 +33,6 @@ Copyright (C) 2012-2016 Zeg9
 Copyright (C) 2012-2016 thetoon
 Copyright (C) 2012-2016 PavelS(SokolovPavel)
 Copyright (C) 2016 sofar (sofar@foo-projects.org)
-Copyright (C) 2019 Bartosz (gang65@poczta.onet.pl)
 
 You are free to:
 Share — copy and redistribute the material in any medium or format.

mods/boats/mod.conf

@@ -1,2 +0,0 @@
-name = boats
-depends = default, player_api, creative

mods/bones/depends.txt

@@ -0,0 +1 @@
+default

mods/bones/init.lua

@@ -1,13 +1,6 @@
--- bones/init.lua
-
 -- Minetest 0.4 mod: bones
 -- See README.txt for licensing and other information.
 
--- Load support for MT game translation.
-local S = minetest.get_translator("bones")
-
-bones = {}
-
 local function is_owner(pos, name)
 	local owner = minetest.get_meta(pos):get_string("owner")
 	if owner == "" or owner == name or minetest.check_player_privs(name, "protection_bypass") then
@@ -18,6 +11,9 @@ end
 
 local bones_formspec =
 	"size[8,9]" ..
+	default.gui_bg ..
+	default.gui_bg_img ..
+	default.gui_slots ..
 	"list[current_name;main;0,0.3;8,4;]" ..
 	"list[current_player;main;0,4.85;8,1;]" ..
 	"list[current_player;main;0,6.08;8,3;8]" ..
@@ -29,7 +25,7 @@ local share_bones_time = tonumber(minetest.settings:get("share_bones_time")) or
 local share_bones_time_early = tonumber(minetest.settings:get("share_bones_time_early")) or share_bones_time / 4
 
 minetest.register_node("bones:bones", {
-	description = S("Bones"),
+	description = "Bones",
 	tiles = {
 		"bones_top.png^[transform2",
 		"bones_bottom.png",
@@ -121,7 +117,7 @@ minetest.register_node("bones:bones", {
 		local meta = minetest.get_meta(pos)
 		local time = meta:get_int("time") + elapsed
 		if time >= share_bones_time then
-			meta:set_string("infotext", S("@1's old bones", meta:get_string("owner")))
+			meta:set_string("infotext", meta:get_string("owner") .. "'s old bones")
 			meta:set_string("owner", "")
 		else
 			meta:set_int("time", time)
@@ -161,7 +157,7 @@ end
 local drop = function(pos, itemstack)
 	local obj = minetest.add_item(pos, itemstack:take_item(itemstack:get_count()))
 	if obj then
-		obj:set_velocity({
+		obj:setvelocity({
 			x = math.random(-10, 10) / 9,
 			y = 5,
 			z = math.random(-10, 10) / 9,
@@ -169,18 +165,6 @@ local drop = function(pos, itemstack)
 	end
 end
 
-local player_inventory_lists = { "main", "craft" }
-bones.player_inventory_lists = player_inventory_lists
-
-local function is_all_empty(player_inv)
-	for _, list_name in ipairs(player_inventory_lists) do
-		if not player_inv:is_empty(list_name) then
-			return false
-		end
-	end
-	return true
-end
-
 minetest.register_on_dieplayer(function(player)
 
 	local bones_mode = minetest.settings:get("bones_mode") or "bones"
@@ -188,32 +172,21 @@ minetest.register_on_dieplayer(function(player)
 		bones_mode = "bones"
 	end
 
-	local bones_position_message = minetest.settings:get_bool("bones_position_message") == true
-	local player_name = player:get_player_name()
-	local pos = vector.round(player:get_pos())
-	local pos_string = minetest.pos_to_string(pos)
-
 	-- return if keep inventory set or in creative mode
 	if bones_mode == "keep" or (creative and creative.is_enabled_for
 			and creative.is_enabled_for(player:get_player_name())) then
-		minetest.log("action", player_name .. " dies at " .. pos_string ..
-			". No bones placed")
-		if bones_position_message then
-			minetest.chat_send_player(player_name, S("@1 died at @2.", player_name, pos_string))
-		end
 		return
 	end
 
 	local player_inv = player:get_inventory()
-	if is_all_empty(player_inv) then
-		minetest.log("action", player_name .. " dies at " .. pos_string ..
-			". No bones placed")
-		if bones_position_message then
-			minetest.chat_send_player(player_name, S("@1 died at @2.", player_name, pos_string))
-		end
+	if player_inv:is_empty("main") and
+		player_inv:is_empty("craft") then
 		return
 	end
 
+	local pos = vector.round(player:getpos())
+	local player_name = player:get_player_name()
+
 	-- check if it's possible to place bones, if not find space near player
 	if bones_mode == "bones" and not may_replace(pos, player) then
 		local air = minetest.find_node_near(pos, 1, {"air"})
@@ -225,51 +198,49 @@ minetest.register_on_dieplayer(function(player)
 	end
 
 	if bones_mode == "drop" then
-		for _, list_name in ipairs(player_inventory_lists) do
-			for i = 1, player_inv:get_size(list_name) do
-				drop(pos, player_inv:get_stack(list_name, i))
-			end
-			player_inv:set_list(list_name, {})
+
+		-- drop inventory items
+		for i = 1, player_inv:get_size("main") do
+			drop(pos, player_inv:get_stack("main", i))
 		end
+		player_inv:set_list("main", {})
+
+		-- drop crafting grid items
+		for i = 1, player_inv:get_size("craft") do
+			drop(pos, player_inv:get_stack("craft", i))
+		end
+		player_inv:set_list("craft", {})
+
 		drop(pos, ItemStack("bones:bones"))
-		minetest.log("action", player_name .. " dies at " .. pos_string ..
-			". Inventory dropped")
-		if bones_position_message then
-			minetest.chat_send_player(player_name, S("@1 died at @2, and dropped their inventory.", player_name, pos_string))
-		end
 		return
 	end
 
 	local param2 = minetest.dir_to_facedir(player:get_look_dir())
 	minetest.set_node(pos, {name = "bones:bones", param2 = param2})
 
-	minetest.log("action", player_name .. " dies at " .. pos_string ..
-		". Bones placed")
-	if bones_position_message then
-		minetest.chat_send_player(player_name, S("@1 died at @2, and bones were placed.", player_name, pos_string))
-	end
-
 	local meta = minetest.get_meta(pos)
 	local inv = meta:get_inventory()
 	inv:set_size("main", 8 * 4)
+	inv:set_list("main", player_inv:get_list("main"))
 
-	for _, list_name in ipairs(player_inventory_lists) do
-		for i = 1, player_inv:get_size(list_name) do
-			local stack = player_inv:get_stack(list_name, i)
-			if inv:room_for_item("main", stack) then
-				inv:add_item("main", stack)
-			else -- no space left
-				drop(pos, stack)
-			end
+	for i = 1, player_inv:get_size("craft") do
+		local stack = player_inv:get_stack("craft", i)
+		if inv:room_for_item("main", stack) then
+			inv:add_item("main", stack)
+		else
+			--drop if no space left
+			drop(pos, stack)
 		end
-		player_inv:set_list(list_name, {})
 	end
 
+	player_inv:set_list("main", {})
+	player_inv:set_list("craft", {})
+
 	meta:set_string("formspec", bones_formspec)
 	meta:set_string("owner", player_name)
 
 	if share_bones_time ~= 0 then
-		meta:set_string("infotext", S("@1's fresh bones", player_name))
+		meta:set_string("infotext", player_name .. "'s fresh bones")
 
 		if share_bones_time_early == 0 or not minetest.is_protected(pos, player_name) then
 			meta:set_int("time", 0)
@@ -279,6 +250,6 @@ minetest.register_on_dieplayer(function(player)
 
 		minetest.get_node_timer(pos):start(10)
 	else
-		meta:set_string("infotext", S("@1's bones", player_name))
+		meta:set_string("infotext", player_name.."'s bones")
 	end
 end)

mods/bones/locale/bones.de.tr

@@ -1,8 +0,0 @@
-# textdomain: bones
-Bones=Knochen
-@1's old bones=Alte Knochen von @1
-@1 died at @2.=@1 starb bei @2.
-@1 died at @2, and dropped their inventory.=@1 starb bei @2 und ließ das Inventar fallen.
-@1 died at @2, and bones were placed.=@1 starb bei @2 und Knochen wurden platziert.
-@1's fresh bones=Frische Knochen von @1
-@1's bones=Knochen von @1

mods/bones/locale/bones.es.tr

@@ -1,8 +0,0 @@
-# textdomain: bones
-Bones=Huesos
-@1's old bones=Huesos antiguos de @1
-@1 died at @2.=@1 murió en @2.
-@1 died at @2, and dropped their inventory.=@1 murió en @2, y su inventario se desprendió.
-@1 died at @2, and bones were placed.=@1 murió en @2, y sus huesos fueron depositados.
-@1's fresh bones=Huesos recientes de @1
-@1's bones=Huesos de @1

mods/bones/locale/bones.fr.tr

@@ -1,8 +0,0 @@
-# textdomain: bones
-Bones=Os
-@1's old bones=Vieux os de @1
-@1 died at @2.=@1 est mort à @2.
-@1 died at @2, and dropped their inventory.=@1 est mort à @2 et a laissé tomber son inventaire.
-@1 died at @2, and bones were placed.=@1 est mort à @2 et ses os ont été placés.
-@1's fresh bones=Os frais de @1
-@1's bones=Os de @1

mods/bones/locale/bones.it.tr

@@ -1,8 +0,0 @@
-# textdomain: bones
-Bones=Ossa
-@1's old bones=Ossa vecchie di @1
-@1 died at @2.=@1 è morto alla posizione @2.
-@1 died at @2, and dropped their inventory.=@1 è morto alla posizione @2, e ha lasciato a terra il contenuto del suo inventario.
-@1 died at @2, and bones were placed.=@1 è morto alla posizione @2, e vi sono state posizionate delle ossa.
-@1's fresh bones=Ossa fresche di @1
-@1's bones=Ossa di @1

mods/bones/locale/bones.ms.tr

@@ -1,8 +0,0 @@
-# textdomain: bones
-Bones=Tulang
-@1's old bones=Tulang lama @1
-@1 died at @2.=@1 mati di @2.
-@1 died at @2, and dropped their inventory.=@1 mati di @2, dan menjatuhkan inventorinya.
-@1 died at @2, and bones were placed.=@1 mati di @2, dan tulang diletakkan.
-@1's fresh bones=Tulang segar @1
-@1's bones=Tulang @1

mods/bones/locale/bones.ru.tr

@@ -1,8 +0,0 @@
-# textdomain: bones
-Bones=Кости
-@1's old bones=Старые кости @1
-@1 died at @2.=@1 умер в @2.
-@1 died at @2, and dropped their inventory.=@1 умер в @2 и потерял содержимое своего инвентаря. 
-@1 died at @2, and bones were placed.=@1 умер в @2, помещены кости.
-@1's fresh bones=новые кости @1
-@1's bones=кости @1

mods/bones/locale/bones.se.tr

@@ -1,8 +0,0 @@
-# textdomain: bones
-Bones=Ben
-@1's old bones=@1s Gamla ben
-@1 died at @2.=@1 dog på @a.
-@1 died at @2, and dropped their inventory.=@1 dog på @a, och tappade deras saker.
-@1 died at @2, and bones were placed.=@1 dog på @2, och deras ben var placerade.
-@1's fresh bones=@1s färska ben
-@1's bones=@1s ben

mods/bones/locale/bones.zh_CN.tr

@@ -1,8 +0,0 @@
-# textdomain: bones
-Bones=骨骸
-@1's old bones=@1的旧骨骸
-@1 died at @2.=@1在@2死亡。
-@1 died at @2, and dropped their inventory.=@1在@2死亡，丢掉了物品栏。
-@1 died at @2, and bones were placed.=@1在@2死亡，骨骸被放置。
-@1's fresh bones=@1的新鲜骨骸
-@1's bones=@1的骨骸

mods/bones/locale/bones.zh_TW.tr

@@ -1,8 +0,0 @@
-# textdomain: bones
-Bones=骨骸
-@1's old bones=@1的舊骨骸
-@1 died at @2.=@1在@2死亡。
-@1 died at @2, and dropped their inventory.=@1在@2死亡，丟掉了物品欄。
-@1 died at @2, and bones were placed.=@1在@2死亡，骨骸被放置。
-@1's fresh bones=@1的新鮮骨骸
-@1's bones=@1的骨骸

mods/bones/locale/template.txt

@@ -1,8 +0,0 @@
-# textdomain: bones
-Bones=
-@1's old bones=
-@1 died at @2.=
-@1 died at @2, and dropped their inventory.=
-@1 died at @2, and bones were placed.=
-@1's fresh bones=
-@1's bones=

mods/bones/mod.conf

@@ -1,3 +0,0 @@
-name = bones
-description = Minetest Game mod: bones
-depends = default