From 920b7f3228b2143360c192f9bd304491a255cd8d Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Thu, 8 Feb 2018 17:17:38 -0500 Subject: [PATCH] made linux server ENLIVEN installer universal --- README.md | 71 +++++++++++++++++++++++++++++++++++++++- etc/game-install-ENLIVEN | 57 ++++++++++++++++++++++++-------- 2 files changed, 113 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 8de5e56..99e6842 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,25 @@ ENLIVEN is a subgame for minetest with the goals of providing immersion and less ### Planned Features * see also EnlivenMinetest/etc/game-install-enliven-testing.sh +* slimenodes fork with buckets and recipes (craft from glue or animal hide) +* https://github.com/minetest-mods/sounding_line (machine block that measures depth of water under it) +* https://github.com/minetest-mods/tutor +* https://github.com/minetest-mods/lightning +* https://github.com/minetest-mods/chat_anticurse +* https://github.com/minetest-mods/cozy (sitting and laying down player animations)--compare with emote +* https://github.com/minetest-mods/mywalls (more wall styles; brick & stone brick walls) +* https://github.com/minetest-mods/mymasonhammer (cut stairs & ladders in blocks) #### Possible Additions +* SWITCH testing mod for furniture to minetest-mods version: + https://github.com/minetest-mods/ts_furniture +* SWITCH to https://github.com/minetest-mods/inspector (from metatools mod) + https://github.com/minetest-mods/inspector +* SWITCH to frame: "non-laggy item frame"--& make mod to alias-out the existing (homedecor?) ones in ENLIVEN + https://github.com/minetest-mods/frame +* SWITCH to mob-engine (based on cme) by minetest-mods team + https://github.com/minetest-mods/mob-engine + https://forum.minetest.net/viewtopic.php?t=17106 * SWITCH from GunshipPenguin's sprint to minetest-mods' hbsprint (which optionally uses hudbars, hbhunger, and player_monoids) https://github.com/minetest-mods/hbsprint.git * SWITCH from tsm_chests_dungeon to loot or dungeon_loot (loot is maintained by minetest-mods; tsm generates treasure from trm treasure lists using treasurer) @@ -21,6 +38,11 @@ ENLIVEN is a subgame for minetest with the goals of providing immersion and less * loot_vaults - Set to true to enable loot vault generation. * loot_dungeons - Set to true to enable loot generation in dungeons. * SWITCH from farming redo to minetest-mods crops + (works with farming from minetest_game) + "pumpkins, melons and potatoes are obtainable. The rest currently isn't." -sofar + so probably a trm_crops mod should be created +* timer: "A persistent timer class that can be restarted after server shutdown" + https://github.com/minetest-mods/timer * add but remove fire (flint and steel)? https://github.com/xisd/trmp_Pack.git * https://github.com/minetest-mods/woodcutting/archive/master.zip @@ -28,7 +50,31 @@ ENLIVEN is a subgame for minetest with the goals of providing immersion and less * subterrane: fork of Caverealms, but is just an API and needs other mods to generate anything * craftguide * privilegeareas: Privileges granted depending on areas -- https://github.com/minetest-mods/privilegeareas/archive/master.zip - +* castle_farming: floor&wall animal hide mats, straw bales, and straw training dummy + https://github.com/minetest-mods/castle_farming +* mapfix: fixes flow and light issues + https://github.com/minetest-mods/mapfix +* maptools: admin pickaxe and admin blocks&items to control building, movement, and light; also permanent fire, fake fire, and igniters + https://github.com/minetest-mods/maptools + https://forum.minetest.net/viewtopic.php?f=11&t=1882 +* worldedge: wrap world as if it is a sphere + https://github.com/minetest-mods/worldedge +* stamina: hunger-based stamina + https://github.com/minetest-mods/stamina +* myroofs: sloped roofs in red, green, and dark gray--compare with existing (homedecor?) roofs in ENLIVEN + https://github.com/minetest-mods/myroofs +* https://github.com/minetest-mods/BobBlocks (light poles and settable damaging traps) +* https://github.com/xisd/trmp_Pack (but only the mods from it mods matching ENLIVEN mods) + (NOT the same as [trm_pack by Wuzzy](https://forum.minetest.net/viewtopic.php?pid=113052#p113052), which has mostly stuff from weird mods or stuff already in trmp_minetest_game) + +##### low-pri +* https://github.com/minetest-mods/pontoons (brown blocks with x that can be placed parallel with water's surface by right-clicking water) +* https://github.com/minetest-mods/trash_can (wood trash can and green dumpster) +* https://github.com/minetest-mods/armor_monoid (an api for creating multipliers for damage types) +* https://github.com/minetest-mods/breadcrumbs (special sign: right-click sign to see stream of particles to previous sign) +* https://github.com/minetest-mods/round_trunks +* https://github.com/minetest-mods/mywoodslopes +* make fork of trmp_minetest_game that has random wear for tools (see for setting properties) #### Shell Script Deprecation Process ##### Goals @@ -91,6 +137,8 @@ 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-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) * trm_pyramids added (partial code in game-install-ENLIVEN completed) (a required treasure table so tsm_pyramids can provide treasure in pyramids) @@ -190,6 +238,27 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn * Updated pipeworks fork by HybridDog: https://github.com/HybridDog/pipeworks ## Known issues: +* worlds made with older version of enliven use Echoes' throwing, so the following differences must be fixed possibly with a new mod: + * Old throwing items that are not in throwing_arrows: + * throwing:arrow_steel + * throwing:arrow_obsidian + * throwing:arrow_diamond + * throwing:arrow_fireworks_blue + * throwing:arrow_fireworks_red + * throwing:arrow_torch + * Old throwing items that are also in new throwing_arrows: + * throwing:arrow_stone + * throwing:arrow_gold + * throwing:arrow_build + * throwing:arrow_teleport + * New minetest-mods/throwing_arrows which uses minetest-mods/throwing: + * Item throwing:arrow 99 + * Item throwing:arrow_build 99 + * Item throwing:arrow_dig 99 + * Item throwing:arrow_drop 99 + * Item throwing:arrow_fire 99 + * Item throwing:arrow_gold 99 + * Item throwing:arrow_teleport 99 * install whatever mod allows making a sign to see awards * use player_monoids instead of playereffects for mock_tnt? * pyramids have empty chests (still?): possibly fork spawners so pyramids use treasurer like Wuzzy's fork of pyramids does: diff --git a/etc/game-install-ENLIVEN b/etc/game-install-ENLIVEN index 4e48d54..3e641dc 100755 --- a/etc/game-install-ENLIVEN +++ b/etc/game-install-ENLIVEN @@ -28,9 +28,13 @@ sudo echo "starting ENLIVEN installer script..." - #region paste this part into terminal to get some great environment variables -if [ "$0" = "-bash" ]; then +shell_name="bash" +err_txt=$HOME/err-enliven.txt +# doesn't work if equal: [ $0 = *"$shell_name"* ] +# could be -bash or bash +#if [ "$0" = "-bash" ]; then +if [[ $0 == *"$shell_name"* ]]; then REPO_PATH="$HOME/GitHub/EnlivenMinetest" echo "You must have pasted this into terminal, so assuming REPO_PATH:" echo " $REPO_PATH" @@ -94,20 +98,40 @@ MT_MYGAME_MODS_PATH="$MT_MYGAME_DIR/mods" MT_WORLDS_DIR="$HOME/.minetest/worlds" MT_DEFAULT_WORLD_NAME="`ls $MT_WORLDS_DIR | grep --max-count=1 -v world`" # aka -m 1 (no '=' sign in that case) MT_MYWORLD_NAME="$MT_DEFAULT_WORLD_NAME" -if [ -z "$MT_MYWORLD_NAME" ]; then +if [ -z "$MT_DEFAULT_WORLD_NAME" ]; then if [ ! -z "`ls $MT_WORLDS_DIR | grep --max-count=1 -v world`" ]; then MT_MYWORLD_NAME=world echo "Could not find any worlds other than $MT_MYWORLD_NAME" else echo "Could not find any worlds" fi - echo "Please enter a world (name only--must be in )" - read MT_MYWORLD_NAME + #if [ "$0" = "-bash" ]; then + if [[ $0 == *"$shell_name"* ]]; then + REPO_PATH="$HOME/GitHub/EnlivenMinetest" + MT_MYWORLD_NAME="world" + echo "You must have pasted this into terminal, so assuming MT_MYWORLD_NAME:" + echo " $MT_MYWORLD_NAME" + echo "Press Ctrl C to cancel, otherwise $MT_MYWORLD_NAME will be used..." + sleep 1 + echo " 3..." + sleep 1 + echo " 2..." + sleep 1 + echo " 1..." + else + read -p "Please enter a world (name only--must be in $MT_WORLDS_DIR): " MT_MYWORLD_NAME + fi else - echo "Please enter a world [blank for $MT_DEFAULT_WORLD_NAME]: " - read MT_MYWORLD_NAME - if [ -z "$MT_MYWORLD_NAME" ]; then + if [[ $0 == *"$shell_name"* ]]; then + REPO_PATH="$HOME/GitHub/EnlivenMinetest" MT_MYWORLD_NAME="$MT_DEFAULT_WORLD_NAME" + echo "You must have pasted this into terminal, so assuming MT_MYWORLD_NAME:" + echo " $MT_MYWORLD_NAME" + else + read -p "Please enter a world [blank for $MT_DEFAULT_WORLD_NAME]: " MT_MYWORLD_NAME + if [ -z "$MT_MYWORLD_NAME" ]; then + MT_MYWORLD_NAME="$MT_DEFAULT_WORLD_NAME" + fi fi fi if [ ! -d "$MT_WORLDS_DIR/$MT_MYWORLD_NAME" ]; then @@ -125,7 +149,6 @@ fi MT_MYWORLD_DIR=$MT_WORLDS_DIR/$MT_MYWORLD_NAME echo "Using world at $MT_MYWORLD_DIR" WORLD_MT_PATH=$MT_MYWORLD_DIR/world.mt -err_txt=$HOME/err-enliven.txt # see also https://www.shellscript.sh/functions.html add_zip_mod() @@ -159,9 +182,11 @@ add_zip_mod() if [ -d "$MTMOD_UNZ_NAME/etc" ]; then rm -Rf "$MTMOD_UNZ_NAME/etc" fi + if [ -f "$MTMOD_UNZ_NAME/screenshot.png" ]; then + rm -f "$MTMOD_UNZ_NAME/screenshot.png" + fi + sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" fi - sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" - sudo rm -Rf "$MTMOD_DEST_PATH/etc" if [ ! -d "$MTMOD_DEST_PATH" ]; then echo " ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt cat $err_txt @@ -204,9 +229,11 @@ add_git_mod() if [ -d "$MTMOD_UNZ_NAME/etc" ]; then rm -Rf "$MTMOD_UNZ_NAME/etc" fi + if [ -f "$MTMOD_UNZ_NAME/screenshot.png" ]; then + rm -f "$MTMOD_UNZ_NAME/screenshot.png" + fi + sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" fi - sudo mv $MTMOD_UNZ_NAME "$MTMOD_DEST_PATH" - sudo rm -Rf "$MTMOD_DEST_PATH/etc" if [ ! -d "$MTMOD_DEST_PATH" ]; then echo " ERROR: failed to unzip $MTMOD_DEST_PATH, so cannot continue." > $err_txt cat $err_txt @@ -735,7 +762,9 @@ add_git_mod slimenodes minetest_slimenodes http://repo.or.cz/minetest_slimenodes # MTMOD_DL_ZIP=file.php?id=1301 # Copied to GitHub by ClockGen (I posted the link below on the forum page) # 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 +#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 # NOTE: tsm_chests_dungeon supercedes dungeon_loot: if [ -d "$MT_MYGAME_MODS_PATH/dungeon_loot" ]; then