poikilos
/
EnlivenMinetest
mirror of https://github.com/poikilos/EnlivenMinetest
1
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity
Browse Source

switch from patched homedecor to original and homedecor_ua 

and switch to tsm_chests_dungeon--works with spawners in minetest-git
master
poikilos 7 years ago
committed by Jacob Gustafson
parent
e99af37e6b
commit
6459429c3f
1 changed files with 62 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      etc/game-install-ENLIVEN

118
etc/game-install-ENLIVEN
View File

@ -7,6 +7,23 @@
#First make sure all folders in $HOME/.minetest are created (I am not sure whether this is required!):
# minetestserver
# Mods were found at https://forum.minetest.net/viewforum.php?f=11
# (Ubuntu 14.04 Trusty Tahr Server) folders were found using:
# cd /
# sudo find -name 'worlds' (worlds folder is in $HOME/.minetest)
# sudo find -name 'minimal' (stable build [such as 0.4.9 games folder is /usr/share/games/minetest/games, but git version games folder is /usr/local/share/minetest/games)
# ISSUES:
# * 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
#region paste this part into terminal to get some great environment variables
CONFIGS_PATH="$HOME/.config/EnlivenMinetest"
if [ ! -d "$CONFIGS_PATH" ]; then
mkdir -p "$CONFIGS_PATH"
@ -58,23 +75,6 @@ fi
#sleep 1
#echo "1..."
#sleep 1
# (Ubuntu 14.04 Trusty Tahr Server) folders were found using:
# cd /
# sudo find -name 'worlds' (worlds folder is in $HOME/.minetest)
# sudo find -name 'minimal' (stable build [such as 0.4.9 games folder is /usr/share/games/minetest/games, but git version games folder is /usr/local/share/minetest/games)
# ISSUES:
# * 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
#region paste this part into terminal to get some great environment variables
update_enable="true"
shell_name="bash"
err_txt=$HOME/err-enliven.txt
@ -731,6 +731,9 @@ if [ "$spawners_enable" = "true" ]; then
echo "NOTE: in spawners, only SPAWNERS_GENERATE or CHESTS_GENERATE, not both (chests seem to override) spawn in world for now. See thread for updated info: https://forum.minetest.net/viewtopic.php?f=11&t=13857&start=25"
echo "see also expertmm's game-install-enliven-testing-SPAWNERS_BOTH_DEBUG.txt"
# dungeon_loot is part of default game, but I haven't created loot tables for this subgame yet, so remove:
remove_mod "dungeon_loot"
# NOTE: tsm_chests_dungeon supercedes dungeon_loot, but dungeon_loot :
if [ -d "$MT_MYGAME_MODS_PATH/dungeon_loot" ]; then
echo "WARNING: tsm_chests_dungeon may not be compatible with dungeon_loot"
@ -988,6 +991,8 @@ add_git_mod signs_lib signs_lib https://github.com/minetest-mods/signs_lib.git
farming_redo_enable="false"
if [ -f "$MT_MYWORLD_DIR/farming_redo_enable" ]; then
farming_redo_enable="true"
else
echo "$MT_MYWORLD_DIR/farming_redo_enable not found (may contain anything or nothing to enable), so not using farming_redo"
fi
if [ "$farming_redo_enable" = "true" ]; then
remove_mod crops
@ -1125,7 +1130,7 @@ fi
# 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
add_git_mod homedecor_ua homedecor_ua https://github.com/poikilos/homedecor_ua.git
echo
@ -1221,45 +1226,46 @@ fi
echo "ALREADY patched $MTMOD_DEST_NAME with $MODIFIED_PATH."
fi
fi
BASIS_PATH=$PATCHES_PATH/subgame-basis/mods/homedecor_modpack/homedecor/gastronomy.lua
MODIFIED_PATH=$PATCHES_PATH/subgame/mods/homedecor_modpack/homedecor/gastronomy.lua
TARGET_PATH=$MT_MYGAME_MODS_PATH/homedecor_modpack/homedecor/gastronomy.lua
MTMOD_DEST_NAME=homedecor_modpack
MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/homedecor_modpack/homedecor
TRY_DIFF="`diff $BASIS_PATH $TARGET_PATH`"
if [ -z "$TRY_DIFF" ]; then
sudo cp -f $MODIFIED_PATH "$MTMOD_DEST_PATH/"
echo "done attempting to patch $MTMOD_DEST_PATH/"
else
if [ -z `diff $MODIFIED_PATH $TARGET_PATH` ]; then
echo "ALREADY patched $TARGET_PATH with $MODIFIED_PATH"
else
echo "FAILED to patch $MTMOD_DEST_NAME since $TARGET_PATH differs from known version."
sleep 4
fi
fi
BASIS_PATH=$PATCHES_PATH/subgame-basis/mods/homedecor_modpack/homedecor/crafts.lua
MODIFIED_PATH=$PATCHES_PATH/subgame/mods/homedecor_modpack/homedecor/crafts.lua
TARGET_PATH=$MT_MYGAME_MODS_PATH/homedecor_modpack/homedecor/crafts.lua
MTMOD_DEST_NAME=homedecor_modpack
TRY_DIFF="`diff $BASIS_PATH $TARGET_PATH`"
if [ -z "$TRY_DIFF" ]; then
sudo cp -f $MODIFIED_PATH "$MTMOD_DEST_PATH/"
echo "done attempting to patch $MTMOD_DEST_PATH/"
else
if [ -z `diff $MODIFIED_PATH $TARGET_PATH` ]; then
echo "ALREADY patched $TARGET_PATH with $MODIFIED_PATH"
else
echo "FAILED to patch $MTMOD_DEST_NAME since $TARGET_PATH differs from known version."
sleep 4
fi
fi
if [ -d "$PATCHES_PATH/subgame/mods/homedecor_modpack/homedecor/models" ]; then
# deprecated, but copy in case gets un-deprecated
cp -f $PATCHES_PATH/subgame/mods/homedecor_modpack/homedecor/models/* "$MTMOD_DEST_PATH/models/"
fi
#homedecor: see homedecor_ua (underage) instead ABOVE
#BASIS_PATH=$PATCHES_PATH/subgame-basis/mods/homedecor_modpack/homedecor/gastronomy.lua
#MODIFIED_PATH=$PATCHES_PATH/subgame/mods/homedecor_modpack/homedecor/gastronomy.lua
#TARGET_PATH=$MT_MYGAME_MODS_PATH/homedecor_modpack/homedecor/gastronomy.lua
#MTMOD_DEST_NAME=homedecor_modpack
#MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/homedecor_modpack/homedecor
#TRY_DIFF="`diff $BASIS_PATH $TARGET_PATH`"
#if [ -z "$TRY_DIFF" ]; then
# sudo cp -f $MODIFIED_PATH "$MTMOD_DEST_PATH/"
# echo "done attempting to patch $MTMOD_DEST_PATH/"
#else
# if [ -z `diff $MODIFIED_PATH $TARGET_PATH` ]; then
# echo "ALREADY patched $TARGET_PATH with $MODIFIED_PATH"
# else
# echo "FAILED to patch $MTMOD_DEST_NAME since $TARGET_PATH differs from known version."
# sleep 4
# fi
#fi
#BASIS_PATH=$PATCHES_PATH/subgame-basis/mods/homedecor_modpack/homedecor/crafts.lua
#MODIFIED_PATH=$PATCHES_PATH/subgame/mods/homedecor_modpack/homedecor/crafts.lua
#TARGET_PATH=$MT_MYGAME_MODS_PATH/homedecor_modpack/homedecor/crafts.lua
#MTMOD_DEST_NAME=homedecor_modpack
#TRY_DIFF="`diff $BASIS_PATH $TARGET_PATH`"
#if [ -z "$TRY_DIFF" ]; then
# sudo cp -f $MODIFIED_PATH "$MTMOD_DEST_PATH/"
# echo "done attempting to patch $MTMOD_DEST_PATH/"
#else
# if [ -z `diff $MODIFIED_PATH $TARGET_PATH` ]; then
# echo "ALREADY patched $TARGET_PATH with $MODIFIED_PATH"
# else
# echo "FAILED to patch $MTMOD_DEST_NAME since $TARGET_PATH differs from known version."
# sleep 4
# fi
#fi
#if [ -d "$PATCHES_PATH/subgame/mods/homedecor_modpack/homedecor/models" ]; then
# # deprecated, but copy in case gets un-deprecated
# cp -f $PATCHES_PATH/subgame/mods/homedecor_modpack/homedecor/models/* "$MTMOD_DEST_PATH/models/"
#fi
# NOTE: quotes don't work with wildcard
cp -f $PATCHES_PATH/subgame/mods/homedecor_modpack/homedecor/textures/* "$MTMOD_DEST_PATH/textures/"
#cp -f $PATCHES_PATH/subgame/mods/homedecor_modpack/homedecor/textures/* "$MTMOD_DEST_PATH/textures/"
echo "# not recommended:"
echo "sudo cp -Rf $PATCHES_PATH/mods-stopgap/* $MT_MYGAME_MODS_PATH/"
#echo "sudo rm -Rf $MT_MYGAME_MODS_PATH/1.nonworking # leftovers from deprecated ENLIVEN installer"

Write Preview
Loading…
Cancel
Save