diff --git a/install-minetest.sh b/install-minetest.sh index 57e214d..9f2bb0a 100644 --- a/install-minetest.sh +++ b/install-minetest.sh @@ -1,6 +1,25 @@ #!/bin/bash # The git repo ONLY includes the core engine: http://localhost:3000/minetest/minetest.git # The build kit should be used, & has "patched Irrlicht, the new LuaJit, built-in LevelDB and Snappy support, Bucket Game, Bucket City, Wonder World, the schems collection, and other pieces" + +customDie() { + echo + echo "ERROR:" + echo "$1" + echo + echo +} + +cd webapp || customDie "You must run this script from the directory containing the webapp directory." +if [ ! -d linux-minetest-kit ]; then + bash reset-minetest-install-source.sh +fi +bash install-mts.sh --client --server + + +exit 0 +# IGNORE EVERYTHING BELOW, it forces the git version + msg="Installing minetestserver ONLY (no param specified). If you want to install the client on your server (not normal practice) or are on a computer with a graphical desktop, add client or both param when calling this script." warnings="" enable_postgres=false @@ -54,7 +73,7 @@ do elif [ "$var" == "--git" ]; then touch git_flag if [ ! -d minetest ]; then - git clone http://localhost:3000/minetest/minetest.git + git clone http://git.minetest.org:3000/minetest/minetest.git else cd minetest git pull diff --git a/patches/mods-stopgap/cme_to_spawners/README.txt b/patches/mods-stopgap-minetest_game/cme_to_spawners/README.txt similarity index 100% rename from patches/mods-stopgap/cme_to_spawners/README.txt rename to patches/mods-stopgap-minetest_game/cme_to_spawners/README.txt diff --git a/patches/mods-stopgap/cme_to_spawners/depends.txt b/patches/mods-stopgap-minetest_game/cme_to_spawners/depends.txt similarity index 100% rename from patches/mods-stopgap/cme_to_spawners/depends.txt rename to patches/mods-stopgap-minetest_game/cme_to_spawners/depends.txt diff --git a/patches/mods-stopgap/cme_to_spawners/init.lua b/patches/mods-stopgap-minetest_game/cme_to_spawners/init.lua similarity index 100% rename from patches/mods-stopgap/cme_to_spawners/init.lua rename to patches/mods-stopgap-minetest_game/cme_to_spawners/init.lua diff --git a/patches/mods-stopgap/dynamic_liquid_to_default/README.txt b/patches/mods-stopgap-minetest_game/dynamic_liquid_to_default/README.txt similarity index 100% rename from patches/mods-stopgap/dynamic_liquid_to_default/README.txt rename to patches/mods-stopgap-minetest_game/dynamic_liquid_to_default/README.txt diff --git a/patches/mods-stopgap/dynamic_liquid_to_default/depends.txt b/patches/mods-stopgap-minetest_game/dynamic_liquid_to_default/depends.txt similarity index 100% rename from patches/mods-stopgap/dynamic_liquid_to_default/depends.txt rename to patches/mods-stopgap-minetest_game/dynamic_liquid_to_default/depends.txt diff --git a/patches/mods-stopgap/dynamic_liquid_to_default/init.lua b/patches/mods-stopgap-minetest_game/dynamic_liquid_to_default/init.lua similarity index 100% rename from patches/mods-stopgap/dynamic_liquid_to_default/init.lua rename to patches/mods-stopgap-minetest_game/dynamic_liquid_to_default/init.lua diff --git a/patches/mods-stopgap/junglelike_dryplants_recipes/README.txt b/patches/mods-stopgap-minetest_game/junglelike_dryplants_recipes/README.txt similarity index 100% rename from patches/mods-stopgap/junglelike_dryplants_recipes/README.txt rename to patches/mods-stopgap-minetest_game/junglelike_dryplants_recipes/README.txt diff --git a/patches/mods-stopgap/junglelike_dryplants_recipes/depends.txt b/patches/mods-stopgap-minetest_game/junglelike_dryplants_recipes/depends.txt similarity index 100% rename from patches/mods-stopgap/junglelike_dryplants_recipes/depends.txt rename to patches/mods-stopgap-minetest_game/junglelike_dryplants_recipes/depends.txt diff --git a/patches/mods-stopgap/junglelike_dryplants_recipes/init.lua b/patches/mods-stopgap-minetest_game/junglelike_dryplants_recipes/init.lua similarity index 100% rename from patches/mods-stopgap/junglelike_dryplants_recipes/init.lua rename to patches/mods-stopgap-minetest_game/junglelike_dryplants_recipes/init.lua diff --git a/patches/mods-stopgap/junglelike_minetestgame_recipes/README.txt b/patches/mods-stopgap-minetest_game/junglelike_minetestgame_recipes/README.txt similarity index 100% rename from patches/mods-stopgap/junglelike_minetestgame_recipes/README.txt rename to patches/mods-stopgap-minetest_game/junglelike_minetestgame_recipes/README.txt diff --git a/patches/mods-stopgap/junglelike_minetestgame_recipes/depends.txt b/patches/mods-stopgap-minetest_game/junglelike_minetestgame_recipes/depends.txt similarity index 100% rename from patches/mods-stopgap/junglelike_minetestgame_recipes/depends.txt rename to patches/mods-stopgap-minetest_game/junglelike_minetestgame_recipes/depends.txt diff --git a/patches/mods-stopgap/junglelike_minetestgame_recipes/init.lua b/patches/mods-stopgap-minetest_game/junglelike_minetestgame_recipes/init.lua similarity index 100% rename from patches/mods-stopgap/junglelike_minetestgame_recipes/init.lua rename to patches/mods-stopgap-minetest_game/junglelike_minetestgame_recipes/init.lua diff --git a/patches/mods-stopgap/lasermk3_to_junk/README.txt b/patches/mods-stopgap-minetest_game/lasermk3_to_junk/README.txt similarity index 100% rename from patches/mods-stopgap/lasermk3_to_junk/README.txt rename to patches/mods-stopgap-minetest_game/lasermk3_to_junk/README.txt diff --git a/patches/mods-stopgap/lasermk3_to_junk/depends.txt b/patches/mods-stopgap-minetest_game/lasermk3_to_junk/depends.txt similarity index 100% rename from patches/mods-stopgap/lasermk3_to_junk/depends.txt rename to patches/mods-stopgap-minetest_game/lasermk3_to_junk/depends.txt diff --git a/patches/mods-stopgap/lasermk3_to_junk/init.lua b/patches/mods-stopgap-minetest_game/lasermk3_to_junk/init.lua similarity index 100% rename from patches/mods-stopgap/lasermk3_to_junk/init.lua rename to patches/mods-stopgap-minetest_game/lasermk3_to_junk/init.lua diff --git a/patches/mods-stopgap/lasermk3_to_junk/technic-microfork/tools/mining_lasers.lua b/patches/mods-stopgap-minetest_game/lasermk3_to_junk/technic-microfork/tools/mining_lasers.lua similarity index 100% rename from patches/mods-stopgap/lasermk3_to_junk/technic-microfork/tools/mining_lasers.lua rename to patches/mods-stopgap-minetest_game/lasermk3_to_junk/technic-microfork/tools/mining_lasers.lua diff --git a/patches/mods-stopgap/nyancat/README.txt b/patches/mods-stopgap-minetest_game/nyancat/README.txt similarity index 100% rename from patches/mods-stopgap/nyancat/README.txt rename to patches/mods-stopgap-minetest_game/nyancat/README.txt diff --git a/patches/mods-stopgap/nyancat/depends.txt b/patches/mods-stopgap-minetest_game/nyancat/depends.txt similarity index 100% rename from patches/mods-stopgap/nyancat/depends.txt rename to patches/mods-stopgap-minetest_game/nyancat/depends.txt diff --git a/patches/mods-stopgap/nyancat/init.lua b/patches/mods-stopgap-minetest_game/nyancat/init.lua similarity index 100% rename from patches/mods-stopgap/nyancat/init.lua rename to patches/mods-stopgap-minetest_game/nyancat/init.lua diff --git a/patches/mods-stopgap/nyancat/license.txt b/patches/mods-stopgap-minetest_game/nyancat/license.txt similarity index 100% rename from patches/mods-stopgap/nyancat/license.txt rename to patches/mods-stopgap-minetest_game/nyancat/license.txt diff --git a/patches/mods-stopgap/nyancat/textures/nyancat_back.png b/patches/mods-stopgap-minetest_game/nyancat/textures/nyancat_back.png similarity index 100% rename from patches/mods-stopgap/nyancat/textures/nyancat_back.png rename to patches/mods-stopgap-minetest_game/nyancat/textures/nyancat_back.png diff --git a/patches/mods-stopgap/nyancat/textures/nyancat_front.png b/patches/mods-stopgap-minetest_game/nyancat/textures/nyancat_front.png similarity index 100% rename from patches/mods-stopgap/nyancat/textures/nyancat_front.png rename to patches/mods-stopgap-minetest_game/nyancat/textures/nyancat_front.png diff --git a/patches/mods-stopgap/nyancat/textures/nyancat_rainbow.png b/patches/mods-stopgap-minetest_game/nyancat/textures/nyancat_rainbow.png similarity index 100% rename from patches/mods-stopgap/nyancat/textures/nyancat_rainbow.png rename to patches/mods-stopgap-minetest_game/nyancat/textures/nyancat_rainbow.png diff --git a/patches/mods-stopgap/nyancat/textures/nyancat_side.png b/patches/mods-stopgap-minetest_game/nyancat/textures/nyancat_side.png similarity index 100% rename from patches/mods-stopgap/nyancat/textures/nyancat_side.png rename to patches/mods-stopgap-minetest_game/nyancat/textures/nyancat_side.png diff --git a/patches/mods-stopgap/spawners_to_spawners_mobs/README.txt b/patches/mods-stopgap-minetest_game/spawners_to_spawners_mobs/README.txt similarity index 100% rename from patches/mods-stopgap/spawners_to_spawners_mobs/README.txt rename to patches/mods-stopgap-minetest_game/spawners_to_spawners_mobs/README.txt diff --git a/patches/mods-stopgap/spawners_to_spawners_mobs/depends.txt b/patches/mods-stopgap-minetest_game/spawners_to_spawners_mobs/depends.txt similarity index 100% rename from patches/mods-stopgap/spawners_to_spawners_mobs/depends.txt rename to patches/mods-stopgap-minetest_game/spawners_to_spawners_mobs/depends.txt diff --git a/patches/mods-stopgap/spawners_to_spawners_mobs/init.lua b/patches/mods-stopgap-minetest_game/spawners_to_spawners_mobs/init.lua similarity index 100% rename from patches/mods-stopgap/spawners_to_spawners_mobs/init.lua rename to patches/mods-stopgap-minetest_game/spawners_to_spawners_mobs/init.lua diff --git a/patches/mods-stopgap/teleporter_to_travelnet/README.txt b/patches/mods-stopgap-minetest_game/teleporter_to_travelnet/README.txt similarity index 100% rename from patches/mods-stopgap/teleporter_to_travelnet/README.txt rename to patches/mods-stopgap-minetest_game/teleporter_to_travelnet/README.txt diff --git a/patches/mods-stopgap/teleporter_to_travelnet/depends.txt b/patches/mods-stopgap-minetest_game/teleporter_to_travelnet/depends.txt similarity index 100% rename from patches/mods-stopgap/teleporter_to_travelnet/depends.txt rename to patches/mods-stopgap-minetest_game/teleporter_to_travelnet/depends.txt diff --git a/patches/mods-stopgap/teleporter_to_travelnet/init.lua b/patches/mods-stopgap-minetest_game/teleporter_to_travelnet/init.lua similarity index 100% rename from patches/mods-stopgap/teleporter_to_travelnet/init.lua rename to patches/mods-stopgap-minetest_game/teleporter_to_travelnet/init.lua diff --git a/patches/mods-stopgap/tsm_pyramids_to_spawners/README.txt b/patches/mods-stopgap-minetest_game/tsm_pyramids_to_spawners/README.txt similarity index 100% rename from patches/mods-stopgap/tsm_pyramids_to_spawners/README.txt rename to patches/mods-stopgap-minetest_game/tsm_pyramids_to_spawners/README.txt diff --git a/patches/mods-stopgap/tsm_pyramids_to_spawners/depends.txt b/patches/mods-stopgap-minetest_game/tsm_pyramids_to_spawners/depends.txt similarity index 100% rename from patches/mods-stopgap/tsm_pyramids_to_spawners/depends.txt rename to patches/mods-stopgap-minetest_game/tsm_pyramids_to_spawners/depends.txt diff --git a/patches/mods-stopgap/tsm_pyramids_to_spawners/init.lua b/patches/mods-stopgap-minetest_game/tsm_pyramids_to_spawners/init.lua similarity index 100% rename from patches/mods-stopgap/tsm_pyramids_to_spawners/init.lua rename to patches/mods-stopgap-minetest_game/tsm_pyramids_to_spawners/init.lua diff --git a/patches/mods-stopgap/animal_materials_legacy/LICENSE.txt b/patches/mods-stopgap/animal_materials_legacy/LICENSE.txt new file mode 100644 index 0000000..797cc4e --- /dev/null +++ b/patches/mods-stopgap/animal_materials_legacy/LICENSE.txt @@ -0,0 +1,21 @@ +# MIT License +Copyright 2019 Poikilos (Jake Gustafson) + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/patches/mods-stopgap/animal_materials_legacy/README.txt b/patches/mods-stopgap/animal_materials_legacy/README.txt new file mode 100644 index 0000000..dec0b99 --- /dev/null +++ b/patches/mods-stopgap/animal_materials_legacy/README.txt @@ -0,0 +1,11 @@ +Bucket_Game mod: animal_materials_legacy +========================= +This mod provides a transition from old versions of animal_materials. + +Authors of source code +---------------------- +poikilos (github.com/poikilos) + +Authors of media (textures) +--------------------------- +(no media) diff --git a/patches/mods-stopgap/animal_materials_legacy/depends.txt b/patches/mods-stopgap/animal_materials_legacy/depends.txt new file mode 100644 index 0000000..07c360c --- /dev/null +++ b/patches/mods-stopgap/animal_materials_legacy/depends.txt @@ -0,0 +1 @@ +animal_materials diff --git a/patches/mods-stopgap/animal_materials_legacy/init.lua b/patches/mods-stopgap/animal_materials_legacy/init.lua new file mode 100644 index 0000000..3b59bc6 --- /dev/null +++ b/patches/mods-stopgap/animal_materials_legacy/init.lua @@ -0,0 +1,6 @@ +-- NOTE: register_alias is not needed for mobs, since alias_mob calls that +-- minetest.register_alias(name, convert_to) +-- "This means that if the engine finds nodes with the name name in the world the node with the name convert_to is used instead. " +-- +minetest.register_alias("animal_materials:deer_horns", "animal_materials:antlers") + diff --git a/patches/mods-stopgap/nftools_legacy/LICENSE.txt b/patches/mods-stopgap/nftools_legacy/LICENSE.txt new file mode 100644 index 0000000..797cc4e --- /dev/null +++ b/patches/mods-stopgap/nftools_legacy/LICENSE.txt @@ -0,0 +1,21 @@ +# MIT License +Copyright 2019 Poikilos (Jake Gustafson) + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/patches/mods-stopgap/nftools_legacy/README.txt b/patches/mods-stopgap/nftools_legacy/README.txt new file mode 100644 index 0000000..420d883 --- /dev/null +++ b/patches/mods-stopgap/nftools_legacy/README.txt @@ -0,0 +1,11 @@ +Bucket_Game mod: nftools_legacy +========================= +This mod provides a transition from old versions of nftools. + +Authors of source code +---------------------- +poikilos (github.com/poikilos) + +Authors of media (textures) +--------------------------- +(no media) diff --git a/patches/mods-stopgap/nftools_legacy/depends.txt b/patches/mods-stopgap/nftools_legacy/depends.txt new file mode 100644 index 0000000..1dd0dcd --- /dev/null +++ b/patches/mods-stopgap/nftools_legacy/depends.txt @@ -0,0 +1 @@ +nftools diff --git a/patches/mods-stopgap/nftools_legacy/init.lua b/patches/mods-stopgap/nftools_legacy/init.lua new file mode 100644 index 0000000..756eae2 --- /dev/null +++ b/patches/mods-stopgap/nftools_legacy/init.lua @@ -0,0 +1,16 @@ +-- NOTE: register_alias is not needed for mobs, since alias_mob calls that +-- minetest.register_alias(name, convert_to) +-- "This means that if the engine finds nodes with the name name in the world the node with the name convert_to is used instead. " +-- + +minetest.register_alias("nftools:alexandrite_ore", "nftools:stone_with_bismuth") +minetest.register_alias("nftools:alexandrite", "nftools:bismuth") + +minetest.register_alias("nftools:amber", "nftools:stone_with_amber") +-- (formerly called amber but dropped chip; use conventions instead) + +minetest.register_alias("nftools:aquamarine_ore", "nftools:stone_with_turquoise") +minetest.register_alias("nftools:aquamarine", "nftools:turquoise") + +minetest.register_alias("nftools:amethyst_ore", "nftools:stone_with_blackopal") +minetest.register_alias("nftools:amethyst", "nftools:blackopal") diff --git a/util/deprecated/install-ENLIVEN-minetest_game.sh b/util/deprecated/install-ENLIVEN-minetest_game.sh index 93d1d6d..9d57d52 100755 --- a/util/deprecated/install-ENLIVEN-minetest_game.sh +++ b/util/deprecated/install-ENLIVEN-minetest_game.sh @@ -1010,7 +1010,7 @@ fi # NOTE: quotes don't work with wildcard #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 cp -Rf $PATCHES_PATH/mods-stopgap-minetest_game/* $MT_MYGAME_MODS_PATH/" #echo "sudo rm -Rf $MT_MYGAME_MODS_PATH/1.nonworking # leftovers from deprecated ENLIVEN installer" else echo "did not find $PATCHES_PATH, so skipped automatic patching which is partially implemented" diff --git a/webapp/install-mts.sh b/webapp/install-mts.sh index e79c5c4..fc4e4f5 100755 --- a/webapp/install-mts.sh +++ b/webapp/install-mts.sh @@ -24,6 +24,9 @@ extra_options="" if [ "@$1" = "@--client" ]; then enable_client=true fi +if [ "@$2" = "@--client" ]; then + enable_client=true +fi flag_icon="$HOME/Desktop/org.minetest.minetest.desktop" flag_file="minetest/bin/minetestserver" if [ -f "$flag_icon" ]; then @@ -165,6 +168,7 @@ else # cp -f "$flag_dir/mods/LICENSE" "$HOME/minetest/games/ENLIVEN/mods/LICENSE" fi popd + pushd .. src="patches/subgame/menu" dst="$HOME/minetest/games/ENLIVEN/menu" @@ -293,6 +297,14 @@ if [ "@$enable_client" = "@true" ]; then fi fi fi + +if [ -d $HOME/minetest/games/ENLIVEN/mods/animal_materials ]; then + rsync -rt patches/mods-stopgap/animal_materials_legacy $HOME/minetest/games/ENLIVEN/mods/ +fi +if [ -d $HOME/minetest/games/ENLIVEN/mods/nftools ]; then + rsync -rt patches/mods-stopgap/nftools_legacy $HOME/minetest/games/ENLIVEN/mods/ +fi + popd settings_dump="`pwd`/settings-dump.txt" settings_types_list="`pwd`/settingstypes-list.txt"