From 9e87d81e58fa55f3be4af645aafbb43e20db6093 Mon Sep 17 00:00:00 2001
From: Justin Aquadro <jaquadro@gmail.com>
Date: Wed, 9 Feb 2011 06:14:48 +0000
Subject: [PATCH] fixes to printed usage

---
 NBToolkit/main.c    | 10 +++++-----
 NBToolkit/replace.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/NBToolkit/main.c b/NBToolkit/main.c
index df6dcc1..475f578 100644
--- a/NBToolkit/main.c
+++ b/NBToolkit/main.c
@@ -39,12 +39,12 @@ const char * basename (const char *path) {
 }
 
 void print_usage (const char *name) {
-	fprintf(stderr, "Usage: %s <world dir> <tool> <ore_id> [options]\n", basename(name));
+	fprintf(stderr, "Usage: %s <tool> <world dir> [options]\n", basename(name));
 	fprintf(stderr, "Available tools:\n");
 	fprintf(stderr, "    oregen      : Generate new ore deposits\n");
 	fprintf(stderr, "    replace     : Replace one block type with another\n\n");
 	fprintf(stderr, "Usage and options for 'oregen':\n");
-	fprintf(stderr, "    %s <world_dir> oregen <ore_id> [options]\n\n", basename(name));
+	fprintf(stderr, "    %s oregen <world_dir> <ore_id> [options]\n\n", basename(name));
 	fprintf(stderr, "    Ore IDs:\n");
 	fprintf(stderr, "        16 = Coal, 15 = Iron, 14 = Gold, 73 = Redstone, 56 = Diamond, 21 = Lapis\n");
 	fprintf(stderr, "    Options:\n");
@@ -58,10 +58,10 @@ void print_usage (const char *name) {
 	fprintf(stderr, "        -oa         : Take precedence over all existing blocks (including air)\n");
 	fprintf(stderr, "        -oi <id>    : Take precedence over a specific block type\n\n");
 	fprintf(stderr, "Usage and options for 'replace':\n");
-	fprintf(stderr, "    %s <world_dir> replace <block_id_1> <block_id_2> [options]\n\n", basename(name));
+	fprintf(stderr, "    %s replace <world_dir> <block_id_1> <block_id_2> [options]\n\n", basename(name));
 	fprintf(stderr, "    Options:\n");
-	fprintf(stderr, "        -mn <num>   : Minimum depth ore is generated (0-127)\n");
-	fprintf(stderr, "        -mx <num>   : Maximum depth ore is generated (0-127)\n");
+	fprintf(stderr, "        -mn <num>   : Minimum depth blocks are replaced (0-127)\n");
+	fprintf(stderr, "        -mx <num>   : Maximum height blocks are replaced (0-127)\n");
 	fprintf(stderr, "        -p <num>    : Probability that an individual block is replaced (0.0-1.0)\n");
 	fprintf(stderr, "Common Options:\n");
 	/*fprintf(stderr, "    -cb <time>	    : Only update chunks created before time (as unix timestamp)\n");
diff --git a/NBToolkit/replace.c b/NBToolkit/replace.c
index 1c83f4e..2bbd41a 100644
--- a/NBToolkit/replace.c
+++ b/NBToolkit/replace.c
@@ -56,7 +56,7 @@ int pf_replace (nbt_file * nf, struct options * opt, void * pf_opt) {
     				if (opt->set & OPT_VV) {
 						fprintf(stderr, "Replaced block at %d,%d,%d\n", x, y, z);
 					}
-					
+
 					if (rep_opt->set & OPT_DATA) {
 						if (index % 2 == 0) {
 							dat->content[index / 2] = (dat->content[index / 2] & 0xF0) | rep_opt->data;