From 268fc22d1ee02676585c3abface90ef24e9843f4 Mon Sep 17 00:00:00 2001
From: Alejandro Liu <alejandro_liu@hotmail.com>
Date: Thu, 16 Apr 2015 22:12:26 +0200
Subject: [PATCH] Bug fixes, and doc updates

---
 README.md                                    | 22 ++++++++++---------
 build.php                                    | 23 ++++++++++++--------
 classlib/pmimporter/blocks.txt               |  3 +++
 classlib/pmimporter/generic/RegionLoader.php |  1 -
 main.php                                     | 20 ++++++++++++++++-
 scripts/pmconvert.php                        |  2 --
 version.txt                                  |  2 +-
 7 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 00b0093..8eebb8a 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@ pmimporter
 Overview
 --------
 
-* pmconvert - main conversion tool
-* pmcheck - read world maps and analyze the block, object composition
-* pmentities - dump entity information
-* pmlevel - manipulate some level.dat settings
+* convert - main conversion tool
+* check - read world maps and analyze the block, object composition
+* entities - dump entity information
+* level - manipulate some level.dat settings
 * nbtdump - Dump the contents of NBT files
 * dumpchunk - Extract an specific chunk from a map so it can be
   processed by nbtdump.
@@ -52,9 +52,9 @@ In general, the command usage is:
 
 ### Sub-commands
 
-#### PMCONVERT
+#### CONVERT
 
-	pmconvert [-c rules.txt ] [-t count] [-f format] srcpath dstpath
+	convert [-c rules.txt ] [-t count] [-f format] srcpath dstpath
 
 Converts maps.
 
@@ -68,7 +68,7 @@ Converts maps.
 * `srcpath` : Directory path to the source world.
 * `dstpath` : Directory path to create the new world.
 
-Also, `pmconvert` allows you to specify special settings to tweak the
+Also, `convert` allows you to specify special settings to tweak the
 format reader/writer code.  These settings are specifc to each
 `format`. To configure you must pass the option:
 
@@ -79,7 +79,7 @@ format reader/writer code.  These settings are specifc to each
 
 #### PMCHECK
 
-	pmcheck worldpath [--all|[rX,rZ[:cX,cZ[+cX,cZ]]] ...]
+	check worldpath [--all|[rX,rZ[:cX,cZ[+cX,cZ]]] ...]
 
 Analyze the number of chunks, blocks, etc in a world map.
 
@@ -90,9 +90,9 @@ Analyze the number of chunks, blocks, etc in a world map.
   31) to analyze.
 * `+cX,cZ` : Additional chunks to add to totals.
 
-#### PMLEVEL
+#### LEVEL
 
-	pmlevel worldpath [attr=value]
+	level worldpath [attr=value]
 
 Displays and modifies certain level attributes.
 
@@ -328,6 +328,8 @@ Changes
 
 * 1.5: Bugfix
   * BugFixes in MCPE0.2.0 format.
+  * BugFixes with region offsests on negative values
+  * Tweaked builds and subcommand names
 * 1.4: Maintenance release
   * pmentities fix typos
   * minor text info tweaks
diff --git a/build.php b/build.php
index 221a88a..f79610d 100644
--- a/build.php
+++ b/build.php
@@ -42,20 +42,25 @@
 	$p[$f] = file_get_contents($f);
 }
 
+$scripts= ["version","plugin","man"];
+
 $help = "Available sub-commands:\n";
-foreach (glob('scripts/*.php') as $f) {
-	$f = preg_replace('/^scripts\//','',$f);
+foreach (glob('scripts/*.php') as $fp) {
+	$f = preg_replace('/^scripts\//','',$fp);
 	$f = preg_replace('/\.php$/','',$f);
-	$help .= "\t$f\n";
+	$f = preg_replace('/^pm/','',$f);
+	$scripts[] = $f;
+	echo "$fp as $f\n";
+	$p["scripts/$f.php"] = file_get_contents($fp);
 }
-$help .= "\tversion\n";
-$help .= "\tplugin\n";
-$help .= "\treadme\n";
-$p['scripts/help.php'] = $help;
+sort($scripts);
+$p['scripts/help.php'] = "Available sub-commands:\n\t".
+							  implode("\n\t",$scripts)."\n";
+
 $p['scripts/version.php'] = "<?php require_once(CLASSLIB_DIR.'version.txt');";
-$p['scripts/readme.php'] = file_get_contents('README.md');
+$p['scripts/man.php'] = file_get_contents('README.md');
 
-$dirs=['classlib','scripts'];
+$dirs=['classlib'];
 while(count($dirs)) {
 	$d = array_shift($dirs);
 	$dh = opendir($d) or die("$d: unable to open directory\n");
diff --git a/classlib/pmimporter/blocks.txt b/classlib/pmimporter/blocks.txt
index 4eca61d..a26a0a8 100644
--- a/classlib/pmimporter/blocks.txt
+++ b/classlib/pmimporter/blocks.txt
@@ -157,6 +157,7 @@
 -149	UnpoweredComparator	0
 -150	PoweredComparator	0
 -151	DaylightDetector	0
+; WILL BE AVAILABLE IN 0.11.0
 -152	RedstoneBlock		89
 -153	NetherQuartzOre		112
 -154	Hopper			248
@@ -188,6 +189,8 @@
 -180	RedSandstoneStairs	128
 -181	DoubleRedSanstoneSlab	43
 -182	RedSandstoneSlab	44
+; For 0.11.0
+;-198	GrassPath		171
 243	Podzol
 244	Beetroot
 245	StoneCutter
diff --git a/classlib/pmimporter/generic/RegionLoader.php b/classlib/pmimporter/generic/RegionLoader.php
index 6114dcd..550cde6 100644
--- a/classlib/pmimporter/generic/RegionLoader.php
+++ b/classlib/pmimporter/generic/RegionLoader.php
@@ -1,4 +1,3 @@
-
 <?php
 namespace pmimporter\generic;
 use pmimporter\ImporterException;
diff --git a/main.php b/main.php
index 34f6847..0cbbeb8 100644
--- a/main.php
+++ b/main.php
@@ -8,7 +8,25 @@
 	die();
 }
 
-if (in_array($argv[0],array("version","plugin","readme","help"))) {
+if ($argv[0] == "man") {
+	if (extension_loaded("posix")) {
+		if (posix_isatty(STDIN)) {
+			// Interactive... pipe through more
+			$fin = fopen("phar://pmimporter.phar/scripts/$argv[0].php","r");
+			$fout = popen("more","w");
+			if ($fin && $fout) {
+				stream_copy_to_stream($fin,$fout);
+				fclose($fin);
+				fclose($fout);
+				exit();
+			}
+		}
+	}
+	require_once("phar://pmimporter.phar/scripts/$argv[0].php");
+	exit;
+}
+
+if (in_array($argv[0],array("version","plugin","help"))) {
 	require_once("phar://pmimporter.phar/scripts/$argv[0].php");
 	require_once(CLASSLIB_DIR.'autoload.php');
 	exit;
diff --git a/scripts/pmconvert.php b/scripts/pmconvert.php
index b1293a0..3c8d601 100644
--- a/scripts/pmconvert.php
+++ b/scripts/pmconvert.php
@@ -71,8 +71,6 @@
 if (!$dstformat) die("Output format not recognized\n");
 if ($dstformat !== McRegion::class) die("$dstformat: Format not supported\n");
 
-print_r($settings);
-
 $srcfmt = new $srcformat($srcpath,true,$settings["in"]);
 $regions = $srcfmt->getRegions();
 if (!count($regions)) die("No regions found in $srcpath\n");
diff --git a/version.txt b/version.txt
index 93f5e18..b2b8c35 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-pmimporter 1.4rel
+pmimporter 1.5pre