# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1489890146 -3600
# Node ID 4c3e0cb9e2b066db9af0a73ec032be760e81d2ab
# Parent  efc44bf947904f88dbc0ddf792a7bc5b4948ad56
tazcarft: small fixes and improvments

diff -r efc44bf94790 -r 4c3e0cb9e2b0 tazcraft/README
--- a/tazcraft/README	Sun Mar 19 01:32:00 2017 +0100
+++ b/tazcraft/README	Sun Mar 19 03:22:26 2017 +0100
@@ -1,7 +1,9 @@
+Tazcraft
+================================================================================
 
-Minecraft custom tools for SliTaz GNU/Linux. Tazcraft can install and run Minecraft server
-as well as getting the client and starting to play. It can also optionaly install the Java
-Runtime Environement (JRE)
+Minecraft custom tools for SliTaz GNU/Linux. Tazcraft can install and run 
+Minecraft server as well as getting the client and starting to play. It can 
+also optionaly install the Java Runtime Environement (JRE).
 
 
 Server configuration
@@ -13,3 +15,30 @@
 	1 - Creative
 	2 - Adventure
 	3 - Spectator
+
+
+MOTD text colours and formating
+-------------------------------
+	\u00A70 - BLACK
+	\u00A71 - DARK BLUE
+	\u00A72 - DARK GREEN
+	\u00A73 - DARK AQUA
+	\u00A74 - DARK RED
+	\u00A75 - DARK PURPLE
+	\u00A76 - GOLD
+	\u00A77 - GRAY
+	\u00A78 - DARK GRAY
+	\u00A79 - INDIGO
+	\u00A7a - GREEN
+	\u00A7b - AQUA
+	\u00A7c - RED
+	\u00A7d - PINK
+	\u00A7e - YELLOW
+	\u00A7f - WHITE
+	\u00A7k - Obfuscated
+	\u00A7l - Bold
+	\u00A7m - Strikethrough
+	\u00A7n - Underline
+	\u00A7o - Italic
+	\u00A7r - Reset
+	
diff -r efc44bf94790 -r 4c3e0cb9e2b0 tazcraft/cgi-bin/tazcraft.cgi
--- a/tazcraft/cgi-bin/tazcraft.cgi	Sun Mar 19 01:32:00 2017 +0100
+++ b/tazcraft/cgi-bin/tazcraft.cgi	Sun Mar 19 03:22:26 2017 +0100
@@ -41,13 +41,14 @@
 	</div>
 	<h1>Tazcraft Server</h1>
 </header>
+<div id="content">
 
-<div id="content">
 <h2>Welcome to Tazcraft</h2>
 <p>A SliTaz GNU/Linux Minecraft server</p>
 <pre>
-<img src="minecraft.png" alt="*" />Server address: <b>play.slitaz.org</b>
+<img src="minecraft.png" alt="*" />Server address: <b>play.slitaz.me</b>
 </pre>
+
 <h3>Configuration</h3>
 <table>
 	<thead>
@@ -56,14 +57,13 @@
 	</thead>
 EOT
 
-for var in gamemode server-port level-name; do
+for var in gamemode server-port level-name difficulty max-players; do
 	get_value ${var}
 done
 
 # HTML footer
 cat << EOT
 </table>
-
 </div>
 <footer></footer>
 </body>
diff -r efc44bf94790 -r 4c3e0cb9e2b0 tazcraft/tazcraft
--- a/tazcraft/tazcraft	Sun Mar 19 01:32:00 2017 +0100
+++ b/tazcraft/tazcraft	Sun Mar 19 03:22:26 2017 +0100
@@ -56,6 +56,14 @@
 	fi
 }
 
+# Change default motd
+check_motd() {
+	motd=$(grep ^motd= ${config} | sed s'/motd=//')
+	if [ "$motd" == "A Minecraft Server" ]; then
+		sed -i s'/motd=.*/motd=\u00A72A Tazcraft Server/' ${config}
+	fi
+}
+
 # Get a value in
 get_value() {
 	val=$(grep ^${1}= ${config} | cut -d "=" -f 2)
@@ -80,6 +88,7 @@
 	
 	-s|start)
 		check_java || exit 1
+		check_motd
 		colorize 032 "Starting Minecraft server..."
 		[ ! "$gui" ] && opts="nogui"
 		cd ${server}
@@ -120,16 +129,18 @@
 		colorize 032 "Minecraft Server"
 		echo "Version : $version"
 		echo "Home    : $home"
+		newline
 		
 		colorize 032 "Server properties"
-		for var in server-port level-name; do
+		for var in gamemode server-port level-name difficulty max-players; do
 			get_value ${var}
 		done
+		newline
 		
 		if check_java; then
 			colorize 032 "Java Runtime Environment"
-			echo "Java: $java"
-			${java} -version
+			echo "Path: $java"
+			${java} -version #2>&1 | grep "version"
 		fi
 		newline ;;