From f7ff6f86fe21834e956d2b7db9750ac0f1cbc9fd Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Sun, 25 Feb 2018 16:11:25 -0500 Subject: [PATCH] clarifying mod versions and OS issues --- README.md | 25 ++++---- etc/BagEnd.txt | 7 +++ etc/game-install-ENLIVEN | 61 ++++++++++++++----- etc/game-install-testing.sh | 10 --- etc/install-zerobrane-minetest-environment | 2 +- etc/unused/game-install-ENLIVEN-DEPRECATED.sh | 11 ++++ install-subgametest.py | 14 +++-- 7 files changed, 88 insertions(+), 42 deletions(-) create mode 100644 etc/BagEnd.txt mode change 100644 => 100755 etc/install-zerobrane-minetest-environment diff --git a/README.md b/README.md index fba5d0a..26d52d8 100644 --- a/README.md +++ b/README.md @@ -28,11 +28,10 @@ ENLIVEN is a subgame for minetest with the goals of providing immersion and less https://forum.minetest.net/viewtopic.php?t=17106 * timer: "A persistent timer class that can be restarted after server shutdown" https://github.com/minetest-mods/timer -* add modpack but remove fire items (flint and steel?) from: - https://github.com/xisd/trmp_Pack.git -* https://github.com/minetest-mods/woodcutting/archive/master.zip - (sneek click to start auto-harvest tree, sneak again to cancel) -* subterrane: fork of Caverealms, but is just an API and needs other mods to generate anything +* 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) + * add modpack but remove fire items (flint and steel?) + * https://github.com/xisd/trmp_Pack.git * 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 @@ -42,23 +41,18 @@ ENLIVEN is a subgame for minetest with the goals of providing immersion and less * 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 * 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) -* weather: https://github.com/Jeija/minetest-mod-weather ( https://forum.minetest.net/viewtopic.php?t=5245 ) * baked clay (Ethereal NG integrates with it, mobs redo, and farming redo) * Updated pipeworks fork by HybridDog: https://github.com/HybridDog/pipeworks ##### low-pri +* (forum replies report lag) weather: https://github.com/Jeija/minetest-mod-weather ( https://forum.minetest.net/viewtopic.php?t=5245 ) +* https://github.com/minetest-mods/BobBlocks (blocks that look like they have single-color LED panel on each side, light poles, and settable damaging traps) * drawers: https://github.com/minetest-mods/drawers.git * 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 @@ -129,14 +123,21 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn * The included minetest.conf recommended for your clients includes the line enable_local_map_saving = true, which will cache the world locally on their machines. You can feel free to change that according to your preference. ## Changes: +### (2018-02-23) +* added woodcutting https://github.com/minetest-mods/woodcutting.git + (sneek click to start auto-harvest tree, sneak again to cancel) + NOT same as Jeija's timber mod ### (2018-02-21) * (installer now tries to detect 0.5.0 then install "MT_0.5.0-dev" branch of 3d armor) fix player halfway into ground when using 0.5.0 with main branch after installing 3d_armor (must use `MT_0.5.0-dev` branch) * added worldedge mod (teleports you when you hit the edge of the map) + https://github.com/minetest-mods/worldedge ### (2018-02-19) * added ropes * added digilines (I just found out it is used by technic and pipeworks) +* added armor_monoid (found out it is used by 3d_armor!): an api for creating multipliers for damage types ### (2018-02-18) * switched to FaceDeer's fork of caverealms which is integrated with mapgen v7's perlin noise and therefore with its biomes +* subterrane: fork of Caverealms, but is just an API and needs other mods to generate anything (required by FaceDeer's fork of caverealms) * added: * lightning * mywalls (more wall styles; brick & stone brick walls) diff --git a/etc/BagEnd.txt b/etc/BagEnd.txt new file mode 100644 index 0000000..d0a079f --- /dev/null +++ b/etc/BagEnd.txt @@ -0,0 +1,7 @@ +Seed: BagEnd +Mapgen limit (in map_meta.txt): 6144 +NE +,,+ = desert +NW -,,+ = cave +SW -,,- = tropical +SE +,,- = ice + diff --git a/etc/game-install-ENLIVEN b/etc/game-install-ENLIVEN index 23678cd..c151ab6 100755 --- a/etc/game-install-ENLIVEN +++ b/etc/game-install-ENLIVEN @@ -23,6 +23,9 @@ fi # * ERROR[Main]: Singleplayer mode says following mods could not be found: 3d_armor areas mobs mobs_animal mobs_monster protector technic treasurer unified_inventory xban2 sudo echo "starting ENLIVEN installer script..." + + + ## this space was intentionally left blank @@ -34,8 +37,8 @@ err_txt=$HOME/err-enliven.txt # doesn't work if equal: [ $0 = *"$shell_name"* ] # could be -bash or bash #if [ "$0" = "-bash" ]; then -#'[[' doesn't work in debian, so: -if [ $0 == *"$shell_name"* ]; then +#'[[' doesn't work in debian +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" @@ -98,7 +101,7 @@ MT_MYGAME_DIR="$MT_GAMES_DIR/$MT_MYGAME_NAME" # formerly MT_MYGAME_MODDIR: 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_DEFAULT_WORLD_NAME="`ls $MT_WORLDS_DIR | grep -v tar.gz | grep --max-count=1 -v world`" # aka -m 1 (no '=' sign in that case) MT_MYWORLD_NAME="$MT_DEFAULT_WORLD_NAME" if [ -z "$MT_DEFAULT_WORLD_NAME" ]; then if [ ! -z "`ls $MT_WORLDS_DIR | grep --max-count=1 -v world`" ]; then @@ -108,25 +111,34 @@ if [ -z "$MT_DEFAULT_WORLD_NAME" ]; then echo "Could not find any worlds" fi #if [ "$0" = "-bash" ]; then -#'[[' doesn't work in debian, so: - if [ $0 == *"$shell_name"* ]; then +#'[[' doesn't work in debian: + 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 " 3..." + #sleep 1 + #echo " 2..." sleep 1 echo " 1..." + sleep 1 else read -p "Please enter a world (name only--must be in $MT_WORLDS_DIR): " MT_MYWORLD_NAME + #$MT_DEFAULT_WORLD_NAME + echo using "$MT_MYWORLD_NAME" + #echo " 3..." + #sleep 1 + #echo " 2..." + sleep 1 + echo " 1..." + sleep 1 fi else - #'[[' doesn't work in debian, so: - if [ $0 == *"$shell_name"* ]; then + #'[[' doesn't work in debian: + 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:" @@ -134,6 +146,13 @@ else else ls $MT_WORLDS_DIR read -p "Please enter a world [blank for $MT_DEFAULT_WORLD_NAME]: " MT_MYWORLD_NAME + #$MT_DEFAULT_WORLD_NAME + echo using "$MT_MYWORLD_NAME" + echo " 3..." + sleep 1 + echo " 2..." + sleep 1 + echo " 1..." if [ -z "$MT_MYWORLD_NAME" ]; then MT_MYWORLD_NAME="$MT_DEFAULT_WORLD_NAME" fi @@ -233,6 +252,7 @@ if [ ! -d "$MTMOD_DEST_PATH" ] || [ "$update_enable" = "true" ]; then echo "Cloning $BRANCH branch..." git clone -b $BRANCH --single-branch $URL else + echo "Cloning main branch since no branch specified: $BRANCH" git clone $URL fi if [ -d "$MTMOD_UNZ_NAME" ]; then @@ -306,6 +326,10 @@ remove_mod() # cd GitHub/EnlivenMinetest #fi } +#echo "MT_MYGAME_MODS_PATH: $MT_MYGAME_MODS_PATH" +echo "MT_MYGAME_DIR: $MT_MYGAME_DIR" +echo "MT_WORLDS_DIR: $MT_WORLDS_DIR" +echo "MT_MYWORLD_NAME: $MT_MYWORLD_NAME" #endregion paste this part into terminal to get some great environment variables @@ -812,9 +836,11 @@ add_git_mod ts_furniture ts_furniture https://github.com/minetest-mods/ts_furnit #"stable" version is at https://github.com/stujones11/minetest-3d_armor/archive/version-0.4.11.zip #add_zip_mod 3d_armor minetest-3d_armor-MT_0.5.0-dev https://github.com/stujones11/minetest-3d_armor/archive/MT_0.5.0-dev.zip # git clone -b MT_0.5.0-dev --single-branch https://git@github.com/stujones11/minetest-3d_armor.git -if [ "version_0_5_enable" = "true" ]; then +if [ "$version_0_5_enable" = "true" ]; then + echo " trying to get 3d_armor 0.5.0-dev branch..." add_git_mod 3d_armor minetest-3d_armor https://github.com/stujones11/minetest-3d_armor.git "MT_0.5.0-dev" else + echo " trying to get 3d_armor main branch..." add_git_mod 3d_armor minetest-3d_armor https://github.com/stujones11/minetest-3d_armor.git fi #mv minetest-3d_armor-master minetest-3d_armor_MODPACK @@ -914,6 +940,7 @@ remove_mod sprint #remove_mod hbsprint # NOTE: hbsprint bar is on auto-hide by default (world.mt can set hudbars_autohide_stamina to true or false) add_git_mod hbsprint hbsprint https://github.com/minetest-mods/hbsprint.git +# armor_monoid: an api for creating multipliers for damage types (used by 3d_armor) add_git_mod armor_monoid armor_monoid https://github.com/minetest-mods/armor_monoid.git # author="Wuzzy" @@ -931,8 +958,12 @@ add_git_mod playereffects minetest_playereffects http://repo.or.cz/minetest_play # tenplus1's ambience/ambiance ambient sounds (fork linked at original's thread at https://forum.minetest.net/viewtopic.php?f=11&t=2807&start=275 ) add_git_mod ambience ambience https://github.com/tenplus1/ambience.git # forum_url: https://forum.minetest.net/viewtopic.php?t=12189 -# description: Adds animations to the players' head -add_git_mod playeranim playeranim https://github.com/minetest-mods/playeranim.git +# description: ISSUE ON 0.5.0: player halfway into ground; Adds animations to the players' head +if [ "$version_0_5_enable" != "true" ]; then + # doesn't work with 0.5.0-dev as of Feb 2018--see pull request by expertmm: + add_git_mod playeranim playeranim https://github.com/expertmm/playeranim.git + # add_git_mod playeranim playeranim https://github.com/minetest-mods/playeranim.git +fi #add_git_mod stamina stamina https://github.com/minetest-mods/stamina remove_mod stamina # NOTE: a skin database is at http://minetest.fensta.bplaced.net/ @@ -963,6 +994,8 @@ fi # ./update_skins_db.sh # (note, bell07 has the fixed bash script, but the python3 script is still bugged as of 2016-01-29, and includes a .NET assembly that seems to only work for Windows (has meta directory not found error on mono for Linux) # PATCH FURTHER DOWN WILL REMOVE EXISTING SKINS AND ONLY ADD EnlivenMinetest skins from patches folder +# woodcutting: sneek click to start auto-harvest tree, sneak again to cancel +add_git_mod woodcutting woodcutting https://github.com/minetest-mods/woodcutting.git #endregion PLAYER UX MODS diff --git a/etc/game-install-testing.sh b/etc/game-install-testing.sh index bf1dbbb..b19a313 100644 --- a/etc/game-install-testing.sh +++ b/etc/game-install-testing.sh @@ -41,13 +41,6 @@ if [ ! -d "$MT_MYGAME_MODS_PATH" ]; then exit 1 fi -#https://forum.minetest.net/viewtopic.php?t=14359 -#This mod is part of minetest_game 0.4.15! -#TODO: With exception of the wieldlight -#add_git_mod torches torches https://github.com/BlockMen/torches.git - -# This mod is part of minetest_game 0.4.15! -# add_git_mod moresnow moresnow https://github.com/Sokomine/moresnow echo "Installing adrido's (NOT MasterGollum's which is incompatible with moreblocks) darkage..." #linked from MasterGollum's: https://forum.minetest.net/viewtopic.php?id=3213 @@ -62,9 +55,6 @@ add_git_mod advanced_npc advanced_npc https://github.com/hkzorman/advanced_npc.g #forum post (special_picks by cx384): https://forum.minetest.net/viewtopic.php?f=11&t=9574 add_git_mod special_picks special_picks https://github.com/cx384/special_picks.git -# no longer needed since ENLIVEN main branch now uses expertmm travelnet: -# add_git_mod travelnet travelnet https://github.com/Sokomine/travelnet.git - #used by mg_villages fork by Sokomine add_git_mod handle_schematics handle_schematics https://github.com/Sokomine/handle_schematics.git # mg_villages no longer needed (?) since minetest-mods now maintains an mg with villages diff --git a/etc/install-zerobrane-minetest-environment b/etc/install-zerobrane-minetest-environment old mode 100644 new mode 100755 index 7efc711..4df96f6 --- a/etc/install-zerobrane-minetest-environment +++ b/etc/install-zerobrane-minetest-environment @@ -40,7 +40,7 @@ cd "$zb_tmp_name" unzip ../$dl_name cd .. sudo cp -Rf $zb_tmp_name/* "$share_path/" -echo "You must close ZeroBrain Studio if already for this to take effect." +echo "You must close ZeroBrain Studio (if open) for this to take effect." echo echo echo "(For each project) after opening your lua file, click:" diff --git a/etc/unused/game-install-ENLIVEN-DEPRECATED.sh b/etc/unused/game-install-ENLIVEN-DEPRECATED.sh index 974c886..aadd9d9 100644 --- a/etc/unused/game-install-ENLIVEN-DEPRECATED.sh +++ b/etc/unused/game-install-ENLIVEN-DEPRECATED.sh @@ -243,3 +243,14 @@ fi # sleep 1 # exit 1 #fi + +#https://forum.minetest.net/viewtopic.php?t=14359 +#This mod is part of minetest_game 0.4.15! +#TODO: With exception of the wieldlight +#add_git_mod torches torches https://github.com/BlockMen/torches.git + +# This mod is part of minetest_game 0.4.15! +# add_git_mod moresnow moresnow https://github.com/Sokomine/moresnow + +# no longer needed since ENLIVEN main branch now uses expertmm travelnet: +# add_git_mod travelnet travelnet https://github.com/Sokomine/travelnet.git diff --git a/install-subgametest.py b/install-subgametest.py index 9e094b3..67e4754 100755 --- a/install-subgametest.py +++ b/install-subgametest.py @@ -12,11 +12,15 @@ except NameError: try: from git import Repo except: - print("You do not have temperusb installed.\n" + print("You do not have gitpython installed.\n" "Please run the following commands in terminal\n" - " (if in Windows first cd C:\Python27 [or your Python folder],\n" - " but if in *nix-like environment first \"sudo su -\"\n" - " then if no pip, install python-pip/python2-pip/python3-pip" + "For installing Python in Windows, the most usable option\n" + " is CUSTOM install, then change System Path to\n" + " 'install to hard drive'" + " (otherwise first cd C:\Python27 [or your Python folder],\n" + " but if in *nix-like environment first 'su -', and if no\n" + " pip, use your software manager to install:\n" + " python-pip or python2-pip or python3-pip)\n" "python -m pip install --upgrade pip\n" "python -m pip install --upgrade pip wheel\n" "python -m pip install gitpython\n") @@ -62,7 +66,7 @@ if not os.path.isdir(USR_SHARE_MINETEST): print("Minetest could not be found in any known location. Try installing minetest or compiling from source or editing value of USR_SHARE_MINETEST in this script. Script ended early.") input("press enter to close...") exit(3) - + MT_GAMES_DIR = os.path.join(USR_SHARE_MINETEST,"games") MT_MYGAME_NAME = "subgametest"