From 98ad23fedd1292b380cd738655cd751a4d4cac48 Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Wed, 28 Feb 2018 15:48:44 -0500 Subject: [PATCH] updates for new github username --- README.md | 16 ++++++++-------- etc/game-install-ENLIVEN | 39 ++++++++++++++++++++++++++++++--------- install-subgametest.py | 4 ++-- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 26d52d8..011814c 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ENLIVEN is a subgame for minetest with the goals of providing immersion and less * automatically install Minetest client with a usable minetest.conf (for improved graphics) ## Primary Features of ENLIVEN subgame -* birthstones, improved fork: +* birthstones, improved fork: ### Planned Features * maintain a table of short descriptions of mods @@ -71,7 +71,7 @@ ENLIVEN is a subgame for minetest with the goals of providing immersion and less ##### Finished * etc/change_hardcoded_world_name_first/mts-ENLIVEN deprecated by mtsenliven.py -The [ENLIVEN project](https://github.com/expertmm/EnlivenMinetest) (aka EnlivenMinetest) includes tools for installing and maintaining the server and client for internet and LAN use, and now includes the mtanalyze (formerly minetest-chunkymap) project which includes many tools including chunkymap. The server and client are just the Minetest server and client repackaged (or just web installer scripts in the case of the server), and therefore 100% compatible with other copies of Minetest server and client of the same version--including using other subgames, which client will download from servers as usual. +The [ENLIVEN project](https://github.com/poikilos/EnlivenMinetest) (aka EnlivenMinetest) includes tools for installing and maintaining the server and client for internet and LAN use, and now includes the mtanalyze (formerly minetest-chunkymap) project which includes many tools including chunkymap. The server and client are just the Minetest server and client repackaged (or just web installer scripts in the case of the server), and therefore 100% compatible with other copies of Minetest server and client of the same version--including using other subgames, which client will download from servers as usual. DISCLAIMERS: * Please read the Sources and License section of this document. You must agree to the licenses mentioned in order to use and copy this program. @@ -92,7 +92,7 @@ The ENLIVEN client runs Minetest, which can be used as a client for other Minete ### Server: EnlivenMinetest project assists you in setting up ENLIVEN subgame and provides scripts to run it on minetestserver as current user (must be sudoer). -Some of the included scripts help install and manage your git version of Minetest Server on Ubuntu Server or various *buntu flavors (a gui distro neither required nor recommended for minetestserver running ENLIVEN). See also https://github.com/expertmm/minetest-chunkymap for a map non-redis servers, and some offline minetest management tools. +Some of the included scripts help install and manage your git version of Minetest Server on Ubuntu Server or various *buntu flavors (a gui distro neither required nor recommended for minetestserver running ENLIVEN). See also https://github.com/poikilos/minetest-chunkymap for a map non-redis servers, and some offline minetest management tools. (minetestserver requires GNU/Linux System -- only tested using apt on Ubuntu Server [14.04 to 16.04] and Lubuntu [14.04 to 16.04]) The installer script (in the "etc/change_world_name_manually_first" folder) downloads the git versions of all of the mods to the ENLIVEN folder which will be placed in your minetest games folder (one of the two folders listed below, otherwise fails)--but change the world name to the name of your world first. * (optionally) place the ENLIVEN folder in the games folder here into the games folder on your server such as: @@ -107,7 +107,7 @@ Do not expect the mods from game-install-enliven-testing.sh to work. Also, do no (There are also WIP TRMs in there to go with the ENLIVEN subgame) Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawners. (NOTE: spawners makes pyramids now, so tsm_pyramids ) -* Recommend your users use the binary installer (Windows client) from "Releases" at https://github.com/expertmm/EnlivenMinetest/releases or the alternate site above to install, otherwise installation requires a good minetest.conf downloaded such as from the winclient/launcher folder and placed in their minetest folder. The one here has better graphics (opengl 3.0 shaders, smooth lighting). +* Recommend your users use the binary installer (Windows client) from "Releases" at https://github.com/poikilos/EnlivenMinetest/releases or the alternate site above to install, otherwise installation requires a good minetest.conf downloaded such as from the winclient/launcher folder and placed in their minetest folder. The one here has better graphics (opengl 3.0 shaders, smooth lighting). ### mtanalyze * mtanalyze is a set of tools including a live map for Minetest servers and singleplayer if using LevelDB @@ -161,7 +161,7 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn * removed all other huds and hud mods until compatibility can be determined (they were causing health and food system to not work at all) * formerly used GunshipPenguin's sprint ### (2018-02-15) -* moved mappers to +* moved mappers to ### (2018-02-07) * forked trm_minetest_game to use proper dye list (submitted pull request to ClockGen since his is the only known git version of Wuzzy's which was on the [official treasurer thread](https://forum.minetest.net/viewtopic.php?t=7292)) ### (2018-02-08) @@ -387,7 +387,7 @@ end --sort_by_distance ``` ## Building -* scripts and sources for recreating ENLIVEN subgame are at the EnlivenMinetest project page: https://github.com/expertmm/EnlivenMinetest +* scripts and sources for recreating ENLIVEN subgame are at the EnlivenMinetest project page: https://github.com/poikilos/EnlivenMinetest Further steps needed to recreate: * extract entire zip from sfan5 * run postinstall.bat @@ -395,12 +395,12 @@ Further steps needed to recreate: * change version number in C:\Users\Owner\Documents\GitHub\EnlivenMinetest\winclient\launcher-src\ENLIVEN.pro ### additional notes -* The recommended minetest.conf for subgame, including for server, is in the ENLIVEN subgame folder (also available at [EnlivenMinetest on GitHub](https://github.com/expertmm/EnlivenMinetest) +* The recommended minetest.conf for subgame, including for server, is in the ENLIVEN subgame folder (also available at [EnlivenMinetest on GitHub](https://github.com/poikilos/EnlivenMinetest) ## Sources and License Authors: expertmm (Jacob Gustafson) ENLIVEN project (aka EnlivenMinetest), including launcher (ENLIVEN application) and ENLIVEN subgame, is released under the LGPL v2.1 license (see LICENSE), except media which is released under the CC-BY-SA 3.0 license (see LICENSE). There are other exceptions to this license and authorship where specified below and in subfolders. -Source code is available at [https://github.com/expertmm/EnlivenMinetest](https://github.com/expertmm/EnlivenMinetest). +Source code is available at [https://github.com/poikilos/EnlivenMinetest](https://github.com/poikilos/EnlivenMinetest). ### Minetest Minetest is included with releases--for Minetest license, please read README.txt in Minetest's doc folder which is provided in releases. diff --git a/etc/game-install-ENLIVEN b/etc/game-install-ENLIVEN index 91eac8d..35ca036 100755 --- a/etc/game-install-ENLIVEN +++ b/etc/game-install-ENLIVEN @@ -10,6 +10,15 @@ # * Git version uses /home/*/minetest/games and /usr/local/share/minetest/games but the latter is used for minetestserver (minetest-server package) # * Arch stable version uses /usr/share/minetest/ +if [ "$1" = "--help" ]; then + echo "This script installs ENLIVEN subgame for minetest. It uses individual git repositories, so please only run this once so as not to exceed their bandwidth." + echo "Usage:" + echo + echo "version_0_5_enable= (where value is true or false): forces 0.5 (if not specified, this script uses 0.5 versions of mods if minetest is at /usr/local/share/minetest)" + echo + echo "local_enable= (where value is true or false): forces /usr/local/share/minetest (if not specified, script detects minetest but if exists both in /usr/share/ and /usr/local/share, prefers /usr/local/share/minetest)" + echo +fi if [ "$1" = "version_0_5_enable=true" ]; then version_0_5_enable="true" elif [ "$2" = "version_0_5_enable=true" ]; then @@ -116,7 +125,9 @@ if [ "$local_enable" != "false" ]; then # IF git version is installed try_path="/usr/local/share/minetest" if [ -d "$try_path" ]; then - #version_0_5_enable="true" + if [ -z "$version_0_5_enable" ]; then + version_0_5_enable="true" + fi USR_SHARE_MINETEST="$try_path" fi fi @@ -183,6 +194,9 @@ else ls $MT_WORLDS_DIR read -p "Please enter a world [blank for $MT_DEFAULT_WORLD_NAME]: " MT_MYWORLD_NAME #$MT_DEFAULT_WORLD_NAME + if [ -z "$MT_MYWORLD_NAME" ]; then + MT_MYWORLD_NAME=$MT_DEFAULT_WORLD_NAME + fi echo using "$MT_MYWORLD_NAME" echo " 3..." sleep 1 @@ -440,8 +454,15 @@ if [ -f "$WORLD_MT_PATH" ]; then sudo chgrp `cat /tmp/local_mts_user` "$WORLD_MT_PATH" fi echo "gameid = $MT_MYGAME_NAME" > "$WORLD_MT_PATH" - +if [ "`grep -q "backend" "$WORLD_MT_PATH"`" -eq 0 ]; then + echo "has no backend" +fi echo "backend = leveldb" >> "$WORLD_MT_PATH" +echo "teleport_perms_to_build = false" >> "$WORLD_MT_PATH" +echo "teleport_perms_to_configure = false" >> "$WORLD_MT_PATH" +echo "teleport_requires_pairing = true" >> "$WORLD_MT_PATH" +echo "teleport_pairing_check_radius = 2" >> "$WORLD_MT_PATH" +echo "teleport_default_coordinates = 0,0,0" >> "$WORLD_MT_PATH" #MT_MYGAME_DIR (a Minetest "game") is the equivalent of a Minecraft modpack, however, in this case it is actually a collection of mods and modpacks, either of which can be in the mods folder @@ -558,7 +579,7 @@ add_git_mod invhack minetest-invhack https://github.com/salahzar/minetest-invhac echo "Installing Uberi's worldedit..." add_git_mod worldedit Minetest-WorldEdit https://github.com/Uberi/Minetest-WorldEdit.git # metatools: expertmm fork of LeMagnesium's minetest-mod-metatools -add_git_mod metatools minetest-mod-metatools https://github.com/expertmm/minetest-mod-metatools.git +add_git_mod metatools minetest-mod-metatools https://github.com/poikilos/minetest-mod-metatools.git # forum_url="https://forum.minetest.net/viewtopic.php?f=11&t=9376" # author="tenplus1" # description="not the original 2012 protector or 2012 fork of 2012 protector; must be logged in to download protector.zip release version at https://forum.minetest.net/download/file.php?id=5046" @@ -841,7 +862,7 @@ add_git_mod tsm_railcorridors tsm_railcorridors http://repo.or.cz/RailCorridors/ #-- carts:rail # forum_url="https://forum.minetest.net/viewtopic.php?f=11&t=10172&hilit=boost+cart" # birthstones: expertmm fork of a rather non-maintained mod--forum link is at https://forum.minetest.net/viewtopic.php?id=3663 (original mod was at https://github.com/Doc22/birthstones-mod.git) -add_git_mod birthstones minetest-birthstones https://github.com/expertmm/minetest-birthstones.git +add_git_mod birthstones minetest-birthstones https://github.com/poikilos/minetest-birthstones.git add_git_mod bakedclay bakedclay https://github.com/tenplus1/bakedclay.git add_git_mod quartz quartz https://github.com/minetest-mods/quartz add_git_mod magma_conduits magma_conduits https://github.com/FaceDeer/magma_conduits.git @@ -864,7 +885,7 @@ echo "Installing AntumMT's modernized fork of Kilarin's compassgps (NOT TeTpaAka echo "Installing AntumMT's modernized fork of Kilarin's compassgps (NOT TeTpaAka, nor Echo, nor PilzAdam compass) " > ~/Downloads/compassgps.txt # https://github.com/Kilarin/compassgps.git #add_git_mod compassgps mod-compassgps https://github.com/AntumMT/mod-compassgps.git -add_git_mod compassgps compassgps https://github.com/expertmm/compassgps.git +add_git_mod compassgps compassgps https://github.com/poikilos/compassgps.git remove_mod helicopter add_git_mod sounding_line sounding_line https://github.com/minetest-mods/sounding_line.git @@ -893,7 +914,7 @@ add_git_mod homedecor_modpack homedecor_modpack https://github.com/minetest-mods add_git_mod unifieddyes unifieddyes https://github.com/minetest-mods/unifieddyes.git #Sokomine's original version has no security ( https://forum.minetest.net/viewtopic.php?id=4877 ) # https://github.com/Sokomine/travelnet/archive/master.zip -add_git_mod travelnet travelnet https://github.com/expertmm/travelnet.git +add_git_mod travelnet travelnet https://github.com/poikilos/travelnet.git add_git_mod anvil anvil https://github.com/minetest-mods/anvil.git add_git_mod sling sling https://github.com/minetest-mods/sling.git #REPLACES PilzAdam's, modified by kaeza, maintained by VenessaE; FORMERLY in homedecor_modpack @@ -933,7 +954,7 @@ fi # web view: http://repo.or.cz/w/minetest_slimenodes.git # add_git_mod slimenodes minetest_slimenodes http://repo.or.cz/minetest_slimenodes.git # use expertmm fork instead: -add_git_mod slimenodes slimenodes https://github.com/expertmm/slimenodes.git +add_git_mod slimenodes slimenodes https://github.com/poikilos/slimenodes.git # ropes: adds rope spools that are mounted to the side or bottom of a node and can be cut with any choppy tool while someone lower is climbing; doesn't lower into protected areas; also has rope ladders add_git_mod ropes ropes https://github.com/minetest-mods/ropes.git add_git_mod digilines digilines https://github.com/minetest-mods/digilines.git @@ -945,7 +966,7 @@ add_git_mod digilines digilines https://github.com/minetest-mods/digilines.git # wget -O $MTMOD_SRC_ZIP https://forum.minetest.net/download/file.php?id=1301 #add_git_mod trmp_minetest_game trmp_minetest_game https://github.com/ClockGen/trmp_minetest_game.git #fixed version with correct dye list for 0.4.16 (submitted pull request to ClockGen 2018-02-08): -add_git_mod trmp_minetest_game trmp_minetest_game https://github.com/expertmm/trmp_minetest_game.git +add_git_mod trmp_minetest_game trmp_minetest_game https://github.com/poikilos/trmp_minetest_game.git #forum_url = "http://minetest.org/forum/viewtopic.php?f=11&t=4870&sid=3ccbe3a667c6201075fc475ef7dc7cea" #see also minetest-mods version: @@ -1002,7 +1023,7 @@ add_git_mod ambience ambience https://github.com/tenplus1/ambience.git # description: ISSUE ON 0.5.0: player halfway into ground; Adds animations to the players' head if [ "$version_0_5_enable" != "true" ]; then # see - add_git_mod playeranim playeranim https://github.com/expertmm/playeranim.git + add_git_mod playeranim playeranim https://github.com/poikilos/playeranim.git # add_git_mod playeranim playeranim https://github.com/minetest-mods/playeranim.git else #must also set player_model_version = default_character_v3 in minetest.conf (see above for when set in subgame folder's minetest.conf) diff --git a/install-subgametest.py b/install-subgametest.py index 67e4754..ebc7da6 100755 --- a/install-subgametest.py +++ b/install-subgametest.py @@ -168,8 +168,8 @@ input("press enter to close...") #git clone https://github.com/tenplus1/mobs_monster.git #git clone https://github.com/tenplus1/mobs_npc.git #but not: -#git clone https://github.com/expertmm/minetest-minigamer.git -#git clone https://github.com/expertmm/minetest-birthstones.git +#git clone https://github.com/poikilos/minetest-minigamer.git +#git clone https://github.com/poikilos/minetest-birthstones.git #Repo.clone_from(git_url, repo_dir)