updated mods list, reorganized files

README.md

@@ -75,6 +75,14 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn
 * fix exception while trying to recover from exception (see `Could not finish writing r`)
 
 ## Changes:
+(2018-02-06)
+* refactored file structure
+  * renamed games/ENLIVEN to patches/subgame
+  * moved etc/Mods* to patches/mods*
+* updated mod lists for 0.4.16
+  * added
+  * moved nyancat to patches/subgame/minetest_game-deprecated-mods-list.txt
+    (wiki.minetest.net/Nyan_Cat says if you want it back, copy it from 0.4.15)
 (2018-02-03)
 * bump Python requirement to 3 (no more testing is planned to be done on python2) and use python3 binary when calling py files from scripts
     * (chunkymap-generator.bat, pythoninfo.py) if using Windows, check for various versions of Python3 and warn if fails (no longer check for Python2)

etc/change_hardcoded_world_name_first/game-install-ENLIVEN

@@ -1888,19 +1888,30 @@ fi
 echo
 echo
 echo
+echo "adding the following necessary integration mods:"
+ls ~/GitHub/EnlivenMinetest/patches/mods-integration/
+sudo cp -R ~/GitHub/EnlivenMinetest/patches/mods-integration/* "$MT_MYGAME_MODS_PATH/"
+echo
+echo "adding the following multiplayer mods:"
+ls ~/GitHub/EnlivenMinetest/patches/mods-multiplayer/
+sudo cp -R ~/GitHub/EnlivenMinetest/patches/mods-multiplayer/* "$MT_MYGAME_MODS_PATH/"
 echo
 echo "# remove not available on 0.4.16 stable (is only avail on 0.4.16-dev or higher)"
 echo "sudo rm -Rf /usr/share/games/minetest/games/ENLIVEN/mods/worldedit/worldedit_brush"
-echo "# optionally:"
-echo "sudo cp -R ~/GitHub/EnlivenMinetest/etc/Mods\,WIP/* $MT_MYGAME_MODS_PATH/"
 echo "# not recommended:"
-echo "sudo cp -R ~/GitHub/EnlivenMinetest/etc/Mods\,stopgap/* $MT_MYGAME_MODS_PATH/"
+echo "sudo cp -R ~/GitHub/EnlivenMinetest/patches/mods-stopgap/* $MT_MYGAME_MODS_PATH/"
 echo "sudo rm -Rf $MT_MYGAME_MODS_PATH/1.nonworking"
 
 
-echo ""
+echo
-echo ""
+echo
-echo ""
+echo "adding non-manual patches to subgame (vs minetest_game and downloaded mods):"
+sudo cp -f ~/GitHub/EnlivenMinetest/patches/subgame/* "$MT_MYGAME_DIR/"
+sudo cp -f ~/GitHub/EnlivenMinetest/patches/subgame/menu/* "$MT_MYGAME_DIR/menu/"
+sudo cp -f ~/GitHub/EnlivenMinetest/patches/subgame/mods/mobs/textures/* "$MT_MYGAME_DIR/mods/mobs/textures/"
+sudo cp -f ~/GitHub/EnlivenMinetest/patches/subgame/mods/mobs_monster/textures/* "$MT_MYGAME_DIR/mods/mobs_monster/textures/"
+echo "mods affected: mobs"
+echo
 echo "#### $MT_MYWORLD_DIR/world.mt: ####"
 cat "$MT_MYWORLD_DIR/world.mt"
 echo "### end $MT_MYWORLD_DIR/world.mt ##"
@@ -1920,19 +1931,13 @@ echo "  ban: allows /ban ip and /unban ip (and /whitelist add player and /whitel
 echo "  kick: allows /kick player"
 echo "  privs: allows grant and revoke commands"
 echo "  delprotect: circumvents protector blocks, including allowing removing them"
+echo "  invhack: editing player inventories as moderator"
 echo ""
-echo "Also remember to:"
+echo "  * for invhack, remember to do: /giveme invhack:tool"
-echo "  nano $MT_MYGAME_MODS_PATH/teleporter/config.lua"
-echo "  #then change:"
-echo "  teleporter.requires_pairing = true"
-echo "  # also see other lines in this script that wouldn't echo as non-root"
-echo "  #otherwise people can type any coordinates for destination (approaching infinite distance)!"
 echo "  * uncomment columns in lapis mod"
-echo "  * set number = 0 or number = {min=0, max=0} in cme since only using cme for creatures:*_spawner nodes and for compatibility with old worlds"
-echo "  * remember to /grant yourself invhack and then /giveme invhack:tool for editing player inventories as moderator"
 echo "  * Make sure client (server done already above) minetest.conf has secure.trusted_mods = advanced_npc"
 echo "  * Make sure writable minetest conf was successfully written"
-echo "  over /usr/local/share/minetest/games/enliven/minetest.conf with:"
+echo "    over /usr/local/share/minetest/games/enliven/minetest.conf with:"
 echo "protector_radius = 7"
 echo "protector_pvp = true"
 echo "protector_pvp_spawn = 10"

etc/change_hardcoded_world_name_first/mts-ENLIVEN.old

@@ -1,3 +0,0 @@
-#!/bin/sh
-#BROKEN: screen -t MinetestServer minetestserver --gameid minetest_next --draworigin --drawplayers --world FCAWorldMTNext
-screen -t MinetestServer minetestserver --gameid ENLIVEN --worldname FCAGameAWorld

etc/minetestserver-install-git-ENABLE_REDIS.old

@@ -1,19 +0,0 @@
-#sudo apt-get install libncurses5-dev libgettextpo-dev doxygen libspatialindex-dev lua-redis-dev gettext
-
-sudo apt-get install build-essential cmake git libirrlicht-dev libbz2-dev libgettextpo-dev libfreetype6-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libhiredis-dev libcurl3-dev
-#above is from http://dev.minetest.net/Compiling_Minetest#Compiling_on_GNU.2FLinux
-
-#as per <https://www.digitalocean.com/community/tutorials/how-to-configure-a-redis-cluster-on-ubuntu-14-04>:
-sudo add-apt-repository ppa:chris-lea/redis-server
-sudo apt-get update
-sudo apt-get install redis-server
-
-
-#if you skip the above, the below says missing: GetText, Curses, ncurses, Redis, SpatialIndex, Doxygen
-#cd "$HOME"  #done below by parameterless "cd" command
-sudo apt-get install -y git build-essential libirrlicht-dev libgettextpo0 libfreetype6-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-openssl-dev libluajit-5.1-dev liblua5.1-0-dev libleveldb-dev; cd; git clone https://github.com/minetest/minetest.git; cd minetest/games; git clone https://github.com/minetest/minetest_game.git; cd ..; cmake . -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LEVELDB=1 -DENABLE_REDIS=1 -DBUILD_SERVER=TRUE -DBUILD_CLIENT=FALSE; make -j$(nproc); sudo make install;
-# minetest;
-echo -e "\n\n\e[1;33mYou can run Minetest Server by typing \"minetestserver\" in a terminal.\e[0m"
-echo "Remember to add requirepass to /etc/redis/redis.conf -- a long password since redis is fast and can be bruteforced quickly"
-# based on https://forum.minetest.net/viewtopic.php?f=42&t=3837 (below)
-# sudo apt-get install -y git build-essential libirrlicht-dev libgettextpo0 libfreetype6-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-openssl-dev libluajit-5.1-dev liblua5.1-0-dev libleveldb-dev; cd; git clone https://github.com/minetest/minetest.git; cd minetest/games; git clone https://github.com/minetest/minetest_game.git; cd ..; cmake . -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LEVELDB=1 -DENABLE_REDIS=1; make -j$(nproc); sudo make install; minetest; echo -e "\n\n\e[1;33mYou can run Minetest again by typing \"minetest\" in a terminal or selecting it in an applications menu.\nYou can install mods in ~/.minetest/mods, too.\e[0m"

etc/unused/game-install-ENLIVEN-DEPRECATED.sh

@@ -0,0 +1,14 @@
+
+echo "# STEPS BELOW ARE DEPRECATED"
+echo
+echo "## Deprecated since this travelnet is used instead"
+echo "Also remember to:"
+echo "  nano $MT_MYGAME_MODS_PATH/teleporter/config.lua"
+echo "  #then change:"
+echo "  teleporter.requires_pairing = true"
+echo "  # also see other lines in this script that wouldn't echo as non-root"
+echo "  #otherwise people can type any coordinates for destination (approaching infinite distance)!"
+echo
+echo "## Deprecated since using cme_to_spawners and tsm_pyramids_to_spawners from patches/mods-WIP"
+echo "  * set number = 0 or number = {min=0, max=0} in cme since only using cme for creatures:*_spawner nodes and for compatibility with old worlds"
+

etc/unused/minetestserver-install-git (NO REDIS).old

@@ -1,6 +0,0 @@
-sudo apt-get install -y git build-essential libirrlicht-dev libgettextpo0 libfreetype6-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-openssl-dev libluajit-5.1-dev liblua5.1-0-dev libleveldb-dev; cd; git clone https://github.com/minetest/minetest.git; cd minetest/games; git clone https://github.com/minetest/minetest_game.git; cd ..; cmake . -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LEVELDB=1 -DBUILD_SERVER=TRUE -DBUILD_CLIENT=FALSE; make -j$(nproc); sudo make install;
-# minetest;
-echo -e "\n\n\e[1;33mYou can run Minetest Server by typing \"minetestserver\" in a terminal.\e[0m"
-
-# based on https://forum.minetest.net/viewtopic.php?f=42&t=3837 (below)
-# sudo apt-get install -y git build-essential libirrlicht-dev libgettextpo0 libfreetype6-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-openssl-dev libluajit-5.1-dev liblua5.1-0-dev libleveldb-dev; cd; git clone https://github.com/minetest/minetest.git; cd minetest/games; git clone https://github.com/minetest/minetest_game.git; cd ..; cmake . -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LEVELDB=1; make -j$(nproc); sudo make install; minetest; echo -e "\n\n\e[1;33mYou can run Minetest again by typing \"minetest\" in a terminal or selecting it in an applications menu.\nYou can install mods in ~/.minetest/mods, too.\e[0m"

patches/minetest_game-mods-deprecated-list.txt

@@ -0,0 +1 @@
+nyancat

patches/subgame/minetest_game-mods-list.txt → patches/minetest_game-mods-list.txt

@@ -1,4 +1,5 @@
 beds
+binoculars
 boats
 bones
 bucket
@@ -6,13 +7,15 @@ carts
 creative
 default
 doors
+dungeon_loot
 dye
 farming
 fire
 flowers
 give_initial_stuff
 killme
-nyancat
+map
+player_api
 screwdriver
 sethome
 sfinv

patches/mods-stopgap/nyancat/README.txt

@@ -0,0 +1,16 @@
+Minetest Game mod: nyancat
+==========================
+See license.txt for license information.
+
+Authors of source code
+----------------------
+Originally by celeron55, Perttu Ahola <celeron55@gmail.com> (LGPL 2.1)
+Various Minetest developers and contributors (LGPL 2.1)
+
+Authors of media files
+----------------------
+VanessaE (CC BY-SA 3.0):
+  nyancat_front.png
+  nyancat_back.png
+  nyancat_side.png
+  nyancat_rainbow.png

patches/mods-stopgap/nyancat/depends.txt

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

patches/mods-stopgap/nyancat/init.lua

@@ -0,0 +1,89 @@
+minetest.register_node("nyancat:nyancat", {
+	description = "Nyan Cat",
+	tiles = {"nyancat_side.png", "nyancat_side.png", "nyancat_side.png",
+		"nyancat_side.png", "nyancat_back.png", "nyancat_front.png"},
+	paramtype = "light",
+	light_source = default.LIGHT_MAX,
+	paramtype2 = "facedir",
+	groups = {cracky = 2},
+	is_ground_content = false,
+	legacy_facedir_simple = true,
+	sounds = default.node_sound_defaults(),
+})
+
+minetest.register_node("nyancat:nyancat_rainbow", {
+	description = "Nyan Cat Rainbow",
+	tiles = {
+		"nyancat_rainbow.png^[transformR90",
+		"nyancat_rainbow.png^[transformR90",
+		"nyancat_rainbow.png"
+	},
+	paramtype = "light",
+	light_source = default.LIGHT_MAX,
+	paramtype2 = "facedir",
+	groups = {cracky = 2},
+	is_ground_content = false,
+	sounds = default.node_sound_defaults(),
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "nyancat:nyancat",
+	burntime = 1,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "nyancat:nyancat_rainbow",
+	burntime = 1,
+})
+
+nyancat = {}
+
+function nyancat.place(pos, facedir, length)
+	if facedir > 3 then
+		facedir = 0
+	end
+	local tailvec = minetest.facedir_to_dir(facedir)
+	local p = {x = pos.x, y = pos.y, z = pos.z}
+	minetest.set_node(p, {name = "nyancat:nyancat", param2 = facedir})
+	for i = 1, length do
+		p.x = p.x + tailvec.x
+		p.z = p.z + tailvec.z
+		minetest.set_node(p, {name = "nyancat:nyancat_rainbow", param2 = facedir})
+	end
+end
+
+function nyancat.generate(minp, maxp, seed)
+	local height_min = -31000
+	local height_max = -32
+	if maxp.y < height_min or minp.y > height_max then
+		return
+	end
+	local y_min = math.max(minp.y, height_min)
+	local y_max = math.min(maxp.y, height_max)
+	local volume = (maxp.x - minp.x + 1) * (y_max - y_min + 1) * (maxp.z - minp.z + 1)
+	local pr = PseudoRandom(seed + 9324342)
+	local max_num_nyancats = math.floor(volume / (16 * 16 * 16))
+	for i = 1, max_num_nyancats do
+		if pr:next(0, 1000) == 0 then
+			local x0 = pr:next(minp.x, maxp.x)
+			local y0 = pr:next(minp.y, maxp.y)
+			local z0 = pr:next(minp.z, maxp.z)
+			local p0 = {x = x0, y = y0, z = z0}
+			nyancat.place(p0, pr:next(0, 3), pr:next(3, 15))
+		end
+	end
+end
+
+minetest.register_on_generated(function(minp, maxp, seed)
+	nyancat.generate(minp, maxp, seed)
+end)
+
+-- Legacy
+minetest.register_alias("default:nyancat", "nyancat:nyancat")
+minetest.register_alias("default:nyancat_rainbow", "nyancat:nyancat_rainbow")
+minetest.register_alias("nyancat", "nyancat:nyancat")
+minetest.register_alias("nyancat_rainbow", "nyancat:nyancat_rainbow")
+default.make_nyancat = nyancat.place
+default.generate_nyancats = nyancat.generate

patches/mods-stopgap/nyancat/license.txt

@@ -0,0 +1,50 @@
+License of source code
+----------------------
+
+GNU Lesser General Public License, version 2.1
+Copyright (C) 2011-2016 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2012-2016 Various Minetest developers and contributors
+
+This program is free software; you can redistribute it and/or modify it under the terms
+of the GNU Lesser General Public License as published by the Free Software Foundation;
+either version 2.1 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Lesser General Public License for more details:
+https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+
+
+Licenses of media (textures)
+----------------------------
+
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+Copyright (C) 2012-2016 VanessaE
+
+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/

webapp/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "express-handlebars-basic-example",
+  "version": "0.0.0",
+  "description": "",
+  "private": true,
+  "main": "server.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node server.js"
+  },
+  "author": "Eric Ferraiuolo <eferraiuolo@gmail.com>",
+  "license": "BSD",
+  "dependencies": {
+    "express": "^4.7.2"
+  }
+}

webapp/server.js

@@ -0,0 +1,17 @@
+'use strict';
+
+var express = require('express'),
+    exphbs  = require('../../'); // "express-handlebars"
+
+var app = express();
+
+app.engine('handlebars', exphbs({defaultLayout: 'main'}));
+app.set('view engine', 'handlebars');
+
+app.get('/', function (req, res) {
+    res.render('home');
+});
+
+app.listen(3000, function () {
+    console.log('express-handlebars example server listening on: 3000');
+});

webapp/views/home.handlebars

@@ -0,0 +1 @@
+<h1>Example App: Home</h1>

webapp/views/layouts/main.handlebars

@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Example App</title>
+</head>
+<body>
+
+    {{{body}}}
+
+</body>
+</html>