From 7f4e04a7352a0e9913d922326cf1d24f68d180d5 Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Tue, 22 Mar 2016 20:19:32 -0400 Subject: [PATCH] working on renaming shorter names for less keyboarding --- README.md | 8 +++ ...-regen-loop.bat => chunkymap-generator.bat | 0 ...ap-regen-loop.sh => chunkymap-generator.sh | 0 ...ng-files-in-www-minetest-chunkymapdata.bat | 0 ...wamp-www-minetest-chunkymapdata-worlds.bat | 0 chunkymap-regen.py => generator.py | 0 rename-deprecated.bat | 19 ++++++ rename-deprecated.sh | 65 +++++++++++++++++++ ...-signal STOP.bat => send signal - STOP.bat | 0 ...> send signal - stop refreshing player.bat | 0 ...t => send signal - verbose_enable True.bat | 0 ...> signals example - change map refresh.txt | 0 ...ignals example - change player refresh.txt | 0 ... => signals example - no player update.txt | 0 ...xample - prevent or cancel map refresh.txt | 0 ....txt => signals example - stop looping.txt | 0 ... signals example - verbose_enable True.txt | 0 ...te C wamp www.bat => update C wamp www.bat | 0 web/chunkymap.php | 8 +++ 19 files changed, 100 insertions(+) rename chunkymap-regen-loop.bat => chunkymap-generator.bat (100%) rename chunkymap-regen-loop.sh => chunkymap-generator.sh (100%) rename chunkymap-erase-png-files-in-www-minetest-chunkymapdata.bat => erase-png-files-in-www-minetest-chunkymapdata.bat (100%) rename chunkymap-erase-wamp-www-minetest-chunkymapdata-worlds.bat => erase-wamp-www-minetest-chunkymapdata-worlds.bat (100%) rename chunkymap-regen.py => generator.py (100%) create mode 100644 rename-deprecated.bat create mode 100644 rename-deprecated.sh rename chunkymap-signal STOP.bat => send signal - STOP.bat (100%) rename chunkymap-signal stop refreshing player.bat => send signal - stop refreshing player.bat (100%) rename chunkymap-signal verbose_enable True.bat => send signal - verbose_enable True.bat (100%) rename chunkymap-signals example - change map refresh.txt => signals example - change map refresh.txt (100%) rename chunkymap-signals example - change player refresh.txt => signals example - change player refresh.txt (100%) rename chunkymap-signals example - no player update.txt => signals example - no player update.txt (100%) rename chunkymap-signals example - prevent or cancel map refresh.txt => signals example - prevent or cancel map refresh.txt (100%) rename chunkymap-signals example - stop looping.txt => signals example - stop looping.txt (100%) rename chunkymap-signals example - verbose_enable True.txt => signals example - verbose_enable True.txt (100%) rename chunkymap-update C wamp www.bat => update C wamp www.bat (100%) diff --git a/README.md b/README.md index 9932ad3..c2a784e 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,14 @@ world_path * If you are not using Ubuntu, first edit the installer for your distro (and please send the modified file to me [submit as new issue named such as: DISTRONAME installer except instead of DISTRONAME put the distro you made work]) * If you are using Ubuntu * Install the git version of minetest (or otherwise install 0.4.13 or other version compatible with the map generators used by chunkymap) + such as: + #if you have a version before 2016-03-23: + wget + + wget https://github.com/expertmm/minetest-chunkymap/raw/master/install-chunkymap-on-ubuntu-from-web.sh + chmod +x install-chunkymap-on-ubuntu-from-web.sh + wget https://github.com/expertmm/minetest-chunkymap/raw/master/update-chunkymap-on-ubuntu-from-web.sh + chmod +x update-chunkymap-on-ubuntu-from-web.sh OPTION 2: IF you are using Ubuntu go to a terminal, cd to this directory, then switch user to the one that will run minetestserver (since install-chunkymap-on-ubuntu.sh DOES replace "/home/owner" with current user's home [replace-with-current-user.py, which is automatically called by install, will change /home/owner to current user's directory in each script that install copies to $HOME/chunkymap]) diff --git a/chunkymap-regen-loop.bat b/chunkymap-generator.bat similarity index 100% rename from chunkymap-regen-loop.bat rename to chunkymap-generator.bat diff --git a/chunkymap-regen-loop.sh b/chunkymap-generator.sh similarity index 100% rename from chunkymap-regen-loop.sh rename to chunkymap-generator.sh diff --git a/chunkymap-erase-png-files-in-www-minetest-chunkymapdata.bat b/erase-png-files-in-www-minetest-chunkymapdata.bat similarity index 100% rename from chunkymap-erase-png-files-in-www-minetest-chunkymapdata.bat rename to erase-png-files-in-www-minetest-chunkymapdata.bat diff --git a/chunkymap-erase-wamp-www-minetest-chunkymapdata-worlds.bat b/erase-wamp-www-minetest-chunkymapdata-worlds.bat similarity index 100% rename from chunkymap-erase-wamp-www-minetest-chunkymapdata-worlds.bat rename to erase-wamp-www-minetest-chunkymapdata-worlds.bat diff --git a/chunkymap-regen.py b/generator.py similarity index 100% rename from chunkymap-regen.py rename to generator.py diff --git a/rename-deprecated.bat b/rename-deprecated.bat new file mode 100644 index 0000000..34c9e04 --- /dev/null +++ b/rename-deprecated.bat @@ -0,0 +1,19 @@ +REM CHUNKYMAP_DEST_PATH=$HOME/chunkymap +rename chunkymap-erase-png-files-in-www-minetest-chunkymapdata.bat erase-png-files-in-www-minetest-chunkymapdata.bat +rename chunkymap-erase-wamp-www-minetest-chunkymapdata-worlds.bat erase-wamp-www-minetest-chunkymapdata-worlds.bat +rename chunkymap-regen.py generator.py +rename chunkymap-regen-loop.bat chunkymap-generator.bat +rename chunkymap-regen-loop.sh chunkymap-generator.sh +REM mv chunkymap-regen-loop.sh $CHUNKYMAP_DEST_PATH/unused/ +rename "chunkymap-signal stop refreshing player.bat" "send signal - stop refreshing player.bat" +rename "chunkymap-signal STOP.bat" "send signal - STOP.bat" +rename "chunkymap-signal verbose_enable True.bat" "send signal - verbose_enable True.bat" +rename "chunkymap-signals example - change map refresh.txt" "signals example - change map refresh.txt" +rename "chunkymap-signals example - change player refresh.txt" "signals example - change player refresh.txt" +rename "chunkymap-signals example - no player update.txt" "signals example - no player update.txt" +rename "chunkymap-signals example - prevent or cancel map refresh.txt" "signals example - prevent or cancel map refresh.txt" +rename "chunkymap-signals example - stop looping.txt" "signals example - stop looping.txt" +rename "chunkymap-signals example - verbose_enable True.txt" "signals example - verbose_enable True.txt" +rename "chunkymap-update C wamp www.bat" "update C wamp www.bat" + + diff --git a/rename-deprecated.sh b/rename-deprecated.sh new file mode 100644 index 0000000..3818023 --- /dev/null +++ b/rename-deprecated.sh @@ -0,0 +1,65 @@ +#!/bin/sh +cd $HOME +CHUNKYMAP_DEPRECATED_PATH=$HOME/minetest/util +CHUNKYMAP_DEST_PATH=$HOME/chunkymap +if [ ! -d "$CHUNKYMAP_DEST_PATH" ]; then + mkdir "$CHUNKYMAP_DEST_PATH" +fi + +if [ ! -f "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-regen.py" ]; then + CHUNKYMAP_DEPRECATED_PATH=$CHUNKYMAP_DEST_PATH + mv "$CHUNKYMAP_DEPRECATED_PATH/colors (base).txt" "$CHUNKYMAP_DEST_PATH/colors (base).txt" +else + cp -f "$CHUNKYMAP_DEPRECATED_PATH/colors.txt" "$CHUNKYMAP_DEST_PATH/colors (base).txt" +fi + +mv "$CHUNKYMAP_DEPRECATED_PATH/web" "$CHUNKYMAP_DEST_PATH/web" +mv "$CHUNKYMAP_DEPRECATED_PATH/unused" "$CHUNKYMAP_DEST_PATH/unused" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-genresults" "$CHUNKYMAP_DEST_PATH/chunkymap-genresults" +mv "$CHUNKYMAP_DEPRECATED_PATH/archivedebug.py" "$CHUNKYMAP_DEST_PATH/archivedebug.py" +mv "$CHUNKYMAP_DEPRECATED_PATH/colors-missing.txt" "$CHUNKYMAP_DEST_PATH/colors-missing.txt" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-erase-png-files-in-www-minetest-chunkymapdata.bat" "$CHUNKYMAP_DEST_PATH/erase-png-files-in-www-minetest-chunkymapdata.bat" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-erase-wamp-www-minetest-chunkymapdata-worlds.bat" "$CHUNKYMAP_DEST_PATH/erase-wamp-www-minetest-chunkymapdata-worlds.bat" +mv "$CHUNKYMAP_DEPRECATED_PATH/expertmm.py" "$CHUNKYMAP_DEST_PATH/expertmm.py" +rm "$CHUNKYMAP_DEPRECATED_PATH/expertmm.pyc" +mv "$CHUNKYMAP_DEPRECATED_PATH/expertmmregressionsuite.py" "$CHUNKYMAP_DEST_PATH/expertmmregressionsuite.py" +rm "$CHUNKYMAP_DEPRECATED_PATH/expertmmregressionsuite.pyc" +rm "$CHUNKYMAP_DEPRECATED_PATH/expertmmregressiontmp.py" +rm "$CHUNKYMAP_DEPRECATED_PATH/expertmmregressiontmp.pyc" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-regen.py" "$CHUNKYMAP_DEST_PATH/generator.py" +rm "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-regen.pyc" +mv "$CHUNKYMAP_DEPRECATED_PATH/get_python_architecture.py" "$CHUNKYMAP_DEST_PATH/get_python_architecture.py" +mv "$CHUNKYMAP_DEPRECATED_PATH/install-chunkymap-on-ubuntu.sh" "$CHUNKYMAP_DEST_PATH/install-chunkymap-on-ubuntu.sh" +mv "$CHUNKYMAP_DEPRECATED_PATH/install-chunkymap-on-ubuntu-from-web.sh" "$CHUNKYMAP_DEST_PATH/install-chunkymap-on-ubuntu-from-web.sh" +mv $CHUNKYMAP_DEPRECATED_PATH/*.bat +mv "$CHUNKYMAP_DEPRECATED_PATH/install-chunkymap-on-windows.py" "$CHUNKYMAP_DEST_PATH/install-chunkymap-on-windows.py" +mv "$CHUNKYMAP_DEPRECATED_PATH/minetestinfo.py" "$CHUNKYMAP_DEST_PATH/minetestinfo.py" +rm "$CHUNKYMAP_DEPRECATED_PATH/minetestinfo.pyc" +mv "$CHUNKYMAP_DEPRECATED_PATH/minetestmapper-expertmm.py" "$CHUNKYMAP_DEST_PATH/minetestmapper-expertmm.py" +mv "$CHUNKYMAP_DEPRECATED_PATH/minetestmapper-numpy.py" "$CHUNKYMAP_DEST_PATH/minetestmapper-numpy.py" +mv "$CHUNKYMAP_DEPRECATED_PATH/minetestmeta.yml" "$CHUNKYMAP_DEST_PATH/minetestmeta.yml" +mv "$CHUNKYMAP_DEPRECATED_PATH/minetestoffline.py" "$CHUNKYMAP_DEST_PATH/minetestoffline.py" +mv "$CHUNKYMAP_DEPRECATED_PATH/post-update.sh" "$CHUNKYMAP_DEST_PATH/post-update.sh" +mv "$CHUNKYMAP_DEPRECATED_PATH/pythoninfo.py" "$CHUNKYMAP_DEST_PATH/pythoninfo.py" +rm "$CHUNKYMAP_DEPRECATED_PATH/pythoninfo.pyc" +mv "$CHUNKYMAP_DEPRECATED_PATH/README.md" "$CHUNKYMAP_DEST_PATH/README.md" +mv "$CHUNKYMAP_DEPRECATED_PATH/replace-with-current-user.py" "$CHUNKYMAP_DEST_PATH/replace-with-current-user.py" +mv "$CHUNKYMAP_DEPRECATED_PATH/singleimage.py" "$CHUNKYMAP_DEST_PATH/singleimage.py" +mv "$CHUNKYMAP_DEPRECATED_PATH/stop-mts.sh" "$CHUNKYMAP_DEST_PATH/stop-mts.sh" +mv "$CHUNKYMAP_DEPRECATED_PATH/update-chunkymap-installer-only.sh" "$CHUNKYMAP_DEST_PATH/update-chunkymap-installer-only.sh" +mv "$CHUNKYMAP_DEPRECATED_PATH/update-chunkymap-on-ubuntu-from-web.sh" "$CHUNKYMAP_DEST_PATH/update-chunkymap-on-ubuntu-from-web.sh" + +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-regen-loop.bat" "$CHUNKYMAP_DEST_PATH/chunkymap-generator.bat" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-regen-loop.sh" "$CHUNKYMAP_DEST_PATH/chunkymap-generator.bat" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-signal stop refreshing player.bat" "$CHUNKYMAP_DEST_PATH/send signal - stop refreshing player.bat" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-signal STOP.bat" "$CHUNKYMAP_DEST_PATH/send signal - STOP.bat" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-signal verbose_enable True.bat" "$CHUNKYMAP_DEST_PATH/send signal - verbose_enable True.bat" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-signals example - change map refresh.txt" "$CHUNKYMAP_DEST_PATH/signals example - change map refresh.txt" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-signals example - change player refresh.txt" "$CHUNKYMAP_DEST_PATH/signals example - change player refresh.txt" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-signals example - no player update.txt" "$CHUNKYMAP_DEST_PATH/signals example - no player update.txt" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-signals example - prevent or cancel map refresh.txt" "$CHUNKYMAP_DEST_PATH/signals example - prevent or cancel map refresh.txt" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-signals example - stop looping.txt" "$CHUNKYMAP_DEST_PATH/signals example - stop looping.txt" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-signals example - verbose_enable True.txt" "$CHUNKYMAP_DEST_PATH/signals example - verbose_enable True.txt" +mv "$CHUNKYMAP_DEPRECATED_PATH/chunkymap-update C wamp www.bat" "$CHUNKYMAP_DEST_PATH/update C wamp www.bat" + + diff --git a/chunkymap-signal STOP.bat b/send signal - STOP.bat similarity index 100% rename from chunkymap-signal STOP.bat rename to send signal - STOP.bat diff --git a/chunkymap-signal stop refreshing player.bat b/send signal - stop refreshing player.bat similarity index 100% rename from chunkymap-signal stop refreshing player.bat rename to send signal - stop refreshing player.bat diff --git a/chunkymap-signal verbose_enable True.bat b/send signal - verbose_enable True.bat similarity index 100% rename from chunkymap-signal verbose_enable True.bat rename to send signal - verbose_enable True.bat diff --git a/chunkymap-signals example - change map refresh.txt b/signals example - change map refresh.txt similarity index 100% rename from chunkymap-signals example - change map refresh.txt rename to signals example - change map refresh.txt diff --git a/chunkymap-signals example - change player refresh.txt b/signals example - change player refresh.txt similarity index 100% rename from chunkymap-signals example - change player refresh.txt rename to signals example - change player refresh.txt diff --git a/chunkymap-signals example - no player update.txt b/signals example - no player update.txt similarity index 100% rename from chunkymap-signals example - no player update.txt rename to signals example - no player update.txt diff --git a/chunkymap-signals example - prevent or cancel map refresh.txt b/signals example - prevent or cancel map refresh.txt similarity index 100% rename from chunkymap-signals example - prevent or cancel map refresh.txt rename to signals example - prevent or cancel map refresh.txt diff --git a/chunkymap-signals example - stop looping.txt b/signals example - stop looping.txt similarity index 100% rename from chunkymap-signals example - stop looping.txt rename to signals example - stop looping.txt diff --git a/chunkymap-signals example - verbose_enable True.txt b/signals example - verbose_enable True.txt similarity index 100% rename from chunkymap-signals example - verbose_enable True.txt rename to signals example - verbose_enable True.txt diff --git a/chunkymap-update C wamp www.bat b/update C wamp www.bat similarity index 100% rename from chunkymap-update C wamp www.bat rename to update C wamp www.bat diff --git a/web/chunkymap.php b/web/chunkymap.php index b39e66b..462e45f 100644 --- a/web/chunkymap.php +++ b/web/chunkymap.php @@ -377,6 +377,14 @@ function echo_chunkymap_canvas($show_player_names_enable, $decachunks_enable, $c check_world(); + if ($html4_mode_enable!==true) { + echo ''; + } + if (isset($world_name)) { $chunks_per_tile_x_count = 10; $chunks_per_tile_z_count = 10;