From 984380b6fab2534646a3f7ac140b699158c53d39 Mon Sep 17 00:00:00 2001
From: saibotk <saibotk@users.noreply.github.com>
Date: Tue, 18 Jun 2019 16:14:29 +0200
Subject: [PATCH] update input dirs and symlinks

---
 Dockerfile                 | 6 +++---
 README.md                  | 8 ++++----
 files/docker-entrypoint.sh | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9b99ce5..7fabce5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,9 +8,9 @@ ARG PUID=844
 ARG PGID=844
 
 ENV OUTPUT=/blockmap/output \
-	INPUT_OVERWORLD=/blockmap/input/region \
-	INPUT_NETHER=/blockmap/input/DIM1/region \
-	INPUT_END=/blockmap/input/DIM-1/region \
+	INPUT_OVERWORLD=/blockmap/input/overworld \
+	INPUT_NETHER=/blockmap/input/nether/ \
+	INPUT_END=/blockmap/input/end/ \
 	VERSION=1.4.0 \
 	SHA1=6b51f4d3d23094da2820d9461036a618c2933083
 
diff --git a/README.md b/README.md
index 0bf308e..cf53408 100644
--- a/README.md
+++ b/README.md
@@ -18,13 +18,13 @@ This image can be used to render a Minecraft map, by just mounting the world fol
 ### Quick Start
 
 *Please **replace the paths** on the left side with your own!*  
-*They should all point to a directory, where the region files are located (files like **r.0.0.mca**)*
+*They should all point to a directory, where the region files are located (files like **r.0.0.mca**) or if you want all data to be processed, the parent folder (usually where the 'region') folder lives in.*
 
 ```
 sudo docker run -d \
-	-v /MY-MINECRAFT-PATH/world/region:/blockmap/input/region/ \
-	-v /MY-MINECRAFT-PATH/world_nether/:/blockmap/input/DIM1/ \
-	-v /MY-MINECRAFT-PATH/world_the_end/:/blockmap/input/DIM-1/ \ 
+	-v /MY-MINECRAFT-PATH/world/:/blockmap/input/overworld/ \
+	-v /MY-MINECRAFT-PATH/world_nether/:/blockmap/input/nether/ \
+	-v /MY-MINECRAFT-PATH/world_the_end/:/blockmap/input/end/ \ 
 	-v /MY-OUTPUT-PATH/output:/opt/blockmap/output \
 	--name blockmap \
 	saibotk/blockmap
diff --git a/files/docker-entrypoint.sh b/files/docker-entrypoint.sh
index c1b21a2..be524f7 100755
--- a/files/docker-entrypoint.sh
+++ b/files/docker-entrypoint.sh
@@ -16,6 +16,7 @@ WORLD_FOLDER_END=/opt/blockmap/end
 OUTPUT_DIR=/opt/blockmap/output
 BLOCKMAP_FILE=/opt/blockmap/BlockMap.jar
 
+ls -l /opt/blockmap
 # A simple and plain overworld view
 echo "[INFO] Rendering overworld..."
 mkdir -p $OUTPUT_DIR/overworld
@@ -28,12 +29,12 @@ java -jar $BLOCKMAP_FILE -v render -l -o=$OUTPUT_DIR/overworld_ocean -c=OCEAN_GR
 
 # The nether up to height 64
 echo "[INFO] Rendering overworld_nether..."
-mkdir -p $OUTPUT_DIR/overworld_nether
+mkdir -p $OUTPUT_DIR/nether
 java -jar $BLOCKMAP_FILE -v render -l -o=$OUTPUT_DIR/nether --max-height=64 $WORLD_FOLDER_NETHER
 
 # A plain view of the end
 echo "[INFO] Rendering overworld_end..."
-mkdir -p $OUTPUT_DIR/overworld_end
+mkdir -p $OUTPUT_DIR/end
 java -jar $BLOCKMAP_FILE -v render -l -o=$OUTPUT_DIR/end $WORLD_FOLDER_END
 
 # Write an index file to the root directory. It is a simple name=path properties file, but in JSON.