Merge pull request #386 from arvitus/cli-arguments

Fixing import and export mode in CLI
Querz · Jun 1, 2023 · 47d2002 · 47d2002
2 parents a04e863 + 3b27827
commit 47d2002
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/net/querz/mcaselector/cli/ParamExecutor.java b/src/main/java/net/querz/mcaselector/cli/ParamExecutor.java
@@ -106,6 +106,11 @@ public final class ParamExecutor {
 			.longOpt("force")
 			.desc("Whether to force NBT tags during NBT change")
 			.build());
+		options.addOption(Option.builder()
+			.longOpt("sections")
+			.desc("One or a range of section indices to import into the target world during chunk import")
+			.hasArg()
+			.build());
 		options.addOption(Option.builder()
 			.longOpt("render-height")
 			.desc("The highest Y level to render in image mode")
@@ -340,7 +345,7 @@ public Future<Boolean> run() {
 	private void printHelp() {
 		String[] helpOrder = new String[]{
 			"help", "version", "mode", "output", "query", "selection", "source-selection", "radius", "x-offset",
-			"y-offset", "z-offset", "overwrite", "force", "render-height", "render-caves", "render-layer-only",
+			"y-offset", "z-offset", "overwrite", "force", "sections", "render-height", "render-caves", "render-layer-only",
 			"render-shade", "render-water-shade", "overlay-type", "overlay-min-value", "overlay-max-value",
 			"overlay-data", "overlay-min-hue", "overlay-max-hue", "zoom-level", "world", "region", "poi", "entities",
 			"source-world", "source-region", "source-poi", "source-entities", "output-world", "output-region",
@@ -513,7 +518,7 @@ private WorldDirectories parseAndCreateWorldDirectories(String prefix) throws Pa
 			poi = parseDirAndCreate(poiName);
 		} else {
 			poi = new File(world, "poi");
-			if (!region.mkdirs()) {
+			if (!poi.mkdirs()) {
 				throw new ParseException(String.format("failed to create poi directory %s", poi));
 			}
 		}

diff --git a/src/main/java/net/querz/mcaselector/io/job/ChunkImporter.java b/src/main/java/net/querz/mcaselector/io/job/ChunkImporter.java
@@ -337,7 +337,7 @@ public boolean execute() {
 
 				ChunkSet targetChunks = null;
 				if (targetSelection != null) {
-					targetChunks = sourceSelection.getSelectedChunks(target);
+					targetChunks = targetSelection.getSelectedChunks(target);
 				}
 
 				for (Map.Entry<Point2i, byte[]> sourceData : sourceDataMappingRegion.entrySet()) {