From 6a1d80e021d0e5d2c8734663c5469b411cb5e53f Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Sat, 21 Dec 2024 17:41:01 +0000
Subject: [PATCH 1/3] tools/convert-world: fixed some UI issues

---
 tools/convert-world.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/convert-world.php b/tools/convert-world.php
index d4d15ce57..828ccb470 100644
--- a/tools/convert-world.php
+++ b/tools/convert-world.php
@@ -52,7 +52,7 @@ $writableFormats = array_filter($providerManager->getAvailableProviders(), fn(Wo
 $requiredOpts = [
 	"world" => "path to the input world for conversion",
 	"backup" => "path to back up the original files",
-	"format" => "desired output format (can be one of: " . implode(",", array_keys($writableFormats)) . ")"
+	"format" => "desired output format (can be one of: " . implode(", ", array_keys($writableFormats)) . ")"
 ];
 $usageMessage = "Options:\n";
 foreach($requiredOpts as $_opt => $_desc){
@@ -89,7 +89,7 @@ if(count($oldProviderClasses) === 0){
 	exit(1);
 }
 if(count($oldProviderClasses) > 1){
-	fwrite(STDERR, "Ambiguous input world format: matched " . count($oldProviderClasses) . " (" . implode(array_keys($oldProviderClasses)) . ")" . PHP_EOL);
+	fwrite(STDERR, "Ambiguous input world format: matched " . count($oldProviderClasses) . " (" . implode(", ", array_keys($oldProviderClasses)) . ")" . PHP_EOL);
 	exit(1);
 }
 $oldProviderClass = array_shift($oldProviderClasses);

From ada3acdba4a0a2cef5f4de284a66e42cc6dcf23e Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Sat, 21 Dec 2024 17:43:59 +0000
Subject: [PATCH 2/3] FormatConverter: ensure we don't get stalled due to
 stdout buffer flood this can happen due to very noisy outputs during
 conversion, e.g. if there were many unknown blocks.

---
 src/world/format/io/FormatConverter.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/world/format/io/FormatConverter.php b/src/world/format/io/FormatConverter.php
index 1d485afa2..ea5af221c 100644
--- a/src/world/format/io/FormatConverter.php
+++ b/src/world/format/io/FormatConverter.php
@@ -33,6 +33,7 @@ use function basename;
 use function crc32;
 use function file_exists;
 use function floor;
+use function flush;
 use function microtime;
 use function mkdir;
 use function random_bytes;
@@ -150,6 +151,7 @@ class FormatConverter{
 				$diff = $time - $thisRound;
 				$thisRound = $time;
 				$this->logger->info("Converted $counter / $count chunks (" . floor($this->chunksPerProgressUpdate / $diff) . " chunks/sec)");
+				flush();
 			}
 		}
 		$total = microtime(true) - $start;

From 306623e890b046cf195e57860d1043d99cf986fb Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Sat, 21 Dec 2024 17:47:16 +0000
Subject: [PATCH 3/3] FormatConverter: do periodic GC this reduces the risk of
 OOM during conversion of large worlds we probably ought to limit the size of
 region caches for regionized worlds, but that's a problem for another time.

---
 src/world/format/io/FormatConverter.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/world/format/io/FormatConverter.php b/src/world/format/io/FormatConverter.php
index ea5af221c..421d707fa 100644
--- a/src/world/format/io/FormatConverter.php
+++ b/src/world/format/io/FormatConverter.php
@@ -153,6 +153,9 @@ class FormatConverter{
 				$this->logger->info("Converted $counter / $count chunks (" . floor($this->chunksPerProgressUpdate / $diff) . " chunks/sec)");
 				flush();
 			}
+			if(($counter % (2 ** 16)) === 0){
+				$new->doGarbageCollection();
+			}
 		}
 		$total = microtime(true) - $start;
 		$this->logger->info("Converted $counter / $counter chunks in " . round($total, 3) . " seconds (" . floor($counter / $total) . " chunks/sec)");