upgraded tsm_pyramids_to_spawners to modpack version of spawners

etc/change_hardcoded_world_name_first/game-install-ENLIVEN

@@ -1749,7 +1749,7 @@ remove_mod u_skins
 PATCH_SKINS_MOD_NAME="skinsdb"  # used further down too!
 add_zipped_mod $PATCH_SKINS_MOD_NAME skinsdb-master https://github.com/minetest-mods/skinsdb/archive/master.zip
 if [ ! -z "$MATCHING_MODS_BEFORE" ]; then
-  echo "Removed $MATCHING_MODS_BEFORE then installed $PATCH_SKINS_MOD_NAME"
+  echo "Removed $MATCHING_MODS_BEFORE then installed $PATCH_SKINS_MOD_NAME (this output is shown on purpose)"
 fi
 # Update skins database (WARNING: skin numbering affects chosen player skin):
 # (jq is a json processor, required for the updater bash script:)
@@ -1793,7 +1793,7 @@ if [ -d "$SUB_PATH" ]; then
   echo "removing original $SUB_PATH/character_*..."
   rm -Rf $SUB_PATH/character_*  # cannot have quotes if using wildcards
 fi
-sudo cp -f $PATCHES_PATH/mods-multiplayer/$PATCH_SKINS_MOD_NAME/$SUB_NAME "$SUB_PATH"
+sudo cp -f $PATCHES_PATH/mods-multiplayer/$PATCH_SKINS_MOD_NAME/$SUB_NAME/* "$SUB_PATH"
 if [ ! -d "$SUB_PATH" ]; then
   echo "ERROR: failed to install expertmm's skins to $SUB_PATH, so cannot continue." > $err_txt
   cat $err_txt
@@ -1808,7 +1808,7 @@ if [ -d "$SUB_PATH" ]; then
   echo "removing original $SUB_PATH/character_*..."
   rm -Rf $SUB_PATH/character_*  # cannot have quotes if using wildcards
 fi
-sudo cp -f $PATCHES_PATH/mods-multiplayer/$PATCH_SKINS_MOD_NAME/$SUB_NAME "$SUB_PATH"
+sudo cp -f $PATCHES_PATH/mods-multiplayer/$PATCH_SKINS_MOD_NAME/$SUB_NAME/* "$SUB_PATH"
 if [ ! -d "$SUB_PATH" ]; then
   echo "ERROR: failed to install expertmm's skins to $SUB_PATH, so cannot continue." > $err_txt
   cat $err_txt

patches/mods-integration/tsm_pyramids_to_spawners/README.txt → patches/mods-deprecated/tsm_pyramids_to_spawners-0.4.15-git/README.txt

@@ -1,6 +1,6 @@
 Minetest Game mod: tsm_pyramids_to_pyramids
 ===========================================
-This mod provides a transition from tsm_pyramids so you can use "spawners" mod instead, which also uses the pyramids namespace but replaces the pyramids mod.
+This mod provides a transition from tsm_pyramids so you can use "spawners" mod instead for existing worlds, which also uses the pyramids namespace but replaces the pyramids mod.
 
 Authors of source code
 ----------------------
@@ -8,4 +8,4 @@ expertmm (github.com/expertmm)
 
 Authors of media (textures)
 ---------------------------
-(no media)
+(no media)

patches/mods-stopgap/tsm_pyramids_to_spawners/README.txt

@@ -0,0 +1,11 @@
+Minetest Game mod: tsm_pyramids_to_pyramids
+===========================================
+This mod provides a transition from tsm_pyramids so you can use "spawners" modpack instead for existing worlds, which also uses the pyramids namespace but replaces the pyramids mod.
+
+Authors of source code
+----------------------
+expertmm (github.com/expertmm)
+
+Authors of media (textures)
+---------------------------
+(no media)

patches/mods-stopgap/tsm_pyramids_to_spawners/depends.txt

@@ -0,0 +1,3 @@
+default
+spawners_mobs
+moreblocks

patches/mods-stopgap/tsm_pyramids_to_spawners/init.lua

@@ -0,0 +1,50 @@
+-- Copyright 2017 expertmm
+-- 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.
+
+-- 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."
+-- from https://dev.minetest.net/minetest.register_alias
+
+-- BELOW is based on all instances of tsm_pyramids: from tsm_pyramids:
+-- minetest.register_alias("tsm_pyramids:spawner_mummy", "pyramids:spawner_mummy")
+-- minetest.register_alias("tsm_pyramids:spawn_egg", "pyramids:spawn_egg")
+-- minetest.register_alias("tsm_pyramids:mummy", "pyramids:mummy")
+-- minetest.register_alias("tsm_pyramids:mummy_spawner", "pyramids:mummy_spawner")
+-- minetest.register_alias("tsm_pyramids:trap", "pyramids:trap")
+-- minetest.register_alias("tsm_pyramids:trap_2", "pyramids:trap_2")
+-- minetest.register_alias("tsm_pyramids:deco_stone1", "pyramids:deco_stone1")
+-- minetest.register_alias("tsm_pyramids:deco_stone2", "pyramids:deco_stone2")
+-- minetest.register_alias("tsm_pyramids:deco_stone3", "pyramids:deco_stone3")
+-- minetest.register_alias("tsm_pyramids:spawner_mummy", "pyramids:spawner_mummy")
+
+-- BELOW is found from instances of pyramids: in spawners:
+-- minetest.register_alias("pyramids:spawn_egg", "tsm_pyramids:spawn_egg")
+-- minetest.register_alias("pyramids:deco_stone1", "tsm_pyramids:deco_stone1")
+-- minetest.register_alias("pyramids:deco_stone2", "tsm_pyramids:deco_stone2")
+-- minetest.register_alias("pyramids:deco_stone3", "tsm_pyramids:deco_stone3")
+-- minetest.register_alias("pyramids:trap", "tsm_pyramids:trap")
+-- minetest.register_alias("pyramids:trap_2", "tsm_pyramids:trap_2")
+
+-- BELOW uses the backwards compatibility from spawners but pyramids is changed to tsm_pyramids
+--
+-- backwards compatibility
+--
+-- spawner mummy
+minetest.register_alias("tsm_pyramids:spawner_mummy", "spawners_mobs:spawners_mobs_mummy_spawner")
+-- minetest.register_alias("tsm_pyramids:mummy_spawner", "spawners:spawners_mummy_spawner_env")
+-- spawn egg
+minetest.register_alias("tsm_pyramids:spawn_egg", "spawners_mobs:mummy")
+-- mummy entity
+minetest.register_alias("tsm_pyramids:mummy", "spawners_mobs:mummy")
+-- deco stone 1
+minetest.register_alias("tsm_pyramids:deco_stone1", "spawners_mobs:deco_stone_bird")
+-- deco stone 2
+minetest.register_alias("tsm_pyramids:deco_stone2", "spawners_mobs:deco_stone_eye")
+-- deco stone 3
+minetest.register_alias("tsm_pyramids:deco_stone3", "spawners_mobs:deco_stone_men")
+-- deco trap
+minetest.register_alias("tsm_pyramids:trap", "moreblocks:trap_sandstone")
+-- deco trap 2
+minetest.register_alias("tsm_pyramids:trap_2", "moreblocks:trap_desert_stone")